From e6e7354a9e44416b1242bee9ffed3105579f97bc Mon Sep 17 00:00:00 2001
From: Poff Poffenberger <poffdeluxe@gmail.com>
Date: Tue, 18 Aug 2020 12:39:46 -0500
Subject: [PATCH 01/85] [Canvas] Remove dependency on legacy expressions APIs
 (#74885)

* Remove legacy types and function registration

* Pull server interpreter functions routes into Canvas and update them to use new expressions API

* Clean up comment

* Removing boom and doing more cleanup

* Add functions test and refactor other router tests

* Adding a type and refactoring a forgotten test

* more tests

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 x-pack/plugins/canvas/common/lib/constants.ts |  1 +
 x-pack/plugins/canvas/kibana.json             |  2 +-
 x-pack/plugins/canvas/public/application.tsx  |  2 +-
 .../canvas/public/functions/filters.ts        |  2 +-
 .../plugins/canvas/public/functions/index.ts  |  2 +-
 x-pack/plugins/canvas/public/functions/to.ts  |  2 +-
 x-pack/plugins/canvas/public/plugin.tsx       |  2 +
 .../canvas/public/services/expressions.ts     | 39 +++++++++-
 x-pack/plugins/canvas/public/store.ts         |  3 +-
 x-pack/plugins/canvas/server/plugin.ts        | 10 ++-
 .../routes/custom_elements/create.test.ts     | 19 ++---
 .../routes/custom_elements/delete.test.ts     | 18 ++---
 .../routes/custom_elements/find.test.ts       | 18 ++---
 .../server/routes/custom_elements/get.test.ts | 18 ++---
 .../routes/custom_elements/update.test.ts     | 18 ++---
 .../server/routes/es_fields/es_fields.test.ts | 18 ++---
 .../server/routes/functions/functions.test.ts | 51 +++++++++++++
 .../server/routes/functions/functions.ts      | 73 +++++++++++++++++++
 .../canvas/server/routes/functions/index.ts   | 13 ++++
 x-pack/plugins/canvas/server/routes/index.ts  |  9 ++-
 .../server/routes/shareables/download.test.ts | 13 ++--
 .../server/routes/shareables/zip.test.ts      | 14 ++--
 .../server/routes/templates/list.test.ts      | 25 ++-----
 .../canvas/server/routes/test_helpers.ts      | 29 ++++++++
 .../server/routes/workpad/create.test.ts      | 19 ++---
 .../server/routes/workpad/delete.test.ts      | 18 ++---
 .../canvas/server/routes/workpad/find.test.ts | 18 ++---
 .../canvas/server/routes/workpad/get.test.ts  | 18 ++---
 .../server/routes/workpad/update.test.ts      | 29 +++-----
 .../canvas/server/setup_interpreter.ts        |  2 +-
 30 files changed, 306 insertions(+), 199 deletions(-)
 create mode 100644 x-pack/plugins/canvas/server/routes/functions/functions.test.ts
 create mode 100644 x-pack/plugins/canvas/server/routes/functions/functions.ts
 create mode 100644 x-pack/plugins/canvas/server/routes/functions/index.ts
 create mode 100644 x-pack/plugins/canvas/server/routes/test_helpers.ts

diff --git a/x-pack/plugins/canvas/common/lib/constants.ts b/x-pack/plugins/canvas/common/lib/constants.ts
index e960a86bd76dc..d514fb53b4a4b 100644
--- a/x-pack/plugins/canvas/common/lib/constants.ts
+++ b/x-pack/plugins/canvas/common/lib/constants.ts
@@ -42,3 +42,4 @@ export const API_ROUTE_SHAREABLE_RUNTIME = '/public/canvas/runtime';
 export const API_ROUTE_SHAREABLE_RUNTIME_DOWNLOAD = `/public/canvas/${SHAREABLE_RUNTIME_NAME}.js`;
 export const CANVAS_EMBEDDABLE_CLASSNAME = `canvasEmbeddable`;
 export const CONTEXT_MENU_TOP_BORDER_CLASSNAME = 'canvasContextMenu--topBorder';
+export const API_ROUTE_FUNCTIONS = `${API_ROUTE}/fns`;
diff --git a/x-pack/plugins/canvas/kibana.json b/x-pack/plugins/canvas/kibana.json
index 5f4ea5802cb13..68fbec3e8429d 100644
--- a/x-pack/plugins/canvas/kibana.json
+++ b/x-pack/plugins/canvas/kibana.json
@@ -5,7 +5,7 @@
     "configPath": ["xpack", "canvas"],
     "server": true,
     "ui": true,
-    "requiredPlugins": ["data", "embeddable", "expressions", "features", "home", "inspector", "uiActions"],
+    "requiredPlugins": ["bfetch", "data", "embeddable", "expressions", "features", "home", "inspector", "uiActions"],
     "optionalPlugins": ["usageCollection"],
     "requiredBundles": ["kibanaReact", "maps", "lens", "visualizations", "kibanaUtils", "kibanaLegacy", "discover", "savedObjects", "reporting"]
   }
diff --git a/x-pack/plugins/canvas/public/application.tsx b/x-pack/plugins/canvas/public/application.tsx
index 90173a20500e5..482cd04373105 100644
--- a/x-pack/plugins/canvas/public/application.tsx
+++ b/x-pack/plugins/canvas/public/application.tsx
@@ -86,7 +86,7 @@ export const initializeCanvas = async (
   const canvasFunctions = initFunctions({
     timefilter: setupPlugins.data.query.timefilter.timefilter,
     prependBasePath: coreSetup.http.basePath.prepend,
-    typesRegistry: setupPlugins.expressions.__LEGACY.types,
+    types: setupPlugins.expressions.getTypes(),
   });
 
   for (const fn of canvasFunctions) {
diff --git a/x-pack/plugins/canvas/public/functions/filters.ts b/x-pack/plugins/canvas/public/functions/filters.ts
index 61fa67dc63316..fdb5d69d35515 100644
--- a/x-pack/plugins/canvas/public/functions/filters.ts
+++ b/x-pack/plugins/canvas/public/functions/filters.ts
@@ -81,7 +81,7 @@ export function filtersFunctionFactory(initialize: InitializeArguments): () => F
           const filterAST = fromExpression(filterExpression);
           return interpretAst(filterAST, getWorkpadVariablesAsObject(getState()));
         } else {
-          const filterType = initialize.typesRegistry.get('filter');
+          const filterType = initialize.types.filter;
           return filterType?.from(null, {});
         }
       },
diff --git a/x-pack/plugins/canvas/public/functions/index.ts b/x-pack/plugins/canvas/public/functions/index.ts
index 5e098d8f175c5..a7893162be8f8 100644
--- a/x-pack/plugins/canvas/public/functions/index.ts
+++ b/x-pack/plugins/canvas/public/functions/index.ts
@@ -12,7 +12,7 @@ import { CanvasSetupDeps, CoreSetup } from '../plugin';
 
 export interface InitializeArguments {
   prependBasePath: CoreSetup['http']['basePath']['prepend'];
-  typesRegistry: CanvasSetupDeps['expressions']['__LEGACY']['types'];
+  types: ReturnType<CanvasSetupDeps['expressions']['getTypes']>;
   timefilter: CanvasSetupDeps['data']['query']['timefilter']['timefilter'];
 }
 
diff --git a/x-pack/plugins/canvas/public/functions/to.ts b/x-pack/plugins/canvas/public/functions/to.ts
index 032873dfa6cf2..36b2d3f9f04c6 100644
--- a/x-pack/plugins/canvas/public/functions/to.ts
+++ b/x-pack/plugins/canvas/public/functions/to.ts
@@ -38,7 +38,7 @@ export function toFunctionFactory(initialize: InitializeArguments): () => ToFunc
           throw errors.missingType();
         }
 
-        return castProvider(initialize.typesRegistry.toJS())(input, args.type);
+        return castProvider(initialize.types)(input, args.type);
       },
     };
   };
diff --git a/x-pack/plugins/canvas/public/plugin.tsx b/x-pack/plugins/canvas/public/plugin.tsx
index 4829a94bb0db8..0269774a446c1 100644
--- a/x-pack/plugins/canvas/public/plugin.tsx
+++ b/x-pack/plugins/canvas/public/plugin.tsx
@@ -24,6 +24,7 @@ import { UiActionsStart } from '../../../../src/plugins/ui_actions/public';
 import { EmbeddableStart } from '../../../../src/plugins/embeddable/public';
 import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
 import { Start as InspectorStart } from '../../../../src/plugins/inspector/public';
+import { BfetchPublicSetup } from '../../../../src/plugins/bfetch/public';
 // @ts-expect-error untyped local
 import { argTypeSpecs } from './expression_types/arg_types';
 import { transitions } from './transitions';
@@ -41,6 +42,7 @@ export interface CanvasSetupDeps {
   expressions: ExpressionsSetup;
   home: HomePublicPluginSetup;
   usageCollection?: UsageCollectionSetup;
+  bfetch: BfetchPublicSetup;
 }
 
 export interface CanvasStartDeps {
diff --git a/x-pack/plugins/canvas/public/services/expressions.ts b/x-pack/plugins/canvas/public/services/expressions.ts
index 1376aab0ca8b9..87a657641acfd 100644
--- a/x-pack/plugins/canvas/public/services/expressions.ts
+++ b/x-pack/plugins/canvas/public/services/expressions.ts
@@ -5,7 +5,11 @@
  */
 
 import { CanvasServiceFactory } from '.';
-import { ExpressionsService } from '../../../../../src/plugins/expressions/common';
+import {
+  ExpressionsService,
+  serializeProvider,
+} from '../../../../../src/plugins/expressions/common';
+import { API_ROUTE_FUNCTIONS } from '../../common/lib/constants';
 
 export const expressionsServiceFactory: CanvasServiceFactory<ExpressionsService> = async (
   coreSetup,
@@ -13,6 +17,37 @@ export const expressionsServiceFactory: CanvasServiceFactory<ExpressionsService>
   setupPlugins,
   startPlugins
 ) => {
-  await setupPlugins.expressions.__LEGACY.loadLegacyServerFunctionWrappers();
+  const { expressions, bfetch } = setupPlugins;
+
+  let cached: Promise<void> | null = null;
+  const loadServerFunctionWrappers = async () => {
+    if (!cached) {
+      cached = (async () => {
+        const serverFunctionList = await coreSetup.http.get(API_ROUTE_FUNCTIONS);
+        const batchedFunction = bfetch.batchedFunction({ url: API_ROUTE_FUNCTIONS });
+        const { serialize } = serializeProvider(expressions.getTypes());
+
+        // For every sever-side function, register a client-side
+        // function that matches its definition, but which simply
+        // calls the server-side function endpoint.
+        Object.keys(serverFunctionList).forEach((functionName) => {
+          if (expressions.getFunction(functionName)) {
+            return;
+          }
+          const fn = () => ({
+            ...serverFunctionList[functionName],
+            fn: (input: any, args: any) => {
+              return batchedFunction({ functionName, args, context: serialize(input) });
+            },
+          });
+          expressions.registerFunction(fn);
+        });
+      })();
+    }
+    return cached;
+  };
+
+  await loadServerFunctionWrappers();
+
   return setupPlugins.expressions.fork();
 };
diff --git a/x-pack/plugins/canvas/public/store.ts b/x-pack/plugins/canvas/public/store.ts
index ef93a34296da2..b1c10f8d46d27 100644
--- a/x-pack/plugins/canvas/public/store.ts
+++ b/x-pack/plugins/canvas/public/store.ts
@@ -15,6 +15,7 @@ import {
 import { getInitialState } from './state/initial_state';
 
 import { CoreSetup } from '../../../../src/core/public';
+import { API_ROUTE_FUNCTIONS } from '../common/lib/constants';
 import { CanvasSetupDeps } from './plugin';
 
 export async function createStore(core: CoreSetup, plugins: CanvasSetupDeps) {
@@ -31,7 +32,7 @@ export async function createFreshStore(core: CoreSetup, plugins: CanvasSetupDeps
   const basePath = core.http.basePath.get();
 
   // Retrieve server functions
-  const serverFunctionsResponse = await core.http.get(`/api/interpreter/fns`);
+  const serverFunctionsResponse = await core.http.get(API_ROUTE_FUNCTIONS);
   const serverFunctions = Object.values(serverFunctionsResponse);
 
   initialState.app = {
diff --git a/x-pack/plugins/canvas/server/plugin.ts b/x-pack/plugins/canvas/server/plugin.ts
index 4fa7e2d934647..c822ed86cb01c 100644
--- a/x-pack/plugins/canvas/server/plugin.ts
+++ b/x-pack/plugins/canvas/server/plugin.ts
@@ -7,6 +7,7 @@
 import { first } from 'rxjs/operators';
 import { CoreSetup, PluginInitializerContext, Plugin, Logger, CoreStart } from 'src/core/server';
 import { ExpressionsServerSetup } from 'src/plugins/expressions/server';
+import { BfetchServerSetup } from 'src/plugins/bfetch/server';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { HomeServerPluginSetup } from 'src/plugins/home/server';
 import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
@@ -21,6 +22,7 @@ interface PluginsSetup {
   expressions: ExpressionsServerSetup;
   features: FeaturesPluginSetup;
   home: HomeServerPluginSetup;
+  bfetch: BfetchServerSetup;
   usageCollection?: UsageCollectionSetup;
 }
 
@@ -67,7 +69,13 @@ export class CanvasPlugin implements Plugin {
 
     const canvasRouter = coreSetup.http.createRouter();
 
-    initRoutes({ router: canvasRouter, logger: this.logger });
+    initRoutes({
+      router: canvasRouter,
+      expressions: plugins.expressions,
+      bfetch: plugins.bfetch,
+      elasticsearch: coreSetup.elasticsearch,
+      logger: this.logger,
+    });
 
     loadSampleData(
       plugins.home.sampleData.addSavedObjectsToSampleDataset,
diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/create.test.ts b/x-pack/plugins/canvas/server/routes/custom_elements/create.test.ts
index 290175d9062ea..4f6215b811505 100644
--- a/x-pack/plugins/canvas/server/routes/custom_elements/create.test.ts
+++ b/x-pack/plugins/canvas/server/routes/custom_elements/create.test.ts
@@ -5,15 +5,11 @@
  */
 
 import sinon from 'sinon';
-import {
-  savedObjectsClientMock,
-  httpServiceMock,
-  httpServerMock,
-  loggingSystemMock,
-} from 'src/core/server/mocks';
+import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
 import { CUSTOM_ELEMENT_TYPE } from '../../../common/lib/constants';
 import { initializeCreateCustomElementRoute } from './create';
 import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
+import { getMockedRouterDeps } from '../test_helpers';
 
 const mockRouteContext = ({
   core: {
@@ -36,15 +32,10 @@ describe('POST custom element', () => {
   beforeEach(() => {
     clock = sinon.useFakeTimers(now);
 
-    const httpService = httpServiceMock.createSetupContract();
+    const routerDeps = getMockedRouterDeps();
+    initializeCreateCustomElementRoute(routerDeps);
 
-    const router = httpService.createRouter();
-    initializeCreateCustomElementRoute({
-      router,
-      logger: loggingSystemMock.create().get(),
-    });
-
-    routeHandler = router.post.mock.calls[0][1];
+    routeHandler = routerDeps.router.post.mock.calls[0][1];
   });
 
   afterEach(() => {
diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/delete.test.ts b/x-pack/plugins/canvas/server/routes/custom_elements/delete.test.ts
index 62ce4b9c3593c..1a72917a6bce9 100644
--- a/x-pack/plugins/canvas/server/routes/custom_elements/delete.test.ts
+++ b/x-pack/plugins/canvas/server/routes/custom_elements/delete.test.ts
@@ -7,12 +7,8 @@
 import { CUSTOM_ELEMENT_TYPE } from '../../../common/lib/constants';
 import { initializeDeleteCustomElementRoute } from './delete';
 import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import {
-  savedObjectsClientMock,
-  httpServiceMock,
-  httpServerMock,
-  loggingSystemMock,
-} from 'src/core/server/mocks';
+import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
+import { getMockedRouterDeps } from '../test_helpers';
 
 const mockRouteContext = ({
   core: {
@@ -26,14 +22,10 @@ describe('DELETE custom element', () => {
   let routeHandler: RequestHandler<any, any, any>;
 
   beforeEach(() => {
-    const httpService = httpServiceMock.createSetupContract();
-    const router = httpService.createRouter();
-    initializeDeleteCustomElementRoute({
-      router,
-      logger: loggingSystemMock.create().get(),
-    });
+    const routerDeps = getMockedRouterDeps();
+    initializeDeleteCustomElementRoute(routerDeps);
 
-    routeHandler = router.delete.mock.calls[0][1];
+    routeHandler = routerDeps.router.delete.mock.calls[0][1];
   });
 
   it(`returns 200 ok when the custom element is deleted`, async () => {
diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/find.test.ts b/x-pack/plugins/canvas/server/routes/custom_elements/find.test.ts
index d42c97b62e0f3..10aaa633be53c 100644
--- a/x-pack/plugins/canvas/server/routes/custom_elements/find.test.ts
+++ b/x-pack/plugins/canvas/server/routes/custom_elements/find.test.ts
@@ -6,12 +6,8 @@
 
 import { initializeFindCustomElementsRoute } from './find';
 import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import {
-  savedObjectsClientMock,
-  httpServiceMock,
-  httpServerMock,
-  loggingSystemMock,
-} from 'src/core/server/mocks';
+import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
+import { getMockedRouterDeps } from '../test_helpers';
 
 const mockRouteContext = ({
   core: {
@@ -25,14 +21,10 @@ describe('Find custom element', () => {
   let routeHandler: RequestHandler<any, any, any>;
 
   beforeEach(() => {
-    const httpService = httpServiceMock.createSetupContract();
-    const router = httpService.createRouter();
-    initializeFindCustomElementsRoute({
-      router,
-      logger: loggingSystemMock.create().get(),
-    });
+    const routerDeps = getMockedRouterDeps();
+    initializeFindCustomElementsRoute(routerDeps);
 
-    routeHandler = router.get.mock.calls[0][1];
+    routeHandler = routerDeps.router.get.mock.calls[0][1];
   });
 
   it(`returns 200 with the found custom elements`, async () => {
diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/get.test.ts b/x-pack/plugins/canvas/server/routes/custom_elements/get.test.ts
index 7b4d0eba37419..a6c3d60ee9096 100644
--- a/x-pack/plugins/canvas/server/routes/custom_elements/get.test.ts
+++ b/x-pack/plugins/canvas/server/routes/custom_elements/get.test.ts
@@ -7,12 +7,8 @@
 import { CUSTOM_ELEMENT_TYPE } from '../../../common/lib/constants';
 import { initializeGetCustomElementRoute } from './get';
 import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import {
-  savedObjectsClientMock,
-  httpServiceMock,
-  httpServerMock,
-  loggingSystemMock,
-} from 'src/core/server/mocks';
+import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
+import { getMockedRouterDeps } from '../test_helpers';
 
 const mockRouteContext = ({
   core: {
@@ -26,14 +22,10 @@ describe('GET custom element', () => {
   let routeHandler: RequestHandler<any, any, any>;
 
   beforeEach(() => {
-    const httpService = httpServiceMock.createSetupContract();
-    const router = httpService.createRouter();
-    initializeGetCustomElementRoute({
-      router,
-      logger: loggingSystemMock.create().get(),
-    });
+    const routerDeps = getMockedRouterDeps();
+    initializeGetCustomElementRoute(routerDeps);
 
-    routeHandler = router.get.mock.calls[0][1];
+    routeHandler = routerDeps.router.get.mock.calls[0][1];
   });
 
   it(`returns 200 when the custom element is found`, async () => {
diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/update.test.ts b/x-pack/plugins/canvas/server/routes/custom_elements/update.test.ts
index 0f954904355ae..6b81cf9e3faa1 100644
--- a/x-pack/plugins/canvas/server/routes/custom_elements/update.test.ts
+++ b/x-pack/plugins/canvas/server/routes/custom_elements/update.test.ts
@@ -9,13 +9,9 @@ import { CustomElement } from '../../../types';
 import { CUSTOM_ELEMENT_TYPE } from '../../../common/lib/constants';
 import { initializeUpdateCustomElementRoute } from './update';
 import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import {
-  savedObjectsClientMock,
-  httpServiceMock,
-  httpServerMock,
-  loggingSystemMock,
-} from 'src/core/server/mocks';
+import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
 import { okResponse } from '../ok_response';
+import { getMockedRouterDeps } from '../test_helpers';
 
 const mockRouteContext = ({
   core: {
@@ -51,14 +47,10 @@ describe('PUT custom element', () => {
   beforeEach(() => {
     clock = sinon.useFakeTimers(now);
 
-    const httpService = httpServiceMock.createSetupContract();
-    const router = httpService.createRouter();
-    initializeUpdateCustomElementRoute({
-      router,
-      logger: loggingSystemMock.create().get(),
-    });
+    const routerDeps = getMockedRouterDeps();
+    initializeUpdateCustomElementRoute(routerDeps);
 
-    routeHandler = router.put.mock.calls[0][1];
+    routeHandler = routerDeps.router.put.mock.calls[0][1];
   });
 
   afterEach(() => {
diff --git a/x-pack/plugins/canvas/server/routes/es_fields/es_fields.test.ts b/x-pack/plugins/canvas/server/routes/es_fields/es_fields.test.ts
index c2cff83f85f0d..a3aff029868d7 100644
--- a/x-pack/plugins/canvas/server/routes/es_fields/es_fields.test.ts
+++ b/x-pack/plugins/canvas/server/routes/es_fields/es_fields.test.ts
@@ -6,12 +6,8 @@
 
 import { initializeESFieldsRoute } from './es_fields';
 import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import {
-  httpServiceMock,
-  httpServerMock,
-  loggingSystemMock,
-  elasticsearchServiceMock,
-} from 'src/core/server/mocks';
+import { httpServerMock, elasticsearchServiceMock } from 'src/core/server/mocks';
+import { getMockedRouterDeps } from '../test_helpers';
 
 const mockRouteContext = ({
   core: {
@@ -27,14 +23,10 @@ describe('Retrieve ES Fields', () => {
   let routeHandler: RequestHandler<any, any, any>;
 
   beforeEach(() => {
-    const httpService = httpServiceMock.createSetupContract();
-    const router = httpService.createRouter();
-    initializeESFieldsRoute({
-      router,
-      logger: loggingSystemMock.create().get(),
-    });
+    const routerDeps = getMockedRouterDeps();
+    initializeESFieldsRoute(routerDeps);
 
-    routeHandler = router.get.mock.calls[0][1];
+    routeHandler = routerDeps.router.get.mock.calls[0][1];
   });
 
   it(`returns 200 with fields from existing index/index pattern`, async () => {
diff --git a/x-pack/plugins/canvas/server/routes/functions/functions.test.ts b/x-pack/plugins/canvas/server/routes/functions/functions.test.ts
new file mode 100644
index 0000000000000..755af3eb4ef7e
--- /dev/null
+++ b/x-pack/plugins/canvas/server/routes/functions/functions.test.ts
@@ -0,0 +1,51 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
+import { httpServerMock } from 'src/core/server/mocks';
+import { ExpressionFunction } from 'src/plugins/expressions/common/expression_functions';
+import { initializeGetFunctionsRoute } from './functions';
+import { getMockedRouterDeps } from '../test_helpers';
+import { API_ROUTE_FUNCTIONS } from '../../../common/lib';
+import { functions } from '../../../canvas_plugin_src/functions/server';
+
+const mockRouteContext = {} as RequestHandlerContext;
+const routePath = API_ROUTE_FUNCTIONS;
+
+describe('Get list of serverside expression functions', () => {
+  let routeHandler: RequestHandler<any, any, any>;
+  let mockFuncs: Record<string, ExpressionFunction>;
+
+  beforeEach(() => {
+    mockFuncs = {
+      demodata: new ExpressionFunction(functions[0]()),
+    };
+
+    const routerDeps = getMockedRouterDeps();
+
+    routerDeps.expressions.getFunctions.mockReturnValueOnce(mockFuncs);
+
+    initializeGetFunctionsRoute(routerDeps);
+
+    routeHandler = routerDeps.router.get.mock.calls[0][1];
+  });
+
+  afterAll(() => {
+    jest.restoreAllMocks();
+  });
+
+  it(`returns 200 with list of functions`, async () => {
+    const request = httpServerMock.createKibanaRequest({
+      method: 'get',
+      path: routePath,
+    });
+
+    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+
+    expect(response.status).toBe(200);
+    expect(response.payload).toBe(JSON.stringify(mockFuncs));
+  });
+});
diff --git a/x-pack/plugins/canvas/server/routes/functions/functions.ts b/x-pack/plugins/canvas/server/routes/functions/functions.ts
new file mode 100644
index 0000000000000..dba3d315c5f8b
--- /dev/null
+++ b/x-pack/plugins/canvas/server/routes/functions/functions.ts
@@ -0,0 +1,73 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { LegacyAPICaller } from 'src/core/server';
+import { serializeProvider } from '../../../../../../src/plugins/expressions/common';
+import { RouteInitializerDeps } from '../';
+import { API_ROUTE_FUNCTIONS } from '../../../common/lib/constants';
+
+interface FunctionCall {
+  functionName: string;
+  args: Record<string, any>;
+  context: Record<string, any>;
+}
+
+export function initializeGetFunctionsRoute(deps: RouteInitializerDeps) {
+  const { router, expressions } = deps;
+  router.get(
+    {
+      path: API_ROUTE_FUNCTIONS,
+      validate: false,
+    },
+    async (context, request, response) => {
+      const functions = expressions.getFunctions();
+      const body = JSON.stringify(functions);
+      return response.ok({
+        body,
+      });
+    }
+  );
+}
+
+export function initializeBatchFunctionsRoute(deps: RouteInitializerDeps) {
+  const { bfetch, elasticsearch, expressions } = deps;
+
+  async function runFunction(
+    handlers: { environment: string; elasticsearchClient: LegacyAPICaller },
+    fnCall: FunctionCall
+  ) {
+    const { functionName, args, context } = fnCall;
+    const { deserialize } = serializeProvider(expressions.getTypes());
+
+    const fnDef = expressions.getFunctions()[functionName];
+    if (!fnDef) throw new Error(`Function "${functionName}" could not be found.`);
+
+    const deserialized = deserialize(context);
+    const result = fnDef.fn(deserialized, args, handlers);
+
+    return result;
+  }
+
+  /**
+   * Register an endpoint that executes a batch of functions, and streams the
+   * results back using ND-JSON.
+   */
+  bfetch.addBatchProcessingRoute(API_ROUTE_FUNCTIONS, (request) => {
+    return {
+      onBatchItem: async (fnCall: FunctionCall) => {
+        const handlers = {
+          environment: 'server',
+          elasticsearchClient: elasticsearch.legacy.client.asScoped(request).callAsCurrentUser,
+        };
+        const result = await runFunction(handlers, fnCall);
+        if (typeof result === 'undefined') {
+          throw new Error(`Function ${fnCall.functionName} did not return anything.`);
+        }
+        return result;
+      },
+    };
+  });
+}
diff --git a/x-pack/plugins/canvas/server/routes/functions/index.ts b/x-pack/plugins/canvas/server/routes/functions/index.ts
new file mode 100644
index 0000000000000..768320fdf499a
--- /dev/null
+++ b/x-pack/plugins/canvas/server/routes/functions/index.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { initializeGetFunctionsRoute, initializeBatchFunctionsRoute } from './functions';
+import { RouteInitializerDeps } from '..';
+
+export function initFunctionsRoutes(deps: RouteInitializerDeps) {
+  initializeGetFunctionsRoute(deps);
+  initializeBatchFunctionsRoute(deps);
+}
diff --git a/x-pack/plugins/canvas/server/routes/index.ts b/x-pack/plugins/canvas/server/routes/index.ts
index 56874151530aa..2999f4dc5cfe6 100644
--- a/x-pack/plugins/canvas/server/routes/index.ts
+++ b/x-pack/plugins/canvas/server/routes/index.ts
@@ -4,16 +4,22 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IRouter, Logger } from 'src/core/server';
+import { IRouter, Logger, ElasticsearchServiceSetup } from 'src/core/server';
+import { ExpressionsServerSetup } from 'src/plugins/expressions/server';
+import { BfetchServerSetup } from 'src/plugins/bfetch/server';
 import { initCustomElementsRoutes } from './custom_elements';
 import { initESFieldsRoutes } from './es_fields';
 import { initShareablesRoutes } from './shareables';
 import { initWorkpadRoutes } from './workpad';
 import { initTemplateRoutes } from './templates';
+import { initFunctionsRoutes } from './functions';
 
 export interface RouteInitializerDeps {
   router: IRouter;
   logger: Logger;
+  expressions: ExpressionsServerSetup;
+  bfetch: BfetchServerSetup;
+  elasticsearch: ElasticsearchServiceSetup;
 }
 
 export function initRoutes(deps: RouteInitializerDeps) {
@@ -22,4 +28,5 @@ export function initRoutes(deps: RouteInitializerDeps) {
   initShareablesRoutes(deps);
   initWorkpadRoutes(deps);
   initTemplateRoutes(deps);
+  initFunctionsRoutes(deps);
 }
diff --git a/x-pack/plugins/canvas/server/routes/shareables/download.test.ts b/x-pack/plugins/canvas/server/routes/shareables/download.test.ts
index 0267a695ae9fe..1edf9f52e164a 100644
--- a/x-pack/plugins/canvas/server/routes/shareables/download.test.ts
+++ b/x-pack/plugins/canvas/server/routes/shareables/download.test.ts
@@ -8,8 +8,9 @@ jest.mock('fs');
 
 import fs from 'fs';
 import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import { httpServiceMock, httpServerMock, loggingSystemMock } from 'src/core/server/mocks';
+import { httpServerMock } from 'src/core/server/mocks';
 import { initializeDownloadShareableWorkpadRoute } from './download';
+import { getMockedRouterDeps } from '../test_helpers';
 
 const mockRouteContext = {} as RequestHandlerContext;
 const path = `api/canvas/workpad/find`;
@@ -19,14 +20,10 @@ describe('Download Canvas shareables runtime', () => {
   let routeHandler: RequestHandler<any, any, any>;
 
   beforeEach(() => {
-    const httpService = httpServiceMock.createSetupContract();
-    const router = httpService.createRouter();
-    initializeDownloadShareableWorkpadRoute({
-      router,
-      logger: loggingSystemMock.create().get(),
-    });
+    const routerDeps = getMockedRouterDeps();
+    initializeDownloadShareableWorkpadRoute(routerDeps);
 
-    routeHandler = router.get.mock.calls[0][1];
+    routeHandler = routerDeps.router.get.mock.calls[0][1];
   });
 
   afterAll(() => {
diff --git a/x-pack/plugins/canvas/server/routes/shareables/zip.test.ts b/x-pack/plugins/canvas/server/routes/shareables/zip.test.ts
index 0c19886f07e5c..b1649c7524c7e 100644
--- a/x-pack/plugins/canvas/server/routes/shareables/zip.test.ts
+++ b/x-pack/plugins/canvas/server/routes/shareables/zip.test.ts
@@ -9,8 +9,9 @@ jest.mock('archiver');
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const archiver = require('archiver') as jest.Mock;
 import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import { httpServiceMock, httpServerMock, loggingSystemMock } from 'src/core/server/mocks';
+import { httpServerMock } from 'src/core/server/mocks';
 import { initializeZipShareableWorkpadRoute } from './zip';
+import { getMockedRouterDeps } from '../test_helpers';
 import { API_ROUTE_SHAREABLE_ZIP } from '../../../common/lib';
 import {
   SHAREABLE_RUNTIME_FILE,
@@ -26,14 +27,9 @@ describe('Zips Canvas shareables runtime together with workpad', () => {
   let routeHandler: RequestHandler<any, any, any>;
 
   beforeEach(() => {
-    const httpService = httpServiceMock.createSetupContract();
-    const router = httpService.createRouter();
-    initializeZipShareableWorkpadRoute({
-      router,
-      logger: loggingSystemMock.create().get(),
-    });
-
-    routeHandler = router.post.mock.calls[0][1];
+    const routerDeps = getMockedRouterDeps();
+    initializeZipShareableWorkpadRoute(routerDeps);
+    routeHandler = routerDeps.router.post.mock.calls[0][1];
   });
 
   afterAll(() => {
diff --git a/x-pack/plugins/canvas/server/routes/templates/list.test.ts b/x-pack/plugins/canvas/server/routes/templates/list.test.ts
index 95658e6a7b511..9ceab3b5c9705 100644
--- a/x-pack/plugins/canvas/server/routes/templates/list.test.ts
+++ b/x-pack/plugins/canvas/server/routes/templates/list.test.ts
@@ -6,18 +6,9 @@
 
 import { badRequest } from 'boom';
 import { initializeListTemplates } from './list';
-import {
-  IRouter,
-  kibanaResponseFactory,
-  RequestHandlerContext,
-  RequestHandler,
-} from 'src/core/server';
-import {
-  savedObjectsClientMock,
-  httpServiceMock,
-  httpServerMock,
-  loggingSystemMock,
-} from 'src/core/server/mocks';
+import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
+import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
+import { getMockedRouterDeps } from '../test_helpers';
 
 const mockRouteContext = ({
   core: {
@@ -31,14 +22,10 @@ describe('Find workpad', () => {
   let routeHandler: RequestHandler<any, any, any>;
 
   beforeEach(() => {
-    const httpService = httpServiceMock.createSetupContract();
-    const router = httpService.createRouter() as jest.Mocked<IRouter>;
-    initializeListTemplates({
-      router,
-      logger: loggingSystemMock.create().get(),
-    });
+    const routerDeps = getMockedRouterDeps();
+    initializeListTemplates(routerDeps);
 
-    routeHandler = router.get.mock.calls[0][1];
+    routeHandler = routerDeps.router.get.mock.calls[0][1];
   });
 
   it(`returns 200 with the found templates`, async () => {
diff --git a/x-pack/plugins/canvas/server/routes/test_helpers.ts b/x-pack/plugins/canvas/server/routes/test_helpers.ts
new file mode 100644
index 0000000000000..695cc79e513dc
--- /dev/null
+++ b/x-pack/plugins/canvas/server/routes/test_helpers.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  httpServiceMock,
+  loggingSystemMock,
+  elasticsearchServiceMock,
+} from 'src/core/server/mocks';
+import { bfetchPluginMock } from '../../../../../src/plugins/bfetch/server/mocks';
+import { expressionsPluginMock } from '../../../../../src/plugins/expressions/server/mocks';
+
+export function getMockedRouterDeps() {
+  const httpService = httpServiceMock.createSetupContract();
+  const elasticsearch = elasticsearchServiceMock.createSetup();
+  const bfetch = bfetchPluginMock.createSetupContract();
+  const expressions = expressionsPluginMock.createSetupContract();
+  const router = httpService.createRouter();
+
+  return {
+    router,
+    expressions,
+    elasticsearch,
+    bfetch,
+    logger: loggingSystemMock.create().get(),
+  };
+}
diff --git a/x-pack/plugins/canvas/server/routes/workpad/create.test.ts b/x-pack/plugins/canvas/server/routes/workpad/create.test.ts
index 4756349a8a5ff..4e927751a026f 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/create.test.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/create.test.ts
@@ -5,15 +5,11 @@
  */
 
 import sinon from 'sinon';
-import {
-  savedObjectsClientMock,
-  httpServiceMock,
-  httpServerMock,
-  loggingSystemMock,
-} from 'src/core/server/mocks';
+import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
 import { CANVAS_TYPE } from '../../../common/lib/constants';
 import { initializeCreateWorkpadRoute } from './create';
 import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
+import { getMockedRouterDeps } from '../test_helpers';
 
 let mockRouteContext = ({
   core: {
@@ -44,15 +40,10 @@ describe('POST workpad', () => {
 
     clock = sinon.useFakeTimers(now);
 
-    const httpService = httpServiceMock.createSetupContract();
+    const routerDeps = getMockedRouterDeps();
+    initializeCreateWorkpadRoute(routerDeps);
 
-    const router = httpService.createRouter();
-    initializeCreateWorkpadRoute({
-      router,
-      logger: loggingSystemMock.create().get(),
-    });
-
-    routeHandler = router.post.mock.calls[0][1];
+    routeHandler = routerDeps.router.post.mock.calls[0][1];
   });
 
   afterEach(() => {
diff --git a/x-pack/plugins/canvas/server/routes/workpad/delete.test.ts b/x-pack/plugins/canvas/server/routes/workpad/delete.test.ts
index 32ce30325b60a..e66628ffb4d4e 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/delete.test.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/delete.test.ts
@@ -7,12 +7,8 @@
 import { CANVAS_TYPE } from '../../../common/lib/constants';
 import { initializeDeleteWorkpadRoute } from './delete';
 import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import {
-  savedObjectsClientMock,
-  httpServiceMock,
-  httpServerMock,
-  loggingSystemMock,
-} from 'src/core/server/mocks';
+import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
+import { getMockedRouterDeps } from '../test_helpers';
 
 const mockRouteContext = ({
   core: {
@@ -26,14 +22,10 @@ describe('DELETE workpad', () => {
   let routeHandler: RequestHandler<any, any, any>;
 
   beforeEach(() => {
-    const httpService = httpServiceMock.createSetupContract();
-    const router = httpService.createRouter();
-    initializeDeleteWorkpadRoute({
-      router,
-      logger: loggingSystemMock.create().get(),
-    });
+    const routerDeps = getMockedRouterDeps();
+    initializeDeleteWorkpadRoute(routerDeps);
 
-    routeHandler = router.delete.mock.calls[0][1];
+    routeHandler = routerDeps.router.delete.mock.calls[0][1];
   });
 
   it(`returns 200 ok when the workpad is deleted`, async () => {
diff --git a/x-pack/plugins/canvas/server/routes/workpad/find.test.ts b/x-pack/plugins/canvas/server/routes/workpad/find.test.ts
index a87cf7be57d81..593e4062686f9 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/find.test.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/find.test.ts
@@ -6,12 +6,8 @@
 
 import { initializeFindWorkpadsRoute } from './find';
 import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import {
-  savedObjectsClientMock,
-  httpServiceMock,
-  httpServerMock,
-  loggingSystemMock,
-} from 'src/core/server/mocks';
+import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
+import { getMockedRouterDeps } from '../test_helpers';
 
 const mockRouteContext = ({
   core: {
@@ -25,14 +21,10 @@ describe('Find workpad', () => {
   let routeHandler: RequestHandler<any, any, any>;
 
   beforeEach(() => {
-    const httpService = httpServiceMock.createSetupContract();
-    const router = httpService.createRouter();
-    initializeFindWorkpadsRoute({
-      router,
-      logger: loggingSystemMock.create().get(),
-    });
+    const routerDeps = getMockedRouterDeps();
+    initializeFindWorkpadsRoute(routerDeps);
 
-    routeHandler = router.get.mock.calls[0][1];
+    routeHandler = routerDeps.router.get.mock.calls[0][1];
   });
 
   it(`returns 200 with the found workpads`, async () => {
diff --git a/x-pack/plugins/canvas/server/routes/workpad/get.test.ts b/x-pack/plugins/canvas/server/routes/workpad/get.test.ts
index 8cc190dc6231c..a51cbefd4031e 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/get.test.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/get.test.ts
@@ -7,14 +7,10 @@
 import { CANVAS_TYPE } from '../../../common/lib/constants';
 import { initializeGetWorkpadRoute } from './get';
 import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import {
-  savedObjectsClientMock,
-  httpServiceMock,
-  httpServerMock,
-  loggingSystemMock,
-} from 'src/core/server/mocks';
+import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
 import { workpadWithGroupAsElement } from '../../../__tests__/fixtures/workpads';
 import { CanvasWorkpad } from '../../../types';
+import { getMockedRouterDeps } from '../test_helpers';
 
 const mockRouteContext = ({
   core: {
@@ -28,14 +24,10 @@ describe('GET workpad', () => {
   let routeHandler: RequestHandler<any, any, any>;
 
   beforeEach(() => {
-    const httpService = httpServiceMock.createSetupContract();
-    const router = httpService.createRouter();
-    initializeGetWorkpadRoute({
-      router,
-      logger: loggingSystemMock.create().get(),
-    });
+    const routerDeps = getMockedRouterDeps();
+    initializeGetWorkpadRoute(routerDeps);
 
-    routeHandler = router.get.mock.calls[0][1];
+    routeHandler = routerDeps.router.get.mock.calls[0][1];
   });
 
   it(`returns 200 when the workpad is found`, async () => {
diff --git a/x-pack/plugins/canvas/server/routes/workpad/update.test.ts b/x-pack/plugins/canvas/server/routes/workpad/update.test.ts
index 6d7ea06852a5e..0d97145c90298 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/update.test.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/update.test.ts
@@ -8,14 +8,10 @@ import sinon from 'sinon';
 import { CANVAS_TYPE } from '../../../common/lib/constants';
 import { initializeUpdateWorkpadRoute, initializeUpdateWorkpadAssetsRoute } from './update';
 import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import {
-  savedObjectsClientMock,
-  httpServiceMock,
-  httpServerMock,
-  loggingSystemMock,
-} from 'src/core/server/mocks';
+import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
 import { workpads } from '../../../__tests__/fixtures/workpads';
 import { okResponse } from '../ok_response';
+import { getMockedRouterDeps } from '../test_helpers';
 
 const mockRouteContext = ({
   core: {
@@ -38,14 +34,10 @@ describe('PUT workpad', () => {
   beforeEach(() => {
     clock = sinon.useFakeTimers(now);
 
-    const httpService = httpServiceMock.createSetupContract();
-    const router = httpService.createRouter();
-    initializeUpdateWorkpadRoute({
-      router,
-      logger: loggingSystemMock.create().get(),
-    });
+    const routerDeps = getMockedRouterDeps();
+    initializeUpdateWorkpadRoute(routerDeps);
 
-    routeHandler = router.put.mock.calls[0][1];
+    routeHandler = routerDeps.router.put.mock.calls[0][1];
   });
 
   afterEach(() => {
@@ -152,14 +144,11 @@ describe('update assets', () => {
 
   beforeEach(() => {
     clock = sinon.useFakeTimers(now);
-    const httpService = httpServiceMock.createSetupContract();
-    const router = httpService.createRouter();
-    initializeUpdateWorkpadAssetsRoute({
-      router,
-      logger: loggingSystemMock.create().get(),
-    });
 
-    routeHandler = router.put.mock.calls[0][1];
+    const routerDeps = getMockedRouterDeps();
+    initializeUpdateWorkpadAssetsRoute(routerDeps);
+
+    routeHandler = routerDeps.router.put.mock.calls[0][1];
   });
 
   afterEach(() => {
diff --git a/x-pack/plugins/canvas/server/setup_interpreter.ts b/x-pack/plugins/canvas/server/setup_interpreter.ts
index 79bc2f3c1996b..8dc431345e5f5 100644
--- a/x-pack/plugins/canvas/server/setup_interpreter.ts
+++ b/x-pack/plugins/canvas/server/setup_interpreter.ts
@@ -8,5 +8,5 @@ import { ExpressionsServerSetup } from 'src/plugins/expressions/server';
 import { functions } from '../canvas_plugin_src/functions/server';
 
 export function setupInterpreter(expressions: ExpressionsServerSetup) {
-  expressions.__LEGACY.register({ types: [], serverFunctions: functions });
+  functions.forEach((f) => expressions.registerFunction(f));
 }

From 4a274e0325c2af8d673c3ea1a623f1128db238d9 Mon Sep 17 00:00:00 2001
From: Bohdan Tsymbala <bohdan.tsymbala@elastic.co>
Date: Tue, 18 Aug 2020 19:42:47 +0200
Subject: [PATCH 02/85] [ENDPOINT] Reintroduced tabs to endpoint management and
 migrated pages to use common security components (#74886)

* Reintroduced tabs to endpoint management and migrated pages to use common security components.

* Empty trusted apps tab.

* Changed casing in the translations.

* Switched to using route path generation functions.

* Added propagation of data-test-subj attribute to Wrapper component.

* Fixed CommonProps import.

* Moved out shared component for administration list page.

* Removed unused file.

* Removed unused translation keys.

* Removed redundant snapshot.

* Added some minimal tests.

* Attempt to fix functional tests.

* Attempt to fix functional tests again.

* Reverted function declarations back to const.

* Wrapped component in memo.
---
 .../__snapshots__/page_view.test.tsx.snap     | 802 ------------------
 .../components/endpoint/page_view.test.tsx    |  88 --
 .../common/components/endpoint/page_view.tsx  | 184 ----
 .../common/components/wrapper_page/index.tsx  |  18 +-
 .../public/management/common/constants.ts     |   1 +
 .../public/management/common/routing.ts       |  17 +-
 .../public/management/common/translations.ts  |   8 +
 .../components/administration_list_page.tsx   |  65 ++
 .../components/management_page_view.tsx       |  19 -
 .../pages/endpoint_hosts/view/index.test.tsx  |   1 +
 .../pages/endpoint_hosts/view/index.tsx       |  57 +-
 .../public/management/pages/index.test.tsx    |  11 +-
 .../public/management/pages/index.tsx         |  30 +-
 .../pages/policy/view/policy_details.test.tsx |  27 +-
 .../pages/policy/view/policy_details.tsx      |  56 +-
 .../pages/policy/view/policy_list.test.tsx    |   1 +
 .../pages/policy/view/policy_list.tsx         |  56 +-
 .../management/pages/trusted_apps/index.tsx   |  20 +
 .../trusted_apps_page.test.tsx.snap           |  21 +
 .../pages/trusted_apps/view/index.ts          |   6 +
 .../view/trusted_apps_page.test.tsx}          |  17 +-
 .../trusted_apps/view/trusted_apps_page.tsx   |  28 +
 .../public/management/types.ts                |   1 +
 .../translations/translations/ja-JP.json      |   2 -
 .../translations/translations/zh-CN.json      |   2 -
 .../apps/endpoint/endpoint_list.ts            |   4 +-
 .../apps/endpoint/policy_details.ts           |   2 +-
 .../apps/endpoint/policy_list.ts              |   4 +-
 .../apps/endpoint/trusted_apps_list.ts        |  29 +
 .../page_objects/index.ts                     |   2 +
 .../page_objects/trusted_apps_page.ts         |  20 +
 31 files changed, 325 insertions(+), 1274 deletions(-)
 delete mode 100644 x-pack/plugins/security_solution/public/common/components/endpoint/__snapshots__/page_view.test.tsx.snap
 delete mode 100644 x-pack/plugins/security_solution/public/common/components/endpoint/page_view.test.tsx
 delete mode 100644 x-pack/plugins/security_solution/public/common/components/endpoint/page_view.tsx
 create mode 100644 x-pack/plugins/security_solution/public/management/components/administration_list_page.tsx
 delete mode 100644 x-pack/plugins/security_solution/public/management/components/management_page_view.tsx
 create mode 100644 x-pack/plugins/security_solution/public/management/pages/trusted_apps/index.tsx
 create mode 100644 x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/__snapshots__/trusted_apps_page.test.tsx.snap
 create mode 100644 x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/index.ts
 rename x-pack/plugins/security_solution/public/management/pages/{endpoint_hosts/routes.tsx => trusted_apps/view/trusted_apps_page.test.tsx} (51%)
 create mode 100644 x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_page.tsx
 create mode 100644 x-pack/test/security_solution_endpoint/apps/endpoint/trusted_apps_list.ts
 create mode 100644 x-pack/test/security_solution_endpoint/page_objects/trusted_apps_page.ts

diff --git a/x-pack/plugins/security_solution/public/common/components/endpoint/__snapshots__/page_view.test.tsx.snap b/x-pack/plugins/security_solution/public/common/components/endpoint/__snapshots__/page_view.test.tsx.snap
deleted file mode 100644
index bed5ac6950a2b..0000000000000
--- a/x-pack/plugins/security_solution/public/common/components/endpoint/__snapshots__/page_view.test.tsx.snap
+++ /dev/null
@@ -1,802 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`PageView component should display body header custom element 1`] = `
-.c0.endpoint--isListView {
-  padding: 0 24px;
-}
-
-.c0.endpoint--isListView .endpoint-header {
-  padding: 24px;
-  margin-bottom: 0;
-}
-
-.c0.endpoint--isListView .endpoint-page-content {
-  border-left: none;
-  border-right: none;
-}
-
-.c0.endpoint--isDetailsView .endpoint-page-content {
-  padding: 0;
-  border: none;
-  background: none;
-}
-
-.c0 .endpoint-navTabs {
-  margin-left: 12px;
-}
-
-.c0 .endpoint-header-leftSection {
-  overflow: hidden;
-}
-
-<PageView
-  bodyHeader={
-    <p>
-      body header
-    </p>
-  }
-  viewType="list"
->
-  <Styled(EuiPage)
-    className="endpoint--isListView"
-  >
-    <EuiPage
-      className="c0 endpoint--isListView"
-    >
-      <div
-        className="euiPage c0 endpoint--isListView"
-      >
-        <EuiPageBody>
-          <main
-            className="euiPageBody"
-          >
-            <EuiPageContent
-              className="endpoint-page-content"
-            >
-              <EuiPanel
-                className="euiPageContent endpoint-page-content"
-                paddingSize="l"
-              >
-                <div
-                  className="euiPanel euiPanel--paddingLarge euiPageContent endpoint-page-content"
-                >
-                  <EuiPageContentHeader>
-                    <div
-                      className="euiPageContentHeader euiPageContentHeader--responsive"
-                    >
-                      <EuiPageContentHeaderSection
-                        data-test-subj="pageViewBodyTitleArea"
-                      >
-                        <div
-                          className="euiPageContentHeaderSection"
-                          data-test-subj="pageViewBodyTitleArea"
-                        >
-                          <p>
-                            body header
-                          </p>
-                        </div>
-                      </EuiPageContentHeaderSection>
-                    </div>
-                  </EuiPageContentHeader>
-                  <EuiPageContentBody
-                    data-test-subj="pageViewBodyContent"
-                  >
-                    <div
-                      className="euiPageContentBody"
-                      data-test-subj="pageViewBodyContent"
-                    >
-                      body content
-                    </div>
-                  </EuiPageContentBody>
-                </div>
-              </EuiPanel>
-            </EuiPageContent>
-          </main>
-        </EuiPageBody>
-      </div>
-    </EuiPage>
-  </Styled(EuiPage)>
-</PageView>
-`;
-
-exports[`PageView component should display body header wrapped in EuiTitle 1`] = `
-.c0.endpoint--isListView {
-  padding: 0 24px;
-}
-
-.c0.endpoint--isListView .endpoint-header {
-  padding: 24px;
-  margin-bottom: 0;
-}
-
-.c0.endpoint--isListView .endpoint-page-content {
-  border-left: none;
-  border-right: none;
-}
-
-.c0.endpoint--isDetailsView .endpoint-page-content {
-  padding: 0;
-  border: none;
-  background: none;
-}
-
-.c0 .endpoint-navTabs {
-  margin-left: 12px;
-}
-
-.c0 .endpoint-header-leftSection {
-  overflow: hidden;
-}
-
-<PageView
-  bodyHeader="body header"
-  viewType="list"
->
-  <Styled(EuiPage)
-    className="endpoint--isListView"
-  >
-    <EuiPage
-      className="c0 endpoint--isListView"
-    >
-      <div
-        className="euiPage c0 endpoint--isListView"
-      >
-        <EuiPageBody>
-          <main
-            className="euiPageBody"
-          >
-            <EuiPageContent
-              className="endpoint-page-content"
-            >
-              <EuiPanel
-                className="euiPageContent endpoint-page-content"
-                paddingSize="l"
-              >
-                <div
-                  className="euiPanel euiPanel--paddingLarge euiPageContent endpoint-page-content"
-                >
-                  <EuiPageContentHeader>
-                    <div
-                      className="euiPageContentHeader euiPageContentHeader--responsive"
-                    >
-                      <EuiPageContentHeaderSection
-                        data-test-subj="pageViewBodyTitleArea"
-                      >
-                        <div
-                          className="euiPageContentHeaderSection"
-                          data-test-subj="pageViewBodyTitleArea"
-                        >
-                          <PageViewBodyHeaderTitle>
-                            <EuiTitle>
-                              <h2
-                                className="euiTitle euiTitle--medium"
-                                data-test-subj="pageViewBodyTitle"
-                              >
-                                body header
-                              </h2>
-                            </EuiTitle>
-                          </PageViewBodyHeaderTitle>
-                        </div>
-                      </EuiPageContentHeaderSection>
-                    </div>
-                  </EuiPageContentHeader>
-                  <EuiPageContentBody
-                    data-test-subj="pageViewBodyContent"
-                  >
-                    <div
-                      className="euiPageContentBody"
-                      data-test-subj="pageViewBodyContent"
-                    >
-                      body content
-                    </div>
-                  </EuiPageContentBody>
-                </div>
-              </EuiPanel>
-            </EuiPageContent>
-          </main>
-        </EuiPageBody>
-      </div>
-    </EuiPage>
-  </Styled(EuiPage)>
-</PageView>
-`;
-
-exports[`PageView component should display header left and right 1`] = `
-.c0.endpoint--isListView {
-  padding: 0 24px;
-}
-
-.c0.endpoint--isListView .endpoint-header {
-  padding: 24px;
-  margin-bottom: 0;
-}
-
-.c0.endpoint--isListView .endpoint-page-content {
-  border-left: none;
-  border-right: none;
-}
-
-.c0.endpoint--isDetailsView .endpoint-page-content {
-  padding: 0;
-  border: none;
-  background: none;
-}
-
-.c0 .endpoint-navTabs {
-  margin-left: 12px;
-}
-
-.c0 .endpoint-header-leftSection {
-  overflow: hidden;
-}
-
-<PageView
-  headerLeft="page title"
-  headerRight="right side actions"
-  viewType="list"
->
-  <Styled(EuiPage)
-    className="endpoint--isListView"
-  >
-    <EuiPage
-      className="c0 endpoint--isListView"
-    >
-      <div
-        className="euiPage c0 endpoint--isListView"
-      >
-        <EuiPageBody>
-          <main
-            className="euiPageBody"
-          >
-            <EuiPageHeader
-              className="endpoint-header"
-            >
-              <div
-                className="euiPageHeader euiPageHeader--responsive endpoint-header"
-              >
-                <EuiPageHeaderSection
-                  className="endpoint-header-leftSection"
-                  data-test-subj="pageViewHeaderLeft"
-                >
-                  <div
-                    className="euiPageHeaderSection endpoint-header-leftSection"
-                    data-test-subj="pageViewHeaderLeft"
-                  >
-                    <PageViewHeaderTitle>
-                      <EuiTitle
-                        size="l"
-                      >
-                        <h1
-                          className="euiTitle euiTitle--large"
-                          data-test-subj="pageViewHeaderLeftTitle"
-                        >
-                          page title
-                        </h1>
-                      </EuiTitle>
-                    </PageViewHeaderTitle>
-                  </div>
-                </EuiPageHeaderSection>
-                <EuiPageHeaderSection
-                  data-test-subj="pageViewHeaderRight"
-                >
-                  <div
-                    className="euiPageHeaderSection"
-                    data-test-subj="pageViewHeaderRight"
-                  >
-                    right side actions
-                  </div>
-                </EuiPageHeaderSection>
-              </div>
-            </EuiPageHeader>
-            <EuiPageContent
-              className="endpoint-page-content"
-            >
-              <EuiPanel
-                className="euiPageContent endpoint-page-content"
-                paddingSize="l"
-              >
-                <div
-                  className="euiPanel euiPanel--paddingLarge euiPageContent endpoint-page-content"
-                >
-                  <EuiPageContentBody
-                    data-test-subj="pageViewBodyContent"
-                  >
-                    <div
-                      className="euiPageContentBody"
-                      data-test-subj="pageViewBodyContent"
-                    >
-                      body content
-                    </div>
-                  </EuiPageContentBody>
-                </div>
-              </EuiPanel>
-            </EuiPageContent>
-          </main>
-        </EuiPageBody>
-      </div>
-    </EuiPage>
-  </Styled(EuiPage)>
-</PageView>
-`;
-
-exports[`PageView component should display only body if not header props used 1`] = `
-.c0.endpoint--isListView {
-  padding: 0 24px;
-}
-
-.c0.endpoint--isListView .endpoint-header {
-  padding: 24px;
-  margin-bottom: 0;
-}
-
-.c0.endpoint--isListView .endpoint-page-content {
-  border-left: none;
-  border-right: none;
-}
-
-.c0.endpoint--isDetailsView .endpoint-page-content {
-  padding: 0;
-  border: none;
-  background: none;
-}
-
-.c0 .endpoint-navTabs {
-  margin-left: 12px;
-}
-
-.c0 .endpoint-header-leftSection {
-  overflow: hidden;
-}
-
-<PageView
-  viewType="list"
->
-  <Styled(EuiPage)
-    className="endpoint--isListView"
-  >
-    <EuiPage
-      className="c0 endpoint--isListView"
-    >
-      <div
-        className="euiPage c0 endpoint--isListView"
-      >
-        <EuiPageBody>
-          <main
-            className="euiPageBody"
-          >
-            <EuiPageContent
-              className="endpoint-page-content"
-            >
-              <EuiPanel
-                className="euiPageContent endpoint-page-content"
-                paddingSize="l"
-              >
-                <div
-                  className="euiPanel euiPanel--paddingLarge euiPageContent endpoint-page-content"
-                >
-                  <EuiPageContentBody
-                    data-test-subj="pageViewBodyContent"
-                  >
-                    <div
-                      className="euiPageContentBody"
-                      data-test-subj="pageViewBodyContent"
-                    >
-                      body content
-                    </div>
-                  </EuiPageContentBody>
-                </div>
-              </EuiPanel>
-            </EuiPageContent>
-          </main>
-        </EuiPageBody>
-      </div>
-    </EuiPage>
-  </Styled(EuiPage)>
-</PageView>
-`;
-
-exports[`PageView component should display only header left 1`] = `
-.c0.endpoint--isListView {
-  padding: 0 24px;
-}
-
-.c0.endpoint--isListView .endpoint-header {
-  padding: 24px;
-  margin-bottom: 0;
-}
-
-.c0.endpoint--isListView .endpoint-page-content {
-  border-left: none;
-  border-right: none;
-}
-
-.c0.endpoint--isDetailsView .endpoint-page-content {
-  padding: 0;
-  border: none;
-  background: none;
-}
-
-.c0 .endpoint-navTabs {
-  margin-left: 12px;
-}
-
-.c0 .endpoint-header-leftSection {
-  overflow: hidden;
-}
-
-<PageView
-  headerLeft="page title"
-  viewType="list"
->
-  <Styled(EuiPage)
-    className="endpoint--isListView"
-  >
-    <EuiPage
-      className="c0 endpoint--isListView"
-    >
-      <div
-        className="euiPage c0 endpoint--isListView"
-      >
-        <EuiPageBody>
-          <main
-            className="euiPageBody"
-          >
-            <EuiPageHeader
-              className="endpoint-header"
-            >
-              <div
-                className="euiPageHeader euiPageHeader--responsive endpoint-header"
-              >
-                <EuiPageHeaderSection
-                  className="endpoint-header-leftSection"
-                  data-test-subj="pageViewHeaderLeft"
-                >
-                  <div
-                    className="euiPageHeaderSection endpoint-header-leftSection"
-                    data-test-subj="pageViewHeaderLeft"
-                  >
-                    <PageViewHeaderTitle>
-                      <EuiTitle
-                        size="l"
-                      >
-                        <h1
-                          className="euiTitle euiTitle--large"
-                          data-test-subj="pageViewHeaderLeftTitle"
-                        >
-                          page title
-                        </h1>
-                      </EuiTitle>
-                    </PageViewHeaderTitle>
-                  </div>
-                </EuiPageHeaderSection>
-              </div>
-            </EuiPageHeader>
-            <EuiPageContent
-              className="endpoint-page-content"
-            >
-              <EuiPanel
-                className="euiPageContent endpoint-page-content"
-                paddingSize="l"
-              >
-                <div
-                  className="euiPanel euiPanel--paddingLarge euiPageContent endpoint-page-content"
-                >
-                  <EuiPageContentBody
-                    data-test-subj="pageViewBodyContent"
-                  >
-                    <div
-                      className="euiPageContentBody"
-                      data-test-subj="pageViewBodyContent"
-                    >
-                      body content
-                    </div>
-                  </EuiPageContentBody>
-                </div>
-              </EuiPanel>
-            </EuiPageContent>
-          </main>
-        </EuiPageBody>
-      </div>
-    </EuiPage>
-  </Styled(EuiPage)>
-</PageView>
-`;
-
-exports[`PageView component should display only header right but include an empty left side 1`] = `
-.c0.endpoint--isListView {
-  padding: 0 24px;
-}
-
-.c0.endpoint--isListView .endpoint-header {
-  padding: 24px;
-  margin-bottom: 0;
-}
-
-.c0.endpoint--isListView .endpoint-page-content {
-  border-left: none;
-  border-right: none;
-}
-
-.c0.endpoint--isDetailsView .endpoint-page-content {
-  padding: 0;
-  border: none;
-  background: none;
-}
-
-.c0 .endpoint-navTabs {
-  margin-left: 12px;
-}
-
-.c0 .endpoint-header-leftSection {
-  overflow: hidden;
-}
-
-<PageView
-  headerRight="right side actions"
-  viewType="list"
->
-  <Styled(EuiPage)
-    className="endpoint--isListView"
-  >
-    <EuiPage
-      className="c0 endpoint--isListView"
-    >
-      <div
-        className="euiPage c0 endpoint--isListView"
-      >
-        <EuiPageBody>
-          <main
-            className="euiPageBody"
-          >
-            <EuiPageHeader
-              className="endpoint-header"
-            >
-              <div
-                className="euiPageHeader euiPageHeader--responsive endpoint-header"
-              >
-                <EuiPageHeaderSection
-                  className="endpoint-header-leftSection"
-                  data-test-subj="pageViewHeaderLeft"
-                >
-                  <div
-                    className="euiPageHeaderSection endpoint-header-leftSection"
-                    data-test-subj="pageViewHeaderLeft"
-                  />
-                </EuiPageHeaderSection>
-                <EuiPageHeaderSection
-                  data-test-subj="pageViewHeaderRight"
-                >
-                  <div
-                    className="euiPageHeaderSection"
-                    data-test-subj="pageViewHeaderRight"
-                  >
-                    right side actions
-                  </div>
-                </EuiPageHeaderSection>
-              </div>
-            </EuiPageHeader>
-            <EuiPageContent
-              className="endpoint-page-content"
-            >
-              <EuiPanel
-                className="euiPageContent endpoint-page-content"
-                paddingSize="l"
-              >
-                <div
-                  className="euiPanel euiPanel--paddingLarge euiPageContent endpoint-page-content"
-                >
-                  <EuiPageContentBody
-                    data-test-subj="pageViewBodyContent"
-                  >
-                    <div
-                      className="euiPageContentBody"
-                      data-test-subj="pageViewBodyContent"
-                    >
-                      body content
-                    </div>
-                  </EuiPageContentBody>
-                </div>
-              </EuiPanel>
-            </EuiPageContent>
-          </main>
-        </EuiPageBody>
-      </div>
-    </EuiPage>
-  </Styled(EuiPage)>
-</PageView>
-`;
-
-exports[`PageView component should pass through EuiPage props 1`] = `
-.c0.endpoint--isListView {
-  padding: 0 24px;
-}
-
-.c0.endpoint--isListView .endpoint-header {
-  padding: 24px;
-  margin-bottom: 0;
-}
-
-.c0.endpoint--isListView .endpoint-page-content {
-  border-left: none;
-  border-right: none;
-}
-
-.c0.endpoint--isDetailsView .endpoint-page-content {
-  padding: 0;
-  border: none;
-  background: none;
-}
-
-.c0 .endpoint-navTabs {
-  margin-left: 12px;
-}
-
-.c0 .endpoint-header-leftSection {
-  overflow: hidden;
-}
-
-<PageView
-  aria-label="test-aria-label-here"
-  className="test-class-name-here"
-  data-test-subj="test-data-test-subj-here"
-  restrictWidth="1000"
-  viewType="list"
->
-  <Styled(EuiPage)
-    aria-label="test-aria-label-here"
-    className="test-class-name-here"
-    data-test-subj="test-data-test-subj-here"
-    restrictWidth="1000"
-  >
-    <EuiPage
-      aria-label="test-aria-label-here"
-      className="c0 test-class-name-here"
-      data-test-subj="test-data-test-subj-here"
-      restrictWidth="1000"
-    >
-      <div
-        aria-label="test-aria-label-here"
-        className="euiPage euiPage--restrictWidth-custom c0 test-class-name-here"
-        data-test-subj="test-data-test-subj-here"
-        style={
-          Object {
-            "maxWidth": "1000",
-          }
-        }
-      >
-        <EuiPageBody>
-          <main
-            className="euiPageBody"
-          >
-            <EuiPageContent
-              className="endpoint-page-content"
-            >
-              <EuiPanel
-                className="euiPageContent endpoint-page-content"
-                paddingSize="l"
-              >
-                <div
-                  className="euiPanel euiPanel--paddingLarge euiPageContent endpoint-page-content"
-                >
-                  <EuiPageContentBody
-                    data-test-subj="pageViewBodyContent"
-                  >
-                    <div
-                      className="euiPageContentBody"
-                      data-test-subj="pageViewBodyContent"
-                    >
-                      body content
-                    </div>
-                  </EuiPageContentBody>
-                </div>
-              </EuiPanel>
-            </EuiPageContent>
-          </main>
-        </EuiPageBody>
-      </div>
-    </EuiPage>
-  </Styled(EuiPage)>
-</PageView>
-`;
-
-exports[`PageView component should use custom element for header left and not wrap in EuiTitle 1`] = `
-.c0.endpoint--isListView {
-  padding: 0 24px;
-}
-
-.c0.endpoint--isListView .endpoint-header {
-  padding: 24px;
-  margin-bottom: 0;
-}
-
-.c0.endpoint--isListView .endpoint-page-content {
-  border-left: none;
-  border-right: none;
-}
-
-.c0.endpoint--isDetailsView .endpoint-page-content {
-  padding: 0;
-  border: none;
-  background: none;
-}
-
-.c0 .endpoint-navTabs {
-  margin-left: 12px;
-}
-
-.c0 .endpoint-header-leftSection {
-  overflow: hidden;
-}
-
-<PageView
-  headerLeft={
-    <p>
-      title here
-    </p>
-  }
-  viewType="list"
->
-  <Styled(EuiPage)
-    className="endpoint--isListView"
-  >
-    <EuiPage
-      className="c0 endpoint--isListView"
-    >
-      <div
-        className="euiPage c0 endpoint--isListView"
-      >
-        <EuiPageBody>
-          <main
-            className="euiPageBody"
-          >
-            <EuiPageHeader
-              className="endpoint-header"
-            >
-              <div
-                className="euiPageHeader euiPageHeader--responsive endpoint-header"
-              >
-                <EuiPageHeaderSection
-                  className="endpoint-header-leftSection"
-                  data-test-subj="pageViewHeaderLeft"
-                >
-                  <div
-                    className="euiPageHeaderSection endpoint-header-leftSection"
-                    data-test-subj="pageViewHeaderLeft"
-                  >
-                    <p>
-                      title here
-                    </p>
-                  </div>
-                </EuiPageHeaderSection>
-              </div>
-            </EuiPageHeader>
-            <EuiPageContent
-              className="endpoint-page-content"
-            >
-              <EuiPanel
-                className="euiPageContent endpoint-page-content"
-                paddingSize="l"
-              >
-                <div
-                  className="euiPanel euiPanel--paddingLarge euiPageContent endpoint-page-content"
-                >
-                  <EuiPageContentBody
-                    data-test-subj="pageViewBodyContent"
-                  >
-                    <div
-                      className="euiPageContentBody"
-                      data-test-subj="pageViewBodyContent"
-                    >
-                      body content
-                    </div>
-                  </EuiPageContentBody>
-                </div>
-              </EuiPanel>
-            </EuiPageContent>
-          </main>
-        </EuiPageBody>
-      </div>
-    </EuiPage>
-  </Styled(EuiPage)>
-</PageView>
-`;
diff --git a/x-pack/plugins/security_solution/public/common/components/endpoint/page_view.test.tsx b/x-pack/plugins/security_solution/public/common/components/endpoint/page_view.test.tsx
deleted file mode 100644
index 2c14f66b64865..0000000000000
--- a/x-pack/plugins/security_solution/public/common/components/endpoint/page_view.test.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-import { mount } from 'enzyme';
-import { PageView } from './page_view';
-import { EuiThemeProvider } from '../../../../../../legacy/common/eui_styled_components';
-
-describe('PageView component', () => {
-  const render = (ui: Parameters<typeof mount>[0]) =>
-    mount(ui, { wrappingComponent: EuiThemeProvider });
-
-  it('should display only body if not header props used', () => {
-    expect(render(<PageView viewType="list">{'body content'}</PageView>)).toMatchSnapshot();
-  });
-  it('should display header left and right', () => {
-    expect(
-      render(
-        <PageView viewType="list" headerLeft="page title" headerRight="right side actions">
-          {'body content'}
-        </PageView>
-      )
-    ).toMatchSnapshot();
-  });
-  it('should display only header left', () => {
-    expect(
-      render(
-        <PageView viewType="list" headerLeft="page title">
-          {'body content'}
-        </PageView>
-      )
-    ).toMatchSnapshot();
-  });
-  it('should display only header right but include an empty left side', () => {
-    expect(
-      render(
-        <PageView viewType="list" headerRight="right side actions">
-          {'body content'}
-        </PageView>
-      )
-    ).toMatchSnapshot();
-  });
-  it(`should use custom element for header left and not wrap in EuiTitle`, () => {
-    expect(
-      render(
-        <PageView viewType="list" headerLeft={<p>{'title here'}</p>}>
-          {'body content'}
-        </PageView>
-      )
-    ).toMatchSnapshot();
-  });
-  it('should display body header wrapped in EuiTitle', () => {
-    expect(
-      render(
-        <PageView viewType="list" bodyHeader="body header">
-          {'body content'}
-        </PageView>
-      )
-    ).toMatchSnapshot();
-  });
-  it('should display body header custom element', () => {
-    expect(
-      render(
-        <PageView viewType="list" bodyHeader={<p>{'body header'}</p>}>
-          {'body content'}
-        </PageView>
-      )
-    ).toMatchSnapshot();
-  });
-  it('should pass through EuiPage props', () => {
-    expect(
-      render(
-        <PageView
-          viewType="list"
-          restrictWidth="1000"
-          className="test-class-name-here"
-          aria-label="test-aria-label-here"
-          data-test-subj="test-data-test-subj-here"
-        >
-          {'body content'}
-        </PageView>
-      )
-    ).toMatchSnapshot();
-  });
-});
diff --git a/x-pack/plugins/security_solution/public/common/components/endpoint/page_view.tsx b/x-pack/plugins/security_solution/public/common/components/endpoint/page_view.tsx
deleted file mode 100644
index d4753b3a64e24..0000000000000
--- a/x-pack/plugins/security_solution/public/common/components/endpoint/page_view.tsx
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import {
-  EuiPage,
-  EuiPageBody,
-  EuiPageContent,
-  EuiPageContentBody,
-  EuiPageContentHeader,
-  EuiPageContentHeaderSection,
-  EuiPageHeader,
-  EuiPageHeaderSection,
-  EuiPageProps,
-  EuiTab,
-  EuiTabs,
-  EuiTitle,
-  EuiTitleProps,
-} from '@elastic/eui';
-import React, { memo, MouseEventHandler, ReactNode, useMemo } from 'react';
-import styled from 'styled-components';
-import { EuiTabProps } from '@elastic/eui/src/components/tabs/tab';
-
-const StyledEuiPage = styled(EuiPage)`
-  &.endpoint--isListView {
-    padding: 0 ${(props) => props.theme.eui.euiSizeL};
-
-    .endpoint-header {
-      padding: ${(props) => props.theme.eui.euiSizeL};
-      margin-bottom: 0;
-    }
-    .endpoint-page-content {
-      border-left: none;
-      border-right: none;
-    }
-  }
-  &.endpoint--isDetailsView {
-    .endpoint-page-content {
-      padding: 0;
-      border: none;
-      background: none;
-    }
-  }
-  .endpoint-navTabs {
-    margin-left: ${(props) => props.theme.eui.euiSizeM};
-  }
-  .endpoint-header-leftSection {
-    overflow: hidden;
-  }
-`;
-
-const isStringOrNumber = /(string|number)/;
-
-/**
- * The `PageView` component used to render `headerLeft` when it is set as a `string`
- * Can be used when wanting to customize the `headerLeft` value but still use the standard
- * title component
- */
-export const PageViewHeaderTitle = memo<Omit<EuiTitleProps, 'children'> & { children: ReactNode }>(
-  ({ children, size = 'l', ...otherProps }) => {
-    return (
-      <EuiTitle {...otherProps} size={size}>
-        <h1 data-test-subj="pageViewHeaderLeftTitle">{children}</h1>
-      </EuiTitle>
-    );
-  }
-);
-
-PageViewHeaderTitle.displayName = 'PageViewHeaderTitle';
-
-/**
- * The `PageView` component used to render `bodyHeader` when it is set as a `string`
- * Can be used when wanting to customize the `bodyHeader` value but still use the standard
- * title component
- */
-export const PageViewBodyHeaderTitle = memo<{ children: ReactNode }>(
-  ({ children, ...otherProps }) => {
-    return (
-      <EuiTitle {...otherProps}>
-        <h2 data-test-subj="pageViewBodyTitle">{children}</h2>
-      </EuiTitle>
-    );
-  }
-);
-PageViewBodyHeaderTitle.displayName = 'PageViewBodyHeaderTitle';
-
-export type PageViewProps = EuiPageProps & {
-  /**
-   * The type of view
-   */
-  viewType: 'list' | 'details';
-  /**
-   * content to be placed on the left side of the header. If a `string` is used, then it will
-   * be wrapped with `<EuiTitle><h1></h1></EuiTitle>`, else it will just be used as is.
-   */
-  headerLeft?: ReactNode;
-  /** Content for the right side of the header */
-  headerRight?: ReactNode;
-  /**
-   *  body (sub-)header section. If a `string` is used, then it will be wrapped with
-   *  `<EuiTitle><h2></h2></EuiTitle>`
-   */
-  bodyHeader?: ReactNode;
-  /**
-   * The list of tab navigation items
-   */
-  tabs?: Array<
-    EuiTabProps & {
-      name: ReactNode;
-      id: string;
-      href?: string;
-      onClick?: MouseEventHandler<HTMLAnchorElement | HTMLButtonElement>;
-    }
-  >;
-  children?: ReactNode;
-};
-
-/**
- * Page View layout for use in Endpoint
- */
-export const PageView = memo<PageViewProps>(
-  ({ viewType, children, headerLeft, headerRight, bodyHeader, tabs, ...otherProps }) => {
-    const tabComponents = useMemo(() => {
-      if (!tabs) {
-        return [];
-      }
-      return tabs.map(({ name, id, ...otherEuiTabProps }) => (
-        <EuiTab {...otherEuiTabProps} key={id}>
-          {name}
-        </EuiTab>
-      ));
-    }, [tabs]);
-
-    return (
-      <StyledEuiPage
-        className={(viewType === 'list' && 'endpoint--isListView') || 'endpoint--isDetailsView'}
-        {...otherProps}
-      >
-        <EuiPageBody>
-          {(headerLeft || headerRight) && (
-            <EuiPageHeader className="endpoint-header">
-              <EuiPageHeaderSection
-                className="endpoint-header-leftSection"
-                data-test-subj="pageViewHeaderLeft"
-              >
-                {isStringOrNumber.test(typeof headerLeft) ? (
-                  <PageViewHeaderTitle>{headerLeft}</PageViewHeaderTitle>
-                ) : (
-                  headerLeft
-                )}
-              </EuiPageHeaderSection>
-              {headerRight && (
-                <EuiPageHeaderSection data-test-subj="pageViewHeaderRight">
-                  {headerRight}
-                </EuiPageHeaderSection>
-              )}
-            </EuiPageHeader>
-          )}
-          {tabComponents.length > 0 && (
-            <EuiTabs className="endpoint-navTabs">{tabComponents}</EuiTabs>
-          )}
-          <EuiPageContent className="endpoint-page-content">
-            {bodyHeader && (
-              <EuiPageContentHeader>
-                <EuiPageContentHeaderSection data-test-subj="pageViewBodyTitleArea">
-                  {isStringOrNumber.test(typeof bodyHeader) ? (
-                    <PageViewBodyHeaderTitle>{bodyHeader}</PageViewBodyHeaderTitle>
-                  ) : (
-                    bodyHeader
-                  )}
-                </EuiPageContentHeaderSection>
-              </EuiPageContentHeader>
-            )}
-            <EuiPageContentBody data-test-subj="pageViewBodyContent">{children}</EuiPageContentBody>
-          </EuiPageContent>
-        </EuiPageBody>
-      </StyledEuiPage>
-    );
-  }
-);
-
-PageView.displayName = 'PageView';
diff --git a/x-pack/plugins/security_solution/public/common/components/wrapper_page/index.tsx b/x-pack/plugins/security_solution/public/common/components/wrapper_page/index.tsx
index 373c1f7aaec75..f3136b0a40b3e 100644
--- a/x-pack/plugins/security_solution/public/common/components/wrapper_page/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/wrapper_page/index.tsx
@@ -7,14 +7,15 @@
 import classNames from 'classnames';
 import React, { useEffect } from 'react';
 import styled from 'styled-components';
+import { CommonProps } from '@elastic/eui';
 
 import { useFullScreen } from '../../containers/use_full_screen';
 import { gutterTimeline } from '../../lib/helpers';
 import { AppGlobalStyle } from '../page/index';
 
 const Wrapper = styled.div`
-  padding: ${({ theme }) =>
-    `${theme.eui.paddingSizes.l} ${gutterTimeline} ${theme.eui.paddingSizes.l} ${theme.eui.paddingSizes.l}`};
+  padding: ${(props) => `${props.theme.eui.paddingSizes.l}`};
+
   &.siemWrapperPage--restrictWidthDefault,
   &.siemWrapperPage--restrictWidthCustom {
     box-sizing: content-box;
@@ -29,6 +30,10 @@ const Wrapper = styled.div`
     height: 100%;
   }
 
+  &.siemWrapperPage--withTimeline {
+    padding-right: ${gutterTimeline};
+  }
+
   &.siemWrapperPage--noPadding {
     padding: 0;
   }
@@ -38,18 +43,20 @@ Wrapper.displayName = 'Wrapper';
 
 interface WrapperPageProps {
   children: React.ReactNode;
-  className?: string;
   restrictWidth?: boolean | number | string;
   style?: Record<string, string>;
   noPadding?: boolean;
+  noTimeline?: boolean;
 }
 
-const WrapperPageComponent: React.FC<WrapperPageProps> = ({
+const WrapperPageComponent: React.FC<WrapperPageProps & CommonProps> = ({
   children,
   className,
   restrictWidth,
   style,
   noPadding,
+  noTimeline,
+  ...otherProps
 }) => {
   const { globalFullScreen, setGlobalFullScreen } = useFullScreen();
   useEffect(() => {
@@ -59,6 +66,7 @@ const WrapperPageComponent: React.FC<WrapperPageProps> = ({
   const classes = classNames(className, {
     siemWrapperPage: true,
     'siemWrapperPage--noPadding': noPadding,
+    'siemWrapperPage--withTimeline': !noTimeline,
     'siemWrapperPage--fullHeight': globalFullScreen,
     'siemWrapperPage--restrictWidthDefault':
       restrictWidth && typeof restrictWidth === 'boolean' && restrictWidth === true,
@@ -73,7 +81,7 @@ const WrapperPageComponent: React.FC<WrapperPageProps> = ({
   }
 
   return (
-    <Wrapper className={classes} style={customStyle || style}>
+    <Wrapper className={classes} style={customStyle || style} {...otherProps}>
       {children}
       <AppGlobalStyle />
     </Wrapper>
diff --git a/x-pack/plugins/security_solution/public/management/common/constants.ts b/x-pack/plugins/security_solution/public/management/common/constants.ts
index 88396cc24a5e2..39d42114f9939 100644
--- a/x-pack/plugins/security_solution/public/management/common/constants.ts
+++ b/x-pack/plugins/security_solution/public/management/common/constants.ts
@@ -13,6 +13,7 @@ export const MANAGEMENT_ROUTING_ROOT_PATH = '';
 export const MANAGEMENT_ROUTING_ENDPOINTS_PATH = `${MANAGEMENT_ROUTING_ROOT_PATH}/:tabName(${AdministrationSubTab.endpoints})`;
 export const MANAGEMENT_ROUTING_POLICIES_PATH = `${MANAGEMENT_ROUTING_ROOT_PATH}/:tabName(${AdministrationSubTab.policies})`;
 export const MANAGEMENT_ROUTING_POLICY_DETAILS_PATH = `${MANAGEMENT_ROUTING_ROOT_PATH}/:tabName(${AdministrationSubTab.policies})/:policyId`;
+export const MANAGEMENT_ROUTING_TRUSTED_APPS_PATH = `${MANAGEMENT_ROUTING_ROOT_PATH}/:tabName(${AdministrationSubTab.trustedApps})`;
 
 // --[ STORE ]---------------------------------------------------------------------------
 /** The SIEM global store namespace where the management state will be mounted */
diff --git a/x-pack/plugins/security_solution/public/management/common/routing.ts b/x-pack/plugins/security_solution/public/management/common/routing.ts
index ea162422abb6f..c5ced6f3bcf55 100644
--- a/x-pack/plugins/security_solution/public/management/common/routing.ts
+++ b/x-pack/plugins/security_solution/public/management/common/routing.ts
@@ -13,6 +13,7 @@ import {
   MANAGEMENT_ROUTING_ENDPOINTS_PATH,
   MANAGEMENT_ROUTING_POLICIES_PATH,
   MANAGEMENT_ROUTING_POLICY_DETAILS_PATH,
+  MANAGEMENT_ROUTING_TRUSTED_APPS_PATH,
 } from './constants';
 import { AdministrationSubTab } from '../types';
 import { appendSearch } from '../../common/components/link_to/helpers';
@@ -72,13 +73,21 @@ export const getEndpointDetailsPath = (
   })}${appendSearch(`${urlQueryParams ? `${urlQueryParams}${urlSearch}` : urlSearch}`)}`;
 };
 
-export const getPoliciesPath = (search?: string) =>
-  `${generatePath(MANAGEMENT_ROUTING_POLICIES_PATH, {
+export const getPoliciesPath = (search?: string) => {
+  return `${generatePath(MANAGEMENT_ROUTING_POLICIES_PATH, {
     tabName: AdministrationSubTab.policies,
   })}${appendSearch(search)}`;
+};
 
-export const getPolicyDetailPath = (policyId: string, search?: string) =>
-  `${generatePath(MANAGEMENT_ROUTING_POLICY_DETAILS_PATH, {
+export const getPolicyDetailPath = (policyId: string, search?: string) => {
+  return `${generatePath(MANAGEMENT_ROUTING_POLICY_DETAILS_PATH, {
     tabName: AdministrationSubTab.policies,
     policyId,
   })}${appendSearch(search)}`;
+};
+
+export const getTrustedAppsListPath = (search?: string) => {
+  return `${generatePath(MANAGEMENT_ROUTING_TRUSTED_APPS_PATH, {
+    tabName: AdministrationSubTab.trustedApps,
+  })}${appendSearch(search)}`;
+};
diff --git a/x-pack/plugins/security_solution/public/management/common/translations.ts b/x-pack/plugins/security_solution/public/management/common/translations.ts
index 03f6a80ef99a4..d24eb1bd315fa 100644
--- a/x-pack/plugins/security_solution/public/management/common/translations.ts
+++ b/x-pack/plugins/security_solution/public/management/common/translations.ts
@@ -13,3 +13,11 @@ export const ENDPOINTS_TAB = i18n.translate('xpack.securitySolution.endpointsTab
 export const POLICIES_TAB = i18n.translate('xpack.securitySolution.policiesTab', {
   defaultMessage: 'Policies',
 });
+
+export const TRUSTED_APPS_TAB = i18n.translate('xpack.securitySolution.trustedAppsTab', {
+  defaultMessage: 'Trusted applications',
+});
+
+export const BETA_BADGE_LABEL = i18n.translate('xpack.securitySolution.administration.list.beta', {
+  defaultMessage: 'Beta',
+});
diff --git a/x-pack/plugins/security_solution/public/management/components/administration_list_page.tsx b/x-pack/plugins/security_solution/public/management/components/administration_list_page.tsx
new file mode 100644
index 0000000000000..3df525b4d59d6
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/components/administration_list_page.tsx
@@ -0,0 +1,65 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React, { FC, memo } from 'react';
+import { EuiPanel, EuiSpacer, CommonProps } from '@elastic/eui';
+import { SecurityPageName } from '../../../common/constants';
+import { WrapperPage } from '../../common/components/wrapper_page';
+import { HeaderPage } from '../../common/components/header_page';
+import { SiemNavigation } from '../../common/components/navigation';
+import { SpyRoute } from '../../common/utils/route/spy_routes';
+import { AdministrationSubTab } from '../types';
+import { ENDPOINTS_TAB, TRUSTED_APPS_TAB, BETA_BADGE_LABEL } from '../common/translations';
+import { getEndpointListPath, getTrustedAppsListPath } from '../common/routing';
+
+interface AdministrationListPageProps {
+  beta: boolean;
+  title: React.ReactNode;
+  subtitle: React.ReactNode;
+  actions?: React.ReactNode;
+}
+
+export const AdministrationListPage: FC<AdministrationListPageProps & CommonProps> = memo(
+  ({ beta, title, subtitle, actions, children, ...otherProps }) => {
+    const badgeOptions = !beta ? undefined : { beta: true, text: BETA_BADGE_LABEL };
+
+    return (
+      <WrapperPage noTimeline {...otherProps}>
+        <HeaderPage title={title} subtitle={subtitle} badgeOptions={badgeOptions}>
+          {actions}
+        </HeaderPage>
+
+        <SiemNavigation
+          navTabs={{
+            [AdministrationSubTab.endpoints]: {
+              name: ENDPOINTS_TAB,
+              id: AdministrationSubTab.endpoints,
+              href: getEndpointListPath({ name: 'endpointList' }),
+              urlKey: 'administration',
+              pageId: SecurityPageName.administration,
+              disabled: false,
+            },
+            [AdministrationSubTab.trustedApps]: {
+              name: TRUSTED_APPS_TAB,
+              id: AdministrationSubTab.trustedApps,
+              href: getTrustedAppsListPath(),
+              urlKey: 'administration',
+              pageId: SecurityPageName.administration,
+              disabled: false,
+            },
+          }}
+        />
+
+        <EuiSpacer />
+
+        <EuiPanel>{children}</EuiPanel>
+
+        <SpyRoute pageName={SecurityPageName.administration} />
+      </WrapperPage>
+    );
+  }
+);
+
+AdministrationListPage.displayName = 'AdministrationListPage';
diff --git a/x-pack/plugins/security_solution/public/management/components/management_page_view.tsx b/x-pack/plugins/security_solution/public/management/components/management_page_view.tsx
deleted file mode 100644
index 54d9131209d0d..0000000000000
--- a/x-pack/plugins/security_solution/public/management/components/management_page_view.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { memo } from 'react';
-import { EuiErrorBoundary } from '@elastic/eui';
-import { PageView, PageViewProps } from '../../common/components/endpoint/page_view';
-
-export const ManagementPageView = memo<Omit<PageViewProps, 'tabs'>>((options) => {
-  return (
-    <EuiErrorBoundary>
-      <PageView {...options} />
-    </EuiErrorBoundary>
-  );
-});
-
-ManagementPageView.displayName = 'ManagementPageView';
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx
index 09df6d6ece042..fe06bcc8131f8 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx
@@ -8,6 +8,7 @@ import React from 'react';
 import * as reactTestingLibrary from '@testing-library/react';
 
 import { EndpointList } from './index';
+import '../../../../common/mock/match_media.ts';
 import {
   mockEndpointDetailsApiResult,
   mockEndpointResultList,
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx
index a923d49012d70..611e69391ab06 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx
@@ -10,15 +10,10 @@ import {
   EuiBasicTable,
   EuiBasicTableColumn,
   EuiText,
-  EuiTitle,
-  EuiSpacer,
   EuiLink,
   EuiHealth,
   EuiToolTip,
   EuiSelectableProps,
-  EuiBetaBadge,
-  EuiFlexGroup,
-  EuiFlexItem,
 } from '@elastic/eui';
 import { useHistory } from 'react-router-dom';
 import { i18n } from '@kbn/i18n';
@@ -36,8 +31,6 @@ import {
 import { useNavigateByRouterEventHandler } from '../../../../common/hooks/endpoint/use_navigate_by_router_event_handler';
 import { CreateStructuredSelector } from '../../../../common/store';
 import { Immutable, HostInfo } from '../../../../../common/endpoint/types';
-import { SpyRoute } from '../../../../common/utils/route/spy_routes';
-import { ManagementPageView } from '../../../components/management_page_view';
 import { PolicyEmptyState, HostsEmptyState } from '../../../components/management_empty_state';
 import { FormattedDate } from '../../../../common/components/formatted_date';
 import { useNavigateToAppEventHandler } from '../../../../common/hooks/endpoint/use_navigate_to_app_event_handler';
@@ -50,6 +43,7 @@ import { getEndpointListPath, getEndpointDetailsPath } from '../../../common/rou
 import { useFormatUrl } from '../../../../common/components/link_to';
 import { EndpointAction } from '../store/action';
 import { EndpointPolicyLink } from './components/endpoint_policy_link';
+import { AdministrationListPage } from '../../../components/administration_list_page';
 
 const EndpointListNavLink = memo<{
   name: string;
@@ -375,40 +369,20 @@ export const EndpointList = () => {
   ]);
 
   return (
-    <ManagementPageView
-      viewType="list"
+    <AdministrationListPage
       data-test-subj="endpointPage"
-      headerLeft={
-        <>
-          <EuiFlexGroup alignItems="center" responsive={false}>
-            <EuiFlexItem grow={false}>
-              <EuiTitle size="l">
-                <h1 data-test-subj="pageViewHeaderLeftTitle">
-                  <FormattedMessage
-                    id="xpack.securitySolution.endpoint.list.pageTitle"
-                    defaultMessage="Endpoints"
-                  />
-                </h1>
-              </EuiTitle>
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              <EuiBetaBadge
-                label={i18n.translate('xpack.securitySolution.endpoint.list.beta', {
-                  defaultMessage: 'Beta',
-                })}
-              />
-            </EuiFlexItem>
-          </EuiFlexGroup>
-          <EuiSpacer size="s" />
-          <EuiText size="s" color="subdued">
-            <p>
-              <FormattedMessage
-                id="xpack.securitySolution.endpoint.list.pageSubTitle"
-                defaultMessage="Hosts running Elastic Endpoint Security"
-              />
-            </p>
-          </EuiText>
-        </>
+      beta={true}
+      title={
+        <FormattedMessage
+          id="xpack.securitySolution.endpoint.list.pageTitle"
+          defaultMessage="Endpoints"
+        />
+      }
+      subtitle={
+        <FormattedMessage
+          id="xpack.securitySolution.endpoint.list.pageSubTitle"
+          defaultMessage="Hosts running Elastic Endpoint Security"
+        />
       }
     >
       {hasSelectedEndpoint && <EndpointDetailsFlyout />}
@@ -425,7 +399,6 @@ export const EndpointList = () => {
         </>
       )}
       {renderTableOrEmptyState}
-      <SpyRoute pageName={SecurityPageName.administration} />
-    </ManagementPageView>
+    </AdministrationListPage>
   );
 };
diff --git a/x-pack/plugins/security_solution/public/management/pages/index.test.tsx b/x-pack/plugins/security_solution/public/management/pages/index.test.tsx
index 9e496ce6c0b50..c04d3b1ec1a90 100644
--- a/x-pack/plugins/security_solution/public/management/pages/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/index.test.tsx
@@ -7,6 +7,7 @@
 import React from 'react';
 
 import { ManagementContainer } from './index';
+import '../../common/mock/match_media.ts';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../common/mock/endpoint';
 import { useIngestEnabledCheck } from '../../common/hooks/endpoint/ingest_enabled';
 
@@ -22,15 +23,13 @@ describe('when in the Admistration tab', () => {
 
   it('should display the No Permissions view when Ingest is OFF', async () => {
     (useIngestEnabledCheck as jest.Mock).mockReturnValue({ allEnabled: false });
-    const renderResult = render();
-    const noIngestPermissions = await renderResult.findByTestId('noIngestPermissions');
-    expect(noIngestPermissions).not.toBeNull();
+
+    expect(await render().findByTestId('noIngestPermissions')).not.toBeNull();
   });
 
   it('should display the Management view when Ingest is ON', async () => {
     (useIngestEnabledCheck as jest.Mock).mockReturnValue({ allEnabled: true });
-    const renderResult = render();
-    const endpointPage = await renderResult.findByTestId('endpointPage');
-    expect(endpointPage).not.toBeNull();
+
+    expect(await render().findByTestId('endpointPage')).not.toBeNull();
   });
 });
diff --git a/x-pack/plugins/security_solution/public/management/pages/index.tsx b/x-pack/plugins/security_solution/public/management/pages/index.tsx
index c20a3dd31d6a4..959753cba7bd7 100644
--- a/x-pack/plugins/security_solution/public/management/pages/index.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/index.tsx
@@ -11,55 +11,50 @@ import { useHistory, Route, Switch } from 'react-router-dom';
 import { ChromeBreadcrumb } from 'kibana/public';
 import { EuiText, EuiEmptyPrompt } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { PolicyContainer } from './policy';
 import {
   MANAGEMENT_ROUTING_ENDPOINTS_PATH,
   MANAGEMENT_ROUTING_POLICIES_PATH,
   MANAGEMENT_ROUTING_ROOT_PATH,
+  MANAGEMENT_ROUTING_TRUSTED_APPS_PATH,
 } from '../common/constants';
 import { NotFoundPage } from '../../app/404';
 import { EndpointsContainer } from './endpoint_hosts';
+import { PolicyContainer } from './policy';
+import { TrustedAppsContainer } from './trusted_apps';
 import { getEndpointListPath } from '../common/routing';
 import { APP_ID, SecurityPageName } from '../../../common/constants';
 import { GetUrlForApp } from '../../common/components/navigation/types';
 import { AdministrationRouteSpyState } from '../../common/utils/route/types';
 import { ADMINISTRATION } from '../../app/home/translations';
 import { AdministrationSubTab } from '../types';
-import { ENDPOINTS_TAB, POLICIES_TAB } from '../common/translations';
+import { ENDPOINTS_TAB, POLICIES_TAB, TRUSTED_APPS_TAB } from '../common/translations';
 import { SpyRoute } from '../../common/utils/route/spy_routes';
 import { useIngestEnabledCheck } from '../../common/hooks/endpoint/ingest_enabled';
 
-const TabNameMappedToI18nKey: Record<string, string> = {
+const TabNameMappedToI18nKey: Record<AdministrationSubTab, string> = {
   [AdministrationSubTab.endpoints]: ENDPOINTS_TAB,
   [AdministrationSubTab.policies]: POLICIES_TAB,
+  [AdministrationSubTab.trustedApps]: TRUSTED_APPS_TAB,
 };
 
-export const getBreadcrumbs = (
+export function getBreadcrumbs(
   params: AdministrationRouteSpyState,
   search: string[],
   getUrlForApp: GetUrlForApp
-): ChromeBreadcrumb[] => {
-  let breadcrumb = [
+): ChromeBreadcrumb[] {
+  return [
     {
       text: ADMINISTRATION,
       href: getUrlForApp(`${APP_ID}:${SecurityPageName.administration}`, {
         path: !isEmpty(search[0]) ? search[0] : '',
       }),
     },
-  ];
-
-  const tabName = params?.tabName;
-  if (!tabName) return breadcrumb;
-
-  breadcrumb = [
-    ...breadcrumb,
-    {
+    ...(params?.tabName ? [params?.tabName] : []).map((tabName) => ({
       text: TabNameMappedToI18nKey[tabName],
       href: '',
-    },
+    })),
   ];
-  return breadcrumb;
-};
+}
 
 const NoPermissions = memo(() => {
   return (
@@ -104,6 +99,7 @@ export const ManagementContainer = memo(() => {
     <Switch>
       <Route path={MANAGEMENT_ROUTING_ENDPOINTS_PATH} component={EndpointsContainer} />
       <Route path={MANAGEMENT_ROUTING_POLICIES_PATH} component={PolicyContainer} />
+      <Route path={MANAGEMENT_ROUTING_TRUSTED_APPS_PATH} component={TrustedAppsContainer} />
       <Route
         path={MANAGEMENT_ROUTING_ROOT_PATH}
         exact
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx
index c934cfb94fc7e..318d49f5fea9f 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx
@@ -8,6 +8,7 @@ import React from 'react';
 import { mount } from 'enzyme';
 
 import { PolicyDetails } from './policy_details';
+import '../../../../common/mock/match_media.ts';
 import { EndpointDocGenerator } from '../../../../../common/endpoint/generate_data';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../../../common/mock/endpoint';
 import { getPolicyDetailPath, getEndpointListPath } from '../../../common/routing';
@@ -123,35 +124,29 @@ describe('Policy Details', () => {
 
     it('should display back to list button and policy title', () => {
       policyView.update();
-      const pageHeaderLeft = policyView.find(
-        'EuiPageHeaderSection[data-test-subj="pageViewHeaderLeft"]'
-      );
 
-      const backToListButton = pageHeaderLeft.find('EuiButtonEmpty');
-      expect(backToListButton.prop('iconType')).toBe('arrowLeft');
-      expect(backToListButton.prop('href')).toBe(endpointListPath);
-      expect(backToListButton.text()).toBe('Back to endpoint hosts');
+      const backToListLink = policyView.find('LinkIcon[dataTestSubj="policyDetailsBackLink"]');
+      expect(backToListLink.prop('iconType')).toBe('arrowLeft');
+      expect(backToListLink.prop('href')).toBe(endpointListPath);
+      expect(backToListLink.text()).toBe('Back to endpoint hosts');
 
-      const pageTitle = pageHeaderLeft.find('[data-test-subj="pageViewHeaderLeftTitle"]');
+      const pageTitle = policyView.find('h1[data-test-subj="header-page-title"]');
       expect(pageTitle).toHaveLength(1);
       expect(pageTitle.text()).toEqual(policyPackageConfig.name);
     });
     it('should navigate to list if back to link is clicked', async () => {
       policyView.update();
-      const backToListButton = policyView.find(
-        'EuiPageHeaderSection[data-test-subj="pageViewHeaderLeft"] EuiButtonEmpty'
-      );
+
+      const backToListLink = policyView.find('a[data-test-subj="policyDetailsBackLink"]');
       expect(history.location.pathname).toEqual(policyDetailsPathUrl);
-      backToListButton.simulate('click', { button: 0 });
+      backToListLink.simulate('click', { button: 0 });
       expect(history.location.pathname).toEqual(endpointListPath);
     });
     it('should display agent stats', async () => {
       await asyncActions;
       policyView.update();
-      const headerRight = policyView.find(
-        'EuiPageHeaderSection[data-test-subj="pageViewHeaderRight"]'
-      );
-      const agentsSummary = headerRight.find('EuiFlexGroup[data-test-subj="policyAgentsSummary"]');
+
+      const agentsSummary = policyView.find('EuiFlexGroup[data-test-subj="policyAgentsSummary"]');
       expect(agentsSummary).toHaveLength(1);
       expect(agentsSummary.text()).toBe('Endpoints5Online3Offline1Error1');
     });
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.tsx
index e54e684d788c0..636c0e5e6a0c3 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.tsx
@@ -38,9 +38,6 @@ import { WindowsEvents, MacEvents, LinuxEvents } from './policy_forms/events';
 import { MalwareProtections } from './policy_forms/protections/malware';
 import { useToasts } from '../../../../common/lib/kibana';
 import { AppAction } from '../../../../common/store/actions';
-import { useNavigateByRouterEventHandler } from '../../../../common/hooks/endpoint/use_navigate_by_router_event_handler';
-import { PageViewHeaderTitle } from '../../../../common/components/endpoint/page_view';
-import { ManagementPageView } from '../../../components/management_page_view';
 import { SpyRoute } from '../../../../common/utils/route/spy_routes';
 import { SecurityPageName } from '../../../../app/types';
 import { getEndpointListPath } from '../../../common/routing';
@@ -48,6 +45,8 @@ import { useFormatUrl } from '../../../../common/components/link_to';
 import { useNavigateToAppEventHandler } from '../../../../common/hooks/endpoint/use_navigate_to_app_event_handler';
 import { MANAGEMENT_APP_ID } from '../../../common/constants';
 import { PolicyDetailsRouteState } from '../../../../../common/endpoint/types';
+import { WrapperPage } from '../../../../common/components/wrapper_page';
+import { HeaderPage } from '../../../../common/components/header_page';
 
 export const PolicyDetails = React.memo(() => {
   const dispatch = useDispatch<(action: AppAction) => void>();
@@ -109,8 +108,6 @@ export const PolicyDetails = React.memo(() => {
     }
   }, [navigateToApp, toasts, policyName, policyUpdateStatus, routeState]);
 
-  const handleBackToListOnClick = useNavigateByRouterEventHandler(hostListRouterPath);
-
   const navigateToAppArguments = useMemo((): Parameters<ApplicationStart['navigateToApp']> => {
     return routeState?.onCancelNavigateTo ?? [MANAGEMENT_APP_ID, { path: hostListRouterPath }];
   }, [hostListRouterPath, routeState?.onCancelNavigateTo]);
@@ -142,7 +139,7 @@ export const PolicyDetails = React.memo(() => {
   // Else, if we have an error, then show error on the page.
   if (!policyItem) {
     return (
-      <ManagementPageView viewType="details">
+      <WrapperPage noTimeline>
         {isPolicyLoading ? (
           <EuiLoadingSpinner size="xl" />
         ) : policyApiError ? (
@@ -151,28 +148,10 @@ export const PolicyDetails = React.memo(() => {
           </EuiCallOut>
         ) : null}
         <SpyRoute pageName={SecurityPageName.administration} />
-      </ManagementPageView>
+      </WrapperPage>
     );
   }
 
-  const headerLeftContent = (
-    <div>
-      {/* eslint-disable-next-line @elastic/eui/href-or-on-click */}
-      <EuiButtonEmpty
-        iconType="arrowLeft"
-        contentProps={{ style: { paddingLeft: '0' } }}
-        onClick={handleBackToListOnClick}
-        href={formatUrl(hostListRouterPath)}
-      >
-        <FormattedMessage
-          id="xpack.securitySolution.endpoint.policy.details.backToListTitle"
-          defaultMessage="Back to endpoint hosts"
-        />
-      </EuiButtonEmpty>
-      <PageViewHeaderTitle className="eui-textTruncate">{policyItem.name}</PageViewHeaderTitle>
-    </div>
-  );
-
   const headerRightContent = (
     <EuiFlexGroup justifyContent="flexEnd" gutterSize="s">
       <EuiFlexItem grow={false}>
@@ -222,12 +201,21 @@ export const PolicyDetails = React.memo(() => {
           onConfirm={handleSaveConfirmation}
         />
       )}
-      <ManagementPageView
-        viewType="details"
-        data-test-subj="policyDetailsPage"
-        headerLeft={headerLeftContent}
-        headerRight={headerRightContent}
-      >
+      <WrapperPage noTimeline data-test-subj="policyDetailsPage">
+        <HeaderPage
+          title={policyItem.name}
+          backOptions={{
+            text: i18n.translate('xpack.securitySolution.endpoint.policy.details.backToListTitle', {
+              defaultMessage: 'Back to endpoint hosts',
+            }),
+            href: formatUrl(hostListRouterPath),
+            pageId: SecurityPageName.administration,
+            dataTestSubj: 'policyDetailsBackLink',
+          }}
+        >
+          {headerRightContent}
+        </HeaderPage>
+
         <EuiText size="xs" color="subdued">
           <h4>
             <FormattedMessage
@@ -236,9 +224,11 @@ export const PolicyDetails = React.memo(() => {
             />
           </h4>
         </EuiText>
+
         <EuiSpacer size="xs" />
         <MalwareProtections />
         <EuiSpacer size="l" />
+
         <EuiText size="xs" color="subdued">
           <h4>
             <FormattedMessage
@@ -247,13 +237,15 @@ export const PolicyDetails = React.memo(() => {
             />
           </h4>
         </EuiText>
+
         <EuiSpacer size="xs" />
         <WindowsEvents />
         <EuiSpacer size="l" />
         <MacEvents />
         <EuiSpacer size="l" />
         <LinuxEvents />
-      </ManagementPageView>
+      </WrapperPage>
+
       <SpyRoute pageName={SecurityPageName.administration} />
     </>
   );
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.test.tsx
index 97eaceff91e9c..b0139bf3ecb21 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.test.tsx
@@ -6,6 +6,7 @@
 
 import React from 'react';
 import { PolicyList } from './index';
+import '../../../../common/mock/match_media.ts';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../../../common/mock/endpoint';
 import { setPolicyListApiMockImplementation } from '../store/policy_list/test_mock_utils';
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.tsx
index 39b77d259add1..b97ea958fd1c2 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.tsx
@@ -8,7 +8,6 @@ import React, { useCallback, useEffect, useMemo, CSSProperties, useState } from
 import {
   EuiBasicTable,
   EuiText,
-  EuiTitle,
   EuiSpacer,
   EuiFlexGroup,
   EuiFlexItem,
@@ -23,7 +22,6 @@ import {
   EuiConfirmModal,
   EuiCallOut,
   EuiButton,
-  EuiBetaBadge,
   EuiHorizontalRule,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
@@ -41,9 +39,7 @@ import { useKibana } from '../../../../../../../../src/plugins/kibana_react/publ
 import { Immutable, PolicyData } from '../../../../../common/endpoint/types';
 import { useNavigateByRouterEventHandler } from '../../../../common/hooks/endpoint/use_navigate_by_router_event_handler';
 import { LinkToApp } from '../../../../common/components/endpoint/link_to_app';
-import { ManagementPageView } from '../../../components/management_page_view';
 import { PolicyEmptyState } from '../../../components/management_empty_state';
-import { SpyRoute } from '../../../../common/utils/route/spy_routes';
 import { FormattedDateAndTime } from '../../../../common/components/endpoint/formatted_date_time';
 import { SecurityPageName } from '../../../../app/types';
 import { useFormatUrl } from '../../../../common/components/link_to';
@@ -51,6 +47,7 @@ import { getPolicyDetailPath, getPoliciesPath } from '../../../common/routing';
 import { useNavigateToAppEventHandler } from '../../../../common/hooks/endpoint/use_navigate_to_app_event_handler';
 import { CreatePackageConfigRouteState } from '../../../../../../ingest_manager/public';
 import { MANAGEMENT_APP_ID } from '../../../common/constants';
+import { AdministrationListPage } from '../../../components/administration_list_page';
 
 interface TableChangeCallbackArguments {
   page: { index: number; size: number };
@@ -405,42 +402,22 @@ export const PolicyList = React.memo(() => {
           }}
         />
       )}
-      <ManagementPageView
-        viewType="list"
+      <AdministrationListPage
         data-test-subj="policyListPage"
-        headerLeft={
-          <>
-            <EuiFlexGroup alignItems="center" responsive={false}>
-              <EuiFlexItem grow={false}>
-                <EuiTitle size="l">
-                  <h1 data-test-subj="pageViewHeaderLeftTitle">
-                    <FormattedMessage
-                      id="xpack.securitySolution.policyList.pageTitle"
-                      defaultMessage="Policies"
-                    />
-                  </h1>
-                </EuiTitle>
-              </EuiFlexItem>
-              <EuiFlexItem grow={false}>
-                <EuiBetaBadge
-                  label={i18n.translate('xpack.securitySolution.endpoint.policyList.beta', {
-                    defaultMessage: 'Beta',
-                  })}
-                />
-              </EuiFlexItem>
-            </EuiFlexGroup>
-            <EuiSpacer size="s" />
-            <EuiText size="s" color="subdued">
-              <p>
-                <FormattedMessage
-                  id="xpack.securitySolution.policyList.pageSubTitle"
-                  defaultMessage="View and configure protections"
-                />
-              </p>
-            </EuiText>
-          </>
+        beta={true}
+        title={
+          <FormattedMessage
+            id="xpack.securitySolution.policyList.pageTitle"
+            defaultMessage="Policies"
+          />
+        }
+        subtitle={
+          <FormattedMessage
+            id="xpack.securitySolution.policyList.pageSubTitle"
+            defaultMessage="View and configure protections"
+          />
         }
-        headerRight={
+        actions={
           <EuiButton
             iconType="plusInCircle"
             onClick={handleCreatePolicyClick}
@@ -466,8 +443,7 @@ export const PolicyList = React.memo(() => {
           </>
         )}
         {bodyContent}
-        <SpyRoute pageName={SecurityPageName.administration} />
-      </ManagementPageView>
+      </AdministrationListPage>
     </>
   );
 });
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/index.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/index.tsx
new file mode 100644
index 0000000000000..ddc16cc448c8a
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/index.tsx
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Switch, Route } from 'react-router-dom';
+import React from 'react';
+import { TrustedAppsPage } from './view';
+import { MANAGEMENT_ROUTING_TRUSTED_APPS_PATH } from '../../common/constants';
+import { NotFoundPage } from '../../../app/404';
+
+export function TrustedAppsContainer() {
+  return (
+    <Switch>
+      <Route path={MANAGEMENT_ROUTING_TRUSTED_APPS_PATH} exact component={TrustedAppsPage} />
+      <Route path="*" component={NotFoundPage} />
+    </Switch>
+  );
+}
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/__snapshots__/trusted_apps_page.test.tsx.snap b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/__snapshots__/trusted_apps_page.test.tsx.snap
new file mode 100644
index 0000000000000..6f074f3809036
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/__snapshots__/trusted_apps_page.test.tsx.snap
@@ -0,0 +1,21 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`TrustedAppsPage rendering 1`] = `
+<AdministrationListPage
+  beta={true}
+  subtitle={
+    <FormattedMessage
+      defaultMessage="View and configure trusted applications"
+      id="xpack.securitySolution.trustedapps.list.pageSubTitle"
+      values={Object {}}
+    />
+  }
+  title={
+    <FormattedMessage
+      defaultMessage="Trusted Applications"
+      id="xpack.securitySolution.trustedapps.list.pageTitle"
+      values={Object {}}
+    />
+  }
+/>
+`;
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/index.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/index.ts
new file mode 100644
index 0000000000000..af6f7e2863dfb
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/index.ts
@@ -0,0 +1,6 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+export * from './trusted_apps_page';
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/routes.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_page.test.tsx
similarity index 51%
rename from x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/routes.tsx
rename to x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_page.test.tsx
index 727d2715f0974..cc7dbd42d7a7d 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/routes.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_page.test.tsx
@@ -3,16 +3,13 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
+import { shallow } from 'enzyme';
 import React from 'react';
-import { Route, Switch } from 'react-router-dom';
 
-import { EndpointList } from './view';
+import { TrustedAppsPage } from './trusted_apps_page';
 
-export const EndpointHostsRoutes: React.FC = () => (
-  <Switch>
-    <Route path="/:pageName(endpoint-endpoints)">
-      <EndpointList />
-    </Route>
-  </Switch>
-);
+describe('TrustedAppsPage', () => {
+  test('rendering', () => {
+    expect(shallow(<TrustedAppsPage />)).toMatchSnapshot();
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_page.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_page.tsx
new file mode 100644
index 0000000000000..7045fa49ffad3
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_page.tsx
@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { AdministrationListPage } from '../../../components/administration_list_page';
+
+export function TrustedAppsPage() {
+  return (
+    <AdministrationListPage
+      beta={true}
+      title={
+        <FormattedMessage
+          id="xpack.securitySolution.trustedapps.list.pageTitle"
+          defaultMessage="Trusted Applications"
+        />
+      }
+      subtitle={
+        <FormattedMessage
+          id="xpack.securitySolution.trustedapps.list.pageSubTitle"
+          defaultMessage="View and configure trusted applications"
+        />
+      }
+    />
+  );
+}
diff --git a/x-pack/plugins/security_solution/public/management/types.ts b/x-pack/plugins/security_solution/public/management/types.ts
index c35c9277b4488..21214241d1981 100644
--- a/x-pack/plugins/security_solution/public/management/types.ts
+++ b/x-pack/plugins/security_solution/public/management/types.ts
@@ -27,6 +27,7 @@ export type ManagementState = CombinedState<{
 export enum AdministrationSubTab {
   endpoints = 'endpoints',
   policies = 'policy',
+  trustedApps = 'trusted_apps',
 }
 
 /**
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 3daa936f5be58..e617c7ff30885 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -16251,7 +16251,6 @@
     "xpack.securitySolution.endpoint.details.policyResponse.success": "成功",
     "xpack.securitySolution.endpoint.details.policyResponse.warning": "警告",
     "xpack.securitySolution.endpoint.details.policyResponse.workflow": "ワークフロー",
-    "xpack.securitySolution.endpoint.list.beta": "ベータ",
     "xpack.securitySolution.endpoint.list.loadingPolicies": "ポリシー構成を読み込んでいます…",
     "xpack.securitySolution.endpoint.list.noEndpointsInstructions": "セキュリティポリシーを作成しました。以下のステップに従い、エージェントでElastic Endpoint Security機能を有効にする必要があります。",
     "xpack.securitySolution.endpoint.list.noEndpointsPrompt": "エージェントでElastic Endpoint Securityを有効にする",
@@ -16310,7 +16309,6 @@
     "xpack.securitySolution.endpoint.policyList.actionButtonText": "Endpoint Securityを追加",
     "xpack.securitySolution.endpoint.policyList.actionMenu": "開く",
     "xpack.securitySolution.endpoint.policyList.agentConfigAction": "エージェント構成を表示",
-    "xpack.securitySolution.endpoint.policyList.beta": "ベータ",
     "xpack.securitySolution.endpoint.policyList.createdAt": "作成日時",
     "xpack.securitySolution.endpoint.policyList.createdBy": "作成者",
     "xpack.securitySolution.endpoint.policyList.createNewButton": "新しいポリシーを作成",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index f396d950f7526..4c2691035ee54 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -16257,7 +16257,6 @@
     "xpack.securitySolution.endpoint.details.policyResponse.success": "成功",
     "xpack.securitySolution.endpoint.details.policyResponse.warning": "警告",
     "xpack.securitySolution.endpoint.details.policyResponse.workflow": "工作流",
-    "xpack.securitySolution.endpoint.list.beta": "公测版",
     "xpack.securitySolution.endpoint.list.loadingPolicies": "正在加载政策配置",
     "xpack.securitySolution.endpoint.list.noEndpointsInstructions": "您已创建安全策略。现在您需要按照下面的步骤在代理上启用 Elastic Endpoint Security 功能。",
     "xpack.securitySolution.endpoint.list.noEndpointsPrompt": "在您的代理上启用 Elastic Endpoint Security",
@@ -16317,7 +16316,6 @@
     "xpack.securitySolution.endpoint.policyList.actionButtonText": "添加 Endpoint Security",
     "xpack.securitySolution.endpoint.policyList.actionMenu": "打开",
     "xpack.securitySolution.endpoint.policyList.agentConfigAction": "查看代理配置",
-    "xpack.securitySolution.endpoint.policyList.beta": "公测版",
     "xpack.securitySolution.endpoint.policyList.createdAt": "创建日期",
     "xpack.securitySolution.endpoint.policyList.createdBy": "创建者",
     "xpack.securitySolution.endpoint.policyList.createNewButton": "创建新策略",
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts
index 0037c39b8fed2..1843fca29758a 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts
@@ -27,8 +27,8 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       });
 
       it('finds page title', async () => {
-        const title = await testSubjects.getVisibleText('pageViewHeaderLeftTitle');
-        expect(title).to.equal('Endpoints');
+        const title = await testSubjects.getVisibleText('header-page-title');
+        expect(title).to.equal('Endpoints BETA');
       });
 
       it('displays table data', async () => {
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
index 1119906ba5cfa..9efba2b595bde 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
@@ -47,7 +47,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       });
 
       it('should display policy view', async () => {
-        expect(await testSubjects.getVisibleText('pageViewHeaderLeftTitle')).to.equal(
+        expect(await testSubjects.getVisibleText('header-page-title')).to.equal(
           policyInfo.packageConfig.name
         );
       });
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_list.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_list.ts
index 0c5e15ed4104c..cf93ca1b68991 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_list.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_list.ts
@@ -29,8 +29,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       await testSubjects.existOrFail('policyListPage');
     });
     it('displays page title', async () => {
-      const policyTitle = await testSubjects.getVisibleText('pageViewHeaderLeftTitle');
-      expect(policyTitle).to.equal('Policies');
+      const policyTitle = await testSubjects.getVisibleText('header-page-title');
+      expect(policyTitle).to.equal('Policies BETA');
     });
     it('shows header create policy button', async () => {
       const createButtonTitle = await testSubjects.getVisibleText('headerCreateNewPolicyButton');
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/trusted_apps_list.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/trusted_apps_list.ts
new file mode 100644
index 0000000000000..5f749ac272474
--- /dev/null
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/trusted_apps_list.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default ({ getPageObjects, getService }: FtrProviderContext) => {
+  const pageObjects = getPageObjects(['trustedApps']);
+  const testSubjects = getService('testSubjects');
+
+  describe('endpoint list', function () {
+    this.tags('ciGroup7');
+
+    describe('when there is data', () => {
+      before(async () => {
+        await pageObjects.trustedApps.navigateToTrustedAppsList();
+      });
+
+      it('finds page title', async () => {
+        expect(await testSubjects.getVisibleText('header-page-title')).to.equal(
+          'Trusted applications BETA'
+        );
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_endpoint/page_objects/index.ts b/x-pack/test/security_solution_endpoint/page_objects/index.ts
index 68e1ad00619c7..05762ba887c6f 100644
--- a/x-pack/test/security_solution_endpoint/page_objects/index.ts
+++ b/x-pack/test/security_solution_endpoint/page_objects/index.ts
@@ -7,6 +7,7 @@
 import { pageObjects as xpackFunctionalPageObjects } from '../../functional/page_objects';
 import { EndpointPageProvider } from './endpoint_page';
 import { EndpointPolicyPageProvider } from './policy_page';
+import { TrustedAppsPageProvider } from './trusted_apps_page';
 import { EndpointPageUtils } from './page_utils';
 import { IngestManagerCreatePackageConfig } from './ingest_manager_create_package_config_page';
 
@@ -14,6 +15,7 @@ export const pageObjects = {
   ...xpackFunctionalPageObjects,
   endpoint: EndpointPageProvider,
   policy: EndpointPolicyPageProvider,
+  trustedApps: TrustedAppsPageProvider,
   endpointPageUtils: EndpointPageUtils,
   ingestManagerCreatePackageConfig: IngestManagerCreatePackageConfig,
 };
diff --git a/x-pack/test/security_solution_endpoint/page_objects/trusted_apps_page.ts b/x-pack/test/security_solution_endpoint/page_objects/trusted_apps_page.ts
new file mode 100644
index 0000000000000..c02ac0ca9ffe0
--- /dev/null
+++ b/x-pack/test/security_solution_endpoint/page_objects/trusted_apps_page.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export function TrustedAppsPageProvider({ getPageObjects }: FtrProviderContext) {
+  const pageObjects = getPageObjects(['common', 'header', 'endpointPageUtils']);
+
+  return {
+    async navigateToTrustedAppsList(searchParams?: string) {
+      await pageObjects.common.navigateToUrlWithBrowserHistory(
+        'securitySolutionManagement',
+        `/trusted_apps${searchParams ? `?${searchParams}` : ''}`
+      );
+      await pageObjects.header.waitUntilLoadingHasFinished();
+    },
+  };
+}

From f0430f298fad4afd527ad7f113b0290241cab20e Mon Sep 17 00:00:00 2001
From: Spencer <email@spalger.com>
Date: Tue, 18 Aug 2020 10:45:26 -0700
Subject: [PATCH 03/85] [src/dev/build] remove node-version from snapshots
 (#75303)

Co-authored-by: spalger <spalger@users.noreply.github.com>
---
 .../nodejs/extract_node_builds_task.test.ts   | 29 ++++++++++++++-----
 .../verify_existing_node_builds_task.test.ts  | 15 +++++++++-
 2 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/src/dev/build/tasks/nodejs/extract_node_builds_task.test.ts b/src/dev/build/tasks/nodejs/extract_node_builds_task.test.ts
index f1700ef7b578c..a5b9e01714f38 100644
--- a/src/dev/build/tasks/nodejs/extract_node_builds_task.test.ts
+++ b/src/dev/build/tasks/nodejs/extract_node_builds_task.test.ts
@@ -17,10 +17,15 @@
  * under the License.
  */
 
+import { readFileSync } from 'fs';
+import Path from 'path';
+
 import {
   ToolingLog,
   ToolingLogCollectingWriter,
   createAbsolutePathSerializer,
+  createRecursiveSerializer,
+  REPO_ROOT,
 } from '@kbn/dev-utils';
 
 import { Config } from '../../lib';
@@ -37,6 +42,14 @@ log.setWriters([testWriter]);
 
 expect.addSnapshotSerializer(createAbsolutePathSerializer());
 
+const nodeVersion = readFileSync(Path.resolve(REPO_ROOT, '.node-version'), 'utf8').trim();
+expect.addSnapshotSerializer(
+  createRecursiveSerializer(
+    (s) => typeof s === 'string' && s.includes(nodeVersion),
+    (s) => s.split(nodeVersion).join('<node version>')
+  )
+);
+
 async function setup() {
   const config = await Config.create({
     isRelease: true,
@@ -74,8 +87,8 @@ it('runs expected fs operations', async () => {
     Object {
       "copy": Array [
         Array [
-          <absolute path>/.node_binaries/10.21.0/node.exe,
-          <absolute path>/.node_binaries/10.21.0/win32-x64/node.exe,
+          <absolute path>/.node_binaries/<node version>/node.exe,
+          <absolute path>/.node_binaries/<node version>/win32-x64/node.exe,
           Object {
             "clone": true,
           },
@@ -83,22 +96,22 @@ it('runs expected fs operations', async () => {
       ],
       "untar": Array [
         Array [
-          <absolute path>/.node_binaries/10.21.0/node-v10.21.0-linux-x64.tar.gz,
-          <absolute path>/.node_binaries/10.21.0/linux-x64,
+          <absolute path>/.node_binaries/<node version>/node-v<node version>-linux-x64.tar.gz,
+          <absolute path>/.node_binaries/<node version>/linux-x64,
           Object {
             "strip": 1,
           },
         ],
         Array [
-          <absolute path>/.node_binaries/10.21.0/node-v10.21.0-linux-arm64.tar.gz,
-          <absolute path>/.node_binaries/10.21.0/linux-arm64,
+          <absolute path>/.node_binaries/<node version>/node-v<node version>-linux-arm64.tar.gz,
+          <absolute path>/.node_binaries/<node version>/linux-arm64,
           Object {
             "strip": 1,
           },
         ],
         Array [
-          <absolute path>/.node_binaries/10.21.0/node-v10.21.0-darwin-x64.tar.gz,
-          <absolute path>/.node_binaries/10.21.0/darwin-x64,
+          <absolute path>/.node_binaries/<node version>/node-v<node version>-darwin-x64.tar.gz,
+          <absolute path>/.node_binaries/<node version>/darwin-x64,
           Object {
             "strip": 1,
           },
diff --git a/src/dev/build/tasks/nodejs/verify_existing_node_builds_task.test.ts b/src/dev/build/tasks/nodejs/verify_existing_node_builds_task.test.ts
index 19416963d5edd..1a850890a33fe 100644
--- a/src/dev/build/tasks/nodejs/verify_existing_node_builds_task.test.ts
+++ b/src/dev/build/tasks/nodejs/verify_existing_node_builds_task.test.ts
@@ -17,10 +17,15 @@
  * under the License.
  */
 
+import Path from 'path';
+import Fs from 'fs';
+
 import {
   ToolingLog,
   ToolingLogCollectingWriter,
   createAnyInstanceSerializer,
+  createRecursiveSerializer,
+  REPO_ROOT,
 } from '@kbn/dev-utils';
 
 import { Config, Platform } from '../../lib';
@@ -41,6 +46,14 @@ log.setWriters([testWriter]);
 
 expect.addSnapshotSerializer(createAnyInstanceSerializer(Config));
 
+const nodeVersion = Fs.readFileSync(Path.resolve(REPO_ROOT, '.node-version'), 'utf8').trim();
+expect.addSnapshotSerializer(
+  createRecursiveSerializer(
+    (s) => typeof s === 'string' && s.includes(nodeVersion),
+    (s) => s.split(nodeVersion).join('<node version>')
+  )
+);
+
 async function setup(actualShaSums?: Record<string, string>) {
   const config = await Config.create({
     isRelease: true,
@@ -87,7 +100,7 @@ it('checks shasums for each downloaded node build', async () => {
     [MockFunction] {
       "calls": Array [
         Array [
-          "10.21.0",
+          "<node version>",
         ],
       ],
       "results": Array [

From 83bc5004e3ea33b4d671b0204f5f72e1274a1388 Mon Sep 17 00:00:00 2001
From: Brandon Kobel <brandon.kobel@elastic.co>
Date: Tue, 18 Aug 2020 10:46:08 -0700
Subject: [PATCH 04/85] Allow routes to specify the idle socket timeout in
 addition to the payload timeout (#73730)

* Route options timeout -> timeout.payload

* timeout.idleSocket can now be specified per route

* Removing nested ternary

* Fixing integration tests

* Trying to actually fix the integration tests. Existing tests are hitting
idle socket timeout, not the payload timeout

* Fixing payload post timeout integration test

* Fixing PUT and DELETE payload sending too long tests

* Fixing type-script errors

* GET routes can't specify the payload timeout, they can't accept payloads

* Removing some redundancy in the tests

* Adding 'Transfer-Encoding: chunked' to the POST test

* Fixing POST/GET/PUT quick tests

* Adding idleSocket timeout test

* Removing unnecessary `isSafeMethod` call

* Updating documentation

* Removing PUT/DELETE integration tests

* Working around the HapiJS bug

* Deleting unused type import

* The socket can be undefined...

This occurs when using @hapi/shot directly or indirectly via
Server.inject. In these scenarios, there isn't a socket. This can also
occur when a "fake request" is used by the hacky background jobs:
Reporting and Alerting...

* Update src/core/server/http/http_server.ts

Co-authored-by: Josh Dover <me@joshdover.com>

* Adding payload timeout functional tests

* Adding idle socket timeout functional tests

* Adding better comments, using ?? instead of ||

* Fixing the plugin fixture TS

* Fixing some typescript errors

* Fixing plugin fixture tsconfig.json

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Co-authored-by: Josh Dover <me@joshdover.com>
---
 ...a-plugin-core-server.routeconfigoptions.md |   2 +-
 ...-core-server.routeconfigoptions.timeout.md |   7 +-
 src/core/server/http/http_server.test.ts      | 314 ++++++++++++------
 src/core/server/http/http_server.ts           |  37 ++-
 .../http/integration_tests/router.test.ts     | 280 ++++++++++------
 src/core/server/http/router/request.ts        |  12 +-
 src/core/server/http/router/route.ts          |  15 +-
 src/core/server/server.api.md                 |   5 +-
 test/plugin_functional/config.ts              |   1 +
 .../core_plugin_route_timeouts/kibana.json    |   8 +
 .../core_plugin_route_timeouts/package.json   |  17 +
 .../server/index.ts                           |  23 ++
 .../server/plugin.ts                          | 124 +++++++
 .../core_plugin_route_timeouts/tsconfig.json  |  12 +
 .../test_suites/core/index.ts                 |  25 ++
 .../test_suites/core/route.ts                 | 174 ++++++++++
 .../server/routes/import_list_item_route.ts   |   4 +-
 17 files changed, 843 insertions(+), 217 deletions(-)
 create mode 100644 test/plugin_functional/plugins/core_plugin_route_timeouts/kibana.json
 create mode 100644 test/plugin_functional/plugins/core_plugin_route_timeouts/package.json
 create mode 100644 test/plugin_functional/plugins/core_plugin_route_timeouts/server/index.ts
 create mode 100644 test/plugin_functional/plugins/core_plugin_route_timeouts/server/plugin.ts
 create mode 100644 test/plugin_functional/plugins/core_plugin_route_timeouts/tsconfig.json
 create mode 100644 test/plugin_functional/test_suites/core/index.ts
 create mode 100644 test/plugin_functional/test_suites/core/route.ts

diff --git a/docs/development/core/server/kibana-plugin-core-server.routeconfigoptions.md b/docs/development/core/server/kibana-plugin-core-server.routeconfigoptions.md
index fee6124f8d866..17fafe2af0de1 100644
--- a/docs/development/core/server/kibana-plugin-core-server.routeconfigoptions.md
+++ b/docs/development/core/server/kibana-plugin-core-server.routeconfigoptions.md
@@ -19,6 +19,6 @@ export interface RouteConfigOptions<Method extends RouteMethod>
 |  [authRequired](./kibana-plugin-core-server.routeconfigoptions.authrequired.md) | <code>boolean &#124; 'optional'</code> | Defines authentication mode for a route: - true. A user has to have valid credentials to access a resource - false. A user can access a resource without any credentials. - 'optional'. A user can access a resource if has valid credentials or no credentials at all. Can be useful when we grant access to a resource but want to identify a user if possible.<!-- -->Defaults to <code>true</code> if an auth mechanism is registered. |
 |  [body](./kibana-plugin-core-server.routeconfigoptions.body.md) | <code>Method extends 'get' &#124; 'options' ? undefined : RouteConfigOptionsBody</code> | Additional body options [RouteConfigOptionsBody](./kibana-plugin-core-server.routeconfigoptionsbody.md)<!-- -->. |
 |  [tags](./kibana-plugin-core-server.routeconfigoptions.tags.md) | <code>readonly string[]</code> | Additional metadata tag strings to attach to the route. |
-|  [timeout](./kibana-plugin-core-server.routeconfigoptions.timeout.md) | <code>number</code> | Timeouts for processing durations. Response timeout is in milliseconds. Default value: 2 minutes |
+|  [timeout](./kibana-plugin-core-server.routeconfigoptions.timeout.md) | <code>{</code><br/><code>        payload?: Method extends 'get' &#124; 'options' ? undefined : number;</code><br/><code>        idleSocket?: number;</code><br/><code>    }</code> | Defines per-route timeouts. |
 |  [xsrfRequired](./kibana-plugin-core-server.routeconfigoptions.xsrfrequired.md) | <code>Method extends 'get' ? never : boolean</code> | Defines xsrf protection requirements for a route: - true. Requires an incoming POST/PUT/DELETE request to contain <code>kbn-xsrf</code> header. - false. Disables xsrf protection.<!-- -->Set to true by default |
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.routeconfigoptions.timeout.md b/docs/development/core/server/kibana-plugin-core-server.routeconfigoptions.timeout.md
index 479fcf883ec4d..f602a8913964f 100644
--- a/docs/development/core/server/kibana-plugin-core-server.routeconfigoptions.timeout.md
+++ b/docs/development/core/server/kibana-plugin-core-server.routeconfigoptions.timeout.md
@@ -4,10 +4,13 @@
 
 ## RouteConfigOptions.timeout property
 
-Timeouts for processing durations. Response timeout is in milliseconds. Default value: 2 minutes
+Defines per-route timeouts.
 
 <b>Signature:</b>
 
 ```typescript
-timeout?: number;
+timeout?: {
+        payload?: Method extends 'get' | 'options' ? undefined : number;
+        idleSocket?: number;
+    };
 ```
diff --git a/src/core/server/http/http_server.test.ts b/src/core/server/http/http_server.test.ts
index 007d75a69b955..abe70e003732b 100644
--- a/src/core/server/http/http_server.test.ts
+++ b/src/core/server/http/http_server.test.ts
@@ -799,6 +799,7 @@ test('exposes route details of incoming request to a route handler', async () =>
         authRequired: true,
         xsrfRequired: false,
         tags: [],
+        timeout: {},
       },
     });
 });
@@ -906,6 +907,9 @@ test('exposes route details of incoming request to a route handler (POST + paylo
         authRequired: true,
         xsrfRequired: true,
         tags: [],
+        timeout: {
+          payload: 10000,
+        },
         body: {
           parse: true, // hapi populates the default
           maxBytes: 1024, // hapi populates the default
@@ -993,129 +997,249 @@ describe('body options', () => {
 });
 
 describe('timeout options', () => {
-  test('should accept a socket "timeout" which is 3 minutes in milliseconds, "300000" for a POST', async () => {
-    const { registerRouter, server: innerServer } = await server.setup(config);
+  describe('payload timeout', () => {
+    test('POST routes set the payload timeout', async () => {
+      const { registerRouter, server: innerServer } = await server.setup(config);
+
+      const router = new Router('', logger, enhanceWithContext);
+      router.post(
+        {
+          path: '/',
+          validate: false,
+          options: {
+            timeout: {
+              payload: 300000,
+            },
+          },
+        },
+        (context, req, res) => {
+          try {
+            return res.ok({
+              body: {
+                timeout: req.route.options.timeout,
+              },
+            });
+          } catch (err) {
+            return res.internalError({ body: err.message });
+          }
+        }
+      );
+      registerRouter(router);
+      await server.start();
+      await supertest(innerServer.listener)
+        .post('/')
+        .send({ test: 1 })
+        .expect(200, {
+          timeout: {
+            payload: 300000,
+          },
+        });
+    });
 
-    const router = new Router('', logger, enhanceWithContext);
-    router.post(
-      {
-        path: '/',
-        validate: false,
-        options: { timeout: 300000 },
-      },
-      (context, req, res) => {
-        try {
-          return res.ok({ body: { timeout: req.route.options.timeout } });
-        } catch (err) {
-          return res.internalError({ body: err.message });
+    test('DELETE routes set the payload timeout', async () => {
+      const { registerRouter, server: innerServer } = await server.setup(config);
+
+      const router = new Router('', logger, enhanceWithContext);
+      router.delete(
+        {
+          path: '/',
+          validate: false,
+          options: {
+            timeout: {
+              payload: 300000,
+            },
+          },
+        },
+        (context, req, res) => {
+          try {
+            return res.ok({
+              body: {
+                timeout: req.route.options.timeout,
+              },
+            });
+          } catch (err) {
+            return res.internalError({ body: err.message });
+          }
         }
-      }
-    );
-    registerRouter(router);
-    await server.start();
-    await supertest(innerServer.listener).post('/').send({ test: 1 }).expect(200, {
-      timeout: 300000,
+      );
+      registerRouter(router);
+      await server.start();
+      await supertest(innerServer.listener)
+        .delete('/')
+        .expect(200, {
+          timeout: {
+            payload: 300000,
+          },
+        });
     });
-  });
 
-  test('should accept a socket "timeout" which is 3 minutes in milliseconds, "300000" for a GET', async () => {
-    const { registerRouter, server: innerServer } = await server.setup(config);
+    test('PUT routes set the payload timeout and automatically adjusts the idle socket timeout', async () => {
+      const { registerRouter, server: innerServer } = await server.setup(config);
+
+      const router = new Router('', logger, enhanceWithContext);
+      router.put(
+        {
+          path: '/',
+          validate: false,
+          options: {
+            timeout: {
+              payload: 300000,
+            },
+          },
+        },
+        (context, req, res) => {
+          try {
+            return res.ok({
+              body: {
+                timeout: req.route.options.timeout,
+              },
+            });
+          } catch (err) {
+            return res.internalError({ body: err.message });
+          }
+        }
+      );
+      registerRouter(router);
+      await server.start();
+      await supertest(innerServer.listener)
+        .put('/')
+        .expect(200, {
+          timeout: {
+            payload: 300000,
+          },
+        });
+    });
 
-    const router = new Router('', logger, enhanceWithContext);
-    router.get(
-      {
-        path: '/',
-        validate: false,
-        options: { timeout: 300000 },
-      },
-      (context, req, res) => {
-        try {
-          return res.ok({ body: { timeout: req.route.options.timeout } });
-        } catch (err) {
-          return res.internalError({ body: err.message });
+    test('PATCH routes set the payload timeout and automatically adjusts the idle socket timeout', async () => {
+      const { registerRouter, server: innerServer } = await server.setup(config);
+
+      const router = new Router('', logger, enhanceWithContext);
+      router.patch(
+        {
+          path: '/',
+          validate: false,
+          options: {
+            timeout: {
+              payload: 300000,
+            },
+          },
+        },
+        (context, req, res) => {
+          try {
+            return res.ok({
+              body: {
+                timeout: req.route.options.timeout,
+              },
+            });
+          } catch (err) {
+            return res.internalError({ body: err.message });
+          }
         }
-      }
-    );
-    registerRouter(router);
-    await server.start();
-    await supertest(innerServer.listener).get('/').expect(200, {
-      timeout: 300000,
+      );
+      registerRouter(router);
+      await server.start();
+      await supertest(innerServer.listener)
+        .patch('/')
+        .expect(200, {
+          timeout: {
+            payload: 300000,
+          },
+        });
     });
   });
 
-  test('should accept a socket "timeout" which is 3 minutes in milliseconds, "300000" for a DELETE', async () => {
-    const { registerRouter, server: innerServer } = await server.setup(config);
+  describe('idleSocket timeout', () => {
+    test('uses server socket timeout when not specified in the route', async () => {
+      const { registerRouter, server: innerServer } = await server.setup({
+        ...config,
+        socketTimeout: 11000,
+      });
 
-    const router = new Router('', logger, enhanceWithContext);
-    router.delete(
-      {
-        path: '/',
-        validate: false,
-        options: { timeout: 300000 },
-      },
-      (context, req, res) => {
-        try {
-          return res.ok({ body: { timeout: req.route.options.timeout } });
-        } catch (err) {
-          return res.internalError({ body: err.message });
+      const router = new Router('', logger, enhanceWithContext);
+      router.get(
+        {
+          path: '/',
+          validate: { body: schema.any() },
+        },
+        (context, req, res) => {
+          return res.ok({
+            body: {
+              timeout: req.route.options.timeout,
+            },
+          });
         }
-      }
-    );
-    registerRouter(router);
-    await server.start();
-    await supertest(innerServer.listener).delete('/').expect(200, {
-      timeout: 300000,
+      );
+      registerRouter(router);
+
+      await server.start();
+      await supertest(innerServer.listener)
+        .get('/')
+        .send()
+        .expect(200, {
+          timeout: {
+            idleSocket: 11000,
+          },
+        });
     });
-  });
 
-  test('should accept a socket "timeout" which is 3 minutes in milliseconds, "300000" for a PUT', async () => {
-    const { registerRouter, server: innerServer } = await server.setup(config);
+    test('sets the socket timeout when specified in the route', async () => {
+      const { registerRouter, server: innerServer } = await server.setup({
+        ...config,
+        socketTimeout: 11000,
+      });
 
-    const router = new Router('', logger, enhanceWithContext);
-    router.put(
-      {
-        path: '/',
-        validate: false,
-        options: { timeout: 300000 },
-      },
-      (context, req, res) => {
-        try {
-          return res.ok({ body: { timeout: req.route.options.timeout } });
-        } catch (err) {
-          return res.internalError({ body: err.message });
+      const router = new Router('', logger, enhanceWithContext);
+      router.get(
+        {
+          path: '/',
+          validate: { body: schema.any() },
+          options: { timeout: { idleSocket: 12000 } },
+        },
+        (context, req, res) => {
+          return res.ok({
+            body: {
+              timeout: req.route.options.timeout,
+            },
+          });
         }
-      }
-    );
-    registerRouter(router);
-    await server.start();
-    await supertest(innerServer.listener).put('/').expect(200, {
-      timeout: 300000,
+      );
+      registerRouter(router);
+
+      await server.start();
+      await supertest(innerServer.listener)
+        .get('/')
+        .send()
+        .expect(200, {
+          timeout: {
+            idleSocket: 12000,
+          },
+        });
     });
   });
 
-  test('should accept a socket "timeout" which is 3 minutes in milliseconds, "300000" for a PATCH', async () => {
-    const { registerRouter, server: innerServer } = await server.setup(config);
+  test(`idleSocket timeout can be smaller than the payload timeout`, async () => {
+    const { registerRouter } = await server.setup(config);
 
     const router = new Router('', logger, enhanceWithContext);
-    router.patch(
+    router.post(
       {
         path: '/',
-        validate: false,
-        options: { timeout: 300000 },
+        validate: { body: schema.any() },
+        options: {
+          timeout: {
+            payload: 1000,
+            idleSocket: 10,
+          },
+        },
       },
       (context, req, res) => {
-        try {
-          return res.ok({ body: { timeout: req.route.options.timeout } });
-        } catch (err) {
-          return res.internalError({ body: err.message });
-        }
+        return res.ok({ body: { timeout: req.route.options.timeout } });
       }
     );
+
     registerRouter(router);
+
     await server.start();
-    await supertest(innerServer.listener).patch('/').expect(200, {
-      timeout: 300000,
-    });
   });
 });
 
diff --git a/src/core/server/http/http_server.ts b/src/core/server/http/http_server.ts
index 4b70f58deba99..99ab0ef16c2f9 100644
--- a/src/core/server/http/http_server.ts
+++ b/src/core/server/http/http_server.ts
@@ -163,13 +163,17 @@ export class HttpServer {
         const validate = isSafeMethod(route.method) ? undefined : { payload: true };
         const { authRequired, tags, body = {}, timeout } = route.options;
         const { accepts: allow, maxBytes, output, parse } = body;
-        // Hapi does not allow timeouts on payloads to be specified for 'head' or 'get' requests
-        const payloadTimeout = isSafeMethod(route.method) || timeout == null ? undefined : timeout;
 
         const kibanaRouteState: KibanaRouteState = {
           xsrfRequired: route.options.xsrfRequired ?? !isSafeMethod(route.method),
         };
 
+        // To work around https://github.com/hapijs/hapi/issues/4122 until v20, set the socket
+        // timeout on the route to a fake timeout only when the payload timeout is specified.
+        // Within the onPreAuth lifecycle of the route itself, we'll override the timeout with the
+        // real socket timeout.
+        const fakeSocketTimeout = timeout?.payload ? timeout.payload + 1 : undefined;
+
         this.server.route({
           handler: route.handler,
           method: route.method,
@@ -177,13 +181,29 @@ export class HttpServer {
           options: {
             auth: this.getAuthOption(authRequired),
             app: kibanaRouteState,
+            ext: {
+              onPreAuth: {
+                method: (request, h) => {
+                  // At this point, the socket timeout has only been set to work-around the HapiJS bug.
+                  // We need to either set the real per-route timeout or use the default idle socket timeout
+                  if (timeout?.idleSocket) {
+                    request.raw.req.socket.setTimeout(timeout.idleSocket);
+                  } else if (fakeSocketTimeout) {
+                    // NodeJS uses a socket timeout of `0` to denote "no timeout"
+                    request.raw.req.socket.setTimeout(this.config!.socketTimeout ?? 0);
+                  }
+
+                  return h.continue;
+                },
+              },
+            },
             tags: tags ? Array.from(tags) : undefined,
             // TODO: This 'validate' section can be removed once the legacy platform is completely removed.
             // We are telling Hapi that NP routes can accept any payload, so that it can bypass the default
             // validation applied in ./http_tools#getServerOptions
             // (All NP routes are already required to specify their own validation in order to access the payload)
             validate,
-            payload: [allow, maxBytes, output, parse, payloadTimeout].some(
+            payload: [allow, maxBytes, output, parse, timeout?.payload].some(
               (v) => typeof v !== 'undefined'
             )
               ? {
@@ -191,15 +211,12 @@ export class HttpServer {
                   maxBytes,
                   output,
                   parse,
-                  timeout: payloadTimeout,
+                  timeout: timeout?.payload,
                 }
               : undefined,
-            timeout:
-              timeout != null
-                ? {
-                    socket: timeout + 1, // Hapi server requires the socket to be greater than payload settings so we add 1 millisecond
-                  }
-                : undefined,
+            timeout: {
+              socket: fakeSocketTimeout,
+            },
           },
         });
       }
diff --git a/src/core/server/http/integration_tests/router.test.ts b/src/core/server/http/integration_tests/router.test.ts
index 434e22e3cf6f5..e19c348511f1a 100644
--- a/src/core/server/http/integration_tests/router.test.ts
+++ b/src/core/server/http/integration_tests/router.test.ts
@@ -304,126 +304,204 @@ describe('Options', () => {
   });
 
   describe('timeout', () => {
-    it('should timeout if configured with a small timeout value for a POST', async () => {
-      const { server: innerServer, createRouter } = await server.setup(setupDeps);
-      const router = createRouter('/');
+    const writeBodyCharAtATime = (request: supertest.Test, body: string, interval: number) => {
+      return new Promise((resolve, reject) => {
+        let i = 0;
+        const intervalId = setInterval(() => {
+          if (i < body.length) {
+            request.write(body[i++]);
+          } else {
+            clearInterval(intervalId);
+            request.end((err, res) => {
+              resolve(res);
+            });
+          }
+        }, interval);
+        request.on('error', (err) => {
+          clearInterval(intervalId);
+          reject(err);
+        });
+      });
+    };
 
-      router.post(
-        { path: '/a', validate: false, options: { timeout: 1000 } },
-        async (context, req, res) => {
-          await new Promise((resolve) => setTimeout(resolve, 2000));
-          return res.ok({});
-        }
-      );
-      router.post({ path: '/b', validate: false }, (context, req, res) => res.ok({}));
-      await server.start();
-      expect(supertest(innerServer.listener).post('/a')).rejects.toThrow('socket hang up');
-      await supertest(innerServer.listener).post('/b').expect(200, {});
-    });
+    describe('payload', () => {
+      it('should timeout if POST payload sending is too slow', async () => {
+        const { server: innerServer, createRouter } = await server.setup(setupDeps);
+        const router = createRouter('/');
 
-    it('should timeout if configured with a small timeout value for a PUT', async () => {
-      const { server: innerServer, createRouter } = await server.setup(setupDeps);
-      const router = createRouter('/');
+        router.post(
+          {
+            options: {
+              body: {
+                accepts: ['application/json'],
+              },
+              timeout: { payload: 100 },
+            },
+            path: '/a',
+            validate: false,
+          },
+          async (context, req, res) => {
+            return res.ok({});
+          }
+        );
+        await server.start();
 
-      router.put(
-        { path: '/a', validate: false, options: { timeout: 1000 } },
-        async (context, req, res) => {
-          await new Promise((resolve) => setTimeout(resolve, 2000));
-          return res.ok({});
-        }
-      );
-      router.put({ path: '/b', validate: false }, (context, req, res) => res.ok({}));
-      await server.start();
+        // start the request
+        const request = supertest(innerServer.listener)
+          .post('/a')
+          .set('Content-Type', 'application/json')
+          .set('Transfer-Encoding', 'chunked');
 
-      expect(supertest(innerServer.listener).put('/a')).rejects.toThrow('socket hang up');
-      await supertest(innerServer.listener).put('/b').expect(200, {});
-    });
+        const result = writeBodyCharAtATime(request, '{"foo":"bar"}', 10);
 
-    it('should timeout if configured with a small timeout value for a DELETE', async () => {
-      const { server: innerServer, createRouter } = await server.setup(setupDeps);
-      const router = createRouter('/');
+        await expect(result).rejects.toMatchInlineSnapshot(`[Error: Request Timeout]`);
+      });
 
-      router.delete(
-        { path: '/a', validate: false, options: { timeout: 1000 } },
-        async (context, req, res) => {
-          await new Promise((resolve) => setTimeout(resolve, 2000));
-          return res.ok({});
-        }
-      );
-      router.delete({ path: '/b', validate: false }, (context, req, res) => res.ok({}));
-      await server.start();
-      expect(supertest(innerServer.listener).delete('/a')).rejects.toThrow('socket hang up');
-      await supertest(innerServer.listener).delete('/b').expect(200, {});
-    });
+      it('should not timeout if POST payload sending is quick', async () => {
+        const { server: innerServer, createRouter } = await server.setup(setupDeps);
+        const router = createRouter('/');
 
-    it('should timeout if configured with a small timeout value for a GET', async () => {
-      const { server: innerServer, createRouter } = await server.setup(setupDeps);
-      const router = createRouter('/');
+        router.post(
+          {
+            path: '/a',
+            validate: false,
+            options: { body: { accepts: 'application/json' }, timeout: { payload: 10000 } },
+          },
+          async (context, req, res) => res.ok({})
+        );
+        await server.start();
 
-      router.get(
-        // Note: There is a bug within Hapi Server where it cannot set the payload timeout for a GET call but it also cannot configure a timeout less than the payload body
-        // so the least amount of possible time to configure the timeout is 10 seconds.
-        { path: '/a', validate: false, options: { timeout: 100000 } },
-        async (context, req, res) => {
-          // Cause a wait of 20 seconds to cause the socket hangup
-          await new Promise((resolve) => setTimeout(resolve, 200000));
-          return res.ok({});
-        }
-      );
-      router.get({ path: '/b', validate: false }, (context, req, res) => res.ok({}));
-      await server.start();
+        // start the request
+        const request = supertest(innerServer.listener)
+          .post('/a')
+          .set('Content-Type', 'application/json')
+          .set('Transfer-Encoding', 'chunked');
+
+        const result = writeBodyCharAtATime(request, '{}', 10);
 
-      expect(supertest(innerServer.listener).get('/a')).rejects.toThrow('socket hang up');
-      await supertest(innerServer.listener).get('/b').expect(200, {});
+        await expect(result).resolves.toHaveProperty('status', 200);
+      });
     });
 
-    it('should not timeout if configured with a 5 minute timeout value for a POST', async () => {
-      const { server: innerServer, createRouter } = await server.setup(setupDeps);
-      const router = createRouter('/');
+    describe('idleSocket', () => {
+      it('should timeout if payload sending has too long of an idle period', async () => {
+        const { server: innerServer, createRouter } = await server.setup(setupDeps);
+        const router = createRouter('/');
 
-      router.post(
-        { path: '/a', validate: false, options: { timeout: 300000 } },
-        async (context, req, res) => res.ok({})
-      );
-      await server.start();
-      await supertest(innerServer.listener).post('/a').expect(200, {});
-    });
+        router.post(
+          {
+            path: '/a',
+            validate: false,
+            options: {
+              body: {
+                accepts: ['application/json'],
+              },
+              timeout: { idleSocket: 10 },
+            },
+          },
+          async (context, req, res) => {
+            return res.ok({});
+          }
+        );
 
-    it('should not timeout if configured with a 5 minute timeout value for a PUT', async () => {
-      const { server: innerServer, createRouter } = await server.setup(setupDeps);
-      const router = createRouter('/');
+        await server.start();
 
-      router.put(
-        { path: '/a', validate: false, options: { timeout: 300000 } },
-        async (context, req, res) => res.ok({})
-      );
-      await server.start();
+        // start the request
+        const request = supertest(innerServer.listener)
+          .post('/a')
+          .set('Content-Type', 'application/json')
+          .set('Transfer-Encoding', 'chunked');
 
-      await supertest(innerServer.listener).put('/a').expect(200, {});
-    });
+        const result = writeBodyCharAtATime(request, '{}', 20);
 
-    it('should not timeout if configured with a 5 minute timeout value for a DELETE', async () => {
-      const { server: innerServer, createRouter } = await server.setup(setupDeps);
-      const router = createRouter('/');
+        await expect(result).rejects.toThrow('socket hang up');
+      });
 
-      router.delete(
-        { path: '/a', validate: false, options: { timeout: 300000 } },
-        async (context, req, res) => res.ok({})
-      );
-      await server.start();
-      await supertest(innerServer.listener).delete('/a').expect(200, {});
-    });
+      it(`should not timeout if payload sending doesn't have too long of an idle period`, async () => {
+        const { server: innerServer, createRouter } = await server.setup(setupDeps);
+        const router = createRouter('/');
 
-    it('should not timeout if configured with a 5 minute timeout value for a GET', async () => {
-      const { server: innerServer, createRouter } = await server.setup(setupDeps);
-      const router = createRouter('/');
+        router.post(
+          {
+            path: '/a',
+            validate: false,
+            options: {
+              body: {
+                accepts: ['application/json'],
+              },
+              timeout: { idleSocket: 1000 },
+            },
+          },
+          async (context, req, res) => {
+            return res.ok({});
+          }
+        );
 
-      router.get(
-        { path: '/a', validate: false, options: { timeout: 300000 } },
-        async (context, req, res) => res.ok({})
-      );
-      await server.start();
-      await supertest(innerServer.listener).get('/a').expect(200, {});
+        await server.start();
+
+        // start the request
+        const request = supertest(innerServer.listener)
+          .post('/a')
+          .set('Content-Type', 'application/json')
+          .set('Transfer-Encoding', 'chunked');
+
+        const result = writeBodyCharAtATime(request, '{}', 10);
+
+        await expect(result).resolves.toHaveProperty('status', 200);
+      });
+
+      it('should timeout if servers response is too slow', async () => {
+        const { server: innerServer, createRouter } = await server.setup(setupDeps);
+        const router = createRouter('/');
+
+        router.post(
+          {
+            path: '/a',
+            validate: false,
+            options: {
+              body: {
+                accepts: ['application/json'],
+              },
+              timeout: { idleSocket: 1000, payload: 100 },
+            },
+          },
+          async (context, req, res) => {
+            await new Promise((resolve) => setTimeout(resolve, 2000));
+            return res.ok({});
+          }
+        );
+
+        await server.start();
+        await expect(supertest(innerServer.listener).post('/a')).rejects.toThrow('socket hang up');
+      });
+
+      it('should not timeout if servers response is quick', async () => {
+        const { server: innerServer, createRouter } = await server.setup(setupDeps);
+        const router = createRouter('/');
+
+        router.post(
+          {
+            path: '/a',
+            validate: false,
+            options: {
+              body: {
+                accepts: ['application/json'],
+              },
+              timeout: { idleSocket: 2000, payload: 100 },
+            },
+          },
+          async (context, req, res) => {
+            await new Promise((resolve) => setTimeout(resolve, 10));
+            return res.ok({});
+          }
+        );
+
+        await server.start();
+        await expect(supertest(innerServer.listener).post('/a')).resolves.toHaveProperty(
+          'status',
+          200
+        );
+      });
     });
   });
 });
diff --git a/src/core/server/http/router/request.ts b/src/core/server/http/router/request.ts
index 93ffb5aa48259..278bc222b754b 100644
--- a/src/core/server/http/router/request.ts
+++ b/src/core/server/http/router/request.ts
@@ -211,15 +211,21 @@ export class KibanaRequest<
 
   private getRouteInfo(request: Request): KibanaRequestRoute<Method> {
     const method = request.method as Method;
-    const { parse, maxBytes, allow, output } = request.route.settings.payload || {};
-    const timeout = request.route.settings.timeout?.socket;
+    const { parse, maxBytes, allow, output, timeout: payloadTimeout } =
+      request.route.settings.payload || {};
 
+    // net.Socket#timeout isn't documented, yet, and isn't part of the types... https://github.com/nodejs/node/pull/34543
+    // the socket is also undefined when using @hapi/shot, or when a "fake request" is used
+    const socketTimeout = (request.raw.req.socket as any)?.timeout;
     const options = ({
       authRequired: this.getAuthRequired(request),
       // some places in LP call KibanaRequest.from(request) manually. remove fallback to true before v8
       xsrfRequired: (request.route.settings.app as KibanaRouteState)?.xsrfRequired ?? true,
       tags: request.route.settings.tags || [],
-      timeout: typeof timeout === 'number' ? timeout - 1 : undefined, // We are forced to have the timeout be 1 millisecond greater than the server and payload so we subtract one here to give the user consist settings
+      timeout: {
+        payload: payloadTimeout,
+        idleSocket: socketTimeout === 0 ? undefined : socketTimeout,
+      },
       body: isSafeMethod(method)
         ? undefined
         : {
diff --git a/src/core/server/http/router/route.ts b/src/core/server/http/router/route.ts
index 676c494bec522..ce898a34e6b2c 100644
--- a/src/core/server/http/router/route.ts
+++ b/src/core/server/http/router/route.ts
@@ -146,10 +146,19 @@ export interface RouteConfigOptions<Method extends RouteMethod> {
   body?: Method extends 'get' | 'options' ? undefined : RouteConfigOptionsBody;
 
   /**
-   * Timeouts for processing durations. Response timeout is in milliseconds.
-   * Default value: 2 minutes
+   * Defines per-route timeouts.
    */
-  timeout?: number;
+  timeout?: {
+    /**
+     * Milliseconds to receive the payload
+     */
+    payload?: Method extends 'get' | 'options' ? undefined : number;
+
+    /**
+     * Milliseconds the socket can be idle before it's closed
+     */
+    idleSocket?: number;
+  };
 }
 
 /**
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index 60b01aa06d07f..03545284e14fb 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -1886,7 +1886,10 @@ export interface RouteConfigOptions<Method extends RouteMethod> {
     authRequired?: boolean | 'optional';
     body?: Method extends 'get' | 'options' ? undefined : RouteConfigOptionsBody;
     tags?: readonly string[];
-    timeout?: number;
+    timeout?: {
+        payload?: Method extends 'get' | 'options' ? undefined : number;
+        idleSocket?: number;
+    };
     xsrfRequired?: Method extends 'get' ? never : boolean;
 }
 
diff --git a/test/plugin_functional/config.ts b/test/plugin_functional/config.ts
index c611300eade10..9ec82e291e537 100644
--- a/test/plugin_functional/config.ts
+++ b/test/plugin_functional/config.ts
@@ -31,6 +31,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
 
   return {
     testFiles: [
+      require.resolve('./test_suites/core'),
       require.resolve('./test_suites/custom_visualizations'),
       require.resolve('./test_suites/panel_actions'),
       require.resolve('./test_suites/core_plugins'),
diff --git a/test/plugin_functional/plugins/core_plugin_route_timeouts/kibana.json b/test/plugin_functional/plugins/core_plugin_route_timeouts/kibana.json
new file mode 100644
index 0000000000000..6fbddad22b764
--- /dev/null
+++ b/test/plugin_functional/plugins/core_plugin_route_timeouts/kibana.json
@@ -0,0 +1,8 @@
+{
+  "id": "core_plugin_route_timeouts",
+  "version": "0.0.1",
+  "kibanaVersion": "kibana",
+  "configPath": ["core_plugin_route_timeouts"],
+  "server": true,
+  "ui": false
+}
diff --git a/test/plugin_functional/plugins/core_plugin_route_timeouts/package.json b/test/plugin_functional/plugins/core_plugin_route_timeouts/package.json
new file mode 100644
index 0000000000000..a9c520338457b
--- /dev/null
+++ b/test/plugin_functional/plugins/core_plugin_route_timeouts/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "core_plugin_route_timeouts",
+  "version": "1.0.0",
+  "main": "target/test/plugin_functional/plugins/core_plugin_route_timeouts",
+  "kibana": {
+    "version": "kibana",
+    "templateVersion": "1.0.0"
+  },
+  "license": "Apache-2.0",
+  "scripts": {
+    "kbn": "node ../../../../scripts/kbn.js",
+    "build": "rm -rf './target' && tsc"
+  },
+  "devDependencies": {
+    "typescript": "3.9.5"
+  }
+}
diff --git a/test/plugin_functional/plugins/core_plugin_route_timeouts/server/index.ts b/test/plugin_functional/plugins/core_plugin_route_timeouts/server/index.ts
new file mode 100644
index 0000000000000..4fdd6ef0ab04a
--- /dev/null
+++ b/test/plugin_functional/plugins/core_plugin_route_timeouts/server/index.ts
@@ -0,0 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { CorePluginRouteTimeoutsPlugin } from './plugin';
+export { PluginARequestContext } from './plugin';
+
+export const plugin = () => new CorePluginRouteTimeoutsPlugin();
diff --git a/test/plugin_functional/plugins/core_plugin_route_timeouts/server/plugin.ts b/test/plugin_functional/plugins/core_plugin_route_timeouts/server/plugin.ts
new file mode 100644
index 0000000000000..c5bdf6cce084c
--- /dev/null
+++ b/test/plugin_functional/plugins/core_plugin_route_timeouts/server/plugin.ts
@@ -0,0 +1,124 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Plugin, CoreSetup } from 'kibana/server';
+import { schema } from '@kbn/config-schema';
+
+export interface PluginARequestContext {
+  ping: () => Promise<string>;
+}
+
+declare module 'kibana/server' {
+  interface RequestHandlerContext {
+    pluginA?: PluginARequestContext;
+  }
+}
+
+export class CorePluginRouteTimeoutsPlugin implements Plugin {
+  public setup(core: CoreSetup, deps: {}) {
+    const { http } = core;
+
+    const router = http.createRouter();
+
+    router.post(
+      {
+        options: {
+          body: {
+            accepts: ['application/json'],
+          },
+          timeout: { payload: 100 },
+        },
+        path: '/short_payload_timeout',
+        validate: false,
+      },
+      async (context, req, res) => {
+        return res.ok({});
+      }
+    );
+
+    router.post(
+      {
+        options: {
+          body: {
+            accepts: ['application/json'],
+          },
+          timeout: { payload: 10000 },
+        },
+        path: '/longer_payload_timeout',
+        validate: false,
+      },
+      async (context, req, res) => {
+        return res.ok({});
+      }
+    );
+
+    router.post(
+      {
+        options: {
+          body: {
+            accepts: ['application/json'],
+          },
+          timeout: { idleSocket: 10 },
+        },
+        path: '/short_idle_socket_timeout',
+        validate: {
+          body: schema.maybe(
+            schema.object({
+              responseDelay: schema.maybe(schema.number()),
+            })
+          ),
+        },
+      },
+      async (context, req, res) => {
+        if (req.body?.responseDelay) {
+          await new Promise((resolve) => setTimeout(resolve, req.body!.responseDelay));
+        }
+        return res.ok({});
+      }
+    );
+
+    router.post(
+      {
+        options: {
+          body: {
+            accepts: ['application/json'],
+          },
+          timeout: { idleSocket: 5000 },
+        },
+        path: '/longer_idle_socket_timeout',
+        validate: {
+          body: schema.maybe(
+            schema.object({
+              responseDelay: schema.maybe(schema.number()),
+            })
+          ),
+        },
+      },
+      async (context, req, res) => {
+        if (req.body?.responseDelay) {
+          await new Promise((resolve) => setTimeout(resolve, req.body!.responseDelay));
+        }
+        return res.ok({});
+      }
+    );
+  }
+
+  public start() {}
+  public stop() {}
+}
diff --git a/test/plugin_functional/plugins/core_plugin_route_timeouts/tsconfig.json b/test/plugin_functional/plugins/core_plugin_route_timeouts/tsconfig.json
new file mode 100644
index 0000000000000..d0751f31ecc5e
--- /dev/null
+++ b/test/plugin_functional/plugins/core_plugin_route_timeouts/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "extends": "../../../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./target",
+    "skipLibCheck": true
+  },
+  "include": [
+    "server/**/*.ts",
+    "../../../../typings/**/*"
+  ],
+  "exclude": []
+}
diff --git a/test/plugin_functional/test_suites/core/index.ts b/test/plugin_functional/test_suites/core/index.ts
new file mode 100644
index 0000000000000..5852e21fc3b39
--- /dev/null
+++ b/test/plugin_functional/test_suites/core/index.ts
@@ -0,0 +1,25 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { PluginFunctionalProviderContext } from '../../services';
+
+export default function ({ loadTestFile }: PluginFunctionalProviderContext) {
+  describe('core', function () {
+    loadTestFile(require.resolve('./route'));
+  });
+}
diff --git a/test/plugin_functional/test_suites/core/route.ts b/test/plugin_functional/test_suites/core/route.ts
new file mode 100644
index 0000000000000..becde49a69714
--- /dev/null
+++ b/test/plugin_functional/test_suites/core/route.ts
@@ -0,0 +1,174 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import expect from '@kbn/expect';
+import { Test } from 'supertest';
+import { PluginFunctionalProviderContext } from '../../services';
+
+export default function ({ getService }: PluginFunctionalProviderContext) {
+  const supertest = getService('supertest');
+
+  describe('route', function () {
+    describe('timeouts', function () {
+      const writeBodyCharAtATime = (request: Test, body: string, interval: number) => {
+        return new Promise((resolve, reject) => {
+          let i = 0;
+          const intervalId = setInterval(() => {
+            if (i < body.length) {
+              request.write(body[i++]);
+            } else {
+              clearInterval(intervalId);
+              request.end((err, res) => {
+                resolve(res);
+              });
+            }
+          }, interval);
+          request.on('error', (err) => {
+            clearInterval(intervalId);
+            reject(err);
+          });
+        });
+      };
+
+      describe('payload', function () {
+        it(`should timeout if POST payload sending is too slow`, async () => {
+          // start the request
+          const request = supertest
+            .post('/short_payload_timeout')
+            .set('Content-Type', 'application/json')
+            .set('Transfer-Encoding', 'chunked')
+            .set('kbn-xsrf', 'true');
+
+          const result = writeBodyCharAtATime(request, '{"foo":"bar"}', 10);
+
+          await result.then(
+            (res) => {
+              expect(res).to.be(undefined);
+            },
+            (err) => {
+              expect(err.message).to.be('Request Timeout');
+            }
+          );
+        });
+
+        it(`should not timeout if POST payload sending is quick`, async () => {
+          // start the request
+          const request = supertest
+            .post('/longer_payload_timeout')
+            .set('Content-Type', 'application/json')
+            .set('Transfer-Encoding', 'chunked')
+            .set('kbn-xsrf', 'true');
+
+          const result = writeBodyCharAtATime(request, '{"foo":"bar"}', 10);
+
+          await result.then(
+            (res) => {
+              expect(res).to.have.property('statusCode', 200);
+            },
+            (err) => {
+              expect(err).to.be(undefined);
+            }
+          );
+        });
+      });
+
+      describe('idle socket', function () {
+        it('should timeout if payload sending has too long of an idle period', async function () {
+          // start the request
+          const request = supertest
+            .post('/short_idle_socket_timeout')
+            .set('Content-Type', 'application/json')
+            .set('Transfer-Encoding', 'chunked')
+            .set('kbn-xsrf', 'true');
+
+          const result = writeBodyCharAtATime(request, '{"responseDelay":100}', 20);
+
+          await result.then(
+            (res) => {
+              expect(res).to.be(undefined);
+            },
+            (err) => {
+              expect(err.message).to.be('socket hang up');
+            }
+          );
+        });
+
+        it('should not timeout if payload sending does not have too long of an idle period', async function () {
+          // start the request
+          const request = supertest
+            .post('/longer_idle_socket_timeout')
+            .set('Content-Type', 'application/json')
+            .set('Transfer-Encoding', 'chunked')
+            .set('kbn-xsrf', 'true');
+
+          const result = writeBodyCharAtATime(request, '{"responseDelay":0}', 10);
+
+          await result.then(
+            (res) => {
+              expect(res).to.have.property('statusCode', 200);
+            },
+            (err) => {
+              expect(err).to.be(undefined);
+            }
+          );
+        });
+
+        it('should timeout if servers response is too slow', async function () {
+          // start the request
+          const request = supertest
+            .post('/short_idle_socket_timeout')
+            .set('Content-Type', 'application/json')
+            .set('Transfer-Encoding', 'chunked')
+            .set('kbn-xsrf', 'true');
+
+          const result = writeBodyCharAtATime(request, '{"responseDelay":100}', 0);
+
+          await result.then(
+            (res) => {
+              expect(res).to.be(undefined);
+            },
+            (err) => {
+              expect(err.message).to.be('socket hang up');
+            }
+          );
+        });
+
+        it('should not timeout if servers response is fast enough', async function () {
+          // start the request
+          const request = supertest
+            .post('/longer_idle_socket_timeout')
+            .set('Content-Type', 'application/json')
+            .set('Transfer-Encoding', 'chunked')
+            .set('kbn-xsrf', 'true');
+
+          const result = writeBodyCharAtATime(request, '{"responseDelay":100}', 0);
+
+          await result.then(
+            (res) => {
+              expect(res).to.have.property('statusCode', 200);
+            },
+            (err) => {
+              expect(err).to.be(undefined);
+            }
+          );
+        });
+      });
+    });
+  });
+}
diff --git a/x-pack/plugins/lists/server/routes/import_list_item_route.ts b/x-pack/plugins/lists/server/routes/import_list_item_route.ts
index d46c943d95fe9..f7ecc7ac1ac83 100644
--- a/x-pack/plugins/lists/server/routes/import_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/import_list_item_route.ts
@@ -27,7 +27,9 @@ export const importListItemRoute = (router: IRouter, config: ConfigType): void =
           parse: false,
         },
         tags: ['access:lists-all'],
-        timeout: config.importTimeout.asMilliseconds(),
+        timeout: {
+          payload: config.importTimeout.asMilliseconds(),
+        },
       },
       path: `${LIST_ITEM_URL}/_import`,
       validate: {

From 47d41437d9dd0ff35874c92042ba737fc709805d Mon Sep 17 00:00:00 2001
From: Tim Sullivan <tsullivan@users.noreply.github.com>
Date: Tue, 18 Aug 2020 13:26:31 -0700
Subject: [PATCH 05/85] [Reporting] Increase capture.timeouts.openUrl to 1
 minute (#75207)

* [Reporting] Increase capture.timeouts.openUrl to 1 minute

* update the docs
---
 docs/settings/reporting-settings.asciidoc        | 2 +-
 x-pack/plugins/reporting/server/config/schema.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/settings/reporting-settings.asciidoc b/docs/settings/reporting-settings.asciidoc
index b31ae76d28052..0b6f94e86a39f 100644
--- a/docs/settings/reporting-settings.asciidoc
+++ b/docs/settings/reporting-settings.asciidoc
@@ -129,7 +129,7 @@ control the capturing process.
   | Specify how long to allow the Reporting browser to wait for the "Loading..." screen
   to dismiss and find the initial data for the Kibana page.  If the time is
   exceeded, a page screenshot is captured showing the current state, and the download link shows a warning message.
-  Defaults to `30000` (30 seconds).
+  Defaults to `60000` (1 minute).
 
 | `xpack.reporting.capture.timeouts.waitForElements`
   | Specify how long to allow the Reporting browser to wait for all visualization
diff --git a/x-pack/plugins/reporting/server/config/schema.ts b/x-pack/plugins/reporting/server/config/schema.ts
index 33249f20757e2..a81ffd754946b 100644
--- a/x-pack/plugins/reporting/server/config/schema.ts
+++ b/x-pack/plugins/reporting/server/config/schema.ts
@@ -46,7 +46,7 @@ const RulesSchema = schema.object({
 
 const CaptureSchema = schema.object({
   timeouts: schema.object({
-    openUrl: schema.number({ defaultValue: 30000 }),
+    openUrl: schema.number({ defaultValue: 60000 }),
     waitForElements: schema.number({ defaultValue: 30000 }),
     renderComplete: schema.number({ defaultValue: 30000 }),
   }),

From 982402145c959c131b6f48c724674ee9832b414d Mon Sep 17 00:00:00 2001
From: Tim Sullivan <tsullivan@users.noreply.github.com>
Date: Tue, 18 Aug 2020 13:26:52 -0700
Subject: [PATCH 06/85] [Reporting] Network Policy: Do not throw from the
 intercept handler (#75105)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../server/browsers/chromium/driver/chromium_driver.ts          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/plugins/reporting/server/browsers/chromium/driver/chromium_driver.ts b/x-pack/plugins/reporting/server/browsers/chromium/driver/chromium_driver.ts
index 494f7ab0a28db..5f23bbc390bb8 100644
--- a/x-pack/plugins/reporting/server/browsers/chromium/driver/chromium_driver.ts
+++ b/x-pack/plugins/reporting/server/browsers/chromium/driver/chromium_driver.ts
@@ -303,7 +303,7 @@ export class HeadlessChromiumDriver {
       if (!allowed || !this.allowRequest(interceptedUrl)) {
         this.page.browser().close();
         logger.error(getDisallowedOutgoingUrlError(interceptedUrl));
-        throw getDisallowedOutgoingUrlError(interceptedUrl);
+        return;
       }
     });
 

From 245c0a3708c28ee5893ef859733dbf5ec526fd61 Mon Sep 17 00:00:00 2001
From: Andrea Del Rio <delrio.andre@gmail.com>
Date: Tue, 18 Aug 2020 13:51:47 -0700
Subject: [PATCH 07/85] [Discover] Create field_button and add popovers to
 sidebar (#73226)

Co-authored-by: Michail Yasonik <michail.yasonik@elastic.co>
Co-authored-by: cchaos <caroline.horn@elastic.co>
Co-authored-by: Joe Reuter <johannes.reuter@elastic.co>
---
 .../components/sidebar/discover_field.scss    |   4 +
 .../sidebar/discover_field.test.tsx           |   5 -
 .../components/sidebar/discover_field.tsx     | 177 ++++++++++--------
 .../sidebar/discover_field_details.scss       |   5 +
 .../sidebar/discover_field_details.tsx        | 113 +++++------
 .../components/sidebar/discover_sidebar.scss  |  47 +----
 .../components/sidebar/discover_sidebar.tsx   |  20 --
 .../__snapshots__/field_button.test.tsx.snap  | 134 +++++++++++++
 .../public/field_button/field_button.scss     |  75 ++++++++
 .../public/field_button/field_button.test.tsx |  68 +++++++
 .../public/field_button/field_button.tsx      | 111 +++++++++++
 .../kibana_react/public/field_button/index.ts |  19 ++
 src/plugins/kibana_react/public/index.ts      |   1 +
 .../apps/context/_context_navigation.js       |   2 +-
 .../indexpattern_datasource/_field_item.scss  |  48 +----
 .../field_item.test.tsx                       |  13 +-
 .../indexpattern_datasource/field_item.tsx    |  83 ++++----
 .../translations/translations/ja-JP.json      |   3 -
 .../translations/translations/zh-CN.json      |   3 -
 19 files changed, 635 insertions(+), 296 deletions(-)
 create mode 100644 src/plugins/discover/public/application/components/sidebar/discover_field.scss
 create mode 100644 src/plugins/discover/public/application/components/sidebar/discover_field_details.scss
 create mode 100644 src/plugins/kibana_react/public/field_button/__snapshots__/field_button.test.tsx.snap
 create mode 100644 src/plugins/kibana_react/public/field_button/field_button.scss
 create mode 100644 src/plugins/kibana_react/public/field_button/field_button.test.tsx
 create mode 100644 src/plugins/kibana_react/public/field_button/field_button.tsx
 create mode 100644 src/plugins/kibana_react/public/field_button/index.ts

diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field.scss b/src/plugins/discover/public/application/components/sidebar/discover_field.scss
new file mode 100644
index 0000000000000..8e1dd41f66ab1
--- /dev/null
+++ b/src/plugins/discover/public/application/components/sidebar/discover_field.scss
@@ -0,0 +1,4 @@
+.dscSidebarItem__fieldPopoverPanel {
+  min-width: 260px;
+  max-width: 300px;
+}
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx b/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx
index e1abbfd7657d0..a0d9e3c541e47 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx
+++ b/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx
@@ -104,9 +104,4 @@ describe('discover sidebar field', function () {
     findTestSubject(comp, 'fieldToggle-bytes').simulate('click');
     expect(props.onRemoveField).toHaveBeenCalledWith('bytes');
   });
-  it('should trigger onShowDetails', function () {
-    const { comp, props } = getComponent();
-    findTestSubject(comp, 'field-bytes-showDetails').simulate('click');
-    expect(props.onShowDetails).toHaveBeenCalledWith(true, props.field);
-  });
 });
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field.tsx b/src/plugins/discover/public/application/components/sidebar/discover_field.tsx
index 724908281146d..639dbfe09277c 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_field.tsx
+++ b/src/plugins/discover/public/application/components/sidebar/discover_field.tsx
@@ -16,15 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React from 'react';
-import { EuiButton } from '@elastic/eui';
+import React, { useState } from 'react';
+import { EuiPopover, EuiPopoverTitle, EuiButtonIcon, EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { DiscoverFieldDetails } from './discover_field_details';
-import { FieldIcon } from '../../../../../kibana_react/public';
+import { FieldIcon, FieldButton } from '../../../../../kibana_react/public';
 import { FieldDetails } from './types';
 import { IndexPatternField, IndexPattern } from '../../../../../data/public';
 import { shortenDottedString } from '../../helpers';
 import { getFieldTypeName } from './lib/get_field_type_name';
+import './discover_field.scss';
 
 export interface DiscoverFieldProps {
   /**
@@ -48,14 +49,6 @@ export interface DiscoverFieldProps {
    * @param fieldName
    */
   onRemoveField: (fieldName: string) => void;
-  /**
-   * Callback to hide/show details, buckets of the field
-   */
-  onShowDetails: (show: boolean, field: IndexPatternField) => void;
-  /**
-   * Determines, whether details of the field are displayed
-   */
-  showDetails: boolean;
   /**
    * Retrieve details data for the field
    */
@@ -76,22 +69,14 @@ export function DiscoverField({
   onAddField,
   onRemoveField,
   onAddFilter,
-  onShowDetails,
-  showDetails,
   getDetails,
   selected,
   useShortDots,
 }: DiscoverFieldProps) {
-  const addLabel = i18n.translate('discover.fieldChooser.discoverField.addButtonLabel', {
-    defaultMessage: 'Add',
-  });
   const addLabelAria = i18n.translate('discover.fieldChooser.discoverField.addButtonAriaLabel', {
     defaultMessage: 'Add {field} to table',
     values: { field: field.name },
   });
-  const removeLabel = i18n.translate('discover.fieldChooser.discoverField.removeButtonLabel', {
-    defaultMessage: 'Remove',
-  });
   const removeLabelAria = i18n.translate(
     'discover.fieldChooser.discoverField.removeButtonAriaLabel',
     {
@@ -100,6 +85,8 @@ export function DiscoverField({
     }
   );
 
+  const [infoIsOpen, setOpen] = useState(false);
+
   const toggleDisplay = (f: IndexPatternField) => {
     if (selected) {
       onRemoveField(f.name);
@@ -108,6 +95,10 @@ export function DiscoverField({
     }
   };
 
+  function togglePopover() {
+    setOpen(!infoIsOpen);
+  }
+
   function wrapOnDot(str?: string) {
     // u200B is a non-width white-space character, which allows
     // the browser to efficiently word-wrap right after the dot
@@ -115,64 +106,96 @@ export function DiscoverField({
     return str ? str.replace(/\./g, '.\u200B') : '';
   }
 
-  return (
-    <>
-      <div
-        className={`dscSidebarField dscSidebarItem ${showDetails ? 'dscSidebarItem--active' : ''}`}
-        tabIndex={0}
-        onClick={() => onShowDetails(!showDetails, field)}
-        onKeyPress={() => onShowDetails(!showDetails, field)}
-        data-test-subj={`field-${field.name}-showDetails`}
+  const dscFieldIcon = (
+    <FieldIcon type={field.type} label={getFieldTypeName(field.type)} scripted={field.scripted} />
+  );
+
+  const fieldName = (
+    <span
+      data-test-subj={`field-${field.name}`}
+      title={field.name}
+      className="dscSidebarField__name"
+    >
+      {useShortDots ? wrapOnDot(shortenDottedString(field.name)) : wrapOnDot(field.displayName)}
+    </span>
+  );
+
+  let actionButton;
+  if (field.name !== '_source' && !selected) {
+    actionButton = (
+      <EuiToolTip
+        delay="long"
+        content={i18n.translate('discover.fieldChooser.discoverField.addFieldTooltip', {
+          defaultMessage: 'Add field as column',
+        })}
+      >
+        <EuiButtonIcon
+          iconType="plusInCircleFilled"
+          className="dscSidebarItem__action"
+          onClick={(ev: React.MouseEvent<HTMLButtonElement>) => {
+            ev.preventDefault();
+            ev.stopPropagation();
+            toggleDisplay(field);
+          }}
+          data-test-subj={`fieldToggle-${field.name}`}
+          aria-label={addLabelAria}
+        />
+      </EuiToolTip>
+    );
+  } else if (field.name !== '_source' && selected) {
+    actionButton = (
+      <EuiToolTip
+        delay="long"
+        content={i18n.translate('discover.fieldChooser.discoverField.removeFieldTooltip', {
+          defaultMessage: 'Remove field from table',
+        })}
       >
-        <span className="dscSidebarField__fieldIcon">
-          <FieldIcon
-            type={field.type}
-            label={getFieldTypeName(field.type)}
-            scripted={field.scripted}
-          />
-        </span>
-        <span
-          data-test-subj={`field-${field.name}`}
-          title={field.name}
-          className="dscSidebarField__name"
-        >
-          {useShortDots ? wrapOnDot(shortenDottedString(field.name)) : wrapOnDot(field.displayName)}
-        </span>
-        <span>
-          {field.name !== '_source' && !selected && (
-            <EuiButton
-              fill
-              size="s"
-              className="dscSidebarItem__action"
-              onClick={(ev: React.MouseEvent<HTMLButtonElement>) => {
-                ev.preventDefault();
-                ev.stopPropagation();
-                toggleDisplay(field);
-              }}
-              data-test-subj={`fieldToggle-${field.name}`}
-              arial-label={addLabelAria}
-            >
-              {addLabel}
-            </EuiButton>
-          )}
-          {field.name !== '_source' && selected && (
-            <EuiButton
-              color="danger"
-              className="dscSidebarItem__action"
-              onClick={(ev: React.MouseEvent<HTMLButtonElement>) => {
-                ev.preventDefault();
-                ev.stopPropagation();
-                toggleDisplay(field);
-              }}
-              data-test-subj={`fieldToggle-${field.name}`}
-              arial-label={removeLabelAria}
-            >
-              {removeLabel}
-            </EuiButton>
-          )}
-        </span>
-      </div>
-      {showDetails && (
+        <EuiButtonIcon
+          color="danger"
+          iconType="cross"
+          className="dscSidebarItem__action"
+          onClick={(ev: React.MouseEvent<HTMLButtonElement>) => {
+            ev.preventDefault();
+            ev.stopPropagation();
+            toggleDisplay(field);
+          }}
+          data-test-subj={`fieldToggle-${field.name}`}
+          aria-label={removeLabelAria}
+        />
+      </EuiToolTip>
+    );
+  }
+
+  return (
+    <EuiPopover
+      ownFocus
+      display="block"
+      button={
+        <FieldButton
+          size="s"
+          className="dscSidebarItem"
+          isActive={infoIsOpen}
+          onClick={() => {
+            togglePopover();
+          }}
+          buttonProps={{ 'data-test-subj': `field-${field.name}-showDetails` }}
+          fieldIcon={dscFieldIcon}
+          fieldAction={actionButton}
+          fieldName={fieldName}
+        />
+      }
+      isOpen={infoIsOpen}
+      closePopover={() => setOpen(false)}
+      anchorPosition="rightUp"
+      panelClassName="dscSidebarItem__fieldPopoverPanel"
+    >
+      <EuiPopoverTitle>
+        {' '}
+        {i18n.translate('discover.fieldChooser.discoverField.fieldTopValuesLabel', {
+          defaultMessage: 'Top 5 values',
+        })}
+      </EuiPopoverTitle>
+      {infoIsOpen && (
         <DiscoverFieldDetails
           indexPattern={indexPattern}
           field={field}
@@ -180,6 +203,6 @@ export function DiscoverField({
           onAddFilter={onAddFilter}
         />
       )}
-    </>
+    </EuiPopover>
   );
 }
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field_details.scss b/src/plugins/discover/public/application/components/sidebar/discover_field_details.scss
new file mode 100644
index 0000000000000..f4b3eed741f9f
--- /dev/null
+++ b/src/plugins/discover/public/application/components/sidebar/discover_field_details.scss
@@ -0,0 +1,5 @@
+.dscFieldDetails__visualizeBtn {
+  @include euiFontSizeXS;
+  height: $euiSizeL !important;
+  min-width: $euiSize * 4;
+}
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field_details.tsx b/src/plugins/discover/public/application/components/sidebar/discover_field_details.tsx
index dd95a45f71626..875b5a0aa446f 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_field_details.tsx
+++ b/src/plugins/discover/public/application/components/sidebar/discover_field_details.tsx
@@ -17,13 +17,14 @@
  * under the License.
  */
 import React from 'react';
-import { EuiLink, EuiIconTip, EuiText } from '@elastic/eui';
+import { EuiLink, EuiIconTip, EuiText, EuiPopoverFooter, EuiButton, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { DiscoverFieldBucket } from './discover_field_bucket';
 import { getWarnings } from './lib/get_warnings';
 import { Bucket, FieldDetails } from './types';
 import { getServices } from '../../../kibana_services';
 import { IndexPatternField, IndexPattern } from '../../../../../data/public';
+import './discover_field_details.scss';
 
 interface DiscoverFieldDetailsProps {
   field: IndexPatternField;
@@ -41,62 +42,68 @@ export function DiscoverFieldDetails({
   const warnings = getWarnings(field);
 
   return (
-    <div className="dscFieldDetails">
-      {!details.error && (
-        <EuiText size="xs">
-          <FormattedMessage
-            id="discover.fieldChooser.detailViews.topValuesInRecordsDescription"
-            defaultMessage="Top 5 values in"
-          />{' '}
-          {!indexPattern.metaFields.includes(field.name) && !field.scripted ? (
-            <EuiLink onClick={() => onAddFilter('_exists_', field.name, '+')}>
-              {details.exists}
-            </EuiLink>
-          ) : (
-            <span>{details.exists}</span>
-          )}{' '}
-          / {details.total}{' '}
-          <FormattedMessage
-            id="discover.fieldChooser.detailViews.recordsText"
-            defaultMessage="records"
-          />
-        </EuiText>
-      )}
-      {details.error && <EuiText size="xs">{details.error}</EuiText>}
-      {!details.error && (
-        <div style={{ marginTop: '4px' }}>
-          {details.buckets.map((bucket: Bucket, idx: number) => (
-            <DiscoverFieldBucket
-              key={`bucket${idx}`}
-              bucket={bucket}
-              field={field}
-              onAddFilter={onAddFilter}
-            />
-          ))}
-        </div>
-      )}
+    <>
+      <div className="dscFieldDetails">
+        {details.error && <EuiText size="xs">{details.error}</EuiText>}
+        {!details.error && (
+          <div style={{ marginTop: '4px' }}>
+            {details.buckets.map((bucket: Bucket, idx: number) => (
+              <DiscoverFieldBucket
+                key={`bucket${idx}`}
+                bucket={bucket}
+                field={field}
+                onAddFilter={onAddFilter}
+              />
+            ))}
+          </div>
+        )}
 
-      {details.visualizeUrl && (
-        <>
-          <EuiLink
-            onClick={() => {
-              getServices().core.application.navigateToApp(details.visualizeUrl.app, {
-                path: details.visualizeUrl.path,
-              });
-            }}
-            className="kuiButton kuiButton--secondary kuiButton--small kuiVerticalRhythmSmall"
-            data-test-subj={`fieldVisualize-${field.name}`}
-          >
-            <FormattedMessage
-              id="discover.fieldChooser.detailViews.visualizeLinkText"
-              defaultMessage="Visualize"
-            />
+        {details.visualizeUrl && (
+          <>
+            <EuiSpacer size="xs" />
+            <EuiButton
+              onClick={() => {
+                getServices().core.application.navigateToApp(details.visualizeUrl.app, {
+                  path: details.visualizeUrl.path,
+                });
+              }}
+              size="s"
+              className="dscFieldDetails__visualizeBtn"
+              data-test-subj={`fieldVisualize-${field.name}`}
+            >
+              <FormattedMessage
+                id="discover.fieldChooser.detailViews.visualizeLinkText"
+                defaultMessage="Visualize"
+              />
+            </EuiButton>
             {warnings.length > 0 && (
               <EuiIconTip type="alert" color="warning" content={warnings.join(' ')} />
             )}
-          </EuiLink>
-        </>
+          </>
+        )}
+      </div>
+      {!details.error && (
+        <EuiPopoverFooter>
+          <EuiText size="xs" textAlign="center">
+            {!indexPattern.metaFields.includes(field.name) && !field.scripted ? (
+              <EuiLink onClick={() => onAddFilter('_exists_', field.name, '+')}>
+                <FormattedMessage
+                  id="discover.fieldChooser.detailViews.existsText"
+                  defaultMessage="Exists in"
+                />{' '}
+                {details.exists}
+              </EuiLink>
+            ) : (
+              <span>{details.exists}</span>
+            )}{' '}
+            / {details.total}{' '}
+            <FormattedMessage
+              id="discover.fieldChooser.detailViews.recordsText"
+              defaultMessage="records"
+            />
+          </EuiText>
+        </EuiPopoverFooter>
       )}
-    </div>
+    </>
   );
 }
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_sidebar.scss b/src/plugins/discover/public/application/components/sidebar/discover_sidebar.scss
index 07efd64752c84..f130b0399f467 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_sidebar.scss
+++ b/src/plugins/discover/public/application/components/sidebar/discover_sidebar.scss
@@ -42,54 +42,15 @@
 }
 
 .dscSidebarItem {
-  border-top: 1px solid transparent;
-  position: relative;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  cursor: pointer;
-  font-size: $euiFontSizeXS;
-  border-top: solid 1px transparent;
-  border-bottom: solid 1px transparent;
-  line-height: normal;
-  margin-bottom: $euiSizeXS * 0.5;
-
   &:hover,
-  &:focus {
+  &:focus-within,
+  &[class*='-isActive'] {
     .dscSidebarItem__action {
       opacity: 1;
     }
   }
 }
 
-.dscSidebarItem--active {
-  border-top: 1px solid $euiColorLightShade;
-  color: $euiColorFullShade;
-}
-
-.dscSidebarField {
-  padding: $euiSizeXS;
-  display: flex;
-  align-items: center;
-  max-width: 100%;
-  width: 100%;
-  border: none;
-  border-radius: $euiBorderRadius - 1px;
-  text-align: left;
-}
-
-.dscSidebarField__name {
-  margin-left: $euiSizeS;
-  flex-grow: 1;
-  word-break: break-word;
-  padding-right: 1px;
-}
-
-.dscSidebarField__fieldIcon {
-  margin-top: $euiSizeXS / 2;
-  margin-right: $euiSizeXS / 2;
-}
-
 /**
  * 1. Only visually hide the action, so that it's still accessible to screen readers.
  * 2. When tabbed to, this element needs to be visible for keyboard accessibility.
@@ -101,7 +62,7 @@
   &:focus {
     opacity: 1; /* 2 */
   }
-  font-size: 12px;
+  font-size: $euiFontSizeXS;
   padding: 2px 6px !important;
   height: 22px !important;
   min-width: auto !important;
@@ -130,8 +91,6 @@
 }
 
 .dscFieldDetails {
-  padding: $euiSizeS;
-  background-color: $euiColorLightestShade;
   color: $euiTextColor;
   margin-bottom: $euiSizeS;
 }
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx b/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx
index 58b468762c501..450bb93f60bf3 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx
+++ b/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx
@@ -92,7 +92,6 @@ export function DiscoverSidebar({
   setIndexPattern,
   state,
 }: DiscoverSidebarProps) {
-  const [openFieldMap, setOpenFieldMap] = useState(new Map());
   const [showFields, setShowFields] = useState(false);
   const [fields, setFields] = useState<IndexPatternField[] | null>(null);
   const [fieldFilterState, setFieldFilterState] = useState(getDefaultFieldFilter());
@@ -103,19 +102,6 @@ export function DiscoverSidebar({
     setFields(newFields);
   }, [selectedIndexPattern, fieldCounts, hits, services]);
 
-  const onShowDetails = useCallback(
-    (show: boolean, field: IndexPatternField) => {
-      if (!show) {
-        setOpenFieldMap(new Map(openFieldMap.set(field.name, false)));
-      } else {
-        setOpenFieldMap(new Map(openFieldMap.set(field.name, true)));
-        if (services.capabilities.discover.save) {
-          selectedIndexPattern.popularizeField(field.name, 1);
-        }
-      }
-    },
-    [openFieldMap, selectedIndexPattern, services.capabilities.discover.save]
-  );
   const onChangeFieldSearch = useCallback(
     (field: string, value: string | boolean | undefined) => {
       const newState = setFieldFilterProp(fieldFilterState, field, value);
@@ -213,9 +199,7 @@ export function DiscoverSidebar({
                         onAddField={onAddField}
                         onRemoveField={onRemoveField}
                         onAddFilter={onAddFilter}
-                        onShowDetails={onShowDetails}
                         getDetails={getDetailsByField}
-                        showDetails={openFieldMap.get(field.name) || false}
                         selected={true}
                         useShortDots={useShortDots}
                       />
@@ -290,9 +274,7 @@ export function DiscoverSidebar({
                         onAddField={onAddField}
                         onRemoveField={onRemoveField}
                         onAddFilter={onAddFilter}
-                        onShowDetails={onShowDetails}
                         getDetails={getDetailsByField}
-                        showDetails={openFieldMap.get(field.name) || false}
                         useShortDots={useShortDots}
                       />
                     </li>
@@ -318,9 +300,7 @@ export function DiscoverSidebar({
                     onAddField={onAddField}
                     onRemoveField={onRemoveField}
                     onAddFilter={onAddFilter}
-                    onShowDetails={onShowDetails}
                     getDetails={getDetailsByField}
-                    showDetails={openFieldMap.get(field.name) || false}
                     useShortDots={useShortDots}
                   />
                 </li>
diff --git a/src/plugins/kibana_react/public/field_button/__snapshots__/field_button.test.tsx.snap b/src/plugins/kibana_react/public/field_button/__snapshots__/field_button.test.tsx.snap
new file mode 100644
index 0000000000000..e65b5fcb8fbbd
--- /dev/null
+++ b/src/plugins/kibana_react/public/field_button/__snapshots__/field_button.test.tsx.snap
@@ -0,0 +1,134 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`fieldAction is rendered 1`] = `
+<div
+  className="kbnFieldButton"
+>
+  <button
+    className="kbn-resetFocusState kbnFieldButton__button"
+    onClick={[Function]}
+  >
+    <span
+      className="kbnFieldButton__name"
+    >
+      name
+    </span>
+  </button>
+  <div
+    className="kbnFieldButton__fieldAction"
+  >
+    <span>
+      fieldAction
+    </span>
+  </div>
+</div>
+`;
+
+exports[`fieldIcon is rendered 1`] = `
+<div
+  className="kbnFieldButton"
+>
+  <button
+    className="kbn-resetFocusState kbnFieldButton__button"
+    onClick={[Function]}
+  >
+    <span
+      className="kbnFieldButton__fieldIcon"
+    >
+      <span>
+        fieldIcon
+      </span>
+    </span>
+    <span
+      className="kbnFieldButton__name"
+    >
+      name
+    </span>
+  </button>
+</div>
+`;
+
+exports[`isActive defaults to false 1`] = `
+<div
+  className="kbnFieldButton"
+>
+  <button
+    className="kbn-resetFocusState kbnFieldButton__button"
+    onClick={[Function]}
+  >
+    <span
+      className="kbnFieldButton__name"
+    >
+      name
+    </span>
+  </button>
+</div>
+`;
+
+exports[`isActive renders true 1`] = `
+<div
+  className="kbnFieldButton kbnFieldButton-isActive"
+>
+  <button
+    className="kbn-resetFocusState kbnFieldButton__button"
+    onClick={[Function]}
+  >
+    <span
+      className="kbnFieldButton__name"
+    >
+      name
+    </span>
+  </button>
+</div>
+`;
+
+exports[`isDraggable is rendered 1`] = `
+<div
+  className="kbnFieldButton kbnFieldButton--isDraggable"
+>
+  <button
+    className="kbn-resetFocusState kbnFieldButton__button"
+    onClick={[Function]}
+  >
+    <span
+      className="kbnFieldButton__name"
+    >
+      name
+    </span>
+  </button>
+</div>
+`;
+
+exports[`sizes m is applied 1`] = `
+<div
+  className="kbnFieldButton"
+>
+  <button
+    className="kbn-resetFocusState kbnFieldButton__button"
+    onClick={[Function]}
+  >
+    <span
+      className="kbnFieldButton__name"
+    >
+      name
+    </span>
+  </button>
+</div>
+`;
+
+exports[`sizes s is applied 1`] = `
+<div
+  className="kbnFieldButton kbnFieldButton--small"
+>
+  <button
+    className="kbn-resetFocusState kbnFieldButton__button"
+    onClick={[Function]}
+  >
+    <span
+      className="kbnFieldButton__name"
+    >
+      name
+    </span>
+  </button>
+</div>
+`;
diff --git a/src/plugins/kibana_react/public/field_button/field_button.scss b/src/plugins/kibana_react/public/field_button/field_button.scss
new file mode 100644
index 0000000000000..43f60e4503576
--- /dev/null
+++ b/src/plugins/kibana_react/public/field_button/field_button.scss
@@ -0,0 +1,75 @@
+.kbnFieldButton {
+  @include euiFontSizeS;
+  border-radius: $euiBorderRadius;
+  margin-bottom: $euiSizeXS;
+  display: flex;
+  align-items: center;
+  transition: box-shadow $euiAnimSpeedFast $euiAnimSlightResistance,
+    background-color $euiAnimSpeedFast $euiAnimSlightResistance; // sass-lint:disable-line indentation
+
+  &:focus-within,
+  &-isActive {
+    @include euiFocusRing;
+  }
+}
+
+.kbnFieldButton--isDraggable {
+  background: lightOrDarkTheme($euiColorEmptyShade, $euiColorLightestShade);
+
+  &:hover,
+  &:focus,
+  &:focus-within {
+    @include euiBottomShadowMedium;
+    border-radius: $euiBorderRadius;
+    z-index: 2;
+  }
+
+  .kbnFieldButton__button {
+    &:hover,
+    &:focus {
+      cursor: grab;
+    }
+  }
+}
+
+.kbnFieldButton__button {
+  flex-grow: 1;
+  text-align: left;
+  padding: $euiSizeS;
+  display: flex;
+  align-items: flex-start;
+}
+
+.kbnFieldButton__fieldIcon {
+  flex-shrink: 0;
+  line-height: 0;
+  margin-right: $euiSizeS;
+}
+
+.kbnFieldButton__name {
+  flex-grow: 1;
+  word-break: break-word;
+}
+
+.kbnFieldButton__infoIcon {
+  flex-shrink: 0;
+  margin-left: $euiSizeXS;
+}
+
+.kbnFieldButton__fieldAction {
+  margin-right: $euiSizeS;
+}
+
+// Reduce text size and spacing for the small size
+.kbnFieldButton--small {
+  font-size: $euiFontSizeXS;
+
+  .kbnFieldButton__button {
+    padding: $euiSizeXS;
+  }
+
+  .kbnFieldButton__fieldIcon,
+  .kbnFieldButton__fieldAction {
+    margin-right: $euiSizeXS;
+  }
+}
diff --git a/src/plugins/kibana_react/public/field_button/field_button.test.tsx b/src/plugins/kibana_react/public/field_button/field_button.test.tsx
new file mode 100644
index 0000000000000..32e1203b89718
--- /dev/null
+++ b/src/plugins/kibana_react/public/field_button/field_button.test.tsx
@@ -0,0 +1,68 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import { FieldButton, SIZES } from './field_button';
+
+const noop = () => {};
+
+describe('sizes', () => {
+  SIZES.forEach((size) => {
+    test(`${size} is applied`, () => {
+      const component = shallow(<FieldButton onClick={noop} fieldName="name" size={size} />);
+      expect(component).toMatchSnapshot();
+    });
+  });
+});
+
+describe('isDraggable', () => {
+  it('is rendered', () => {
+    const component = shallow(<FieldButton onClick={noop} fieldName="name" isDraggable />);
+    expect(component).toMatchSnapshot();
+  });
+});
+
+describe('fieldIcon', () => {
+  it('is rendered', () => {
+    const component = shallow(
+      <FieldButton onClick={noop} fieldName="name" fieldIcon={<span>fieldIcon</span>} />
+    );
+    expect(component).toMatchSnapshot();
+  });
+});
+
+describe('fieldAction', () => {
+  it('is rendered', () => {
+    const component = shallow(
+      <FieldButton onClick={noop} fieldName="name" fieldAction={<span>fieldAction</span>} />
+    );
+    expect(component).toMatchSnapshot();
+  });
+});
+
+describe('isActive', () => {
+  it('defaults to false', () => {
+    const component = shallow(<FieldButton onClick={noop} fieldName="name" />);
+    expect(component).toMatchSnapshot();
+  });
+  it('renders true', () => {
+    const component = shallow(<FieldButton onClick={noop} fieldName="name" isActive />);
+    expect(component).toMatchSnapshot();
+  });
+});
diff --git a/src/plugins/kibana_react/public/field_button/field_button.tsx b/src/plugins/kibana_react/public/field_button/field_button.tsx
new file mode 100644
index 0000000000000..e5833b261946a
--- /dev/null
+++ b/src/plugins/kibana_react/public/field_button/field_button.tsx
@@ -0,0 +1,111 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import './field_button.scss';
+import classNames from 'classnames';
+import React, { ReactNode, HTMLAttributes, ButtonHTMLAttributes } from 'react';
+import { CommonProps } from '@elastic/eui';
+
+export interface FieldButtonProps extends HTMLAttributes<HTMLDivElement> {
+  /**
+   * Label for the button
+   */
+  fieldName: ReactNode;
+  /**
+   * Icon representing the field type.
+   * Recommend using FieldIcon
+   */
+  fieldIcon?: ReactNode;
+  /**
+   * An optional node to place inside and at the end of the <button>
+   */
+  fieldInfoIcon?: ReactNode;
+  /**
+   * An optional node to place outside of and to the right of the <button>
+   */
+  fieldAction?: ReactNode;
+  /**
+   * Adds a forced focus ring to the whole component
+   */
+  isActive?: boolean;
+  /**
+   * Styles the component differently to indicate it is draggable
+   */
+  isDraggable?: boolean;
+  /**
+   * Use the small size in condensed areas
+   */
+  size?: ButtonSize;
+  className?: string;
+  /**
+   * The component always renders a `<button>` and therefore will always need an `onClick`
+   */
+  onClick: () => void;
+  /**
+   * Pass more button props to the actual `<button>` element
+   */
+  buttonProps?: ButtonHTMLAttributes<HTMLButtonElement> & CommonProps;
+}
+
+const sizeToClassNameMap = {
+  s: 'kbnFieldButton--small',
+  m: null,
+} as const;
+
+export type ButtonSize = keyof typeof sizeToClassNameMap;
+
+export const SIZES = Object.keys(sizeToClassNameMap) as ButtonSize[];
+
+export function FieldButton({
+  size = 'm',
+  isActive = false,
+  fieldIcon,
+  fieldName,
+  fieldInfoIcon,
+  fieldAction,
+  className,
+  isDraggable = false,
+  onClick,
+  buttonProps,
+  ...rest
+}: FieldButtonProps) {
+  const classes = classNames(
+    'kbnFieldButton',
+    size ? sizeToClassNameMap[size] : null,
+    { 'kbnFieldButton-isActive': isActive },
+    { 'kbnFieldButton--isDraggable': isDraggable },
+    className
+  );
+
+  const buttonClasses = classNames(
+    'kbn-resetFocusState kbnFieldButton__button',
+    buttonProps && buttonProps.className
+  );
+
+  return (
+    <div className={classes} {...rest}>
+      <button onClick={onClick} {...buttonProps} className={buttonClasses}>
+        {fieldIcon && <span className="kbnFieldButton__fieldIcon">{fieldIcon}</span>}
+        {fieldName && <span className="kbnFieldButton__name">{fieldName}</span>}
+        {fieldInfoIcon && <div className="kbnFieldButton__infoIcon">{fieldInfoIcon}</div>}
+      </button>
+      {fieldAction && <div className="kbnFieldButton__fieldAction">{fieldAction}</div>}
+    </div>
+  );
+}
diff --git a/src/plugins/kibana_react/public/field_button/index.ts b/src/plugins/kibana_react/public/field_button/index.ts
new file mode 100644
index 0000000000000..4819a7623a163
--- /dev/null
+++ b/src/plugins/kibana_react/public/field_button/index.ts
@@ -0,0 +1,19 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+export * from './field_button';
diff --git a/src/plugins/kibana_react/public/index.ts b/src/plugins/kibana_react/public/index.ts
index 7f8bf6c04cecc..34140703fd8ae 100644
--- a/src/plugins/kibana_react/public/index.ts
+++ b/src/plugins/kibana_react/public/index.ts
@@ -23,6 +23,7 @@ export * from './context';
 export * from './overlays';
 export * from './ui_settings';
 export * from './field_icon';
+export * from './field_button';
 export * from './table_list_view';
 export * from './split_panel';
 export * from './react_router_navigate';
diff --git a/test/functional/apps/context/_context_navigation.js b/test/functional/apps/context/_context_navigation.js
index babefe488d7bc..c5af2fcb79296 100644
--- a/test/functional/apps/context/_context_navigation.js
+++ b/test/functional/apps/context/_context_navigation.js
@@ -18,11 +18,11 @@
  */
 
 const TEST_FILTER_COLUMN_NAMES = [
-  ['extension', 'jpg'],
   [
     'agent',
     'Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.50 Safari/534.24',
   ],
+  ['extension', 'jpg'],
 ];
 
 export default function ({ getService, getPageObjects }) {
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/_field_item.scss b/x-pack/plugins/lens/public/indexpattern_datasource/_field_item.scss
index 6e51c45ad02c1..d194c694abdf8 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/_field_item.scss
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/_field_item.scss
@@ -1,47 +1,11 @@
-.lnsFieldItem {
-  @include euiFontSizeS;
-  background: lightOrDarkTheme($euiColorEmptyShade, $euiColorLightestShade);
-  border-radius: $euiBorderRadius;
-  margin-bottom: $euiSizeXS;
-}
-
-.lnsFieldItem__popoverAnchor:hover,
-.lnsFieldItem__popoverAnchor:focus,
-.lnsFieldItem__popoverAnchor:focus-within {
-  @include euiBottomShadowMedium;
-  border-radius: $euiBorderRadius;
-  z-index: 2;
-}
-
 .lnsFieldItem--missing {
-  background: lightOrDarkTheme(transparentize($euiColorMediumShade, .9), $euiColorEmptyShade);
-  color: $euiColorDarkShade;
+  .lnsFieldItem__info {
+    background: lightOrDarkTheme(transparentize($euiColorMediumShade, .9), $euiColorEmptyShade);
+    color: $euiColorDarkShade;
+  }
 }
 
 .lnsFieldItem__info {
-  border-radius: $euiBorderRadius - 1px;
-  padding: $euiSizeS;
-  display: flex;
-  align-items: flex-start;
-  transition: box-shadow $euiAnimSpeedFast $euiAnimSlightResistance,
-    background-color $euiAnimSpeedFast $euiAnimSlightResistance; // sass-lint:disable-line indentation
-
-  .lnsFieldItem__name {
-    margin-left: $euiSizeS;
-    flex-grow: 1;
-    word-break: break-word;
-  }
-
-  .lnsFieldListPanel__fieldIcon,
-  .lnsFieldItem__infoIcon {
-    flex-shrink: 0;
-  }
-
-  .lnsFieldListPanel__fieldIcon {
-    margin-top: $euiSizeXS / 2;
-    margin-right: $euiSizeXS / 2;
-  }
-
   .lnsFieldItem__infoIcon {
     visibility: hidden;
   }
@@ -56,10 +20,6 @@
   }
 }
 
-.lnsFieldItem__info-isOpen {
-  @include euiFocusRing;
-}
-
 .lnsFieldItem__topValue {
   margin-bottom: $euiSizeS;
 
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/field_item.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/field_item.test.tsx
index 0a3af97f8ad75..08a2f85ec7053 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/field_item.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/field_item.test.tsx
@@ -5,6 +5,7 @@
  */
 
 import React from 'react';
+import { ReactWrapper } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 import { EuiLoadingSpinner, EuiPopover } from '@elastic/eui';
 import { InnerFieldItem, FieldItemProps } from './field_item';
@@ -17,6 +18,10 @@ import { chartPluginMock } from '../../../../../src/plugins/charts/public/mocks'
 
 const chartsThemeService = chartPluginMock.createSetupContract().theme;
 
+function clickField(wrapper: ReactWrapper, field: string) {
+  wrapper.find(`[data-test-subj="lnsFieldListPanelField-${field}"] button`).simulate('click');
+}
+
 describe('IndexPattern Field Item', () => {
   let defaultProps: FieldItemProps;
   let indexPattern: IndexPattern;
@@ -101,7 +106,7 @@ describe('IndexPattern Field Item', () => {
     const wrapper = mountWithIntl(<InnerFieldItem {...defaultProps} />);
 
     await act(async () => {
-      wrapper.find('[data-test-subj="lnsFieldListPanelField-bytes"]').simulate('click');
+      clickField(wrapper, 'bytes');
     });
 
     expect(core.http.post).toHaveBeenCalledWith(
@@ -125,7 +130,7 @@ describe('IndexPattern Field Item', () => {
 
     const wrapper = mountWithIntl(<InnerFieldItem {...defaultProps} />);
 
-    wrapper.find('[data-test-subj="lnsFieldListPanelField-bytes"]').simulate('click');
+    clickField(wrapper, 'bytes');
 
     expect(core.http.post).toHaveBeenCalledWith(
       `/api/lens/index_stats/my-fake-index-pattern/field`,
@@ -174,7 +179,7 @@ describe('IndexPattern Field Item', () => {
 
     expect(wrapper.find(EuiLoadingSpinner)).toHaveLength(0);
 
-    wrapper.find('[data-test-subj="lnsFieldListPanelField-bytes"]').simulate('click');
+    clickField(wrapper, 'bytes');
     expect(core.http.post).toHaveBeenCalledTimes(1);
 
     act(() => {
@@ -200,7 +205,7 @@ describe('IndexPattern Field Item', () => {
       });
     });
 
-    wrapper.find('[data-test-subj="lnsFieldListPanelField-bytes"]').simulate('click');
+    clickField(wrapper, 'bytes');
 
     expect(core.http.post).toHaveBeenCalledTimes(2);
     expect(core.http.post).toHaveBeenLastCalledWith(
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx
index fabf9e9e9bfff..5dc6673bc29ec 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx
@@ -11,7 +11,6 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
   EuiIconTip,
-  EuiKeyboardAccessible,
   EuiLoadingSpinner,
   EuiPopover,
   EuiPopoverFooter,
@@ -40,6 +39,7 @@ import {
   esQuery,
   IIndexPattern,
 } from '../../../../../src/plugins/data/public';
+import { FieldButton } from '../../../../../src/plugins/kibana_react/public';
 import { ChartsPluginSetup } from '../../../../../src/plugins/charts/public';
 import { DraggedField } from './indexpattern';
 import { DragDrop } from '../drag_drop';
@@ -177,8 +177,27 @@ export const InnerFieldItem = function InnerFieldItem(props: FieldItemProps) {
     field,
     indexPattern.id,
   ]);
+  const lensFieldIcon = <LensFieldIcon type={field.type as DataType} />;
+  const lensInfoIcon = (
+    <EuiIconTip
+      anchorClassName="lnsFieldItem__infoIcon"
+      content={
+        hideDetails
+          ? i18n.translate('xpack.lens.indexPattern.fieldItemTooltip', {
+              defaultMessage: 'Drag and drop to visualize.',
+            })
+          : i18n.translate('xpack.lens.indexPattern.fieldStatsButtonLabel', {
+              defaultMessage: 'Click for a field preview, or drag and drop to visualize.',
+            })
+      }
+      type="iInCircle"
+      color="subdued"
+      size="s"
+    />
+  );
   return (
     <EuiPopover
+      ownFocus
       id="lnsFieldListPanel__field"
       className="lnsFieldItem__popoverAnchor"
       display="block"
@@ -193,47 +212,27 @@ export const InnerFieldItem = function InnerFieldItem(props: FieldItemProps) {
             exists ? 'exists' : 'missing'
           }`}
         >
-          <EuiKeyboardAccessible>
-            <div
-              className={`lnsFieldItem__info ${infoIsOpen ? 'lnsFieldItem__info-isOpen' : ''}`}
-              data-test-subj={`lnsFieldListPanelField-${field.name}`}
-              onClick={() => {
-                if (exists) {
-                  togglePopover();
-                }
-              }}
-              onKeyPress={(event) => {
-                if (exists && event.key === 'ENTER') {
-                  togglePopover();
-                }
-              }}
-              aria-label={i18n.translate('xpack.lens.indexPattern.fieldStatsButtonLabel', {
-                defaultMessage: 'Click for a field preview, or drag and drop to visualize.',
-              })}
-            >
-              <LensFieldIcon type={field.type as DataType} />
-
-              <span className="lnsFieldItem__name" title={field.name}>
-                {wrappableHighlightableFieldName}
-              </span>
-
-              <EuiIconTip
-                anchorClassName="lnsFieldItem__infoIcon"
-                content={
-                  hideDetails
-                    ? i18n.translate('xpack.lens.indexPattern.fieldItemTooltip', {
-                        defaultMessage: 'Drag and drop to visualize.',
-                      })
-                    : i18n.translate('xpack.lens.indexPattern.fieldStatsButtonLabel', {
-                        defaultMessage: 'Click for a field preview, or drag and drop to visualize.',
-                      })
-                }
-                type="iInCircle"
-                color="subdued"
-                size="s"
-              />
-            </div>
-          </EuiKeyboardAccessible>
+          <FieldButton
+            className="lnsFieldItem__info"
+            isDraggable
+            isActive={infoIsOpen}
+            data-test-subj={`lnsFieldListPanelField-${field.name}`}
+            onClick={() => {
+              if (exists) {
+                togglePopover();
+              }
+            }}
+            aria-label={i18n.translate('xpack.lens.indexPattern.fieldStatsButtonAriaLabel', {
+              defaultMessage: '{fieldName}: {fieldType}. Hit enter for a field preview.',
+              values: {
+                fieldName: field.name,
+                fieldType: field.type,
+              },
+            })}
+            fieldIcon={lensFieldIcon}
+            fieldName={wrappableHighlightableFieldName}
+            fieldInfoIcon={lensInfoIcon}
+          />
         </DragDrop>
       }
       isOpen={infoIsOpen}
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index e617c7ff30885..c958215a2677e 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -1407,12 +1407,9 @@
     "discover.fieldChooser.detailViews.filterOutValueButtonAriaLabel": "{field}を除外：\"{value}\"",
     "discover.fieldChooser.detailViews.filterValueButtonAriaLabel": "{field}を除外：\"{value}\"",
     "discover.fieldChooser.detailViews.recordsText": "記録",
-    "discover.fieldChooser.detailViews.topValuesInRecordsDescription": "次の記録のトップ5の値",
     "discover.fieldChooser.detailViews.visualizeLinkText": "可視化",
     "discover.fieldChooser.discoverField.addButtonAriaLabel": "{field}を表に追加",
-    "discover.fieldChooser.discoverField.addButtonLabel": "追加",
     "discover.fieldChooser.discoverField.removeButtonAriaLabel": "{field}を表から削除",
-    "discover.fieldChooser.discoverField.removeButtonLabel": "削除",
     "discover.fieldChooser.discoverField.scriptedFieldsTakeLongExecuteDescription": "スクリプトフィールドは実行に時間がかかる場合があります。",
     "discover.fieldChooser.fieldCalculator.analysisIsNotAvailableForGeoFieldsErrorMessage": "ジオフィールドは分析できません。",
     "discover.fieldChooser.fieldCalculator.analysisIsNotAvailableForObjectFieldsErrorMessage": "オブジェクトフィールドは分析できません。",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 4c2691035ee54..a06e5813796f4 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -1408,12 +1408,9 @@
     "discover.fieldChooser.detailViews.filterOutValueButtonAriaLabel": "筛除 {field}：“{value}”",
     "discover.fieldChooser.detailViews.filterValueButtonAriaLabel": "筛留 {field}：“{value}”",
     "discover.fieldChooser.detailViews.recordsText": "个记录",
-    "discover.fieldChooser.detailViews.topValuesInRecordsDescription": "排名前 5 值 - 范围",
     "discover.fieldChooser.detailViews.visualizeLinkText": "可视化",
     "discover.fieldChooser.discoverField.addButtonAriaLabel": "将 {field} 添加到表中",
-    "discover.fieldChooser.discoverField.addButtonLabel": "添加",
     "discover.fieldChooser.discoverField.removeButtonAriaLabel": "从表中移除 {field}",
-    "discover.fieldChooser.discoverField.removeButtonLabel": "移除",
     "discover.fieldChooser.discoverField.scriptedFieldsTakeLongExecuteDescription": "脚本字段执行时间会很长。",
     "discover.fieldChooser.fieldCalculator.analysisIsNotAvailableForGeoFieldsErrorMessage": "分析不适用于地理字段。",
     "discover.fieldChooser.fieldCalculator.analysisIsNotAvailableForObjectFieldsErrorMessage": "分析不适用于对象字段。",

From 0707e29de38b7ba05d8e1903ad0ac94a98169b8b Mon Sep 17 00:00:00 2001
From: Joel Griffith <joel.griffith@elastic.co>
Date: Tue, 18 Aug 2020 15:46:50 -0700
Subject: [PATCH 08/85] Add libnss3.so to Dockerfile template (reporting)
 (#75370)

---
 .../tasks/os_packages/docker_generator/templates/Dockerfile   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/dev/build/tasks/os_packages/docker_generator/templates/Dockerfile b/src/dev/build/tasks/os_packages/docker_generator/templates/Dockerfile
index c6f333beb060e..d235bfe9d6fbc 100644
--- a/src/dev/build/tasks/os_packages/docker_generator/templates/Dockerfile
+++ b/src/dev/build/tasks/os_packages/docker_generator/templates/Dockerfile
@@ -47,7 +47,7 @@ EXPOSE 5601
 RUN for iter in {1..10}; do \
       {{packageManager}} update --setopt=tsflags=nodocs -y && \
       {{packageManager}} install --setopt=tsflags=nodocs -y \
-        fontconfig freetype shadow-utils {{#ubi}}findutils{{/ubi}} && \
+        fontconfig freetype shadow-utils libnss3.so {{#ubi}}findutils{{/ubi}} && \
       {{packageManager}} clean all && exit_code=0 && break || exit_code=$? && echo "{{packageManager}} error: retry $iter in 10s" && \
       sleep 10; \
     done; \
@@ -119,4 +119,4 @@ LABEL name="Kibana" \
 
 ENTRYPOINT ["/usr/local/bin/dumb-init", "--"]
 
-CMD ["/usr/local/bin/kibana-docker"]
\ No newline at end of file
+CMD ["/usr/local/bin/kibana-docker"]

From 6c00cb2ec28acee7774851cb111e6b9aa10e1ea7 Mon Sep 17 00:00:00 2001
From: MadameSheema <snootchie.boochies@gmail.com>
Date: Wed, 19 Aug 2020 08:39:13 +0200
Subject: [PATCH 09/85] [SIEM] Fixes search bar Cypress test (#74833)

* fixes search bar test

* fixes typecheck issue

* fixes test

* uses data-test-subj locator instead of class

* fixes failing kibana tests

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../cypress/integration/search_bar.spec.ts                | 8 ++++++--
 .../security_solution/cypress/screens/search_bar.ts       | 5 +----
 .../security_solution/cypress/tasks/hosts/all_hosts.ts    | 2 +-
 .../plugins/security_solution/cypress/tasks/search_bar.ts | 4 +++-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/x-pack/plugins/security_solution/cypress/integration/search_bar.spec.ts b/x-pack/plugins/security_solution/cypress/integration/search_bar.spec.ts
index 9104f494e3e6b..15ca92714d4a3 100644
--- a/x-pack/plugins/security_solution/cypress/integration/search_bar.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/search_bar.spec.ts
@@ -12,7 +12,7 @@ import { hostIpFilter } from '../objects/filter';
 import { HOSTS_URL } from '../urls/navigation';
 import { waitForAllHostsToBeLoaded } from '../tasks/hosts/all_hosts';
 
-describe.skip('SearchBar', () => {
+describe('SearchBar', () => {
   before(() => {
     loginAndWaitForPage(HOSTS_URL);
     waitForAllHostsToBeLoaded();
@@ -21,6 +21,10 @@ describe.skip('SearchBar', () => {
   it('adds correctly a filter to the global search bar', () => {
     openAddFilterPopover();
     fillAddFilterForm(hostIpFilter);
-    cy.get(GLOBAL_SEARCH_BAR_FILTER_ITEM(hostIpFilter)).should('be.visible');
+
+    cy.get(GLOBAL_SEARCH_BAR_FILTER_ITEM).should(
+      'have.text',
+      `${hostIpFilter.key}: ${hostIpFilter.value}`
+    );
   });
 });
diff --git a/x-pack/plugins/security_solution/cypress/screens/search_bar.ts b/x-pack/plugins/security_solution/cypress/screens/search_bar.ts
index 35864749a4065..07e9de137826c 100644
--- a/x-pack/plugins/security_solution/cypress/screens/search_bar.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/search_bar.ts
@@ -4,8 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SearchBarFilter } from '../objects/filter';
-
 export const GLOBAL_SEARCH_BAR_ADD_FILTER =
   '[data-test-subj="globalDatePicker"] [data-test-subj="addFilter"]';
 
@@ -28,5 +26,4 @@ export const ADD_FILTER_FORM_FILTER_VALUE_INPUT = '[data-test-subj="filterParams
 
 export const ADD_FILTER_FORM_SAVE_BUTTON = '[data-test-subj="saveFilter"]';
 
-export const GLOBAL_SEARCH_BAR_FILTER_ITEM = ({ key, value }: SearchBarFilter) =>
-  `[data-test-subj="filter filter-enabled filter-key-${key} filter-value-${value} filter-unpinned"]`;
+export const GLOBAL_SEARCH_BAR_FILTER_ITEM = '#popoverFor_filter0';
diff --git a/x-pack/plugins/security_solution/cypress/tasks/hosts/all_hosts.ts b/x-pack/plugins/security_solution/cypress/tasks/hosts/all_hosts.ts
index f9f902c3de8c7..27d17f966d8fc 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/hosts/all_hosts.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/hosts/all_hosts.ts
@@ -36,5 +36,5 @@ export const openFirstHostDetails = () => {
 };
 
 export const waitForAllHostsToBeLoaded = () => {
-  cy.get(ALL_HOSTS_TABLE).should('exist');
+  cy.get(ALL_HOSTS_TABLE).should('be.visible');
 };
diff --git a/x-pack/plugins/security_solution/cypress/tasks/search_bar.ts b/x-pack/plugins/security_solution/cypress/tasks/search_bar.ts
index a32c38a97fce5..4b194d1233f25 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/search_bar.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/search_bar.ts
@@ -19,7 +19,8 @@ import {
 
 export const openAddFilterPopover = () => {
   cy.get(GLOBAL_SEARCH_BAR_SUBMIT_BUTTON).should('be.enabled');
-  cy.get(GLOBAL_SEARCH_BAR_ADD_FILTER).click({ force: true });
+  cy.get(GLOBAL_SEARCH_BAR_ADD_FILTER).should('be.visible');
+  cy.get(GLOBAL_SEARCH_BAR_ADD_FILTER).click();
 };
 
 export const fillAddFilterForm = ({ key, value }: SearchBarFilter) => {
@@ -32,4 +33,5 @@ export const fillAddFilterForm = ({ key, value }: SearchBarFilter) => {
   cy.get(ADD_FILTER_FORM_OPERATOR_OPTION_IS).click();
   cy.get(ADD_FILTER_FORM_FILTER_VALUE_INPUT).type(value);
   cy.get(ADD_FILTER_FORM_SAVE_BUTTON).click();
+  cy.get(ADD_FILTER_FORM_SAVE_BUTTON).should('not.exist');
 };

From de4b502cb31855b2c9c062ae97f99228138af27e Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad.muhammad@elastic.co>
Date: Wed, 19 Aug 2020 09:13:40 +0200
Subject: [PATCH 10/85] Fix docs in trigger alerting UI (#75363)

---
 x-pack/plugins/triggers_actions_ui/README.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/x-pack/plugins/triggers_actions_ui/README.md b/x-pack/plugins/triggers_actions_ui/README.md
index b8e765c9ea635..5a0a0c3219d7e 100644
--- a/x-pack/plugins/triggers_actions_ui/README.md
+++ b/x-pack/plugins/triggers_actions_ui/README.md
@@ -1265,7 +1265,7 @@ Then this dependencies will be used to embed Actions form or register your own a
  ];
 
  export const ComponentWithActionsForm: () => {
-   const { http, triggers_actions_ui, toastNotifications } = useKibana().services;
+   const { http, triggers_actions_ui, notifications } = useKibana().services;
    const actionTypeRegistry = triggers_actions_ui.actionTypeRegistry;
    const initialAlert = ({
         name: 'test',
@@ -1307,7 +1307,7 @@ Then this dependencies will be used to embed Actions form or register your own a
           actionTypeRegistry={actionTypeRegistry}
           defaultActionMessage={'Alert [{{ctx.metadata.name}}] has exceeded the threshold'}
           actionTypes={ALOWED_BY_PLUGIN_ACTION_TYPES}
-          toastNotifications={toastNotifications}
+          toastNotifications={notifications.toasts}
           consumer={initialAlert.consumer}
         />
    );
@@ -1409,7 +1409,7 @@ import { ActionsConnectorsContextProvider, ConnectorAddFlyout } from '../../../.
 const [addFlyoutVisible, setAddFlyoutVisibility] = useState<boolean>(false);
 
 // load required dependancied
-const { http, triggers_actions_ui, toastNotifications, capabilities, docLinks } = useKibana().services;
+const { http, triggers_actions_ui, notifications, application, docLinks } = useKibana().services;
 
 const connector = {
       secrets: {},
@@ -1438,9 +1438,9 @@ const connector = {
 <ActionsConnectorsContextProvider
         value={{
           http: http,
-          toastNotifications: toastNotifications,
+          toastNotifications: notifications.toasts,
           actionTypeRegistry: triggers_actions_ui.actionTypeRegistry,
-          capabilities: capabilities,
+          capabilities: application.capabilities,
           docLinks,
         }}
       >
@@ -1526,7 +1526,7 @@ import { ActionsConnectorsContextProvider, ConnectorEditFlyout } from '../../../
 const [editFlyoutVisible, setEditFlyoutVisibility] = useState<boolean>(false);
 
 // load required dependancied
-const { http, triggers_actions_ui, toastNotifications, capabilities } = useKibana().services;
+const { http, triggers_actions_ui, notifications, application } = useKibana().services;
 
 // UI control item for open flyout
 <EuiButton
@@ -1545,9 +1545,9 @@ const { http, triggers_actions_ui, toastNotifications, capabilities } = useKiban
 <ActionsConnectorsContextProvider
         value={{
           http: http,
-          toastNotifications: toastNotifications,
+          toastNotifications: notifications.toasts,
           actionTypeRegistry: triggers_actions_ui.actionTypeRegistry,
-          capabilities: capabilities,
+          capabilities: application.capabilities,
         }}
       >
         <ConnectorEditFlyout

From 68ba4834f3a944b0067866b14d9b1fe3589ce5c2 Mon Sep 17 00:00:00 2001
From: Tim Roes <tim.roes@elastic.co>
Date: Wed, 19 Aug 2020 10:29:23 +0200
Subject: [PATCH 11/85] Use prefix search invis editor field/agg combo box
 (#75290)

---
 src/plugins/vis_default_editor/public/components/agg_select.tsx  | 1 +
 .../vis_default_editor/public/components/controls/field.tsx      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/plugins/vis_default_editor/public/components/agg_select.tsx b/src/plugins/vis_default_editor/public/components/agg_select.tsx
index 8d03940a92d34..04b5e48c65e8e 100644
--- a/src/plugins/vis_default_editor/public/components/agg_select.tsx
+++ b/src/plugins/vis_default_editor/public/components/agg_select.tsx
@@ -157,6 +157,7 @@ function DefaultEditorAggSelect({
         isClearable={false}
         isInvalid={showValidation ? !isValid : false}
         fullWidth={true}
+        sortMatchesBy="startsWith"
         compressed
       />
     </EuiFormRow>
diff --git a/src/plugins/vis_default_editor/public/components/controls/field.tsx b/src/plugins/vis_default_editor/public/components/controls/field.tsx
index 24d94c2b18feb..bfc4f881f8458 100644
--- a/src/plugins/vis_default_editor/public/components/controls/field.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/field.tsx
@@ -124,6 +124,7 @@ function FieldParamEditor({
         onChange={onChange}
         onBlur={setTouched}
         onSearchChange={onSearchChange}
+        sortMatchesBy="startsWith"
         data-test-subj="visDefaultEditorField"
         fullWidth={true}
       />

From b6c475707c2aea5388b3042eba3981be7434ea3a Mon Sep 17 00:00:00 2001
From: Stratoula Kalafateli <efstratia.kalafateli@elastic.co>
Date: Wed, 19 Aug 2020 11:37:45 +0300
Subject: [PATCH 12/85] Uiactions to navigate to visualize or maps (#74121)

* Navigate from discover to visualize with registering into a trigger

* Implement the VISUALIZE_FIELD action

* Implementation of the maps app trigger actions with the isCompatible functionality

* clean up discover code and tile map action implementation

* Add typeIsHidden on mocks

* Retrieve filters and query from url state

* functional test for oss and tile map

* include geoshape

* fix functional tests

* fix types

* remove unecessary dependencies

* minor fixes

* Remove tilemaps actios as it is going tobe deprecated

* Add useEffect on discover details and move the map action to a separate folder

* Retrieve map tooltips info from context

* Retrieve query and filters from QueryService

* Building urls with urlGenerators

* replace with constants, fetch initialLayers as array

* remove irrelevant comments

* nice improvements

* Return contextualFields for both triggers

* Add getHref on actions, move capabilities to isCompatible method per action and other fixes

* fix type

* Fix type incompatibility after merging with master

* fixes on maps plugin file after merge

* remove unecessary declarations

* nice improvements

* Refactor maps services code to be inline with master

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../sidebar/discover_field_details.tsx        |  46 ++++-
 .../components/sidebar/discover_sidebar.tsx   |   5 +-
 .../components/sidebar/lib/get_details.ts     |  16 +-
 .../sidebar/lib/visualize_trigger_utils.ts    | 110 +++++++++++
 .../sidebar/lib/visualize_url_utils.ts        | 182 ------------------
 .../application/components/sidebar/types.ts   |   5 +-
 .../discover/public/kibana_services.ts        |   5 +
 src/plugins/discover/public/plugin.ts         |   3 +
 src/plugins/tile_map/public/plugin.ts         |   3 +-
 src/plugins/ui_actions/public/index.ts        |  14 +-
 src/plugins/ui_actions/public/plugin.ts       |  10 +-
 .../ui_actions/public/triggers/index.ts       |   2 +
 .../triggers/visualize_field_trigger.ts       |  27 +++
 .../triggers/visualize_geo_field_trigger.ts   |  27 +++
 src/plugins/ui_actions/public/types.ts        |  14 ++
 src/plugins/visualize/common/constants.ts     |  20 ++
 src/plugins/visualize/kibana.json             |   3 +-
 .../public/actions/visualize_field_action.ts  |  97 ++++++++++
 src/plugins/visualize/public/plugin.ts        |  39 +++-
 src/plugins/visualize/public/services.ts      |  37 ++++
 .../visualize/public/url_generator.test.ts    | 100 ++++++++++
 src/plugins/visualize/public/url_generator.ts | 137 +++++++++++++
 .../apps/discover/_field_visualize.ts         |   6 +
 x-pack/plugins/maps/common/constants.ts       |   1 +
 x-pack/plugins/maps/kibana.json               |   3 +-
 x-pack/plugins/maps/public/kibana_services.ts |   3 +
 x-pack/plugins/maps/public/plugin.ts          |  17 +-
 .../routing/bootstrap/get_initial_layers.js   |   5 +-
 .../visualize_geo_field_action.ts             |  77 ++++++++
 .../plugins/maps/public/url_generator.test.ts | 113 +++++++++++
 x-pack/plugins/maps/public/url_generator.ts   | 109 +++++++++++
 x-pack/typings/rison_node.d.ts                |   3 +
 32 files changed, 1017 insertions(+), 222 deletions(-)
 create mode 100644 src/plugins/discover/public/application/components/sidebar/lib/visualize_trigger_utils.ts
 delete mode 100644 src/plugins/discover/public/application/components/sidebar/lib/visualize_url_utils.ts
 create mode 100644 src/plugins/ui_actions/public/triggers/visualize_field_trigger.ts
 create mode 100644 src/plugins/ui_actions/public/triggers/visualize_geo_field_trigger.ts
 create mode 100644 src/plugins/visualize/common/constants.ts
 create mode 100644 src/plugins/visualize/public/actions/visualize_field_action.ts
 create mode 100644 src/plugins/visualize/public/services.ts
 create mode 100644 src/plugins/visualize/public/url_generator.test.ts
 create mode 100644 src/plugins/visualize/public/url_generator.ts
 create mode 100644 x-pack/plugins/maps/public/trigger_actions/visualize_geo_field_action.ts
 create mode 100644 x-pack/plugins/maps/public/url_generator.test.ts
 create mode 100644 x-pack/plugins/maps/public/url_generator.ts

diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field_details.tsx b/src/plugins/discover/public/application/components/sidebar/discover_field_details.tsx
index 875b5a0aa446f..3061839bf3ef0 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_field_details.tsx
+++ b/src/plugins/discover/public/application/components/sidebar/discover_field_details.tsx
@@ -16,13 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React from 'react';
+import React, { useState, useEffect } from 'react';
 import { EuiLink, EuiIconTip, EuiText, EuiPopoverFooter, EuiButton, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { DiscoverFieldBucket } from './discover_field_bucket';
 import { getWarnings } from './lib/get_warnings';
+import {
+  triggerVisualizeActions,
+  isFieldVisualizable,
+  getVisualizeHref,
+} from './lib/visualize_trigger_utils';
 import { Bucket, FieldDetails } from './types';
-import { getServices } from '../../../kibana_services';
 import { IndexPatternField, IndexPattern } from '../../../../../data/public';
 import './discover_field_details.scss';
 
@@ -40,6 +44,34 @@ export function DiscoverFieldDetails({
   onAddFilter,
 }: DiscoverFieldDetailsProps) {
   const warnings = getWarnings(field);
+  const [showVisualizeLink, setShowVisualizeLink] = useState<boolean>(false);
+  const [visualizeLink, setVisualizeLink] = useState<string>('');
+
+  useEffect(() => {
+    isFieldVisualizable(field, indexPattern.id, details.columns).then(
+      (flag) => {
+        setShowVisualizeLink(flag);
+        // get href only if Visualize button is enabled
+        getVisualizeHref(field, indexPattern.id, details.columns).then(
+          (uri) => {
+            if (uri) setVisualizeLink(uri);
+          },
+          () => {
+            setVisualizeLink('');
+          }
+        );
+      },
+      () => {
+        setShowVisualizeLink(false);
+      }
+    );
+  }, [field, indexPattern.id, details.columns]);
+
+  const handleVisualizeLinkClick = (event: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => {
+    // regular link click. let the uiActions code handle the navigation and show popup if needed
+    event.preventDefault();
+    triggerVisualizeActions(field, indexPattern.id, details.columns);
+  };
 
   return (
     <>
@@ -58,15 +90,13 @@ export function DiscoverFieldDetails({
           </div>
         )}
 
-        {details.visualizeUrl && (
+        {showVisualizeLink && (
           <>
             <EuiSpacer size="xs" />
+            {/* eslint-disable-next-line @elastic/eui/href-or-on-click */}
             <EuiButton
-              onClick={() => {
-                getServices().core.application.navigateToApp(details.visualizeUrl.app, {
-                  path: details.visualizeUrl.path,
-                });
-              }}
+              onClick={(e) => handleVisualizeLinkClick(e)}
+              href={visualizeLink}
               size="s"
               className="dscFieldDetails__visualizeBtn"
               data-test-subj={`fieldVisualize-${field.name}`}
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx b/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx
index 450bb93f60bf3..1f27766a1756d 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx
+++ b/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx
@@ -111,9 +111,8 @@ export function DiscoverSidebar({
   );
 
   const getDetailsByField = useCallback(
-    (ipField: IndexPatternField) =>
-      getDetails(ipField, selectedIndexPattern, state, columns, hits, services),
-    [selectedIndexPattern, state, columns, hits, services]
+    (ipField: IndexPatternField) => getDetails(ipField, hits, columns),
+    [hits, columns]
   );
 
   const popularLimit = services.uiSettings.get(FIELDS_LIMIT_SETTING);
diff --git a/src/plugins/discover/public/application/components/sidebar/lib/get_details.ts b/src/plugins/discover/public/application/components/sidebar/lib/get_details.ts
index 7ac9f009d73d5..41d3393672474 100644
--- a/src/plugins/discover/public/application/components/sidebar/lib/get_details.ts
+++ b/src/plugins/discover/public/application/components/sidebar/lib/get_details.ts
@@ -16,32 +16,24 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { getVisualizeUrl, isFieldVisualizable } from './visualize_url_utils';
-import { AppState } from '../../../angular/discover_state';
+
 // @ts-ignore
 import { fieldCalculator } from './field_calculator';
-import { IndexPatternField, IndexPattern } from '../../../../../../data/public';
-import { DiscoverServices } from '../../../../build_services';
+import { IndexPatternField } from '../../../../../../data/public';
 
 export function getDetails(
   field: IndexPatternField,
-  indexPattern: IndexPattern,
-  state: AppState,
-  columns: string[],
   hits: Array<Record<string, unknown>>,
-  services: DiscoverServices
+  columns: string[]
 ) {
   const details = {
-    visualizeUrl:
-      services.capabilities.visualize.show && isFieldVisualizable(field, services.visualizations)
-        ? getVisualizeUrl(field, indexPattern, state, columns, services)
-        : null,
     ...fieldCalculator.getFieldValueCounts({
       hits,
       field,
       count: 5,
       grouped: false,
     }),
+    columns,
   };
   if (details.buckets) {
     for (const bucket of details.buckets) {
diff --git a/src/plugins/discover/public/application/components/sidebar/lib/visualize_trigger_utils.ts b/src/plugins/discover/public/application/components/sidebar/lib/visualize_trigger_utils.ts
new file mode 100644
index 0000000000000..f058c198cae7f
--- /dev/null
+++ b/src/plugins/discover/public/application/components/sidebar/lib/visualize_trigger_utils.ts
@@ -0,0 +1,110 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import {
+  VISUALIZE_FIELD_TRIGGER,
+  VISUALIZE_GEO_FIELD_TRIGGER,
+  visualizeFieldTrigger,
+  visualizeGeoFieldTrigger,
+} from '../../../../../../ui_actions/public';
+import { getUiActions } from '../../../../kibana_services';
+import { IndexPatternField, KBN_FIELD_TYPES } from '../../../../../../data/public';
+
+function getTriggerConstant(type: string) {
+  return type === KBN_FIELD_TYPES.GEO_POINT || type === KBN_FIELD_TYPES.GEO_SHAPE
+    ? VISUALIZE_GEO_FIELD_TRIGGER
+    : VISUALIZE_FIELD_TRIGGER;
+}
+
+function getTrigger(type: string) {
+  return type === KBN_FIELD_TYPES.GEO_POINT || type === KBN_FIELD_TYPES.GEO_SHAPE
+    ? visualizeGeoFieldTrigger
+    : visualizeFieldTrigger;
+}
+
+async function getCompatibleActions(
+  fieldName: string,
+  indexPatternId: string,
+  contextualFields: string[],
+  trigger: typeof VISUALIZE_FIELD_TRIGGER | typeof VISUALIZE_GEO_FIELD_TRIGGER
+) {
+  const compatibleActions = await getUiActions().getTriggerCompatibleActions(trigger, {
+    indexPatternId,
+    fieldName,
+    contextualFields,
+  });
+  return compatibleActions;
+}
+
+export async function getVisualizeHref(
+  field: IndexPatternField,
+  indexPatternId: string | undefined,
+  contextualFields: string[]
+) {
+  if (!indexPatternId) return undefined;
+  const triggerOptions = {
+    indexPatternId,
+    fieldName: field.name,
+    contextualFields,
+    trigger: getTrigger(field.type),
+  };
+  const compatibleActions = await getCompatibleActions(
+    field.name,
+    indexPatternId,
+    contextualFields,
+    getTriggerConstant(field.type)
+  );
+  // enable the link only if only one action is registered
+  return compatibleActions.length === 1
+    ? compatibleActions[0].getHref?.(triggerOptions)
+    : undefined;
+}
+
+export function triggerVisualizeActions(
+  field: IndexPatternField,
+  indexPatternId: string | undefined,
+  contextualFields: string[]
+) {
+  if (!indexPatternId) return;
+  const trigger = getTriggerConstant(field.type);
+  const triggerOptions = {
+    indexPatternId,
+    fieldName: field.name,
+    contextualFields,
+  };
+  getUiActions().getTrigger(trigger).exec(triggerOptions);
+}
+
+export async function isFieldVisualizable(
+  field: IndexPatternField,
+  indexPatternId: string | undefined,
+  contextualFields: string[]
+) {
+  if (field.name === '_id' || !indexPatternId) {
+    // for first condition you'd get a 'Fielddata access on the _id field is disallowed' error on ES side.
+    return false;
+  }
+  const trigger = getTriggerConstant(field.type);
+  const compatibleActions = await getCompatibleActions(
+    field.name,
+    indexPatternId,
+    contextualFields,
+    trigger
+  );
+  return compatibleActions.length > 0 && field.visualizable;
+}
diff --git a/src/plugins/discover/public/application/components/sidebar/lib/visualize_url_utils.ts b/src/plugins/discover/public/application/components/sidebar/lib/visualize_url_utils.ts
deleted file mode 100644
index 0c1a44d7845cf..0000000000000
--- a/src/plugins/discover/public/application/components/sidebar/lib/visualize_url_utils.ts
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import uuid from 'uuid/v4';
-import rison from 'rison-node';
-import { parse, stringify } from 'query-string';
-import {
-  IFieldType,
-  IIndexPattern,
-  IndexPatternField,
-  KBN_FIELD_TYPES,
-} from '../../../../../../data/public';
-import { AppState } from '../../../angular/discover_state';
-import { DiscoverServices } from '../../../../build_services';
-import { VisualizationsStart, VisTypeAlias } from '../../../../../../visualizations/public';
-import { AGGS_TERMS_SIZE_SETTING } from '../../../../../common';
-
-export function isMapsAppRegistered(visualizations: VisualizationsStart) {
-  return visualizations.getAliases().some(({ name }: VisTypeAlias) => {
-    return name === 'maps';
-  });
-}
-
-export function isFieldVisualizable(field: IFieldType, visualizations: VisualizationsStart) {
-  if (field.name === '_id') {
-    // Else you'd get a 'Fielddata access on the _id field is disallowed' error on ES side.
-    return false;
-  }
-  if (
-    (field.type === KBN_FIELD_TYPES.GEO_POINT || field.type === KBN_FIELD_TYPES.GEO_SHAPE) &&
-    isMapsAppRegistered(visualizations)
-  ) {
-    return true;
-  }
-  return field.visualizable;
-}
-
-export function getMapsAppUrl(
-  field: IFieldType,
-  indexPattern: IIndexPattern,
-  appState: AppState,
-  columns: string[]
-) {
-  const mapAppParams = new URLSearchParams();
-
-  // Copy global state
-  const locationSplit = window.location.hash.split('?');
-  if (locationSplit.length > 1) {
-    const discoverParams = new URLSearchParams(locationSplit[1]);
-    const globalStateUrlValue = discoverParams.get('_g');
-    if (globalStateUrlValue) {
-      mapAppParams.set('_g', globalStateUrlValue);
-    }
-  }
-
-  // Copy filters and query in app state
-  const mapsAppState: any = {
-    filters: appState.filters || [],
-  };
-  if (appState.query) {
-    mapsAppState.query = appState.query;
-  }
-  // @ts-ignore
-  mapAppParams.set('_a', rison.encode(mapsAppState));
-
-  // create initial layer descriptor
-  const hasColumns = columns && columns.length && columns[0] !== '_source';
-  const supportsClustering = field.aggregatable;
-  mapAppParams.set(
-    'initialLayers',
-    // @ts-ignore
-    rison.encode_array([
-      {
-        id: uuid(),
-        label: indexPattern.title,
-        sourceDescriptor: {
-          id: uuid(),
-          type: 'ES_SEARCH',
-          geoField: field.name,
-          tooltipProperties: hasColumns ? columns : [],
-          indexPatternId: indexPattern.id,
-          scalingType: supportsClustering ? 'CLUSTERS' : 'LIMIT',
-        },
-        visible: true,
-        type: supportsClustering ? 'BLENDED_VECTOR' : 'VECTOR',
-      },
-    ])
-  );
-
-  return {
-    app: 'maps',
-    path: `/map#?${mapAppParams.toString()}`,
-  };
-}
-
-export function getVisualizeUrl(
-  field: IndexPatternField,
-  indexPattern: IIndexPattern,
-  state: AppState,
-  columns: string[],
-  services: DiscoverServices
-) {
-  const aggsTermSize = services.uiSettings.get(AGGS_TERMS_SIZE_SETTING);
-  const urlParams = parse(services.history().location.search) as Record<string, string>;
-
-  if (
-    (field.type === KBN_FIELD_TYPES.GEO_POINT || field.type === KBN_FIELD_TYPES.GEO_SHAPE) &&
-    isMapsAppRegistered(services.visualizations)
-  ) {
-    return getMapsAppUrl(field, indexPattern, state, columns);
-  }
-
-  let agg;
-  const isGeoPoint = field.type === KBN_FIELD_TYPES.GEO_POINT;
-  const type = isGeoPoint ? 'tile_map' : 'histogram';
-  // If we're visualizing a date field, and our index is time based (and thus has a time filter),
-  // then run a date histogram
-  if (field.type === 'date' && indexPattern.timeFieldName === field.name) {
-    agg = {
-      type: 'date_histogram',
-      schema: 'segment',
-      params: {
-        field: field.name,
-        interval: 'auto',
-      },
-    };
-  } else if (isGeoPoint) {
-    agg = {
-      type: 'geohash_grid',
-      schema: 'segment',
-      params: {
-        field: field.name,
-        precision: 3,
-      },
-    };
-  } else {
-    agg = {
-      type: 'terms',
-      schema: 'segment',
-      params: {
-        field: field.name,
-        size: parseInt(aggsTermSize, 10),
-        orderBy: '1',
-      },
-    };
-  }
-  const linkUrlParams = {
-    ...urlParams,
-    ...{
-      indexPattern: state.index!,
-      type,
-      _a: rison.encode({
-        filters: state.filters || [],
-        query: state.query,
-        vis: {
-          type,
-          aggs: [{ schema: 'metric', type: 'count', id: '1' }, agg],
-        },
-      } as any),
-    },
-  };
-
-  return {
-    app: 'visualize',
-    path: `#/create?${stringify(linkUrlParams)}`,
-  };
-}
diff --git a/src/plugins/discover/public/application/components/sidebar/types.ts b/src/plugins/discover/public/application/components/sidebar/types.ts
index e86138761c747..d80662b65cc7b 100644
--- a/src/plugins/discover/public/application/components/sidebar/types.ts
+++ b/src/plugins/discover/public/application/components/sidebar/types.ts
@@ -27,10 +27,7 @@ export interface FieldDetails {
   exists: number;
   total: boolean;
   buckets: Bucket[];
-  visualizeUrl: {
-    app: string;
-    path: string;
-  };
+  columns: string[];
 }
 
 export interface Bucket {
diff --git a/src/plugins/discover/public/kibana_services.ts b/src/plugins/discover/public/kibana_services.ts
index ecb5d7fd90283..bc25fa71dcf41 100644
--- a/src/plugins/discover/public/kibana_services.ts
+++ b/src/plugins/discover/public/kibana_services.ts
@@ -20,6 +20,7 @@
 import _ from 'lodash';
 import { createHashHistory } from 'history';
 import { ScopedHistory } from 'kibana/public';
+import { UiActionsStart } from 'src/plugins/ui_actions/public';
 import { DiscoverServices } from './build_services';
 import { createGetterSetter } from '../../kibana_utils/public';
 import { search } from '../../data/public';
@@ -27,6 +28,7 @@ import { DocViewsRegistry } from './application/doc_views/doc_views_registry';
 
 let angularModule: any = null;
 let services: DiscoverServices | null = null;
+let uiActions: UiActionsStart;
 
 /**
  * set bootstrapped inner angular module
@@ -53,6 +55,9 @@ export function setServices(newServices: any) {
   services = newServices;
 }
 
+export const setUiActions = (pluginUiActions: UiActionsStart) => (uiActions = pluginUiActions);
+export const getUiActions = () => uiActions;
+
 export const [getUrlTracker, setUrlTracker] = createGetterSetter<{
   setTrackedUrl: (url: string) => void;
   restorePreviousUrl: () => void;
diff --git a/src/plugins/discover/public/plugin.ts b/src/plugins/discover/public/plugin.ts
index 20e13d204e0e9..015f4267646c1 100644
--- a/src/plugins/discover/public/plugin.ts
+++ b/src/plugins/discover/public/plugin.ts
@@ -53,6 +53,7 @@ import {
   setUrlTracker,
   setAngularModule,
   setServices,
+  setUiActions,
   setScopedHistory,
   getScopedHistory,
   syncHistoryLocations,
@@ -314,6 +315,8 @@ export class DiscoverPlugin
       this.innerAngularInitialized = true;
     };
 
+    setUiActions(plugins.uiActions);
+
     this.initializeServices = async () => {
       if (this.servicesInitialized) {
         return { core, plugins };
diff --git a/src/plugins/tile_map/public/plugin.ts b/src/plugins/tile_map/public/plugin.ts
index 4582cd2283dc1..9a164f8a303f8 100644
--- a/src/plugins/tile_map/public/plugin.ts
+++ b/src/plugins/tile_map/public/plugin.ts
@@ -34,8 +34,7 @@ import { createTileMapFn } from './tile_map_fn';
 import { createTileMapTypeDefinition } from './tile_map_type';
 import { IServiceSettings, MapsLegacyPluginSetup } from '../../maps_legacy/public';
 import { DataPublicPluginStart } from '../../data/public';
-import { setFormatService, setQueryService } from './services';
-import { setKibanaLegacy } from './services';
+import { setFormatService, setQueryService, setKibanaLegacy } from './services';
 import { KibanaLegacyStart } from '../../kibana_legacy/public';
 
 export interface TileMapConfigType {
diff --git a/src/plugins/ui_actions/public/index.ts b/src/plugins/ui_actions/public/index.ts
index d76ca124ead2c..476ca0ec17066 100644
--- a/src/plugins/ui_actions/public/index.ts
+++ b/src/plugins/ui_actions/public/index.ts
@@ -43,8 +43,20 @@ export {
   valueClickTrigger,
   APPLY_FILTER_TRIGGER,
   applyFilterTrigger,
+  VISUALIZE_FIELD_TRIGGER,
+  visualizeFieldTrigger,
+  VISUALIZE_GEO_FIELD_TRIGGER,
+  visualizeGeoFieldTrigger,
 } from './triggers';
-export { TriggerContextMapping, TriggerId, ActionContextMapping, ActionType } from './types';
+export {
+  TriggerContextMapping,
+  TriggerId,
+  ActionContextMapping,
+  ActionType,
+  VisualizeFieldContext,
+  ACTION_VISUALIZE_FIELD,
+  ACTION_VISUALIZE_GEO_FIELD,
+} from './types';
 export {
   ActionByType,
   ActionDefinitionByType,
diff --git a/src/plugins/ui_actions/public/plugin.ts b/src/plugins/ui_actions/public/plugin.ts
index 71148656cbb16..f83cc97c2a8ef 100644
--- a/src/plugins/ui_actions/public/plugin.ts
+++ b/src/plugins/ui_actions/public/plugin.ts
@@ -19,7 +19,13 @@
 
 import { CoreStart, CoreSetup, Plugin, PluginInitializerContext } from 'src/core/public';
 import { UiActionsService } from './service';
-import { selectRangeTrigger, valueClickTrigger, applyFilterTrigger } from './triggers';
+import {
+  selectRangeTrigger,
+  valueClickTrigger,
+  applyFilterTrigger,
+  visualizeFieldTrigger,
+  visualizeGeoFieldTrigger,
+} from './triggers';
 
 export type UiActionsSetup = Pick<
   UiActionsService,
@@ -42,6 +48,8 @@ export class UiActionsPlugin implements Plugin<UiActionsSetup, UiActionsStart> {
     this.service.registerTrigger(selectRangeTrigger);
     this.service.registerTrigger(valueClickTrigger);
     this.service.registerTrigger(applyFilterTrigger);
+    this.service.registerTrigger(visualizeFieldTrigger);
+    this.service.registerTrigger(visualizeGeoFieldTrigger);
     return this.service;
   }
 
diff --git a/src/plugins/ui_actions/public/triggers/index.ts b/src/plugins/ui_actions/public/triggers/index.ts
index dbc54163c5af5..b7039d287c6e2 100644
--- a/src/plugins/ui_actions/public/triggers/index.ts
+++ b/src/plugins/ui_actions/public/triggers/index.ts
@@ -23,4 +23,6 @@ export * from './trigger_internal';
 export * from './select_range_trigger';
 export * from './value_click_trigger';
 export * from './apply_filter_trigger';
+export * from './visualize_field_trigger';
+export * from './visualize_geo_field_trigger';
 export * from './default_trigger';
diff --git a/src/plugins/ui_actions/public/triggers/visualize_field_trigger.ts b/src/plugins/ui_actions/public/triggers/visualize_field_trigger.ts
new file mode 100644
index 0000000000000..4f3c5f613eddf
--- /dev/null
+++ b/src/plugins/ui_actions/public/triggers/visualize_field_trigger.ts
@@ -0,0 +1,27 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Trigger } from '.';
+
+export const VISUALIZE_FIELD_TRIGGER = 'VISUALIZE_FIELD_TRIGGER';
+export const visualizeFieldTrigger: Trigger<'VISUALIZE_FIELD_TRIGGER'> = {
+  id: VISUALIZE_FIELD_TRIGGER,
+  title: 'Visualize field',
+  description: 'Triggered when user wants to visualize a field.',
+};
diff --git a/src/plugins/ui_actions/public/triggers/visualize_geo_field_trigger.ts b/src/plugins/ui_actions/public/triggers/visualize_geo_field_trigger.ts
new file mode 100644
index 0000000000000..5582b3b42660c
--- /dev/null
+++ b/src/plugins/ui_actions/public/triggers/visualize_geo_field_trigger.ts
@@ -0,0 +1,27 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Trigger } from '.';
+
+export const VISUALIZE_GEO_FIELD_TRIGGER = 'VISUALIZE_GEO_FIELD_TRIGGER';
+export const visualizeGeoFieldTrigger: Trigger<'VISUALIZE_GEO_FIELD_TRIGGER'> = {
+  id: VISUALIZE_GEO_FIELD_TRIGGER,
+  title: 'Visualize Geo field',
+  description: 'Triggered when user wants to visualize a geo field.',
+};
diff --git a/src/plugins/ui_actions/public/types.ts b/src/plugins/ui_actions/public/types.ts
index dcf0bfb14d538..b00f4628ffb96 100644
--- a/src/plugins/ui_actions/public/types.ts
+++ b/src/plugins/ui_actions/public/types.ts
@@ -23,6 +23,8 @@ import {
   SELECT_RANGE_TRIGGER,
   VALUE_CLICK_TRIGGER,
   APPLY_FILTER_TRIGGER,
+  VISUALIZE_FIELD_TRIGGER,
+  VISUALIZE_GEO_FIELD_TRIGGER,
   DEFAULT_TRIGGER,
 } from './triggers';
 import type { RangeSelectContext, ValueClickContext } from '../../embeddable/public';
@@ -32,6 +34,12 @@ export type TriggerRegistry = Map<TriggerId, TriggerInternal<any>>;
 export type ActionRegistry = Map<string, ActionInternal>;
 export type TriggerToActionsRegistry = Map<TriggerId, string[]>;
 
+export interface VisualizeFieldContext {
+  fieldName: string;
+  indexPatternId: string;
+  contextualFields?: string[];
+}
+
 export type TriggerId = keyof TriggerContextMapping;
 
 export type BaseContext = object;
@@ -42,11 +50,17 @@ export interface TriggerContextMapping {
   [SELECT_RANGE_TRIGGER]: RangeSelectContext;
   [VALUE_CLICK_TRIGGER]: ValueClickContext;
   [APPLY_FILTER_TRIGGER]: ApplyGlobalFilterActionContext;
+  [VISUALIZE_FIELD_TRIGGER]: VisualizeFieldContext;
+  [VISUALIZE_GEO_FIELD_TRIGGER]: VisualizeFieldContext;
 }
 
 const DEFAULT_ACTION = '';
+export const ACTION_VISUALIZE_FIELD = 'ACTION_VISUALIZE_FIELD';
+export const ACTION_VISUALIZE_GEO_FIELD = 'ACTION_VISUALIZE_GEO_FIELD';
 export type ActionType = keyof ActionContextMapping;
 
 export interface ActionContextMapping {
   [DEFAULT_ACTION]: BaseContext;
+  [ACTION_VISUALIZE_FIELD]: VisualizeFieldContext;
+  [ACTION_VISUALIZE_GEO_FIELD]: VisualizeFieldContext;
 }
diff --git a/src/plugins/visualize/common/constants.ts b/src/plugins/visualize/common/constants.ts
new file mode 100644
index 0000000000000..4e33638286a19
--- /dev/null
+++ b/src/plugins/visualize/common/constants.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export const AGGS_TERMS_SIZE_SETTING = 'discover:aggs:terms:size';
diff --git a/src/plugins/visualize/kibana.json b/src/plugins/visualize/kibana.json
index 520d1e1daa6fe..a6cc8d8f8af60 100644
--- a/src/plugins/visualize/kibana.json
+++ b/src/plugins/visualize/kibana.json
@@ -9,7 +9,8 @@
     "navigation",
     "savedObjects",
     "visualizations",
-    "embeddable"
+    "embeddable",
+    "uiActions"
   ],
   "optionalPlugins": ["home", "share"],
   "requiredBundles": [
diff --git a/src/plugins/visualize/public/actions/visualize_field_action.ts b/src/plugins/visualize/public/actions/visualize_field_action.ts
new file mode 100644
index 0000000000000..6671d2c981910
--- /dev/null
+++ b/src/plugins/visualize/public/actions/visualize_field_action.ts
@@ -0,0 +1,97 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { i18n } from '@kbn/i18n';
+import {
+  createAction,
+  ACTION_VISUALIZE_FIELD,
+  VisualizeFieldContext,
+} from '../../../ui_actions/public';
+import {
+  getApplication,
+  getUISettings,
+  getIndexPatterns,
+  getQueryService,
+  getShareService,
+} from '../services';
+import { VISUALIZE_APP_URL_GENERATOR, VisualizeUrlGeneratorState } from '../url_generator';
+import { AGGS_TERMS_SIZE_SETTING } from '../../common/constants';
+
+export const visualizeFieldAction = createAction<typeof ACTION_VISUALIZE_FIELD>({
+  type: ACTION_VISUALIZE_FIELD,
+  getDisplayName: () =>
+    i18n.translate('visualize.discover.visualizeFieldLabel', {
+      defaultMessage: 'Visualize field',
+    }),
+  isCompatible: async () => !!getApplication().capabilities.visualize.show,
+  getHref: async (context) => {
+    const url = await getVisualizeUrl(context);
+    return url;
+  },
+  execute: async (context) => {
+    const url = await getVisualizeUrl(context);
+    const hash = url.split('#')[1];
+
+    getApplication().navigateToApp('visualize', {
+      path: `/#${hash}`,
+    });
+  },
+});
+
+const getVisualizeUrl = async (context: VisualizeFieldContext) => {
+  const indexPattern = await getIndexPatterns().get(context.indexPatternId);
+  const field = indexPattern.fields.find((fld) => fld.name === context.fieldName);
+  const aggsTermSize = getUISettings().get(AGGS_TERMS_SIZE_SETTING);
+  let agg;
+
+  // If we're visualizing a date field, and our index is time based (and thus has a time filter),
+  // then run a date histogram
+  if (field?.type === 'date' && indexPattern.timeFieldName === context.fieldName) {
+    agg = {
+      type: 'date_histogram',
+      schema: 'segment',
+      params: {
+        field: context.fieldName,
+        interval: 'auto',
+      },
+    };
+  } else {
+    agg = {
+      type: 'terms',
+      schema: 'segment',
+      params: {
+        field: context.fieldName,
+        size: parseInt(aggsTermSize, 10),
+        orderBy: '1',
+      },
+    };
+  }
+  const generator = getShareService().urlGenerators.getUrlGenerator(VISUALIZE_APP_URL_GENERATOR);
+  const urlState: VisualizeUrlGeneratorState = {
+    filters: getQueryService().filterManager.getFilters(),
+    query: getQueryService().queryString.getQuery(),
+    timeRange: getQueryService().timefilter.timefilter.getTime(),
+    indexPatternId: context.indexPatternId,
+    type: 'histogram',
+    vis: {
+      type: 'histogram',
+      aggs: [{ schema: 'metric', type: 'count', id: '1' }, agg],
+    },
+  };
+  return generator.createUrl(urlState);
+};
diff --git a/src/plugins/visualize/public/plugin.ts b/src/plugins/visualize/public/plugin.ts
index 3299319e613a0..8794593d6c958 100644
--- a/src/plugins/visualize/public/plugin.ts
+++ b/src/plugins/visualize/public/plugin.ts
@@ -39,7 +39,7 @@ import {
 } from '../../kibana_utils/public';
 import { DataPublicPluginStart, DataPublicPluginSetup, esFilters } from '../../data/public';
 import { NavigationPublicPluginStart as NavigationStart } from '../../navigation/public';
-import { SharePluginStart } from '../../share/public';
+import { SharePluginStart, SharePluginSetup } from '../../share/public';
 import { KibanaLegacySetup, KibanaLegacyStart } from '../../kibana_legacy/public';
 import { VisualizationsStart } from '../../visualizations/public';
 import { VisualizeConstants } from './application/visualize_constants';
@@ -48,6 +48,16 @@ import { VisualizeServices } from './application/types';
 import { DEFAULT_APP_CATEGORIES } from '../../../core/public';
 import { SavedObjectsStart } from '../../saved_objects/public';
 import { EmbeddableStart } from '../../embeddable/public';
+import { UiActionsStart, VISUALIZE_FIELD_TRIGGER } from '../../ui_actions/public';
+import {
+  setUISettings,
+  setApplication,
+  setIndexPatterns,
+  setQueryService,
+  setShareService,
+} from './services';
+import { visualizeFieldAction } from './actions/visualize_field_action';
+import { createVisualizeUrlGenerator } from './url_generator';
 
 export interface VisualizePluginStartDependencies {
   data: DataPublicPluginStart;
@@ -57,12 +67,14 @@ export interface VisualizePluginStartDependencies {
   embeddable: EmbeddableStart;
   kibanaLegacy: KibanaLegacyStart;
   savedObjects: SavedObjectsStart;
+  uiActions: UiActionsStart;
 }
 
 export interface VisualizePluginSetupDependencies {
   home?: HomePublicPluginSetup;
   kibanaLegacy: KibanaLegacySetup;
   data: DataPublicPluginSetup;
+  share?: SharePluginSetup;
 }
 
 export interface FeatureFlagConfig {
@@ -80,7 +92,7 @@ export class VisualizePlugin
 
   public async setup(
     core: CoreSetup<VisualizePluginStartDependencies>,
-    { home, kibanaLegacy, data }: VisualizePluginSetupDependencies
+    { home, kibanaLegacy, data, share }: VisualizePluginSetupDependencies
   ) {
     const {
       appMounted,
@@ -113,6 +125,18 @@ export class VisualizePlugin
     this.stopUrlTracking = () => {
       stopUrlTracker();
     };
+    if (share) {
+      share.urlGenerators.registerUrlGenerator(
+        createVisualizeUrlGenerator(async () => {
+          const [coreStart] = await core.getStartServices();
+          return {
+            appBasePath: coreStart.application.getUrlForApp('visualize'),
+            useHashedUrl: coreStart.uiSettings.get('state:storeInSessionStorage'),
+          };
+        })
+      );
+    }
+    setUISettings(core.uiSettings);
 
     core.application.register({
       id: 'visualize',
@@ -140,7 +164,6 @@ export class VisualizePlugin
         const unlistenParentHistory = params.history.listen(() => {
           window.dispatchEvent(new HashChangeEvent('hashchange'));
         });
-
         /**
          * current implementation uses 2 history objects:
          * 1. the hash history (used for the react hash router)
@@ -207,7 +230,15 @@ export class VisualizePlugin
     }
   }
 
-  public start(core: CoreStart, plugins: VisualizePluginStartDependencies) {}
+  public start(core: CoreStart, plugins: VisualizePluginStartDependencies) {
+    setApplication(core.application);
+    setIndexPatterns(plugins.data.indexPatterns);
+    setQueryService(plugins.data.query);
+    if (plugins.share) {
+      setShareService(plugins.share);
+    }
+    plugins.uiActions.addTriggerAction(VISUALIZE_FIELD_TRIGGER, visualizeFieldAction);
+  }
 
   stop() {
     if (this.stopUrlTracking) {
diff --git a/src/plugins/visualize/public/services.ts b/src/plugins/visualize/public/services.ts
new file mode 100644
index 0000000000000..8190872ec6508
--- /dev/null
+++ b/src/plugins/visualize/public/services.ts
@@ -0,0 +1,37 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { ApplicationStart, IUiSettingsClient } from '../../../core/public';
+import { createGetterSetter } from '../../../plugins/kibana_utils/public';
+import { IndexPatternsContract, DataPublicPluginStart } from '../../../plugins/data/public';
+import { SharePluginStart } from '../../../plugins/share/public';
+
+export const [getUISettings, setUISettings] = createGetterSetter<IUiSettingsClient>('UISettings');
+
+export const [getApplication, setApplication] = createGetterSetter<ApplicationStart>('Application');
+
+export const [getShareService, setShareService] = createGetterSetter<SharePluginStart>('Share');
+
+export const [getIndexPatterns, setIndexPatterns] = createGetterSetter<IndexPatternsContract>(
+  'IndexPatterns'
+);
+
+export const [getQueryService, setQueryService] = createGetterSetter<
+  DataPublicPluginStart['query']
+>('Query');
diff --git a/src/plugins/visualize/public/url_generator.test.ts b/src/plugins/visualize/public/url_generator.test.ts
new file mode 100644
index 0000000000000..8c8a0f70c15e3
--- /dev/null
+++ b/src/plugins/visualize/public/url_generator.test.ts
@@ -0,0 +1,100 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { createVisualizeUrlGenerator } from './url_generator';
+import { esFilters } from '../../data/public';
+
+const APP_BASE_PATH: string = 'test/app/visualize';
+const VISUALIZE_ID: string = '13823000-99b9-11ea-9eb6-d9e8adceb647';
+const INDEXPATTERN_ID: string = '13823000-99b9-11ea-9eb6-d9e8adceb647';
+
+describe('visualize url generator', () => {
+  test('creates a link to a new visualization', async () => {
+    const generator = createVisualizeUrlGenerator(() =>
+      Promise.resolve({
+        appBasePath: APP_BASE_PATH,
+        useHashedUrl: false,
+      })
+    );
+    const url = await generator.createUrl!({ indexPatternId: INDEXPATTERN_ID, type: 'table' });
+    expect(url).toMatchInlineSnapshot(
+      `"test/app/visualize#/create?_g=()&_a=()&indexPattern=${INDEXPATTERN_ID}&type=table"`
+    );
+  });
+
+  test('creates a link with global time range set up', async () => {
+    const generator = createVisualizeUrlGenerator(() =>
+      Promise.resolve({
+        appBasePath: APP_BASE_PATH,
+        useHashedUrl: false,
+      })
+    );
+    const url = await generator.createUrl!({
+      timeRange: { to: 'now', from: 'now-15m', mode: 'relative' },
+      indexPatternId: INDEXPATTERN_ID,
+      type: 'table',
+    });
+    expect(url).toMatchInlineSnapshot(
+      `"test/app/visualize#/create?_g=(time:(from:now-15m,mode:relative,to:now))&_a=()&indexPattern=${INDEXPATTERN_ID}&type=table"`
+    );
+  });
+
+  test('creates a link with filters, time range, refresh interval and query to a saved visualization', async () => {
+    const generator = createVisualizeUrlGenerator(() =>
+      Promise.resolve({
+        appBasePath: APP_BASE_PATH,
+        useHashedUrl: false,
+        indexPatternId: INDEXPATTERN_ID,
+        type: 'table',
+      })
+    );
+    const url = await generator.createUrl!({
+      timeRange: { to: 'now', from: 'now-15m', mode: 'relative' },
+      refreshInterval: { pause: false, value: 300 },
+      visualizationId: VISUALIZE_ID,
+      filters: [
+        {
+          meta: {
+            alias: null,
+            disabled: false,
+            negate: false,
+          },
+          query: { query: 'q1' },
+        },
+        {
+          meta: {
+            alias: null,
+            disabled: false,
+            negate: false,
+          },
+          query: { query: 'q1' },
+          $state: {
+            store: esFilters.FilterStateStore.GLOBAL_STATE,
+          },
+        },
+      ],
+      query: { query: 'q2', language: 'kuery' },
+      indexPatternId: INDEXPATTERN_ID,
+      type: 'table',
+    });
+    expect(url).toMatchInlineSnapshot(
+      `"test/app/visualize#/edit/${VISUALIZE_ID}?_g=(filters:!(('$state':(store:globalState),meta:(alias:!n,disabled:!f,negate:!f),query:(query:q1))),refreshInterval:(pause:!f,value:300),time:(from:now-15m,mode:relative,to:now))&_a=(filters:!((meta:(alias:!n,disabled:!f,negate:!f),query:(query:q1))),query:(language:kuery,query:q2))&indexPattern=${INDEXPATTERN_ID}&type=table"`
+    );
+  });
+});
diff --git a/src/plugins/visualize/public/url_generator.ts b/src/plugins/visualize/public/url_generator.ts
new file mode 100644
index 0000000000000..38b7633c6fde1
--- /dev/null
+++ b/src/plugins/visualize/public/url_generator.ts
@@ -0,0 +1,137 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import {
+  TimeRange,
+  Filter,
+  Query,
+  esFilters,
+  QueryState,
+  RefreshInterval,
+} from '../../data/public';
+import { setStateToKbnUrl } from '../../kibana_utils/public';
+import { UrlGeneratorsDefinition } from '../../share/public';
+
+const STATE_STORAGE_KEY = '_a';
+const GLOBAL_STATE_STORAGE_KEY = '_g';
+
+export const VISUALIZE_APP_URL_GENERATOR = 'VISUALIZE_APP_URL_GENERATOR';
+
+export interface VisualizeUrlGeneratorState {
+  /**
+   * If given, it will load the given visualization else will load the create a new visualization page.
+   */
+  visualizationId?: string;
+  /**
+   * Optionally set the time range in the time picker.
+   */
+  timeRange?: TimeRange;
+
+  /**
+   * Optional set indexPatternId.
+   */
+  indexPatternId?: string;
+
+  /**
+   * Optional set visualization type.
+   */
+  type?: string;
+
+  /**
+   * Optionally set the visualization.
+   */
+  vis?: unknown;
+
+  /**
+   * Optionally set the refresh interval.
+   */
+  refreshInterval?: RefreshInterval;
+
+  /**
+   * Optionally apply filers. NOTE: if given and used in conjunction with `dashboardId`, and the
+   * saved dashboard has filters saved with it, this will _replace_ those filters.
+   */
+  filters?: Filter[];
+  /**
+   * Optionally set a query. NOTE: if given and used in conjunction with `dashboardId`, and the
+   * saved dashboard has a query saved with it, this will _replace_ that query.
+   */
+  query?: Query;
+  /**
+   * If not given, will use the uiSettings configuration for `storeInSessionStorage`. useHash determines
+   * whether to hash the data in the url to avoid url length issues.
+   */
+  hash?: boolean;
+}
+
+export const createVisualizeUrlGenerator = (
+  getStartServices: () => Promise<{
+    appBasePath: string;
+    useHashedUrl: boolean;
+  }>
+): UrlGeneratorsDefinition<typeof VISUALIZE_APP_URL_GENERATOR> => ({
+  id: VISUALIZE_APP_URL_GENERATOR,
+  createUrl: async ({
+    visualizationId,
+    filters,
+    indexPatternId,
+    query,
+    refreshInterval,
+    vis,
+    type,
+    timeRange,
+    hash,
+  }: VisualizeUrlGeneratorState): Promise<string> => {
+    const startServices = await getStartServices();
+    const useHash = hash ?? startServices.useHashedUrl;
+    const appBasePath = startServices.appBasePath;
+    const mode = visualizationId ? `edit/${visualizationId}` : `create`;
+
+    const appState: {
+      query?: Query;
+      filters?: Filter[];
+      vis?: unknown;
+    } = {};
+    const queryState: QueryState = {};
+
+    if (query) appState.query = query;
+    if (filters && filters.length)
+      appState.filters = filters?.filter((f) => !esFilters.isFilterPinned(f));
+    if (vis) appState.vis = vis;
+
+    if (timeRange) queryState.time = timeRange;
+    if (filters && filters.length)
+      queryState.filters = filters?.filter((f) => esFilters.isFilterPinned(f));
+    if (refreshInterval) queryState.refreshInterval = refreshInterval;
+
+    let url = `${appBasePath}#/${mode}`;
+    url = setStateToKbnUrl<QueryState>(GLOBAL_STATE_STORAGE_KEY, queryState, { useHash }, url);
+    url = setStateToKbnUrl(STATE_STORAGE_KEY, appState, { useHash }, url);
+
+    if (indexPatternId) {
+      url = `${url}&indexPattern=${indexPatternId}`;
+    }
+
+    if (type) {
+      url = `${url}&type=${type}`;
+    }
+
+    return url;
+  },
+});
diff --git a/test/functional/apps/discover/_field_visualize.ts b/test/functional/apps/discover/_field_visualize.ts
index b0db6c149e41a..c95211e98cdba 100644
--- a/test/functional/apps/discover/_field_visualize.ts
+++ b/test/functional/apps/discover/_field_visualize.ts
@@ -87,6 +87,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await inspector.close();
     });
 
+    it('should not show the "Visualize" button for geo field', async () => {
+      await PageObjects.discover.findFieldByName('geo.coordinates');
+      log.debug('visualize a geo field');
+      await PageObjects.discover.expectMissingFieldListItemVisualize('geo.coordinates');
+    });
+
     it('should preserve app filters in visualize', async () => {
       await filterBar.addFilter('bytes', 'is between', '3500', '4000');
       await PageObjects.discover.findFieldByName('geo.src');
diff --git a/x-pack/plugins/maps/common/constants.ts b/x-pack/plugins/maps/common/constants.ts
index eec23f95bb17b..363122ac62212 100644
--- a/x-pack/plugins/maps/common/constants.ts
+++ b/x-pack/plugins/maps/common/constants.ts
@@ -26,6 +26,7 @@ export const EMS_TILES_VECTOR_TILE_PATH = 'vector/tile';
 export const MAP_SAVED_OBJECT_TYPE = 'map';
 export const APP_ID = 'maps';
 export const APP_ICON = 'gisApp';
+export const INITIAL_LAYERS_KEY = 'initialLayers';
 
 export const MAPS_APP_PATH = `app/${APP_ID}`;
 export const MAP_PATH = 'map';
diff --git a/x-pack/plugins/maps/kibana.json b/x-pack/plugins/maps/kibana.json
index fbf45aee02125..d554d159a196f 100644
--- a/x-pack/plugins/maps/kibana.json
+++ b/x-pack/plugins/maps/kibana.json
@@ -15,7 +15,8 @@
     "visualizations",
     "embeddable",
     "mapsLegacy",
-    "usageCollection"
+    "usageCollection",
+    "share"
   ],
   "ui": true,
   "server": true,
diff --git a/x-pack/plugins/maps/public/kibana_services.ts b/x-pack/plugins/maps/public/kibana_services.ts
index 3b004e2cda67b..f8f89ebaed102 100644
--- a/x-pack/plugins/maps/public/kibana_services.ts
+++ b/x-pack/plugins/maps/public/kibana_services.ts
@@ -45,6 +45,7 @@ export const getToasts = () => coreStart.notifications.toasts;
 export const getSavedObjectsClient = () => coreStart.savedObjects.client;
 export const getCoreChrome = () => coreStart.chrome;
 export const getMapsCapabilities = () => coreStart.application.capabilities.maps;
+export const getVisualizeCapabilities = () => coreStart.application.capabilities.visualize;
 export const getDocLinks = () => coreStart.docLinks;
 export const getCoreOverlays = () => coreStart.overlays;
 export const getData = () => pluginsStart.data;
@@ -81,3 +82,5 @@ export const getProxyElasticMapsServiceInMaps = () =>
   getKibanaCommonConfig().proxyElasticMapsServiceInMaps;
 export const getRegionmapLayers = () => _.get(getKibanaCommonConfig(), 'regionmap.layers', []);
 export const getTilemap = () => _.get(getKibanaCommonConfig(), 'tilemap', []);
+
+export const getShareService = () => pluginsStart.share;
diff --git a/x-pack/plugins/maps/public/plugin.ts b/x-pack/plugins/maps/public/plugin.ts
index e2b40e22bfe7d..9bb79f2937c68 100644
--- a/x-pack/plugins/maps/public/plugin.ts
+++ b/x-pack/plugins/maps/public/plugin.ts
@@ -31,6 +31,9 @@ import { getMapsVisTypeAlias } from './maps_vis_type_alias';
 import { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
 import { VisualizationsSetup } from '../../../../src/plugins/visualizations/public';
 import { APP_ICON, APP_ID, MAP_SAVED_OBJECT_TYPE } from '../common/constants';
+import { VISUALIZE_GEO_FIELD_TRIGGER } from '../../../../src/plugins/ui_actions/public';
+import { createMapsUrlGenerator } from './url_generator';
+import { visualizeGeoFieldAction } from './trigger_actions/visualize_geo_field_action';
 import { MapEmbeddableFactory } from './embeddable/map_embeddable_factory';
 import { EmbeddableSetup } from '../../../../src/plugins/embeddable/public';
 import { MapsXPackConfig, MapsConfigType } from '../config';
@@ -39,6 +42,7 @@ import { ILicense } from '../../licensing/common/types';
 import { lazyLoadMapModules } from './lazy_load_bundle';
 import { MapsStartApi } from './api';
 import { createSecurityLayerDescriptors, registerLayerWizard, registerSource } from './api';
+import { SharePluginSetup, SharePluginStart } from '../../../../src/plugins/share/public';
 import { EmbeddableStart } from '../../../../src/plugins/embeddable/public';
 import { MapsLegacyConfigType } from '../../../../src/plugins/maps_legacy/public';
 import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
@@ -51,6 +55,7 @@ export interface MapsPluginSetupDependencies {
   visualizations: VisualizationsSetup;
   embeddable: EmbeddableSetup;
   mapsLegacy: { config: MapsLegacyConfigType };
+  share: SharePluginSetup;
 }
 
 export interface MapsPluginStartDependencies {
@@ -61,6 +66,7 @@ export interface MapsPluginStartDependencies {
   licensing: LicensingPluginStart;
   navigation: NavigationPublicPluginStart;
   uiActions: UiActionsStart;
+  share: SharePluginStart;
 }
 
 /**
@@ -91,6 +97,15 @@ export class MapsPlugin
     setKibanaCommonConfig(plugins.mapsLegacy.config);
     setMapAppConfig(config);
     setKibanaVersion(this._initializerContext.env.packageInfo.version);
+    plugins.share.urlGenerators.registerUrlGenerator(
+      createMapsUrlGenerator(async () => {
+        const [coreStart] = await core.getStartServices();
+        return {
+          appBasePath: coreStart.application.getUrlForApp('maps'),
+          useHashedUrl: coreStart.uiSettings.get('state:storeInSessionStorage'),
+        };
+      })
+    );
 
     plugins.inspector.registerView(MapView);
     plugins.home.featureCatalogue.register(featureCatalogueEntry);
@@ -122,7 +137,7 @@ export class MapsPlugin
         setLicenseId(license.uid);
       });
     }
-
+    plugins.uiActions.addTriggerAction(VISUALIZE_GEO_FIELD_TRIGGER, visualizeGeoFieldAction);
     setStartServices(core, plugins);
 
     return {
diff --git a/x-pack/plugins/maps/public/routing/bootstrap/get_initial_layers.js b/x-pack/plugins/maps/public/routing/bootstrap/get_initial_layers.js
index 5d02160fc3eb5..b47f83d5a6664 100644
--- a/x-pack/plugins/maps/public/routing/bootstrap/get_initial_layers.js
+++ b/x-pack/plugins/maps/public/routing/bootstrap/get_initial_layers.js
@@ -20,6 +20,7 @@ import { TileLayer } from '../../classes/layers/tile_layer/tile_layer';
 import { EMSTMSSource } from '../../classes/sources/ems_tms_source';
 import { VectorTileLayer } from '../../classes/layers/vector_tile_layer/vector_tile_layer';
 import { getIsEmsEnabled, getToasts } from '../../kibana_services';
+import { INITIAL_LAYERS_KEY } from '../../../common/constants';
 import { getKibanaTileMap } from '../../meta';
 
 export function getInitialLayers(layerListJSON, initialLayers = []) {
@@ -51,12 +52,12 @@ export function getInitialLayersFromUrlParam() {
     return [];
   }
   const mapAppParams = new URLSearchParams(locationSplit[1]);
-  if (!mapAppParams.has('initialLayers')) {
+  if (!mapAppParams.has(INITIAL_LAYERS_KEY)) {
     return [];
   }
 
   try {
-    let mapInitLayers = mapAppParams.get('initialLayers');
+    let mapInitLayers = mapAppParams.get(INITIAL_LAYERS_KEY);
     if (mapInitLayers[mapInitLayers.length - 1] === '#') {
       mapInitLayers = mapInitLayers.substr(0, mapInitLayers.length - 1);
     }
diff --git a/x-pack/plugins/maps/public/trigger_actions/visualize_geo_field_action.ts b/x-pack/plugins/maps/public/trigger_actions/visualize_geo_field_action.ts
new file mode 100644
index 0000000000000..bdeab292b214c
--- /dev/null
+++ b/x-pack/plugins/maps/public/trigger_actions/visualize_geo_field_action.ts
@@ -0,0 +1,77 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import uuid from 'uuid/v4';
+import { i18n } from '@kbn/i18n';
+import {
+  createAction,
+  ACTION_VISUALIZE_GEO_FIELD,
+  VisualizeFieldContext,
+} from '../../../../../src/plugins/ui_actions/public';
+import {
+  getVisualizeCapabilities,
+  getIndexPatternService,
+  getData,
+  getShareService,
+  getNavigateToApp,
+} from '../kibana_services';
+import { MAPS_APP_URL_GENERATOR, MapsUrlGeneratorState } from '../url_generator';
+import { LAYER_TYPE, SOURCE_TYPES, SCALING_TYPES, APP_ID, MAP_PATH } from '../../common/constants';
+
+export const visualizeGeoFieldAction = createAction<typeof ACTION_VISUALIZE_GEO_FIELD>({
+  type: ACTION_VISUALIZE_GEO_FIELD,
+  getDisplayName: () =>
+    i18n.translate('xpack.maps.discover.visualizeFieldLabel', {
+      defaultMessage: 'Visualize in Maps',
+    }),
+  isCompatible: async () => !!getVisualizeCapabilities().show,
+  getHref: async (context) => {
+    const url = await getMapsLink(context);
+    return url;
+  },
+  execute: async (context) => {
+    const url = await getMapsLink(context);
+    const hash = url.split('#')[1];
+
+    getNavigateToApp()(APP_ID, {
+      path: `${MAP_PATH}/#${hash}`,
+    });
+  },
+});
+
+const getMapsLink = async (context: VisualizeFieldContext) => {
+  const indexPattern = await getIndexPatternService().get(context.indexPatternId);
+  const field = indexPattern.fields.find((fld) => fld.name === context.fieldName);
+  const supportsClustering = field?.aggregatable;
+  // create initial layer descriptor
+  const hasTooltips =
+    context?.contextualFields?.length && context?.contextualFields[0] !== '_source';
+  const initialLayers = [
+    {
+      id: uuid(),
+      visible: true,
+      type: supportsClustering ? LAYER_TYPE.BLENDED_VECTOR : LAYER_TYPE.VECTOR,
+      sourceDescriptor: {
+        id: uuid(),
+        type: SOURCE_TYPES.ES_SEARCH,
+        tooltipProperties: hasTooltips ? context.contextualFields : [],
+        label: indexPattern.title,
+        indexPatternId: context.indexPatternId,
+        geoField: context.fieldName,
+        scalingType: supportsClustering ? SCALING_TYPES.CLUSTERS : SCALING_TYPES.LIMIT,
+      },
+    },
+  ];
+
+  const generator = getShareService().urlGenerators.getUrlGenerator(MAPS_APP_URL_GENERATOR);
+  const urlState: MapsUrlGeneratorState = {
+    filters: getData().query.filterManager.getFilters(),
+    query: getData().query.queryString.getQuery(),
+    initialLayers,
+    timeRange: getData().query.timefilter.timefilter.getTime(),
+  };
+  return generator.createUrl(urlState);
+};
diff --git a/x-pack/plugins/maps/public/url_generator.test.ts b/x-pack/plugins/maps/public/url_generator.test.ts
new file mode 100644
index 0000000000000..a44f8d952fde1
--- /dev/null
+++ b/x-pack/plugins/maps/public/url_generator.test.ts
@@ -0,0 +1,113 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import rison from 'rison-node';
+import { createMapsUrlGenerator } from './url_generator';
+import { LAYER_TYPE, SOURCE_TYPES, SCALING_TYPES } from '../common/constants';
+import { esFilters } from '../../../../src/plugins/data/public';
+
+const APP_BASE_PATH: string = 'test/app/maps';
+const MAP_ID: string = '2c9c1f60-1909-11e9-919b-ffe5949a18d2';
+const LAYER_ID: string = '13823000-99b9-11ea-9eb6-d9e8adceb647';
+const INDEX_PATTERN_ID: string = '90943e30-9a47-11e8-b64d-95841ca0b247';
+
+describe('visualize url generator', () => {
+  test('creates a link to a new visualization', async () => {
+    const generator = createMapsUrlGenerator(() =>
+      Promise.resolve({
+        appBasePath: APP_BASE_PATH,
+        useHashedUrl: false,
+      })
+    );
+    const url = await generator.createUrl!({});
+    expect(url).toMatchInlineSnapshot(`"test/app/maps/map#/?_g=()&_a=()"`);
+  });
+
+  test('creates a link with global time range set up', async () => {
+    const generator = createMapsUrlGenerator(() =>
+      Promise.resolve({
+        appBasePath: APP_BASE_PATH,
+        useHashedUrl: false,
+      })
+    );
+    const url = await generator.createUrl!({
+      timeRange: { to: 'now', from: 'now-15m', mode: 'relative' },
+    });
+    expect(url).toMatchInlineSnapshot(
+      `"test/app/maps/map#/?_g=(time:(from:now-15m,mode:relative,to:now))&_a=()"`
+    );
+  });
+
+  test('creates a link with initialLayers set up', async () => {
+    const generator = createMapsUrlGenerator(() =>
+      Promise.resolve({
+        appBasePath: APP_BASE_PATH,
+        useHashedUrl: false,
+      })
+    );
+    const initialLayers = [
+      {
+        id: LAYER_ID,
+        visible: true,
+        type: LAYER_TYPE.VECTOR,
+        sourceDescriptor: {
+          id: LAYER_ID,
+          type: SOURCE_TYPES.ES_SEARCH,
+          tooltipProperties: [],
+          label: 'Sample Data',
+          indexPatternId: INDEX_PATTERN_ID,
+          geoField: 'test',
+          scalingType: SCALING_TYPES.LIMIT,
+        },
+      },
+    ];
+    const encodedLayers = rison.encode_array(initialLayers);
+    const url = await generator.createUrl!({
+      initialLayers,
+    });
+    expect(url).toMatchInlineSnapshot(
+      `"test/app/maps/map#/?_g=()&_a=()&initialLayers=${encodedLayers}"`
+    );
+  });
+
+  test('creates a link with filters, time range, refresh interval and query to a saved visualization', async () => {
+    const generator = createMapsUrlGenerator(() =>
+      Promise.resolve({
+        appBasePath: APP_BASE_PATH,
+        useHashedUrl: false,
+      })
+    );
+    const url = await generator.createUrl!({
+      timeRange: { to: 'now', from: 'now-15m', mode: 'relative' },
+      refreshInterval: { pause: false, value: 300 },
+      mapId: MAP_ID,
+      filters: [
+        {
+          meta: {
+            alias: null,
+            disabled: false,
+            negate: false,
+          },
+          query: { query: 'q1' },
+        },
+        {
+          meta: {
+            alias: null,
+            disabled: false,
+            negate: false,
+          },
+          query: { query: 'q1' },
+          $state: {
+            store: esFilters.FilterStateStore.GLOBAL_STATE,
+          },
+        },
+      ],
+      query: { query: 'q2', language: 'kuery' },
+    });
+    expect(url).toMatchInlineSnapshot(
+      `"test/app/maps/map#/${MAP_ID}?_g=(filters:!(('$state':(store:globalState),meta:(alias:!n,disabled:!f,negate:!f),query:(query:q1))),refreshInterval:(pause:!f,value:300),time:(from:now-15m,mode:relative,to:now))&_a=(filters:!((meta:(alias:!n,disabled:!f,negate:!f),query:(query:q1))),query:(language:kuery,query:q2))"`
+    );
+  });
+});
diff --git a/x-pack/plugins/maps/public/url_generator.ts b/x-pack/plugins/maps/public/url_generator.ts
new file mode 100644
index 0000000000000..3fbb361342c7a
--- /dev/null
+++ b/x-pack/plugins/maps/public/url_generator.ts
@@ -0,0 +1,109 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import rison from 'rison-node';
+import {
+  TimeRange,
+  Filter,
+  Query,
+  esFilters,
+  QueryState,
+  RefreshInterval,
+} from '../../../../src/plugins/data/public';
+import { setStateToKbnUrl } from '../../../../src/plugins/kibana_utils/public';
+import { UrlGeneratorsDefinition } from '../../../../src/plugins/share/public';
+import { LayerDescriptor } from '../common/descriptor_types';
+import { INITIAL_LAYERS_KEY } from '../common/constants';
+
+const STATE_STORAGE_KEY = '_a';
+const GLOBAL_STATE_STORAGE_KEY = '_g';
+
+export const MAPS_APP_URL_GENERATOR = 'MAPS_APP_URL_GENERATOR';
+
+export interface MapsUrlGeneratorState {
+  /**
+   * If given, it will load the given map else will load the create a new map page.
+   */
+  mapId?: string;
+  /**
+   * Optionally set the time range in the time picker.
+   */
+  timeRange?: TimeRange;
+
+  /**
+   * Optionally set the initial Layers.
+   */
+  initialLayers?: LayerDescriptor[];
+
+  /**
+   * Optionally set the refresh interval.
+   */
+  refreshInterval?: RefreshInterval;
+
+  /**
+   * Optionally apply filers. NOTE: if given and used in conjunction with `mapId`, and the
+   * saved map has filters saved with it, this will _replace_ those filters.
+   */
+  filters?: Filter[];
+  /**
+   * Optionally set a query. NOTE: if given and used in conjunction with `mapId`, and the
+   * saved map has a query saved with it, this will _replace_ that query.
+   */
+  query?: Query;
+  /**
+   * If not given, will use the uiSettings configuration for `storeInSessionStorage`. useHash determines
+   * whether to hash the data in the url to avoid url length issues.
+   */
+  hash?: boolean;
+}
+
+export const createMapsUrlGenerator = (
+  getStartServices: () => Promise<{
+    appBasePath: string;
+    useHashedUrl: boolean;
+  }>
+): UrlGeneratorsDefinition<typeof MAPS_APP_URL_GENERATOR> => ({
+  id: MAPS_APP_URL_GENERATOR,
+  createUrl: async ({
+    mapId,
+    filters,
+    query,
+    refreshInterval,
+    timeRange,
+    initialLayers,
+    hash,
+  }: MapsUrlGeneratorState): Promise<string> => {
+    const startServices = await getStartServices();
+    const useHash = hash ?? startServices.useHashedUrl;
+    const appBasePath = startServices.appBasePath;
+
+    const appState: {
+      query?: Query;
+      filters?: Filter[];
+      vis?: unknown;
+    } = {};
+    const queryState: QueryState = {};
+
+    if (query) appState.query = query;
+    if (filters && filters.length)
+      appState.filters = filters?.filter((f) => !esFilters.isFilterPinned(f));
+
+    if (timeRange) queryState.time = timeRange;
+    if (filters && filters.length)
+      queryState.filters = filters?.filter((f) => esFilters.isFilterPinned(f));
+    if (refreshInterval) queryState.refreshInterval = refreshInterval;
+
+    let url = `${appBasePath}/map#/${mapId || ''}`;
+    url = setStateToKbnUrl<QueryState>(GLOBAL_STATE_STORAGE_KEY, queryState, { useHash }, url);
+    url = setStateToKbnUrl(STATE_STORAGE_KEY, appState, { useHash }, url);
+
+    if (initialLayers && initialLayers.length) {
+      // @ts-ignore
+      url = `${url}&${INITIAL_LAYERS_KEY}=${rison.encode_array(initialLayers)}`;
+    }
+
+    return url;
+  },
+});
diff --git a/x-pack/typings/rison_node.d.ts b/x-pack/typings/rison_node.d.ts
index 295392af2e05b..0e6069147e66f 100644
--- a/x-pack/typings/rison_node.d.ts
+++ b/x-pack/typings/rison_node.d.ts
@@ -23,4 +23,7 @@ declare module 'rison-node' {
 
   // eslint-disable-next-line @typescript-eslint/naming-convention
   export const encode_object: <Input extends RisonObject>(input: Input) => string;
+
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  export const encode_array: <Input extends RisonArray>(input: Input) => string;
 }

From 0efe286fad9f1b008478b43549c186ad281f3251 Mon Sep 17 00:00:00 2001
From: Matthias Wilhelm <matthias.wilhelm@elastic.co>
Date: Wed, 19 Aug 2020 10:48:10 +0200
Subject: [PATCH 13/85] [Discover] Fix histogram cloud tests (#75268)

---
 test/functional/apps/discover/_discover_histogram.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/functional/apps/discover/_discover_histogram.ts b/test/functional/apps/discover/_discover_histogram.ts
index 5c78bfccbb966..e06783174e83b 100644
--- a/test/functional/apps/discover/_discover_histogram.ts
+++ b/test/functional/apps/discover/_discover_histogram.ts
@@ -24,6 +24,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const elasticChart = getService('elasticChart');
   const kibanaServer = getService('kibanaServer');
+  const security = getService('security');
   const PageObjects = getPageObjects(['settings', 'common', 'discover', 'header', 'timePicker']);
   const defaultSettings = {
     defaultIndex: 'long-window-logstash-*',
@@ -35,12 +36,14 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await esArchiver.loadIfNeeded('logstash_functional');
       await esArchiver.load('long_window_logstash');
       await esArchiver.load('long_window_logstash_index_pattern');
+      await security.testUser.setRoles(['kibana_admin', 'long_window_logstash']);
       await kibanaServer.uiSettings.replace(defaultSettings);
       await PageObjects.common.navigateToApp('discover');
     });
     after(async () => {
       await esArchiver.unload('long_window_logstash');
       await esArchiver.unload('long_window_logstash_index_pattern');
+      await security.testUser.restoreDefaults();
     });
 
     async function prepareTest(fromTime: string, toTime: string, interval: string) {

From 2559d905518bb8db9b90e9d50932e9dad8c5336b Mon Sep 17 00:00:00 2001
From: Walter Rafelsberger <walter@rafelsberger.at>
Date: Wed, 19 Aug 2020 12:07:15 +0200
Subject: [PATCH 14/85] [ML] Anomaly Explorer / Single Metric Viewer: Fix error
 reporting for annotations. (#74953)

Fixes error reporting when annotations fail to load for Anomaly Explorer and Single Metric Viewer.
Previously, Anomaly Explorer ended up with a completely empty page when annotations failed to load. Single Metric Viewer would not fail to load, but it would make no difference for the user if existing annotations failed to load of if there were simply no existing annotations. Only in dev console an error message would be visible.
Now a callout is shown when annotations fail to load.
---
 x-pack/plugins/ml/common/types/annotations.ts |  10 +-
 .../public/application/explorer/explorer.js   |  32 ++++-
 .../application/explorer/explorer_utils.d.ts  |   3 +-
 .../application/explorer/explorer_utils.js    |  17 ++-
 .../reducers/explorer_reducer/state.ts        |   8 +-
 .../timeseries_chart/timeseries_chart.js      |   6 +-
 .../timeseriesexplorer/timeseriesexplorer.js  |  33 ++++++
 .../get_focus_data.ts                         |  42 ++++---
 .../apps/ml/anomaly_detection/annotations.ts  | 109 ++++++++++++++++++
 .../ml/anomaly_detection/anomaly_explorer.ts  |   4 +
 .../apps/ml/anomaly_detection/index.ts        |   1 +
 .../anomaly_detection/single_metric_viewer.ts |   4 +
 .../services/ml/anomaly_explorer.ts           |  10 ++
 .../test/functional/services/ml/navigation.ts |  18 +++
 .../services/ml/single_metric_viewer.ts       |   6 +
 .../functional/services/ml/test_resources.ts  |  86 ++++++++++++++
 16 files changed, 357 insertions(+), 32 deletions(-)
 create mode 100644 x-pack/test/functional/apps/ml/anomaly_detection/annotations.ts

diff --git a/x-pack/plugins/ml/common/types/annotations.ts b/x-pack/plugins/ml/common/types/annotations.ts
index 159a598f16bf5..eba40c2502f57 100644
--- a/x-pack/plugins/ml/common/types/annotations.ts
+++ b/x-pack/plugins/ml/common/types/annotations.ts
@@ -103,8 +103,7 @@ export function isAnnotation(arg: any): arg is Annotation {
   );
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface Annotations extends Array<Annotation> {}
+export type Annotations = Annotation[];
 
 export function isAnnotations(arg: any): arg is Annotations {
   if (Array.isArray(arg) === false) {
@@ -134,5 +133,12 @@ export type EsAggregationResult = Record<string, TermAggregationResult>;
 export interface GetAnnotationsResponse {
   aggregations?: EsAggregationResult;
   annotations: Record<string, Annotations>;
+  error?: string;
   success: boolean;
 }
+
+export interface AnnotationsTable {
+  annotationsData: Annotations;
+  aggregations: EsAggregationResult;
+  error?: string;
+}
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer.js b/x-pack/plugins/ml/public/application/explorer/explorer.js
index 4e27c17631506..06cec14578f2a 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer.js
+++ b/x-pack/plugins/ml/public/application/explorer/explorer.js
@@ -15,6 +15,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 
 import {
   htmlIdGenerator,
+  EuiCallOut,
   EuiFlexGroup,
   EuiFlexItem,
   EuiFormRow,
@@ -221,7 +222,7 @@ export class Explorer extends React.Component {
       selectedJobs,
       tableData,
     } = this.props.explorerState;
-    const { annotationsData, aggregations } = annotations;
+    const { annotationsData, aggregations, error: annotationsError } = annotations;
 
     const jobSelectorProps = {
       dateFormatTz: getDateFormatTz(),
@@ -302,9 +303,36 @@ export class Explorer extends React.Component {
               setSelectedCells={this.props.setSelectedCells}
             />
             <EuiSpacer size="m" />
-            {annotationsData.length > 0 && (
+            {annotationsError !== undefined && (
               <>
+                <EuiTitle
+                  className="panel-title"
+                  data-test-subj="mlAnomalyExplorerAnnotationsPanel error"
+                >
+                  <h2>
+                    <FormattedMessage
+                      id="xpack.ml.explorer.annotationsErrorTitle"
+                      defaultMessage="Annotations"
+                    />
+                  </h2>
+                </EuiTitle>
                 <EuiPanel>
+                  <EuiCallOut
+                    title={i18n.translate('xpack.ml.explorer.annotationsErrorCallOutTitle', {
+                      defaultMessage: 'An error occurred loading annotations:',
+                    })}
+                    color="danger"
+                    iconType="alert"
+                  >
+                    <p>{annotationsError}</p>
+                  </EuiCallOut>
+                </EuiPanel>
+                <EuiSpacer size="m" />
+              </>
+            )}
+            {annotationsData.length > 0 && (
+              <>
+                <EuiPanel data-test-subj="mlAnomalyExplorerAnnotationsPanel loaded">
                   <EuiAccordion
                     id={this.htmlIdGen()}
                     buttonContent={
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_utils.d.ts b/x-pack/plugins/ml/public/application/explorer/explorer_utils.d.ts
index 0faa20295996c..81b5167cc00bd 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer_utils.d.ts
+++ b/x-pack/plugins/ml/public/application/explorer/explorer_utils.d.ts
@@ -6,6 +6,7 @@
 
 import { Moment } from 'moment';
 
+import { AnnotationsTable } from '../../../common/types/annotations';
 import { CombinedJob } from '../../../common/types/anomaly_detection_jobs';
 import { SwimlaneType } from './explorer_constants';
 
@@ -111,7 +112,7 @@ export declare const loadAnnotationsTableData: (
   selectedJobs: ExplorerJob[],
   interval: number,
   bounds: TimeRangeBounds
-) => Promise<any[]>;
+) => Promise<AnnotationsTable>;
 
 export declare interface AnomaliesTableData {
   anomalies: any[];
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_utils.js b/x-pack/plugins/ml/public/application/explorer/explorer_utils.js
index 03a251d3e2f79..08830decc9449 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer_utils.js
+++ b/x-pack/plugins/ml/public/application/explorer/explorer_utils.js
@@ -16,6 +16,7 @@ import {
   ANOMALIES_TABLE_DEFAULT_QUERY_SIZE,
 } from '../../../common/constants/search';
 import { getEntityFieldList } from '../../../common/util/anomaly_utils';
+import { extractErrorMessage } from '../../../common/util/errors';
 import {
   isSourceDataChartableForDetector,
   isModelPlotChartableForDetector,
@@ -406,7 +407,12 @@ export function loadAnnotationsTableData(selectedCells, selectedJobs, interval,
       .toPromise()
       .then((resp) => {
         if (resp.error !== undefined || resp.annotations === undefined) {
-          return resolve([]);
+          const errorMessage = extractErrorMessage(resp.error);
+          return resolve({
+            annotationsData: [],
+            aggregations: {},
+            error: errorMessage !== '' ? errorMessage : undefined,
+          });
         }
 
         const annotationsData = [];
@@ -430,9 +436,12 @@ export function loadAnnotationsTableData(selectedCells, selectedJobs, interval,
         });
       })
       .catch((resp) => {
-        console.log('Error loading list of annotations for jobs list:', resp);
-        // Silently fail and just return an empty array for annotations to not break the UI.
-        return resolve([]);
+        const errorMessage = extractErrorMessage(resp);
+        return resolve({
+          annotationsData: [],
+          aggregations: {},
+          error: errorMessage !== '' ? errorMessage : undefined,
+        });
       });
   });
 }
diff --git a/x-pack/plugins/ml/public/application/explorer/reducers/explorer_reducer/state.ts b/x-pack/plugins/ml/public/application/explorer/reducers/explorer_reducer/state.ts
index 889d572f4fabc..ea9a8b5c18054 100644
--- a/x-pack/plugins/ml/public/application/explorer/reducers/explorer_reducer/state.ts
+++ b/x-pack/plugins/ml/public/application/explorer/reducers/explorer_reducer/state.ts
@@ -21,14 +21,11 @@ import {
   SwimlaneData,
   ViewBySwimLaneData,
 } from '../../explorer_utils';
-import { Annotations, EsAggregationResult } from '../../../../../common/types/annotations';
+import { AnnotationsTable } from '../../../../../common/types/annotations';
 import { SWIM_LANE_DEFAULT_PAGE_SIZE } from '../../explorer_constants';
 
 export interface ExplorerState {
-  annotations: {
-    annotationsData: Annotations;
-    aggregations: EsAggregationResult;
-  };
+  annotations: AnnotationsTable;
   bounds: TimeRangeBounds | undefined;
   chartsData: ExplorerChartsData;
   fieldFormatsLoading: boolean;
@@ -67,6 +64,7 @@ function getDefaultIndexPattern() {
 export function getExplorerDefaultState(): ExplorerState {
   return {
     annotations: {
+      error: undefined,
       annotationsData: [],
       aggregations: {},
     },
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/components/timeseries_chart/timeseries_chart.js b/x-pack/plugins/ml/public/application/timeseriesexplorer/components/timeseries_chart/timeseries_chart.js
index 7ec59f4acbc51..c1afb2994c92f 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/components/timeseries_chart/timeseries_chart.js
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/components/timeseries_chart/timeseries_chart.js
@@ -552,7 +552,7 @@ class TimeseriesChartIntl extends Component {
   renderFocusChart() {
     const {
       focusAggregationInterval,
-      focusAnnotationData,
+      focusAnnotationData: focusAnnotationDataOriginalPropValue,
       focusChartData,
       focusForecastData,
       modelPlotEnabled,
@@ -565,6 +565,10 @@ class TimeseriesChartIntl extends Component {
       zoomToFocusLoaded,
     } = this.props;
 
+    const focusAnnotationData = Array.isArray(focusAnnotationDataOriginalPropValue)
+      ? focusAnnotationDataOriginalPropValue
+      : [];
+
     if (focusChartData === undefined) {
       return;
     }
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
index 95dc1ed6988f6..83a789074d353 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
@@ -27,6 +27,7 @@ import {
   EuiFormRow,
   EuiSelect,
   EuiSpacer,
+  EuiPanel,
   EuiTitle,
   EuiAccordion,
   EuiBadge,
@@ -1028,6 +1029,7 @@ export class TimeSeriesExplorer extends React.Component {
       dataNotChartable,
       entityValues,
       focusAggregationInterval,
+      focusAnnotationError,
       focusAnnotationData,
       focusAggregations,
       focusChartData,
@@ -1316,6 +1318,36 @@ export class TimeSeriesExplorer extends React.Component {
                     )}
                   </MlTooltipComponent>
                 </div>
+                {focusAnnotationError !== undefined && (
+                  <>
+                    <EuiTitle
+                      className="panel-title"
+                      data-test-subj="mlAnomalyExplorerAnnotations error"
+                    >
+                      <h2>
+                        <FormattedMessage
+                          id="xpack.ml.timeSeriesExplorer.annotationsErrorTitle"
+                          defaultMessage="Annotations"
+                        />
+                      </h2>
+                    </EuiTitle>
+                    <EuiPanel>
+                      <EuiCallOut
+                        title={i18n.translate(
+                          'xpack.ml.timeSeriesExplorer.annotationsErrorCallOutTitle',
+                          {
+                            defaultMessage: 'An error occurred loading annotations:',
+                          }
+                        )}
+                        color="danger"
+                        iconType="alert"
+                      >
+                        <p>{focusAnnotationError}</p>
+                      </EuiCallOut>
+                    </EuiPanel>
+                    <EuiSpacer size="m" />
+                  </>
+                )}
                 {focusAnnotationData && focusAnnotationData.length > 0 && (
                   <EuiAccordion
                     id={'EuiAccordion-blah'}
@@ -1340,6 +1372,7 @@ export class TimeSeriesExplorer extends React.Component {
                         </h2>
                       </EuiTitle>
                     }
+                    data-test-subj="mlAnomalyExplorerAnnotations loaded"
                   >
                     <AnnotationsTable
                       chartDetails={chartDetails}
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/get_focus_data.ts b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/get_focus_data.ts
index d213d371f1d90..23d1e3f7cc904 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/get_focus_data.ts
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/get_focus_data.ts
@@ -11,6 +11,7 @@ import {
   ANNOTATIONS_TABLE_DEFAULT_QUERY_SIZE,
   ANOMALIES_TABLE_DEFAULT_QUERY_SIZE,
 } from '../../../../common/constants/search';
+import { extractErrorMessage } from '../../../../common/util/errors';
 import { mlTimeSeriesSearchService } from '../timeseries_search_service';
 import { mlResultsService, CriteriaField } from '../../services/results_service';
 import { Job } from '../../../../common/types/anomaly_detection_jobs';
@@ -23,7 +24,7 @@ import {
 } from './timeseriesexplorer_utils';
 import { mlForecastService } from '../../services/forecast_service';
 import { mlFunctionToESAggregation } from '../../../../common/util/job_utils';
-import { Annotation } from '../../../../common/types/annotations';
+import { GetAnnotationsResponse } from '../../../../common/types/annotations';
 import { ANNOTATION_EVENT_USER } from '../../../../common/constants/annotations';
 
 export interface Interval {
@@ -36,7 +37,8 @@ export interface FocusData {
   anomalyRecords: any;
   scheduledEvents: any;
   showForecastCheckbox?: any;
-  focusAnnotationData?: any;
+  focusAnnotationError?: string;
+  focusAnnotationData?: any[];
   focusForecastData?: any;
   focusAggregations?: any;
 }
@@ -96,14 +98,14 @@ export function getFocusData(
         entities: nonBlankEntities,
       })
       .pipe(
-        catchError(() => {
-          // silent fail
-          return of({
-            annotations: {} as Record<string, Annotation[]>,
+        catchError((resp) =>
+          of({
+            annotations: {},
             aggregations: {},
+            error: extractErrorMessage(resp),
             success: false,
-          });
-        })
+          } as GetAnnotationsResponse)
+        )
       ),
     // Plus query for forecast data if there is a forecastId stored in the appState.
     forecastId !== undefined
@@ -152,16 +154,22 @@ export function getFocusData(
       };
 
       if (annotations) {
-        refreshFocusData.focusAnnotationData = (annotations.annotations[selectedJob.job_id] ?? [])
-          .sort((a, b) => {
-            return a.timestamp - b.timestamp;
-          })
-          .map((d, i: number) => {
-            d.key = (i + 1).toString();
-            return d;
-          });
+        if (annotations.error !== undefined) {
+          refreshFocusData.focusAnnotationError = annotations.error;
+          refreshFocusData.focusAnnotationData = [];
+          refreshFocusData.focusAggregations = {};
+        } else {
+          refreshFocusData.focusAnnotationData = (annotations.annotations[selectedJob.job_id] ?? [])
+            .sort((a, b) => {
+              return a.timestamp - b.timestamp;
+            })
+            .map((d, i: number) => {
+              d.key = (i + 1).toString();
+              return d;
+            });
 
-        refreshFocusData.focusAggregations = annotations.aggregations;
+          refreshFocusData.focusAggregations = annotations.aggregations;
+        }
       }
 
       if (forecastData) {
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/annotations.ts b/x-pack/test/functional/apps/ml/anomaly_detection/annotations.ts
new file mode 100644
index 0000000000000..202910622fb64
--- /dev/null
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/annotations.ts
@@ -0,0 +1,109 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import expect from '@kbn/expect';
+
+import { FtrProviderContext } from '../../../ftr_provider_context';
+import { Job, Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
+
+const JOB_CONFIG: Job = {
+  job_id: `fq_single_1_smv`,
+  description: 'mean(responsetime) on farequote dataset with 15m bucket span',
+  groups: ['farequote', 'automated', 'single-metric'],
+  analysis_config: {
+    bucket_span: '15m',
+    influencers: [],
+    detectors: [
+      {
+        function: 'mean',
+        field_name: 'responsetime',
+      },
+    ],
+  },
+  data_description: { time_field: '@timestamp' },
+  analysis_limits: { model_memory_limit: '10mb' },
+  model_plot_config: { enabled: true },
+};
+
+const DATAFEED_CONFIG: Datafeed = {
+  datafeed_id: 'datafeed-fq_single_1_smv',
+  indices: ['ft_farequote'],
+  job_id: 'fq_single_1_smv',
+  query: { bool: { must: [{ match_all: {} }] } },
+};
+
+export default function ({ getService }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const ml = getService('ml');
+
+  describe('annotations', function () {
+    this.tags(['mlqa']);
+    before(async () => {
+      await esArchiver.loadIfNeeded('ml/farequote');
+      await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');
+      await ml.testResources.setKibanaTimeZoneToUTC();
+
+      await ml.api.createAndRunAnomalyDetectionLookbackJob(JOB_CONFIG, DATAFEED_CONFIG);
+      // Points the read/write aliases of annotations to an index with wrong mappings
+      // so we can simulate errors when requesting annotations.
+      await ml.testResources.setupBrokenAnnotationsIndexState(JOB_CONFIG.job_id);
+      await ml.securityUI.loginAsMlPowerUser();
+    });
+
+    after(async () => {
+      await ml.api.cleanMlIndices();
+    });
+
+    it('loads from job list row link', async () => {
+      await ml.navigation.navigateToMl();
+      await ml.navigation.navigateToJobManagement();
+
+      await ml.jobTable.waitForJobsToLoad();
+      await ml.jobTable.filterWithSearchString(JOB_CONFIG.job_id);
+      const rows = await ml.jobTable.parseJobTable();
+      expect(rows.filter((row) => row.id === JOB_CONFIG.job_id)).to.have.length(1);
+
+      await ml.jobTable.clickOpenJobInSingleMetricViewerButton(JOB_CONFIG.job_id);
+      await ml.common.waitForMlLoadingIndicatorToDisappear();
+    });
+
+    it('pre-fills the job selection', async () => {
+      await ml.jobSelection.assertJobSelection([JOB_CONFIG.job_id]);
+    });
+
+    it('pre-fills the detector input', async () => {
+      await ml.singleMetricViewer.assertDetectorInputExsist();
+      await ml.singleMetricViewer.assertDetectorInputValue('0');
+    });
+
+    it('should display the annotations section showing an error', async () => {
+      await ml.singleMetricViewer.assertAnnotationsExists('error');
+    });
+
+    it('should navigate to anomaly explorer', async () => {
+      await ml.navigation.navigateToAnomalyExplorerViaSingleMetricViewer();
+    });
+
+    it('should display the annotations section showing an error', async () => {
+      await ml.anomalyExplorer.assertAnnotationsPanelExists('error');
+    });
+
+    it('should display the annotations section without an error', async () => {
+      // restores the aliases to point to the original working annotations index
+      // so we can run tests against successfully loaded annotations sections.
+      await ml.testResources.restoreAnnotationsIndexState();
+      await ml.anomalyExplorer.refreshPage();
+      await ml.anomalyExplorer.assertAnnotationsPanelExists('loaded');
+    });
+
+    it('should navigate to single metric viewer', async () => {
+      await ml.navigation.navigateToSingleMetricViewerViaAnomalyExplorer();
+    });
+
+    it('should display the annotations section without an error', async () => {
+      await ml.singleMetricViewer.assertAnnotationsExists('loaded');
+    });
+  });
+}
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/anomaly_explorer.ts b/x-pack/test/functional/apps/ml/anomaly_detection/anomaly_explorer.ts
index 89308938cfab0..cbee36abef78d 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/anomaly_explorer.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/anomaly_explorer.ts
@@ -118,6 +118,10 @@ export default function ({ getService }: FtrProviderContext) {
           await ml.anomalyExplorer.assertSwimlaneViewByExists();
         });
 
+        it('should display the annotations panel', async () => {
+          await ml.anomalyExplorer.assertAnnotationsPanelExists('loaded');
+        });
+
         it('displays the anomalies table', async () => {
           await ml.anomaliesTable.assertTableExists();
         });
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/index.ts b/x-pack/test/functional/apps/ml/anomaly_detection/index.ts
index b5e6e426e2ead..0983ebd79dd90 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/index.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/index.ts
@@ -18,5 +18,6 @@ export default function ({ loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./anomaly_explorer'));
     loadTestFile(require.resolve('./categorization_job'));
     loadTestFile(require.resolve('./date_nanos_job'));
+    loadTestFile(require.resolve('./annotations'));
   });
 }
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_viewer.ts b/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_viewer.ts
index db511c5d75f39..3855bd0c884cd 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_viewer.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_viewer.ts
@@ -79,6 +79,10 @@ export default function ({ getService }: FtrProviderContext) {
       await ml.singleMetricViewer.assertChartExsist();
     });
 
+    it('should display the annotations section', async () => {
+      await ml.singleMetricViewer.assertAnnotationsExists('loaded');
+    });
+
     it('displays the anomalies table', async () => {
       await ml.anomaliesTable.assertTableExists();
     });
diff --git a/x-pack/test/functional/services/ml/anomaly_explorer.ts b/x-pack/test/functional/services/ml/anomaly_explorer.ts
index 80df235bf6ff8..1a6d5cd09f2e2 100644
--- a/x-pack/test/functional/services/ml/anomaly_explorer.ts
+++ b/x-pack/test/functional/services/ml/anomaly_explorer.ts
@@ -67,6 +67,12 @@ export function MachineLearningAnomalyExplorerProvider({ getService }: FtrProvid
       await testSubjects.existOrFail('mlAnomalyExplorerSwimlaneViewBy');
     },
 
+    async assertAnnotationsPanelExists(state: string) {
+      await testSubjects.existOrFail(`mlAnomalyExplorerAnnotationsPanel ${state}`, {
+        timeout: 30 * 1000,
+      });
+    },
+
     async openAddToDashboardControl() {
       await testSubjects.click('mlAnomalyTimelinePanelMenu');
       await testSubjects.click('mlAnomalyTimelinePanelAddToDashboardButton');
@@ -89,6 +95,10 @@ export function MachineLearningAnomalyExplorerProvider({ getService }: FtrProvid
       );
     },
 
+    async refreshPage() {
+      await testSubjects.click('superDatePickerApplyTimeButton');
+    },
+
     async waitForDashboardsToLoad() {
       await testSubjects.existOrFail('~mlDashboardSelectionTable', { timeout: 60 * 1000 });
     },
diff --git a/x-pack/test/functional/services/ml/navigation.ts b/x-pack/test/functional/services/ml/navigation.ts
index f52197d4b2256..116c9deb7c2dc 100644
--- a/x-pack/test/functional/services/ml/navigation.ts
+++ b/x-pack/test/functional/services/ml/navigation.ts
@@ -103,5 +103,23 @@ export function MachineLearningNavigationProvider({
         await testSubjects.existOrFail('mlNoDataFrameAnalyticsFound');
       });
     },
+
+    async navigateToAnomalyExplorerViaSingleMetricViewer() {
+      // clicks the `Anomaly Explorer` icon on the button group to switch result views
+      await testSubjects.click('mlAnomalyResultsViewSelectorExplorer');
+      await retry.tryForTime(60 * 1000, async () => {
+        // verify that the anomaly explorer page is visible
+        await testSubjects.existOrFail('mlPageAnomalyExplorer');
+      });
+    },
+
+    async navigateToSingleMetricViewerViaAnomalyExplorer() {
+      // clicks the `Single Metric Viewere` icon on the button group to switch result views
+      await testSubjects.click('mlAnomalyResultsViewSelectorSingleMetricViewer');
+      await retry.tryForTime(60 * 1000, async () => {
+        // verify that the single metric viewer page is visible
+        await testSubjects.existOrFail('mlPageSingleMetricViewer');
+      });
+    },
   };
 }
diff --git a/x-pack/test/functional/services/ml/single_metric_viewer.ts b/x-pack/test/functional/services/ml/single_metric_viewer.ts
index b2c3e19020e62..a65ac09a0b056 100644
--- a/x-pack/test/functional/services/ml/single_metric_viewer.ts
+++ b/x-pack/test/functional/services/ml/single_metric_viewer.ts
@@ -49,5 +49,11 @@ export function MachineLearningSingleMetricViewerProvider({ getService }: FtrPro
     async assertChartExsist() {
       await testSubjects.existOrFail('mlSingleMetricViewerChart');
     },
+
+    async assertAnnotationsExists(state: string) {
+      await testSubjects.existOrFail(`mlAnomalyExplorerAnnotations ${state}`, {
+        timeout: 30 * 1000,
+      });
+    },
   };
 }
diff --git a/x-pack/test/functional/services/ml/test_resources.ts b/x-pack/test/functional/services/ml/test_resources.ts
index 942dc4a80d4ac..675ec890b9edf 100644
--- a/x-pack/test/functional/services/ml/test_resources.ts
+++ b/x-pack/test/functional/services/ml/test_resources.ts
@@ -20,6 +20,7 @@ export enum SavedObjectType {
 export type MlTestResourcesi = ProvidedType<typeof MachineLearningTestResourcesProvider>;
 
 export function MachineLearningTestResourcesProvider({ getService }: FtrProviderContext) {
+  const es = getService('es');
   const kibanaServer = getService('kibanaServer');
   const log = getService('log');
   const supertest = getService('supertest');
@@ -166,6 +167,91 @@ export function MachineLearningTestResourcesProvider({ getService }: FtrProvider
       }
     },
 
+    async setupBrokenAnnotationsIndexState(jobId: string) {
+      // Creates a temporary annotations index with unsupported mappings.
+      await es.indices.create({
+        index: '.ml-annotations-6-wrong-mapping',
+        body: {
+          settings: {
+            number_of_shards: 1,
+          },
+          mappings: {
+            properties: {
+              field1: { type: 'text' },
+            },
+          },
+        },
+      });
+
+      // Ingests an annotation that will cause dynamic mapping to pick up the wrong field type.
+      es.create({
+        id: 'annotation_with_wrong_mapping',
+        index: '.ml-annotations-6-wrong-mapping',
+        body: {
+          annotation: 'Annotation with wrong mapping',
+          create_time: 1597393915910,
+          create_username: '_xpack',
+          timestamp: 1549756800000,
+          end_timestamp: 1549756800000,
+          job_id: jobId,
+          modified_time: 1597393915910,
+          modified_username: '_xpack',
+          type: 'annotation',
+          event: 'user',
+          detector_index: 0,
+        },
+      });
+
+      // Points the read/write aliases for annotations to the broken annotations index
+      // so we can run tests against a state where annotation endpoints return errors.
+      await es.indices.updateAliases({
+        body: {
+          actions: [
+            {
+              add: {
+                index: '.ml-annotations-6-wrong-mapping',
+                alias: '.ml-annotations-read',
+                is_hidden: true,
+              },
+            },
+            { remove: { index: '.ml-annotations-6', alias: '.ml-annotations-read' } },
+            {
+              add: {
+                index: '.ml-annotations-6-wrong-mapping',
+                alias: '.ml-annotations-write',
+                is_hidden: true,
+              },
+            },
+            { remove: { index: '.ml-annotations-6', alias: '.ml-annotations-write' } },
+          ],
+        },
+      });
+    },
+
+    async restoreAnnotationsIndexState() {
+      // restore the original working state of pointing read/write aliases
+      // to the right annotations index.
+      await es.indices.updateAliases({
+        body: {
+          actions: [
+            { add: { index: '.ml-annotations-6', alias: '.ml-annotations-read', is_hidden: true } },
+            { remove: { index: '.ml-annotations-6-wrong-mapping', alias: '.ml-annotations-read' } },
+            {
+              add: { index: '.ml-annotations-6', alias: '.ml-annotations-write', is_hidden: true },
+            },
+            {
+              remove: { index: '.ml-annotations-6-wrong-mapping', alias: '.ml-annotations-write' },
+            },
+          ],
+        },
+      });
+
+      // deletes the temporary annotations index with wrong mappings
+      await es.indices.delete({
+        index: '.ml-annotations-6-wrong-mapping',
+      });
+    },
+
     async updateSavedSearchRequestBody(body: object, indexPatternTitle: string): Promise<object> {
       const indexPatternId = await this.getIndexPatternId(indexPatternTitle);
       if (indexPatternId === undefined) {

From 37f4f28040d657b90c7a9f2119e242e529c41dd9 Mon Sep 17 00:00:00 2001
From: Thomas Watson <w@tson.dk>
Date: Wed, 19 Aug 2020 12:14:54 +0200
Subject: [PATCH 15/85] Update Node.js to version 10.22.0 (#75254)

---
 .ci/Dockerfile | 2 +-
 .node-version  | 2 +-
 .nvmrc         | 2 +-
 package.json   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.ci/Dockerfile b/.ci/Dockerfile
index d90d9f4710b5b..065b7f2aafd61 100644
--- a/.ci/Dockerfile
+++ b/.ci/Dockerfile
@@ -1,7 +1,7 @@
 # NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
 # If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
 
-ARG NODE_VERSION=10.21.0
+ARG NODE_VERSION=10.22.0
 
 FROM node:${NODE_VERSION} AS base
 
diff --git a/.node-version b/.node-version
index b61c07ffddbd1..b7604b0c8aea6 100644
--- a/.node-version
+++ b/.node-version
@@ -1 +1 @@
-10.21.0
+10.22.0
diff --git a/.nvmrc b/.nvmrc
index b61c07ffddbd1..b7604b0c8aea6 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-10.21.0
+10.22.0
diff --git a/package.json b/package.json
index 941cad4f0fd02..d6b272e85bd20 100644
--- a/package.json
+++ b/package.json
@@ -479,7 +479,7 @@
     "zlib": "^1.0.5"
   },
   "engines": {
-    "node": "10.21.0",
+    "node": "10.22.0",
     "yarn": "^1.21.1"
   }
 }

From cebcc3a2295e6a4eb02e790114c18ce4790cbe25 Mon Sep 17 00:00:00 2001
From: Nicolas Chaulet <nicolas.chaulet@elastic.co>
Date: Wed, 19 Aug 2020 07:49:08 -0400
Subject: [PATCH 16/85] [Ingest Manager] Fix agent config rollout rate limit to
 use constants (#75364)

---
 .../ingest_manager/common/constants/agent.ts        |  4 ++--
 .../ingest_manager/server/constants/index.ts        |  4 ++--
 x-pack/plugins/ingest_manager/server/index.ts       | 12 ++++++++++--
 .../services/agents/checkin/state_new_actions.ts    | 13 ++++++++++---
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/common/constants/agent.ts b/x-pack/plugins/ingest_manager/common/constants/agent.ts
index 7652c6ac87bce..d94f536b5659a 100644
--- a/x-pack/plugins/ingest_manager/common/constants/agent.ts
+++ b/x-pack/plugins/ingest_manager/common/constants/agent.ts
@@ -17,5 +17,5 @@ export const AGENT_POLLING_INTERVAL = 1000;
 export const AGENT_UPDATE_LAST_CHECKIN_INTERVAL_MS = 30000;
 export const AGENT_UPDATE_ACTIONS_INTERVAL_MS = 5000;
 
-export const AGENT_CONFIG_ROLLUP_RATE_LIMIT_INTERVAL_MS = 5000;
-export const AGENT_CONFIG_ROLLUP_RATE_LIMIT_REQUEST_PER_INTERVAL = 60;
+export const AGENT_CONFIG_ROLLOUT_RATE_LIMIT_INTERVAL_MS = 5000;
+export const AGENT_CONFIG_ROLLOUT_RATE_LIMIT_REQUEST_PER_INTERVAL = 25;
diff --git a/x-pack/plugins/ingest_manager/server/constants/index.ts b/x-pack/plugins/ingest_manager/server/constants/index.ts
index 1ec13bd80f0fb..730d8cf7b172c 100644
--- a/x-pack/plugins/ingest_manager/server/constants/index.ts
+++ b/x-pack/plugins/ingest_manager/server/constants/index.ts
@@ -10,8 +10,8 @@ export {
   AGENT_POLLING_THRESHOLD_MS,
   AGENT_POLLING_INTERVAL,
   AGENT_UPDATE_LAST_CHECKIN_INTERVAL_MS,
-  AGENT_CONFIG_ROLLUP_RATE_LIMIT_REQUEST_PER_INTERVAL,
-  AGENT_CONFIG_ROLLUP_RATE_LIMIT_INTERVAL_MS,
+  AGENT_CONFIG_ROLLOUT_RATE_LIMIT_REQUEST_PER_INTERVAL,
+  AGENT_CONFIG_ROLLOUT_RATE_LIMIT_INTERVAL_MS,
   AGENT_UPDATE_ACTIONS_INTERVAL_MS,
   INDEX_PATTERN_PLACEHOLDER_SUFFIX,
   // Routes
diff --git a/x-pack/plugins/ingest_manager/server/index.ts b/x-pack/plugins/ingest_manager/server/index.ts
index e2f659f54d625..9933266a441e2 100644
--- a/x-pack/plugins/ingest_manager/server/index.ts
+++ b/x-pack/plugins/ingest_manager/server/index.ts
@@ -6,6 +6,10 @@
 import { schema, TypeOf } from '@kbn/config-schema';
 import { PluginInitializerContext } from 'src/core/server';
 import { IngestManagerPlugin } from './plugin';
+import {
+  AGENT_CONFIG_ROLLOUT_RATE_LIMIT_INTERVAL_MS,
+  AGENT_CONFIG_ROLLOUT_RATE_LIMIT_REQUEST_PER_INTERVAL,
+} from '../common';
 export { AgentService, ESIndexPatternService, getRegistryUrl } from './services';
 export {
   IngestManagerSetupContract,
@@ -35,8 +39,12 @@ export const config = {
         host: schema.maybe(schema.string()),
         ca_sha256: schema.maybe(schema.string()),
       }),
-      agentConfigRolloutRateLimitIntervalMs: schema.number({ defaultValue: 5000 }),
-      agentConfigRolloutRateLimitRequestPerInterval: schema.number({ defaultValue: 5 }),
+      agentConfigRolloutRateLimitIntervalMs: schema.number({
+        defaultValue: AGENT_CONFIG_ROLLOUT_RATE_LIMIT_INTERVAL_MS,
+      }),
+      agentConfigRolloutRateLimitRequestPerInterval: schema.number({
+        defaultValue: AGENT_CONFIG_ROLLOUT_RATE_LIMIT_REQUEST_PER_INTERVAL,
+      }),
     }),
   }),
 };
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts b/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
index 1547b6b5ea053..418b59e1ca2e9 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
@@ -25,7 +25,12 @@ import {
 } from '../../../types';
 import { agentConfigService } from '../../agent_config';
 import * as APIKeysService from '../../api_keys';
-import { AGENT_SAVED_OBJECT_TYPE, AGENT_UPDATE_ACTIONS_INTERVAL_MS } from '../../../constants';
+import {
+  AGENT_SAVED_OBJECT_TYPE,
+  AGENT_UPDATE_ACTIONS_INTERVAL_MS,
+  AGENT_CONFIG_ROLLOUT_RATE_LIMIT_INTERVAL_MS,
+  AGENT_CONFIG_ROLLOUT_RATE_LIMIT_REQUEST_PER_INTERVAL,
+} from '../../../constants';
 import { createAgentAction, getNewActionsSince } from '../actions';
 import { appContextService } from '../../app_context';
 import { toPromiseAbortable, AbortError, createRateLimiter } from './rxjs_utils';
@@ -135,8 +140,10 @@ export function agentCheckinStateNewActionsFactory() {
   const newActions$ = createNewActionsSharedObservable();
   // Rx operators
   const rateLimiter = createRateLimiter(
-    appContextService.getConfig()?.fleet.agentConfigRolloutRateLimitIntervalMs ?? 5000,
-    appContextService.getConfig()?.fleet.agentConfigRolloutRateLimitRequestPerInterval ?? 50
+    appContextService.getConfig()?.fleet.agentConfigRolloutRateLimitIntervalMs ??
+      AGENT_CONFIG_ROLLOUT_RATE_LIMIT_INTERVAL_MS,
+    appContextService.getConfig()?.fleet.agentConfigRolloutRateLimitRequestPerInterval ??
+      AGENT_CONFIG_ROLLOUT_RATE_LIMIT_REQUEST_PER_INTERVAL
   );
 
   async function subscribeToNewActions(

From 87414ad0d9f82e344b29167fc2f2c1adedf3f0d5 Mon Sep 17 00:00:00 2001
From: Joe Portner <5295965+jportner@users.noreply.github.com>
Date: Wed, 19 Aug 2020 09:54:11 -0400
Subject: [PATCH 17/85] Bump and consolidate dependencies (#75360)

---
 package.json |   2 +
 yarn.lock    | 337 +++------------------------------------------------
 2 files changed, 22 insertions(+), 317 deletions(-)

diff --git a/package.json b/package.json
index d6b272e85bd20..7d12af2eb5066 100644
--- a/package.json
+++ b/package.json
@@ -90,11 +90,13 @@
     "**/graphql-toolkit/lodash": "^4.17.15",
     "**/hoist-non-react-statics": "^3.3.2",
     "**/isomorphic-git/**/base64-js": "^1.2.1",
+    "**/istanbul-instrumenter-loader/schema-utils": "1.0.0",
     "**/image-diff/gm/debug": "^2.6.9",
     "**/load-grunt-config/lodash": "^4.17.20",
     "**/react-dom": "^16.12.0",
     "**/react": "^16.12.0",
     "**/react-test-renderer": "^16.12.0",
+    "**/request": "^2.88.2",
     "**/deepmerge": "^4.2.2",
     "**/fast-deep-equal": "^3.1.1"
   },
diff --git a/yarn.lock b/yarn.lock
index 6dd6a39c1142e..0bc1ef72651e3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5549,7 +5549,7 @@ ajv-keywords@^3.4.1:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
   integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
 
-ajv@^4.7.0, ajv@^4.9.1:
+ajv@^4.7.0:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
   integrity sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=
@@ -5557,20 +5557,10 @@ ajv@^4.7.0, ajv@^4.9.1:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
-ajv@^5.0.0, ajv@^5.1.0:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
 ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.5.5, ajv@^6.9.1:
-  version "6.12.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
-  integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==
+  version "6.12.4"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234"
+  integrity sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==
   dependencies:
     fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
@@ -6426,11 +6416,6 @@ assert-plus@1.0.0, assert-plus@^1.0.0:
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
   integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
 
-assert-plus@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
-  integrity sha1-104bh+ev/A24qttwIfP+SBAasjQ=
-
 assert@^1.1.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
@@ -6632,26 +6617,11 @@ await-event@^2.1.0:
   resolved "https://registry.yarnpkg.com/await-event/-/await-event-2.1.0.tgz#78e9f92684bae4022f9fa0b5f314a11550f9aa76"
   integrity sha1-eOn5JoS65AIvn6C18xShFVD5qnY=
 
-aws-sign2@~0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
-  integrity sha1-FDQt0428yU0OW4fXY81jYSwOeU8=
-
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
   integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
-aws4@^1.2.1:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e"
-  integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==
-
-aws4@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
-  integrity sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=
-
 aws4@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
@@ -7490,27 +7460,6 @@ boolbase@^1.0.0, boolbase@~1.0.0:
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
-boom@2.x.x:
-  version "2.10.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
-  integrity sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=
-  dependencies:
-    hoek "2.x.x"
-
-boom@4.x.x:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
-  integrity sha1-T4owBctKfjiJ90kDD9JbluAdLjE=
-  dependencies:
-    hoek "4.x.x"
-
-boom@5.x.x:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
-  integrity sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==
-  dependencies:
-    hoek "4.x.x"
-
 boom@7.x.x, boom@^7.1.0, boom@^7.2.0:
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/boom/-/boom-7.2.2.tgz#ac92101451aa5cea901aed07d881dd32b4f08345"
@@ -9073,14 +9022,7 @@ colorspace@1.1.x:
     color "3.0.x"
     text-hex "1.0.x"
 
-combined-stream@^1.0.5:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
-
-combined-stream@^1.0.6, combined-stream@~1.0.5, combined-stream@~1.0.6:
+combined-stream@^1.0.6, combined-stream@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
   integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==
@@ -9791,20 +9733,6 @@ crypt@~0.0.1:
   resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
   integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
 
-cryptiles@2.x.x:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
-  integrity sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=
-  dependencies:
-    boom "2.x.x"
-
-cryptiles@3.x.x:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.4.tgz#769a68c95612b56faadfcebf57ac86479cbe8322"
-  integrity sha512-8I1sgZHfVwcSOY6mSGpVU3lw/GSIZvusg8dD2+OGehCJpOhQRLNcH0qb9upQnOH4XhgxxFJSg6E2kx95deb1Tw==
-  dependencies:
-    boom "5.x.x"
-
 cryptiles@4.x.x:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-4.1.3.tgz#2461d3390ea0b82c643a6ba79f0ed491b0934c25"
@@ -12772,7 +12700,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@^3.0.0, extend@~3.0.0, extend@~3.0.1, extend@~3.0.2:
+extend@^3.0.0, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
@@ -12895,7 +12823,7 @@ fancy-log@^1.3.2:
     color-support "^1.1.3"
     time-stamp "^1.0.0"
 
-fast-deep-equal@^1.0.0, fast-deep-equal@^2.0.1, fast-deep-equal@^3.1.1, fast-deep-equal@~3.1.1:
+fast-deep-equal@^2.0.1, fast-deep-equal@^3.1.1, fast-deep-equal@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
   integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
@@ -13597,7 +13525,7 @@ form-data-to-object@^0.2.0:
   resolved "https://registry.yarnpkg.com/form-data-to-object/-/form-data-to-object-0.2.0.tgz#f7a8e68ddd910a1100a65e25ac6a484143ff8168"
   integrity sha1-96jmjd2RChEApl4lrGpIQUP/gWg=
 
-form-data@^2.3.1, form-data@~2.3.1, form-data@~2.3.2:
+form-data@^2.3.1, form-data@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
   integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
@@ -13615,15 +13543,6 @@ form-data@^2.5.0:
     combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
-form-data@~2.1.1:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
-  integrity sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.5"
-    mime-types "^2.1.12"
-
 format@^0.2.0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b"
@@ -15208,33 +15127,12 @@ hapi@^17.5.3:
     teamwork "3.x.x"
     topo "3.x.x"
 
-har-schema@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
-  integrity sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=
-
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
   integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
-har-validator@~4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
-  integrity sha1-M0gdDxu/9gDdID11gSpqX7oALio=
-  dependencies:
-    ajv "^4.9.1"
-    har-schema "^1.0.5"
-
-har-validator@~5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
-  integrity sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=
-  dependencies:
-    ajv "^5.1.0"
-    har-schema "^2.0.0"
-
-har-validator@~5.1.0, har-validator@~5.1.3:
+har-validator@~5.1.3:
   version "5.1.3"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
   integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
@@ -15420,26 +15318,6 @@ hat@0.0.3:
   resolved "https://registry.yarnpkg.com/hat/-/hat-0.0.3.tgz#bb014a9e64b3788aed8005917413d4ff3d502d8a"
   integrity sha1-uwFKnmSzeIrtgAWRdBPU/z1QLYo=
 
-hawk@~3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
-  integrity sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=
-  dependencies:
-    boom "2.x.x"
-    cryptiles "2.x.x"
-    hoek "2.x.x"
-    sntp "1.x.x"
-
-hawk@~6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
-  integrity sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==
-  dependencies:
-    boom "4.x.x"
-    cryptiles "3.x.x"
-    hoek "4.x.x"
-    sntp "2.x.x"
-
 he@1.2.0, he@1.2.x, he@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
@@ -15523,16 +15401,6 @@ hmac-drbg@^1.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
-hoek@2.x.x:
-  version "2.16.3"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
-  integrity sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=
-
-hoek@4.x.x:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"
-  integrity sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==
-
 hoek@5.x.x, hoek@^5.0.4:
   version "5.0.4"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-5.0.4.tgz#0f7fa270a1cafeb364a4b2ddfaa33f864e4157da"
@@ -15776,15 +15644,6 @@ http-request-to-url@^1.0.0:
     await-event "^2.1.0"
     socket-location "^1.0.0"
 
-http-signature@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
-  integrity sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=
-  dependencies:
-    assert-plus "^0.2.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
@@ -18198,11 +18057,6 @@ json-parse-better-errors@^1.0.2:
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
-json-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
-
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -20076,7 +19930,7 @@ mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19:
   dependencies:
     mime-db "~1.37.0"
 
-mime-types@^2.1.25, mime-types@~2.1.7:
+mime-types@^2.1.25:
   version "2.1.26"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06"
   integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==
@@ -21407,11 +21261,6 @@ nyc@^15.0.1:
     test-exclude "^6.0.0"
     yargs "^15.0.2"
 
-oauth-sign@~0.8.1, oauth-sign@~0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-  integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=
-
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
@@ -23374,7 +23223,7 @@ q@^1.1.2:
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
-qs@6.5.2, qs@^6.4.0, qs@^6.5.1, qs@~6.5.1, qs@~6.5.2:
+qs@6.5.2, qs@^6.4.0, qs@^6.5.1, qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
@@ -23389,11 +23238,6 @@ qs@^6.6.0:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.8.0.tgz#87b763f0d37ca54200334cd57bb2ef8f68a1d081"
   integrity sha512-tPSkj8y92PfZVbinY1n84i1Qdx75lZjMQYx9WZhnkofyxzw2r7Ho39G3/aEvSUdebxpnnM4LZJCtvE/Aq3+s9w==
 
-qs@~6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
-  integrity sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=
-
 query-string@5.1.1, query-string@^5.0.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
@@ -25188,115 +25032,7 @@ request-promise@^4.2.2:
     stealthy-require "^1.1.1"
     tough-cookie "^2.3.3"
 
-request@2.81.0:
-  version "2.81.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
-  integrity sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~4.2.1"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    oauth-sign "~0.8.1"
-    performance-now "^0.2.0"
-    qs "~6.4.0"
-    safe-buffer "^5.0.1"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.0.0"
-
-request@2.88.0, request@^2.88.0:
-  version "2.88.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
-  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.0"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.4.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
-request@^2.74.0:
-  version "2.83.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
-  integrity sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.1"
-    forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
-    hawk "~6.0.2"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.17"
-    oauth-sign "~0.8.2"
-    performance-now "^2.1.0"
-    qs "~6.5.1"
-    safe-buffer "^5.1.1"
-    stringstream "~0.0.5"
-    tough-cookie "~2.3.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.1.0"
-
-request@^2.87.0:
-  version "2.87.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
-  integrity sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.1"
-    forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.17"
-    oauth-sign "~0.8.2"
-    performance-now "^2.1.0"
-    qs "~6.5.1"
-    safe-buffer "^5.1.1"
-    tough-cookie "~2.3.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.1.0"
-
-request@^2.88.2:
+request@2.81.0, request@2.88.0, request@^2.74.0, request@^2.87.0, request@^2.88.0, request@^2.88.2:
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
   integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -25974,12 +25710,14 @@ scheduler@^0.18.0:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-schema-utils@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
-  integrity sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=
+schema-utils@1.0.0, schema-utils@^0.3.0, schema-utils@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
+  integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
   dependencies:
-    ajv "^5.0.0"
+    ajv "^6.1.0"
+    ajv-errors "^1.0.0"
+    ajv-keywords "^3.1.0"
 
 schema-utils@^0.4.5:
   version "0.4.7"
@@ -25989,15 +25727,6 @@ schema-utils@^0.4.5:
     ajv "^6.1.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
-  integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
-  dependencies:
-    ajv "^6.1.0"
-    ajv-errors "^1.0.0"
-    ajv-keywords "^3.1.0"
-
 schema-utils@^2.0.0, schema-utils@^2.0.1, schema-utils@^2.4.1, schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.1, schema-utils@^2.6.4, schema-utils@^2.6.6, schema-utils@^2.7.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7"
@@ -26609,20 +26338,6 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^2.0.0"
 
-sntp@1.x.x:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
-  integrity sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=
-  dependencies:
-    hoek "2.x.x"
-
-sntp@2.x.x:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
-  integrity sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==
-  dependencies:
-    hoek "4.x.x"
-
 socket-location@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/socket-location/-/socket-location-1.0.0.tgz#6f0c6f891c9a61c9a750265c14921d12196d266f"
@@ -27370,11 +27085,6 @@ stringify-object@^3.2.1:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-stringstream@~0.0.4, stringstream@~0.0.5:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72"
-  integrity sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==
-
 strip-ansi@*, strip-ansi@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
@@ -28515,7 +28225,7 @@ touch@^3.1.0:
   dependencies:
     nopt "~1.0.10"
 
-tough-cookie@^2.0.0, tough-cookie@^2.3.3, tough-cookie@~2.4.3:
+tough-cookie@^2.0.0, tough-cookie@^2.3.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
   integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
@@ -28540,13 +28250,6 @@ tough-cookie@^3.0.1:
     psl "^1.1.28"
     punycode "^2.1.1"
 
-tough-cookie@~2.3.0, tough-cookie@~2.3.3:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
-  integrity sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==
-  dependencies:
-    punycode "^1.4.1"
-
 tr46@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"

From 53c765eb2216b7559f96b34417b388feb9a405d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Loix?= <sabee77@gmail.com>
Date: Wed, 19 Aug 2020 16:13:18 +0200
Subject: [PATCH 18/85] [Index template] Add filters to simulate preview
 (#74497)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../component_templates.scss                  |  1 +
 .../component_templates_selector.scss         | 41 +++++------
 .../component_templates_selector.tsx          | 19 +++--
 .../index_templates/shared_imports.ts         | 13 ++++
 .../simulate_template/index.ts                |  2 +-
 .../simulate_template/simulate_template.tsx   | 63 ++++++++++++++---
 .../simulate_template_flyout.tsx              | 70 ++++++++++++++++---
 .../template_form/steps/step_components.tsx   |  2 +-
 .../template_form/steps/step_review.tsx       |  2 +-
 .../template_form/template_form.tsx           | 14 +++-
 .../template_details/tabs/tab_preview.tsx     |  2 +-
 .../translations/translations/ja-JP.json      |  1 -
 .../translations/translations/zh-CN.json      |  1 -
 13 files changed, 177 insertions(+), 54 deletions(-)
 create mode 100644 x-pack/plugins/index_management/public/application/components/index_templates/shared_imports.ts

diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/component_template_selector/component_templates.scss b/x-pack/plugins/index_management/public/application/components/component_templates/component_template_selector/component_templates.scss
index 026e63b2b4caa..8e196936e4073 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/component_template_selector/component_templates.scss
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/component_template_selector/component_templates.scss
@@ -8,6 +8,7 @@ $heightHeader: $euiSizeL * 2;
 
 .componentTemplates {
   border: $euiBorderThin;
+  border-radius: $euiBorderRadius;
   border-top: none;
   height: 100%;
 
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/component_template_selector/component_templates_selector.scss b/x-pack/plugins/index_management/public/application/components/component_templates/component_template_selector/component_templates_selector.scss
index 041fc1c8bf9a4..aeccc6a513fe2 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/component_template_selector/component_templates_selector.scss
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/component_template_selector/component_templates_selector.scss
@@ -7,30 +7,31 @@
 
   &__selection {
     border: $euiBorderThin;
+    border-radius: $euiBorderRadius;
 
-   padding: 0 $euiSize $euiSize;
-   color: $euiColorDarkShade;
+    padding: 0 $euiSize $euiSize;
+    color: $euiColorDarkShade;
 
-   &--is-empty {
-     align-items: center;
-     justify-content: center;
-   }
+    &--is-empty {
+      align-items: center;
+      justify-content: center;
+    }
 
-   &__header {
-    background-color: $euiColorLightestShade;
-    border-bottom: $euiBorderThin;
-    color: $euiColorInk;
-    height: $euiSizeXXL; // [1]
-    line-height: $euiSizeXXL; // [1]
-    font-size: $euiSizeM;
-    margin-bottom: $euiSizeS;
-    margin-left: $euiSize * -1;
-    margin-right: $euiSize * -1;
-    padding-left: $euiSize;
+    &__header {
+      background-color: $euiColorLightestShade;
+      border-bottom: $euiBorderThin;
+      color: $euiColorInk;
+      height: $euiSizeXXL; // [1]
+      line-height: $euiSizeXXL; // [1]
+      font-size: $euiSizeM;
+      margin-bottom: $euiSizeS;
+      margin-left: $euiSize * -1;
+      margin-right: $euiSize * -1;
+      padding-left: $euiSize;
 
-    &__count {
-      font-weight: 600;
-    }
+      &__count {
+        font-weight: 600;
+      }
    }
 
    &__content {
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/component_template_selector/component_templates_selector.tsx b/x-pack/plugins/index_management/public/application/components/component_templates/component_template_selector/component_templates_selector.tsx
index ccdfaad78fb6b..ff871b8b79247 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/component_template_selector/component_templates_selector.tsx
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/component_template_selector/component_templates_selector.tsx
@@ -200,12 +200,19 @@ export const ComponentTemplatesSelector = ({
             </div>
           </>
         ) : (
-          <div>
-            <FormattedMessage
-              id="xpack.idxMgmt.componentTemplatesSelector.noComponentSelectedLabel"
-              defaultMessage="No component template selected."
-            />
-          </div>
+          <EuiText textAlign="center">
+            <p>
+              <FormattedMessage
+                id="xpack.idxMgmt.componentTemplatesSelector.noComponentSelectedLabel-1"
+                defaultMessage="Add component template building blocks to this template."
+              />
+              <br />
+              <FormattedMessage
+                id="xpack.idxMgmt.componentTemplatesSelector.noComponentSelectedLabel-2"
+                defaultMessage="Component templates are applied in the order specified."
+              />
+            </p>
+          </EuiText>
         )}
       </EuiFlexItem>
 
diff --git a/x-pack/plugins/index_management/public/application/components/index_templates/shared_imports.ts b/x-pack/plugins/index_management/public/application/components/index_templates/shared_imports.ts
new file mode 100644
index 0000000000000..cc43b8b48b0c7
--- /dev/null
+++ b/x-pack/plugins/index_management/public/application/components/index_templates/shared_imports.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+export {
+  useForm,
+  Form,
+  getUseField,
+  FormDataProvider,
+} from '../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+
+export { CheckBoxField } from '../../../../../../../src/plugins/es_ui_shared/static/forms/components';
diff --git a/x-pack/plugins/index_management/public/application/components/index_templates/simulate_template/index.ts b/x-pack/plugins/index_management/public/application/components/index_templates/simulate_template/index.ts
index fb10096ed81d4..de231baf11c50 100644
--- a/x-pack/plugins/index_management/public/application/components/index_templates/simulate_template/index.ts
+++ b/x-pack/plugins/index_management/public/application/components/index_templates/simulate_template/index.ts
@@ -10,4 +10,4 @@ export {
   Props as SimulateTemplateProps,
 } from './simulate_template_flyout';
 
-export { SimulateTemplate } from './simulate_template';
+export { SimulateTemplate, Filters as SimulateTemplateFilters } from './simulate_template';
diff --git a/x-pack/plugins/index_management/public/application/components/index_templates/simulate_template/simulate_template.tsx b/x-pack/plugins/index_management/public/application/components/index_templates/simulate_template/simulate_template.tsx
index b362b37d54c49..c2ba4eea56ad8 100644
--- a/x-pack/plugins/index_management/public/application/components/index_templates/simulate_template/simulate_template.tsx
+++ b/x-pack/plugins/index_management/public/application/components/index_templates/simulate_template/simulate_template.tsx
@@ -5,7 +5,8 @@
  */
 import React, { useState, useCallback, useEffect } from 'react';
 import uuid from 'uuid';
-import { EuiCodeBlock } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiCodeBlock, EuiCallOut } from '@elastic/eui';
 
 import { serializers } from '../../../../shared_imports';
 import { TemplateDeserialized } from '../../../../../common';
@@ -14,12 +15,18 @@ import { simulateIndexTemplate } from '../../../services';
 
 const { stripEmptyFields } = serializers;
 
+export interface Filters {
+  mappings: boolean;
+  settings: boolean;
+  aliases: boolean;
+}
+
 interface Props {
   template: { [key: string]: any };
-  minHeightCodeBlock?: string;
+  filters?: Filters;
 }
 
-export const SimulateTemplate = React.memo(({ template, minHeightCodeBlock }: Props) => {
+export const SimulateTemplate = React.memo(({ template, filters }: Props) => {
   const [templatePreview, setTemplatePreview] = useState('{}');
 
   const updatePreview = useCallback(async () => {
@@ -34,26 +41,60 @@ export const SimulateTemplate = React.memo(({ template, minHeightCodeBlock }: Pr
     indexTemplate.index_patterns = [uuid.v4()];
 
     const { data, error } = await simulateIndexTemplate(indexTemplate);
+    let filteredTemplate = data;
 
     if (data) {
       // "Overlapping" info is only useful when simulating against an index
       // which we don't do here.
       delete data.overlapping;
+
+      if (data.template && data.template.mappings === undefined) {
+        // Adding some extra logic to return an empty object for "mappings" as ES does not
+        // return one in that case (empty objects _are_ returned for "settings" and "aliases")
+        // Issue: https://github.com/elastic/elasticsearch/issues/60968
+        data.template.mappings = {};
+      }
+
+      if (filters) {
+        filteredTemplate = Object.entries(filters).reduce(
+          (acc, [key, value]) => {
+            if (!value) {
+              delete acc[key];
+            }
+            return acc;
+          },
+          { ...data.template } as any
+        );
+      }
     }
 
-    setTemplatePreview(JSON.stringify(data ?? error, null, 2));
-  }, [template]);
+    setTemplatePreview(JSON.stringify(filteredTemplate ?? error, null, 2));
+  }, [template, filters]);
 
   useEffect(() => {
     updatePreview();
   }, [updatePreview]);
 
-  return templatePreview === '{}' ? null : (
-    <EuiCodeBlock
-      style={{ minHeight: minHeightCodeBlock }}
-      lang="json"
-      data-test-subj="simulateTemplatePreview"
-    >
+  const isEmpty = templatePreview === '{}';
+  const hasFilters = Boolean(filters);
+
+  if (isEmpty && hasFilters) {
+    return (
+      <EuiCallOut
+        title={
+          <FormattedMessage
+            id="xpack.idxMgmt.simulateTemplate.noFilterSelected"
+            defaultMessage="Select at least one option to preview."
+          />
+        }
+        iconType="pin"
+        size="s"
+      />
+    );
+  }
+
+  return isEmpty ? null : (
+    <EuiCodeBlock lang="json" data-test-subj="simulateTemplatePreview">
       {templatePreview}
     </EuiCodeBlock>
   );
diff --git a/x-pack/plugins/index_management/public/application/components/index_templates/simulate_template/simulate_template_flyout.tsx b/x-pack/plugins/index_management/public/application/components/index_templates/simulate_template/simulate_template_flyout.tsx
index 63bfe78546041..f818f49d8aa59 100644
--- a/x-pack/plugins/index_management/public/application/components/index_templates/simulate_template/simulate_template_flyout.tsx
+++ b/x-pack/plugins/index_management/public/application/components/index_templates/simulate_template/simulate_template_flyout.tsx
@@ -5,6 +5,7 @@
  */
 import React, { useState, useCallback, useEffect, useRef } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
 import {
   EuiFlyoutHeader,
   EuiTitle,
@@ -19,11 +20,16 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 
-import { SimulateTemplate } from './simulate_template';
+import { useForm, Form, getUseField, CheckBoxField, FormDataProvider } from '../shared_imports';
+import { SimulateTemplate, Filters } from './simulate_template';
+
+const CheckBox = getUseField({ component: CheckBoxField });
 
 export interface Props {
   onClose(): void;
   getTemplate: () => { [key: string]: any };
+  filters: Filters;
+  onFiltersChange: (filters: Filters) => void;
 }
 
 export const defaultFlyoutProps = {
@@ -31,16 +37,39 @@ export const defaultFlyoutProps = {
   'aria-labelledby': 'simulateTemplateFlyoutTitle',
 };
 
-export const SimulateTemplateFlyoutContent = ({ onClose, getTemplate }: Props) => {
+const i18nTexts = {
+  filters: {
+    label: i18n.translate('xpack.idxMgmt.simulateTemplate.filters.label', {
+      defaultMessage: 'Include:',
+    }),
+    mappings: i18n.translate('xpack.idxMgmt.simulateTemplate.filters.mappings', {
+      defaultMessage: 'Mappings',
+    }),
+    indexSettings: i18n.translate('xpack.idxMgmt.simulateTemplate.filters.indexSettings', {
+      defaultMessage: 'Index settings',
+    }),
+    aliases: i18n.translate('xpack.idxMgmt.simulateTemplate.filters.aliases', {
+      defaultMessage: 'Aliases',
+    }),
+  },
+};
+
+export const SimulateTemplateFlyoutContent = ({
+  onClose,
+  getTemplate,
+  filters,
+  onFiltersChange,
+}: Props) => {
   const isMounted = useRef(false);
-  const [heightCodeBlock, setHeightCodeBlock] = useState(0);
   const [template, setTemplate] = useState<{ [key: string]: any }>({});
+  const { form } = useForm<Filters>({ defaultValue: filters });
+  const { subscribe } = form;
 
   useEffect(() => {
-    setHeightCodeBlock(
-      document.getElementsByClassName('euiFlyoutBody__overflow')[0].clientHeight - 96
-    );
-  }, []);
+    subscribe((formState) => {
+      onFiltersChange(formState.data.format());
+    });
+  }, [subscribe, onFiltersChange]);
 
   const updatePreview = useCallback(async () => {
     const indexTemplate = await getTemplate();
@@ -71,8 +100,8 @@ export const SimulateTemplateFlyoutContent = ({ onClose, getTemplate }: Props) =
             <p>
               <FormattedMessage
                 id="xpack.idxMgmt.simulateTemplate.descriptionText"
-                defaultMessage="This is the final template that will be applied to your indices based on the
-                components templates you have selected and any overrides you've added."
+                defaultMessage="This is the final template that will be applied to matching indices based on the
+                component templates you have selected and any overrides you've added."
               />
             </p>
           </EuiText>
@@ -80,7 +109,28 @@ export const SimulateTemplateFlyoutContent = ({ onClose, getTemplate }: Props) =
       </EuiFlyoutHeader>
 
       <EuiFlyoutBody data-test-subj="content">
-        <SimulateTemplate template={template} minHeightCodeBlock={`${heightCodeBlock}px`} />
+        <Form form={form}>
+          <EuiFlexGroup alignItems="center">
+            <EuiFlexItem grow={false}>{i18nTexts.filters.label}</EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <CheckBox path="mappings" config={{ label: i18nTexts.filters.mappings }} />
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <CheckBox path="settings" config={{ label: i18nTexts.filters.indexSettings }} />
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <CheckBox path="aliases" config={{ label: i18nTexts.filters.aliases }} />
+            </EuiFlexItem>
+          </EuiFlexGroup>
+
+          <EuiSpacer />
+
+          <FormDataProvider>
+            {(formData) => {
+              return <SimulateTemplate template={template} filters={formData as Filters} />;
+            }}
+          </FormDataProvider>
+        </Form>
       </EuiFlyoutBody>
 
       <EuiFlyoutFooter>
diff --git a/x-pack/plugins/index_management/public/application/components/template_form/steps/step_components.tsx b/x-pack/plugins/index_management/public/application/components/template_form/steps/step_components.tsx
index ae831f4acf7ee..a4f64f7881a28 100644
--- a/x-pack/plugins/index_management/public/application/components/template_form/steps/step_components.tsx
+++ b/x-pack/plugins/index_management/public/application/components/template_form/steps/step_components.tsx
@@ -34,7 +34,7 @@ const i18nTexts = {
   description: (
     <FormattedMessage
       id="xpack.idxMgmt.formWizard.stepComponents.componentsDescription"
-      defaultMessage="Components templates let you save index settings, mappings and aliases and inherit from them in index templates."
+      defaultMessage="Component templates let you save index settings, mappings and aliases and inherit from them in index templates."
     />
   ),
 };
diff --git a/x-pack/plugins/index_management/public/application/components/template_form/steps/step_review.tsx b/x-pack/plugins/index_management/public/application/components/template_form/steps/step_review.tsx
index 1b4f19dda99f7..3bdcf1f35733e 100644
--- a/x-pack/plugins/index_management/public/application/components/template_form/steps/step_review.tsx
+++ b/x-pack/plugins/index_management/public/application/components/template_form/steps/step_review.tsx
@@ -66,7 +66,7 @@ const PreviewTab = ({ template }: { template: { [key: string]: any } }) => {
         <p>
           <FormattedMessage
             id="xpack.idxMgmt.templateForm.stepReview.previewTab.descriptionText"
-            defaultMessage="This is the final template that will be applied to your indices."
+            defaultMessage="This is the final template that will be applied to matching indices. Component templates are applied in the order specified. Explicit mappings, settings, and aliases override the component templates."
           />
         </p>
       </EuiText>
diff --git a/x-pack/plugins/index_management/public/application/components/template_form/template_form.tsx b/x-pack/plugins/index_management/public/application/components/template_form/template_form.tsx
index fb0ba0b68fa6c..151b31b527228 100644
--- a/x-pack/plugins/index_management/public/application/components/template_form/template_form.tsx
+++ b/x-pack/plugins/index_management/public/application/components/template_form/template_form.tsx
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import React, { useState, useCallback } from 'react';
+import React, { useState, useCallback, useRef } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiSpacer, EuiButton } from '@elastic/eui';
@@ -15,6 +15,7 @@ import {
   SimulateTemplateFlyoutContent,
   SimulateTemplateProps,
   simulateTemplateFlyoutProps,
+  SimulateTemplateFilters,
 } from '../index_templates';
 import { StepLogisticsContainer, StepComponentContainer, StepReviewContainer } from './steps';
 import {
@@ -98,6 +99,11 @@ export const TemplateForm = ({
 }: Props) => {
   const [wizardContent, setWizardContent] = useState<Forms.Content<WizardContent> | null>(null);
   const { addContent: addContentToGlobalFlyout, closeFlyout } = useGlobalFlyout();
+  const simulateTemplateFilters = useRef<SimulateTemplateFilters>({
+    mappings: true,
+    settings: true,
+    aliases: true,
+  });
 
   const indexTemplate = defaultValue ?? {
     name: '',
@@ -234,6 +240,10 @@ export const TemplateForm = ({
     return template;
   }, [buildTemplateObject, indexTemplate, wizardContent]);
 
+  const onSimulateTemplateFiltersChange = useCallback((filters: SimulateTemplateFilters) => {
+    simulateTemplateFilters.current = filters;
+  }, []);
+
   const showPreviewFlyout = () => {
     addContentToGlobalFlyout<SimulateTemplateProps>({
       id: 'simulateTemplate',
@@ -241,6 +251,8 @@ export const TemplateForm = ({
       props: {
         getTemplate: getSimulateTemplate,
         onClose: closeFlyout,
+        filters: simulateTemplateFilters.current,
+        onFiltersChange: onSimulateTemplateFiltersChange,
       },
       flyoutProps: simulateTemplateFlyoutProps,
     });
diff --git a/x-pack/plugins/index_management/public/application/sections/home/template_list/template_details/tabs/tab_preview.tsx b/x-pack/plugins/index_management/public/application/sections/home/template_list/template_details/tabs/tab_preview.tsx
index ec52bcbab3b0b..49b78f3f56c25 100644
--- a/x-pack/plugins/index_management/public/application/sections/home/template_list/template_details/tabs/tab_preview.tsx
+++ b/x-pack/plugins/index_management/public/application/sections/home/template_list/template_details/tabs/tab_preview.tsx
@@ -21,7 +21,7 @@ export const TabPreview = ({ templateDetails }: Props) => {
         <p>
           <FormattedMessage
             id="xpack.idxMgmt.templateDetails.previewTab.descriptionText"
-            defaultMessage="This is the final template that will be applied to your indices."
+            defaultMessage="This is the final template that will be applied to matching indices."
           />
         </p>
       </EuiText>
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index c958215a2677e..814c532657f60 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -7278,7 +7278,6 @@
     "xpack.idxMgmt.componentTemplatesSelector.filters.mappingsLabel": "マッピング",
     "xpack.idxMgmt.componentTemplatesSelector.loadingComponentsDescription": "コンポーネントテンプレートを読み込んでいます...",
     "xpack.idxMgmt.componentTemplatesSelector.loadingComponentsErrorMessage": "コンポーネントの読み込みエラー",
-    "xpack.idxMgmt.componentTemplatesSelector.noComponentSelectedLabel": "コンポーネントテンプレートが選択されていません。",
     "xpack.idxMgmt.componentTemplatesSelector.removeItemIconLabel": "削除",
     "xpack.idxMgmt.componentTemplatesSelector.searchBox.placeholder": "コンポーネントテンプレートを検索",
     "xpack.idxMgmt.componentTemplatesSelector.searchResult.emptyPrompt.clearSearchButtonLabel": "検索のクリア",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index a06e5813796f4..667706c886bc8 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -7280,7 +7280,6 @@
     "xpack.idxMgmt.componentTemplatesSelector.filters.mappingsLabel": "映射",
     "xpack.idxMgmt.componentTemplatesSelector.loadingComponentsDescription": "正在加载组件模板……",
     "xpack.idxMgmt.componentTemplatesSelector.loadingComponentsErrorMessage": "加载组件时出错",
-    "xpack.idxMgmt.componentTemplatesSelector.noComponentSelectedLabel": "未选择任何组件模板。",
     "xpack.idxMgmt.componentTemplatesSelector.removeItemIconLabel": "移除",
     "xpack.idxMgmt.componentTemplatesSelector.searchBox.placeholder": "搜索组件模板",
     "xpack.idxMgmt.componentTemplatesSelector.searchResult.emptyPrompt.clearSearchButtonLabel": "清除搜索",

From 774c04a2d5289f57a0f3c742fe19e0b9f5b486c8 Mon Sep 17 00:00:00 2001
From: Chris Roberson <chrisronline@gmail.com>
Date: Wed, 19 Aug 2020 10:13:27 -0400
Subject: [PATCH 19/85] [Monitoring] Migrate karma tests (#75301)

* Move to jest

* More tests
---
 .../get_color.js => get_color.test.js}        |   2 +-
 ...t_last_value.js => get_last_value.test.js} |   2 +-
 .../get_title.js => get_title.test.js}        |   2 +-
 ...egend.js => get_values_for_legend.test.js} |   2 +-
 .../{__tests__/config.js => config.test.js}   |   4 +-
 .../boolean_edge.js => boolean_edge.test.js}  |   4 +-
 .../graph/{__tests__/edge.js => edge.test.js} |   2 +-
 .../edge_factory.js => edge_factory.test.js}  |   6 +-
 .../if_vertex.js => if_vertex.test.js}        |   4 +-
 .../{__tests__/index.js => index.test.js}     |   8 +-
 ...plugin_vertex.js => plugin_vertex.test.js} |   4 +-
 .../queue_vertex.js => queue_vertex.test.js}  |   4 +-
 .../{__tests__/vertex.js => vertex.test.js}   |  69 +++---
 ...rtex_factory.js => vertex_factory.test.js} |   8 +-
 ...peline_state.js => pipeline_state.test.js} |   4 +-
 ....js => monitoring_main_controller.test.js} |  32 ++-
 ...format_number.js => format_number.test.js} |   2 +-
 .../pipelines.js => pipelines.test.js}        |   2 +-
 .../public/services/__tests__/executor.js     | 111 ----------
 .../breadcrumbs.js => breadcrumbs.test.js}    |  34 ++-
 .../public/views/__tests__/base_controller.js | 209 ------------------
 .../views/__tests__/base_table_controller.js  |  92 --------
 22 files changed, 127 insertions(+), 480 deletions(-)
 rename x-pack/plugins/monitoring/public/components/chart/{__tests__/get_color.js => get_color.test.js} (96%)
 rename x-pack/plugins/monitoring/public/components/chart/{__tests__/get_last_value.js => get_last_value.test.js} (96%)
 rename x-pack/plugins/monitoring/public/components/chart/{__tests__/get_title.js => get_title.test.js} (94%)
 rename x-pack/plugins/monitoring/public/components/chart/{__tests__/get_values_for_legend.js => get_values_for_legend.test.js} (99%)
 rename x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/{__tests__/config.js => config.test.js} (93%)
 rename x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/{__tests__/boolean_edge.js => boolean_edge.test.js} (89%)
 rename x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/{__tests__/edge.js => edge.test.js} (96%)
 rename x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/{__tests__/edge_factory.js => edge_factory.test.js} (89%)
 rename x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/{__tests__/if_vertex.js => if_vertex.test.js} (93%)
 rename x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/{__tests__/index.js => index.test.js} (99%)
 rename x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/{__tests__/plugin_vertex.js => plugin_vertex.test.js} (98%)
 rename x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/{__tests__/queue_vertex.js => queue_vertex.test.js} (89%)
 rename x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/{__tests__/vertex.js => vertex.test.js} (81%)
 rename x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/{__tests__/vertex_factory.js => vertex_factory.test.js} (86%)
 rename x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/{__tests__/pipeline_state.js => pipeline_state.test.js} (92%)
 rename x-pack/plugins/monitoring/public/directives/main/{__tests__/monitoring_main_controller.js => monitoring_main_controller.test.js} (93%)
 rename x-pack/plugins/monitoring/public/lib/{__tests__/format_number.js => format_number.test.js} (96%)
 rename x-pack/plugins/monitoring/public/lib/logstash/{__tests__/pipelines.js => pipelines.test.js} (93%)
 delete mode 100644 x-pack/plugins/monitoring/public/services/__tests__/executor.js
 rename x-pack/plugins/monitoring/public/services/{__tests__/breadcrumbs.js => breadcrumbs.test.js} (86%)
 delete mode 100644 x-pack/plugins/monitoring/public/views/__tests__/base_controller.js
 delete mode 100644 x-pack/plugins/monitoring/public/views/__tests__/base_table_controller.js

diff --git a/x-pack/plugins/monitoring/public/components/chart/__tests__/get_color.js b/x-pack/plugins/monitoring/public/components/chart/get_color.test.js
similarity index 96%
rename from x-pack/plugins/monitoring/public/components/chart/__tests__/get_color.js
rename to x-pack/plugins/monitoring/public/components/chart/get_color.test.js
index 7b70f1d1fb224..1029e6c836225 100644
--- a/x-pack/plugins/monitoring/public/components/chart/__tests__/get_color.js
+++ b/x-pack/plugins/monitoring/public/components/chart/get_color.test.js
@@ -5,7 +5,7 @@
  */
 
 import expect from '@kbn/expect';
-import { getColor } from '../get_color';
+import { getColor } from './get_color';
 
 describe('getColors', function () {
   it('elasticsearch colors', () => {
diff --git a/x-pack/plugins/monitoring/public/components/chart/__tests__/get_last_value.js b/x-pack/plugins/monitoring/public/components/chart/get_last_value.test.js
similarity index 96%
rename from x-pack/plugins/monitoring/public/components/chart/__tests__/get_last_value.js
rename to x-pack/plugins/monitoring/public/components/chart/get_last_value.test.js
index c089b47408e81..47e6dad3712a7 100644
--- a/x-pack/plugins/monitoring/public/components/chart/__tests__/get_last_value.js
+++ b/x-pack/plugins/monitoring/public/components/chart/get_last_value.test.js
@@ -5,7 +5,7 @@
  */
 
 import expect from '@kbn/expect';
-import { getLastValue } from '../get_last_value';
+import { getLastValue } from './get_last_value';
 
 describe('monitoringChartGetLastValue', function () {
   it('getLastValue for single number', () => {
diff --git a/x-pack/plugins/monitoring/public/components/chart/__tests__/get_title.js b/x-pack/plugins/monitoring/public/components/chart/get_title.test.js
similarity index 94%
rename from x-pack/plugins/monitoring/public/components/chart/__tests__/get_title.js
rename to x-pack/plugins/monitoring/public/components/chart/get_title.test.js
index a7f4b48a5862a..7905089b21b9e 100644
--- a/x-pack/plugins/monitoring/public/components/chart/__tests__/get_title.js
+++ b/x-pack/plugins/monitoring/public/components/chart/get_title.test.js
@@ -5,7 +5,7 @@
  */
 
 import expect from '@kbn/expect';
-import { getTitle } from '../get_title';
+import { getTitle } from './get_title';
 
 describe('getTitle', function () {
   it('with metric.title', () => {
diff --git a/x-pack/plugins/monitoring/public/components/chart/__tests__/get_values_for_legend.js b/x-pack/plugins/monitoring/public/components/chart/get_values_for_legend.test.js
similarity index 99%
rename from x-pack/plugins/monitoring/public/components/chart/__tests__/get_values_for_legend.js
rename to x-pack/plugins/monitoring/public/components/chart/get_values_for_legend.test.js
index e5c933426efcd..053f88382d9c0 100644
--- a/x-pack/plugins/monitoring/public/components/chart/__tests__/get_values_for_legend.js
+++ b/x-pack/plugins/monitoring/public/components/chart/get_values_for_legend.test.js
@@ -6,7 +6,7 @@
 
 import expect from '@kbn/expect';
 import sinon from 'sinon';
-import { findIndexByX, getValuesByX, getValuesForSeriesIndex } from '../get_values_for_legend';
+import { findIndexByX, getValuesByX, getValuesForSeriesIndex } from './get_values_for_legend';
 
 describe('monitoringChartHelpers', function () {
   it('getValuesForSeriesIndex sets does not impact callback without series', () => {
diff --git a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/__tests__/config.js b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/config.test.js
similarity index 93%
rename from x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/__tests__/config.js
rename to x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/config.test.js
index 83627a8181f38..f1ddd2b933183 100644
--- a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/__tests__/config.js
+++ b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/config.test.js
@@ -6,8 +6,8 @@
 
 import expect from '@kbn/expect';
 import sinon from 'sinon';
-import { Config } from '../config';
-import { Graph } from '../graph';
+import { Config } from './config';
+import { Graph } from './graph';
 
 describe('Config class', () => {
   let configJson;
diff --git a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/__tests__/boolean_edge.js b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/boolean_edge.test.js
similarity index 89%
rename from x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/__tests__/boolean_edge.js
rename to x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/boolean_edge.test.js
index faf56f48db677..1c20d758242e8 100644
--- a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/__tests__/boolean_edge.js
+++ b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/boolean_edge.test.js
@@ -5,8 +5,8 @@
  */
 
 import expect from '@kbn/expect';
-import { BooleanEdge } from '../boolean_edge';
-import { Edge } from '../edge';
+import { BooleanEdge } from './boolean_edge';
+import { Edge } from './edge';
 
 describe('BooleanEdge', () => {
   let graph;
diff --git a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/__tests__/edge.js b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/edge.test.js
similarity index 96%
rename from x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/__tests__/edge.js
rename to x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/edge.test.js
index 8acf0fff7f864..96476aca8cd3b 100644
--- a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/__tests__/edge.js
+++ b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/edge.test.js
@@ -5,7 +5,7 @@
  */
 
 import expect from '@kbn/expect';
-import { Edge } from '../edge';
+import { Edge } from './edge';
 
 describe('Edge', () => {
   let graph;
diff --git a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/__tests__/edge_factory.js b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/edge_factory.test.js
similarity index 89%
rename from x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/__tests__/edge_factory.js
rename to x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/edge_factory.test.js
index 80fb22925a38c..80922064122af 100644
--- a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/__tests__/edge_factory.js
+++ b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/edge_factory.test.js
@@ -5,9 +5,9 @@
  */
 
 import expect from '@kbn/expect';
-import { edgeFactory } from '../edge_factory';
-import { Edge } from '../edge';
-import { BooleanEdge } from '../boolean_edge';
+import { edgeFactory } from './edge_factory';
+import { Edge } from './edge';
+import { BooleanEdge } from './boolean_edge';
 
 describe('edgeFactory', () => {
   let graph;
diff --git a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/__tests__/if_vertex.js b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/if_vertex.test.js
similarity index 93%
rename from x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/__tests__/if_vertex.js
rename to x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/if_vertex.test.js
index 5a64d12a7f5b0..8bbd8326ddf88 100644
--- a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/__tests__/if_vertex.js
+++ b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/if_vertex.test.js
@@ -5,8 +5,8 @@
  */
 
 import expect from '@kbn/expect';
-import { IfVertex } from '../if_vertex';
-import { Vertex } from '../vertex';
+import { IfVertex } from './if_vertex';
+import { Vertex } from './vertex';
 
 describe('IfVertex', () => {
   let graph;
diff --git a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/__tests__/index.js b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/index.test.js
similarity index 99%
rename from x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/__tests__/index.js
rename to x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/index.test.js
index 55d8a0b3e574a..8689d96f1e36a 100644
--- a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/__tests__/index.js
+++ b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/index.test.js
@@ -5,10 +5,10 @@
  */
 
 import expect from '@kbn/expect';
-import { Graph } from '../';
-import { Vertex } from '../vertex';
-import { PluginVertex } from '../plugin_vertex';
-import { Edge } from '../edge';
+import { Graph } from './';
+import { Vertex } from './vertex';
+import { PluginVertex } from './plugin_vertex';
+import { Edge } from './edge';
 
 describe('Graph', () => {
   let graphJson;
diff --git a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/__tests__/plugin_vertex.js b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/plugin_vertex.test.js
similarity index 98%
rename from x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/__tests__/plugin_vertex.js
rename to x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/plugin_vertex.test.js
index 3bc8033e283f2..b2931700eb024 100644
--- a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/__tests__/plugin_vertex.js
+++ b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/plugin_vertex.test.js
@@ -5,8 +5,8 @@
  */
 
 import expect from '@kbn/expect';
-import { Vertex } from '../vertex';
-import { PluginVertex, TIME_CONSUMING_PROCESSOR_THRESHOLD_COEFFICIENT } from '../plugin_vertex';
+import { Vertex } from './vertex';
+import { PluginVertex, TIME_CONSUMING_PROCESSOR_THRESHOLD_COEFFICIENT } from './plugin_vertex';
 
 describe('PluginVertex', () => {
   let graph;
diff --git a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/__tests__/queue_vertex.js b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/queue_vertex.test.js
similarity index 89%
rename from x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/__tests__/queue_vertex.js
rename to x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/queue_vertex.test.js
index 997306f52cc59..b3b15e6169338 100644
--- a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/__tests__/queue_vertex.js
+++ b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/queue_vertex.test.js
@@ -5,8 +5,8 @@
  */
 
 import expect from '@kbn/expect';
-import { QueueVertex } from '../queue_vertex';
-import { Vertex } from '../vertex';
+import { QueueVertex } from './queue_vertex';
+import { Vertex } from './vertex';
 
 describe('QueueVertex', () => {
   let graph;
diff --git a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/__tests__/vertex.js b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/vertex.test.js
similarity index 81%
rename from x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/__tests__/vertex.js
rename to x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/vertex.test.js
index a8761a4c868b1..d54ec354b434b 100644
--- a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/__tests__/vertex.js
+++ b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/vertex.test.js
@@ -5,7 +5,7 @@
  */
 
 import expect from '@kbn/expect';
-import { Graph } from '../';
+import { Graph } from './';
 
 describe('Vertex', () => {
   let graph;
@@ -205,40 +205,39 @@ describe('Vertex', () => {
        *            \---- v
        *                  F5
        */
-      const complexGraphJson = {
-        vertices: [
-          { id: 'I1', type: 'plugin', explicit_id: false },
-          { id: 'my-queue', type: 'queue', config_name: 'some-name' },
-          { id: 'IF1', type: 'if', config_name: 'some-name' },
-          {
-            id: 'IF2',
-            type: 'plugin',
-            meta: { source_text: 'foobar', source_line: 33, source_column: 4 },
-          },
-          { id: 'F1', type: 'plugin', explicit_id: true },
-          { id: 'F2', type: 'plugin', explicit_id: true },
-          { id: 'F3', type: 'plugin', explicit_id: true },
-          { id: 'F4', type: 'plugin', explicit_id: true },
-          { id: 'F5', type: 'plugin', explicit_id: true },
-        ],
-        edges: [
-          { id: '1', type: 'plain', from: 'I1', to: 'my-queue' },
-          { id: '2', type: 'plain', from: 'my-queue', to: 'IF1' },
-          { id: '3', type: 'boolean', when: true, from: 'IF1', to: 'IF2' },
-          { id: '4', type: 'boolean', when: false, from: 'IF1', to: 'F1' },
-          { id: '5', type: 'boolean', when: true, from: 'IF2', to: 'F2' },
-          { id: '6', type: 'boolean', when: false, from: 'IF2', to: 'F3' },
-          { id: '7', type: 'plain', from: 'F2', to: 'F5' },
-          { id: '8', type: 'plain', from: 'F3', to: 'F5' },
-          { id: '9', type: 'plain', from: 'F1', to: 'F4' },
-          { id: '10', type: 'plain', from: 'F4', to: 'F5' },
-        ],
-      };
-
-      beforeEach(() => {
-        graph = new Graph();
-        graph.update(complexGraphJson);
-      });
+      // const complexGraphJson = {
+      //   vertices: [
+      //     { id: 'I1', type: 'plugin', explicit_id: false },
+      //     { id: 'my-queue', type: 'queue', config_name: 'some-name' },
+      //     { id: 'IF1', type: 'if', config_name: 'some-name' },
+      //     {
+      //       id: 'IF2',
+      //       type: 'plugin',
+      //       meta: { source_text: 'foobar', source_line: 33, source_column: 4 },
+      //     },
+      //     { id: 'F1', type: 'plugin', explicit_id: true },
+      //     { id: 'F2', type: 'plugin', explicit_id: true },
+      //     { id: 'F3', type: 'plugin', explicit_id: true },
+      //     { id: 'F4', type: 'plugin', explicit_id: true },
+      //     { id: 'F5', type: 'plugin', explicit_id: true },
+      //   ],
+      //   edges: [
+      //     { id: '1', type: 'plain', from: 'I1', to: 'my-queue' },
+      //     { id: '2', type: 'plain', from: 'my-queue', to: 'IF1' },
+      //     { id: '3', type: 'boolean', when: true, from: 'IF1', to: 'IF2' },
+      //     { id: '4', type: 'boolean', when: false, from: 'IF1', to: 'F1' },
+      //     { id: '5', type: 'boolean', when: true, from: 'IF2', to: 'F2' },
+      //     { id: '6', type: 'boolean', when: false, from: 'IF2', to: 'F3' },
+      //     { id: '7', type: 'plain', from: 'F2', to: 'F5' },
+      //     { id: '8', type: 'plain', from: 'F3', to: 'F5' },
+      //     { id: '9', type: 'plain', from: 'F1', to: 'F4' },
+      //     { id: '10', type: 'plain', from: 'F4', to: 'F5' },
+      //   ],
+      // };
+      // beforeEach(() => {
+      //   graph = new Graph();
+      //   graph.update(complexGraphJson);
+      // });
     });
   });
 
diff --git a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/__tests__/vertex_factory.js b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/vertex_factory.test.js
similarity index 86%
rename from x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/__tests__/vertex_factory.js
rename to x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/vertex_factory.test.js
index 8fbbd72baeb4b..8f8321846aae4 100644
--- a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/__tests__/vertex_factory.js
+++ b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/vertex_factory.test.js
@@ -5,10 +5,10 @@
  */
 
 import expect from '@kbn/expect';
-import { vertexFactory } from '../vertex_factory';
-import { PluginVertex } from '../plugin_vertex';
-import { IfVertex } from '../if_vertex';
-import { QueueVertex } from '../queue_vertex';
+import { vertexFactory } from './vertex_factory';
+import { PluginVertex } from './plugin_vertex';
+import { IfVertex } from './if_vertex';
+import { QueueVertex } from './queue_vertex';
 
 describe('vertexFactory', () => {
   let graph;
diff --git a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/__tests__/pipeline_state.js b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/pipeline_state.test.js
similarity index 92%
rename from x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/__tests__/pipeline_state.js
rename to x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/pipeline_state.test.js
index b47f6b2fa3cee..f2aff4a0413da 100644
--- a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/__tests__/pipeline_state.js
+++ b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/pipeline_state.test.js
@@ -6,8 +6,8 @@
 
 import expect from '@kbn/expect';
 import sinon from 'sinon';
-import { PipelineState } from '../pipeline_state';
-import { Config } from '../config';
+import { PipelineState } from './pipeline_state';
+import { Config } from './config';
 
 describe('PipelineState class', () => {
   let configJson;
diff --git a/x-pack/plugins/monitoring/public/directives/main/__tests__/monitoring_main_controller.js b/x-pack/plugins/monitoring/public/directives/main/monitoring_main_controller.test.js
similarity index 93%
rename from x-pack/plugins/monitoring/public/directives/main/__tests__/monitoring_main_controller.js
rename to x-pack/plugins/monitoring/public/directives/main/monitoring_main_controller.test.js
index e2fb2adccb4b9..a12d18425f923 100644
--- a/x-pack/plugins/monitoring/public/directives/main/__tests__/monitoring_main_controller.js
+++ b/x-pack/plugins/monitoring/public/directives/main/monitoring_main_controller.test.js
@@ -6,12 +6,42 @@
 
 import { noop } from 'lodash';
 import expect from '@kbn/expect';
-import { MonitoringMainController } from '../';
+import { Legacy } from '../../legacy_shims';
+import { MonitoringMainController } from './';
 
 const getMockLicenseService = (options) => ({ mlIsSupported: () => options.mlIsSupported });
 const getMockBreadcrumbsService = () => noop; // breadcrumb service has its own test
 
 describe('Monitoring Main Directive Controller', () => {
+  const core = {
+    notifications: {},
+    application: {},
+    i18n: {},
+    chrome: {},
+  };
+  const data = {
+    query: {
+      timefilter: {
+        timefilter: {
+          isTimeRangeSelectorEnabled: () => true,
+          getTime: () => 1,
+          getRefreshInterval: () => 1,
+        },
+      },
+    },
+  };
+  const isCloud = false;
+  const triggersActionsUi = {};
+
+  beforeAll(() => {
+    Legacy.init({
+      core,
+      data,
+      isCloud,
+      triggersActionsUi,
+    });
+  });
+
   /*
    * Simulates calling the monitoringMain directive the way Cluster Listing
    * does:
diff --git a/x-pack/plugins/monitoring/public/lib/__tests__/format_number.js b/x-pack/plugins/monitoring/public/lib/format_number.test.js
similarity index 96%
rename from x-pack/plugins/monitoring/public/lib/__tests__/format_number.js
rename to x-pack/plugins/monitoring/public/lib/format_number.test.js
index 199eb5298f0be..6f8d4a3d1587c 100644
--- a/x-pack/plugins/monitoring/public/lib/__tests__/format_number.js
+++ b/x-pack/plugins/monitoring/public/lib/format_number.test.js
@@ -5,7 +5,7 @@
  */
 
 import expect from '@kbn/expect';
-import { formatNumber, formatBytesUsage } from '../format_number';
+import { formatNumber, formatBytesUsage } from './format_number';
 
 describe('format_number', () => {
   describe('formatBytesUsage', () => {
diff --git a/x-pack/plugins/monitoring/public/lib/logstash/__tests__/pipelines.js b/x-pack/plugins/monitoring/public/lib/logstash/pipelines.test.js
similarity index 93%
rename from x-pack/plugins/monitoring/public/lib/logstash/__tests__/pipelines.js
rename to x-pack/plugins/monitoring/public/lib/logstash/pipelines.test.js
index 3b0b2b629a4ed..183b15dcb8ea6 100644
--- a/x-pack/plugins/monitoring/public/lib/logstash/__tests__/pipelines.js
+++ b/x-pack/plugins/monitoring/public/lib/logstash/pipelines.test.js
@@ -5,7 +5,7 @@
  */
 
 import expect from '@kbn/expect';
-import { isPipelineMonitoringSupportedInVersion } from '../pipelines';
+import { isPipelineMonitoringSupportedInVersion } from './pipelines';
 
 describe('pipelines', () => {
   describe('isPipelineMonitoringSupportedInVersion', () => {
diff --git a/x-pack/plugins/monitoring/public/services/__tests__/executor.js b/x-pack/plugins/monitoring/public/services/__tests__/executor.js
deleted file mode 100644
index 802378db2740b..0000000000000
--- a/x-pack/plugins/monitoring/public/services/__tests__/executor.js
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import ngMock from 'ng_mock';
-import expect from '@kbn/expect';
-import sinon from 'sinon';
-import { executorProvider } from '../executor';
-import Bluebird from 'bluebird';
-import { Legacy } from '../../legacy_shims';
-import { dataPluginMock } from '../../../../../../src/plugins/data/public/mocks';
-
-describe('$executor service', () => {
-  let scope;
-  let executor;
-  let $timeout;
-  let timefilter;
-
-  beforeEach(() => {
-    const data = dataPluginMock.createStartContract();
-    Legacy._shims = { timefilter };
-    timefilter = data.query.timefilter.timefilter;
-  });
-
-  beforeEach(ngMock.module('kibana'));
-
-  beforeEach(
-    ngMock.inject(function (_$rootScope_) {
-      scope = _$rootScope_.$new();
-    })
-  );
-
-  beforeEach(() => {
-    $timeout = sinon.spy(setTimeout);
-    $timeout.cancel = (id) => clearTimeout(id);
-
-    timefilter.setRefreshInterval({
-      value: 0,
-    });
-
-    executor = executorProvider(Bluebird, $timeout);
-  });
-
-  afterEach(() => executor.destroy());
-
-  it('should not call $timeout if the timefilter is not paused and set to zero', () => {
-    executor.start(scope);
-    expect($timeout.callCount).to.equal(0);
-  });
-
-  it('should call $timeout if the timefilter is not paused and set to 1000ms', () => {
-    timefilter.setRefreshInterval({
-      pause: false,
-      value: 1000,
-    });
-    executor.start(scope);
-    expect($timeout.callCount).to.equal(1);
-  });
-
-  it('should execute function if timefilter is not paused and interval set to 1000ms', (done) => {
-    timefilter.setRefreshInterval({
-      pause: false,
-      value: 1000,
-    });
-    executor.register({ execute: () => Bluebird.resolve().then(() => done(), done) });
-    executor.start(scope);
-  });
-
-  it('should execute function multiple times', (done) => {
-    let calls = 0;
-    timefilter.setRefreshInterval({
-      pause: false,
-      value: 10,
-    });
-    executor.register({
-      execute: () => {
-        if (calls++ > 1) {
-          done();
-        }
-        return Bluebird.resolve();
-      },
-    });
-    executor.start(scope);
-  });
-
-  it('should call handleResponse', (done) => {
-    timefilter.setRefreshInterval({
-      pause: false,
-      value: 10,
-    });
-    executor.register({
-      execute: () => Bluebird.resolve(),
-      handleResponse: () => done(),
-    });
-    executor.start(scope);
-  });
-
-  it('should call handleError', (done) => {
-    timefilter.setRefreshInterval({
-      pause: false,
-      value: 10,
-    });
-    executor.register({
-      execute: () => Bluebird.reject(new Error('reject test')),
-      handleError: () => done(),
-    });
-    executor.start(scope);
-  });
-});
diff --git a/x-pack/plugins/monitoring/public/services/__tests__/breadcrumbs.js b/x-pack/plugins/monitoring/public/services/breadcrumbs.test.js
similarity index 86%
rename from x-pack/plugins/monitoring/public/services/__tests__/breadcrumbs.js
rename to x-pack/plugins/monitoring/public/services/breadcrumbs.test.js
index d4493d4d39e58..25f8a9e0cd4b1 100644
--- a/x-pack/plugins/monitoring/public/services/__tests__/breadcrumbs.js
+++ b/x-pack/plugins/monitoring/public/services/breadcrumbs.test.js
@@ -5,10 +5,40 @@
  */
 
 import expect from '@kbn/expect';
-import { breadcrumbsProvider } from '../breadcrumbs';
-import { MonitoringMainController } from '../../directives/main';
+import { breadcrumbsProvider } from './breadcrumbs';
+import { MonitoringMainController } from '../directives/main';
+import { Legacy } from '../legacy_shims';
 
 describe('Monitoring Breadcrumbs Service', () => {
+  const core = {
+    notifications: {},
+    application: {},
+    i18n: {},
+    chrome: {},
+  };
+  const data = {
+    query: {
+      timefilter: {
+        timefilter: {
+          isTimeRangeSelectorEnabled: () => true,
+          getTime: () => 1,
+          getRefreshInterval: () => 1,
+        },
+      },
+    },
+  };
+  const isCloud = false;
+  const triggersActionsUi = {};
+
+  beforeAll(() => {
+    Legacy.init({
+      core,
+      data,
+      isCloud,
+      triggersActionsUi,
+    });
+  });
+
   it('in Cluster Alerts', () => {
     const controller = new MonitoringMainController();
     controller.setup({
diff --git a/x-pack/plugins/monitoring/public/views/__tests__/base_controller.js b/x-pack/plugins/monitoring/public/views/__tests__/base_controller.js
deleted file mode 100644
index efb66f3e251ac..0000000000000
--- a/x-pack/plugins/monitoring/public/views/__tests__/base_controller.js
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { spy, stub } from 'sinon';
-import expect from '@kbn/expect';
-import { MonitoringViewBaseController } from '../';
-import { Legacy } from '../../legacy_shims';
-import { PromiseWithCancel, Status } from '../../../common/cancel_promise';
-import { dataPluginMock } from '../../../../../../src/plugins/data/public/mocks';
-
-/*
- * Mostly copied from base_table_controller test, with modifications
- */
-describe('MonitoringViewBaseController', function () {
-  let ctrl;
-  let $injector;
-  let $scope;
-  let opts;
-  let titleService;
-  let executorService;
-  let configService;
-  let timefilter;
-  const httpCall = (ms) => new Promise((resolve) => setTimeout(() => resolve(), ms));
-
-  before(() => {
-    const data = dataPluginMock.createStartContract();
-    Legacy._shims = { timefilter };
-    timefilter = data.query.timefilter.timefilter;
-    titleService = spy();
-    executorService = {
-      register: spy(),
-      start: spy(),
-      cancel: spy(),
-      run: spy(),
-    };
-    configService = {
-      get: spy(),
-    };
-
-    const windowMock = () => {
-      const events = {};
-      const targetEvent = 'popstate';
-      return {
-        removeEventListener: stub(),
-        addEventListener: (name, handler) => name === targetEvent && (events[name] = handler),
-        history: {
-          back: () => events[targetEvent] && events[targetEvent](),
-        },
-      };
-    };
-
-    const injectorGetStub = stub();
-    injectorGetStub.withArgs('title').returns(titleService);
-    injectorGetStub.withArgs('$executor').returns(executorService);
-    injectorGetStub
-      .withArgs('localStorage')
-      .throws('localStorage should not be used by this class');
-    injectorGetStub.withArgs('$window').returns(windowMock());
-    injectorGetStub.withArgs('config').returns(configService);
-    $injector = { get: injectorGetStub };
-
-    $scope = {
-      cluster: { cluster_uuid: 'foo' },
-      $on: stub(),
-      $apply: stub(),
-    };
-
-    opts = {
-      title: 'testo',
-      getPageData: () => Promise.resolve({ data: { test: true } }),
-      $injector,
-      $scope,
-    };
-
-    ctrl = new MonitoringViewBaseController(opts);
-  });
-
-  it('show/hide zoom-out button based on interaction', (done) => {
-    const xaxis = { from: 1562089923880, to: 1562090159676 };
-    const timeRange = { xaxis };
-    const { zoomInfo } = ctrl;
-
-    ctrl.onBrush(timeRange);
-
-    expect(zoomInfo.showZoomOutBtn()).to.be(true);
-
-    /*
-      Need to do this async, since we are delaying event adding
-    */
-    setTimeout(() => {
-      zoomInfo.zoomOutHandler();
-      expect(zoomInfo.showZoomOutBtn()).to.be(false);
-      done();
-    }, 15);
-  });
-
-  it('creates functions for fetching data', () => {
-    expect(ctrl.updateData).to.be.a('function');
-    expect(ctrl.onBrush).to.be.a('function');
-  });
-
-  it('sets page title', () => {
-    expect(titleService.calledOnce).to.be(true);
-    const { args } = titleService.getCall(0);
-    expect(args).to.eql([{ cluster_uuid: 'foo' }, 'testo']);
-  });
-
-  it('starts data poller', () => {
-    expect(executorService.register.calledOnce).to.be(true);
-    expect(executorService.start.calledOnce).to.be(true);
-  });
-
-  it('does not allow for a new request if one is inflight', (done) => {
-    let counter = 0;
-    const opts = {
-      title: 'testo',
-      getPageData: (ms) => httpCall(ms),
-      $injector,
-      $scope,
-    };
-
-    const ctrl = new MonitoringViewBaseController(opts);
-    ctrl.updateData(30).then(() => ++counter);
-    ctrl.updateData(60).then(() => {
-      expect(counter).to.be(0);
-      done();
-    });
-  });
-
-  describe('time filter', () => {
-    it('enables timepicker and auto refresh #1', () => {
-      expect(timefilter.isTimeRangeSelectorEnabled()).to.be(true);
-      expect(timefilter.isAutoRefreshSelectorEnabled()).to.be(true);
-    });
-
-    it('enables timepicker and auto refresh #2', () => {
-      opts = {
-        ...opts,
-        options: {},
-      };
-      ctrl = new MonitoringViewBaseController(opts);
-
-      expect(timefilter.isTimeRangeSelectorEnabled()).to.be(true);
-      expect(timefilter.isAutoRefreshSelectorEnabled()).to.be(true);
-    });
-
-    it('disables timepicker and enables auto refresh', () => {
-      opts = {
-        ...opts,
-        options: { enableTimeFilter: false },
-      };
-      ctrl = new MonitoringViewBaseController(opts);
-
-      expect(timefilter.isTimeRangeSelectorEnabled()).to.be(false);
-      expect(timefilter.isAutoRefreshSelectorEnabled()).to.be(true);
-    });
-
-    it('enables timepicker and disables auto refresh', () => {
-      opts = {
-        ...opts,
-        options: { enableAutoRefresh: false },
-      };
-      ctrl = new MonitoringViewBaseController(opts);
-
-      expect(timefilter.isTimeRangeSelectorEnabled()).to.be(true);
-      expect(timefilter.isAutoRefreshSelectorEnabled()).to.be(false);
-    });
-
-    it('disables timepicker and auto refresh', () => {
-      opts = {
-        ...opts,
-        options: {
-          enableTimeFilter: false,
-          enableAutoRefresh: false,
-        },
-      };
-      ctrl = new MonitoringViewBaseController(opts);
-
-      expect(timefilter.isTimeRangeSelectorEnabled()).to.be(false);
-      expect(timefilter.isAutoRefreshSelectorEnabled()).to.be(false);
-    });
-
-    it('disables timepicker and auto refresh', (done) => {
-      opts = {
-        title: 'test',
-        getPageData: () => httpCall(60),
-        $injector,
-        $scope,
-      };
-
-      ctrl = new MonitoringViewBaseController({ ...opts });
-      ctrl.updateDataPromise = new PromiseWithCancel(httpCall(50));
-
-      let shouldBeFalse = false;
-      ctrl.updateDataPromise.promise().then(() => (shouldBeFalse = true));
-
-      const lastUpdateDataPromise = ctrl.updateDataPromise;
-
-      ctrl.updateData().then(() => {
-        expect(shouldBeFalse).to.be(false);
-        expect(lastUpdateDataPromise.status()).to.be(Status.Canceled);
-        done();
-      });
-    });
-  });
-});
diff --git a/x-pack/plugins/monitoring/public/views/__tests__/base_table_controller.js b/x-pack/plugins/monitoring/public/views/__tests__/base_table_controller.js
deleted file mode 100644
index 8d66429349cf4..0000000000000
--- a/x-pack/plugins/monitoring/public/views/__tests__/base_table_controller.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { spy, stub } from 'sinon';
-import expect from '@kbn/expect';
-import { MonitoringViewBaseTableController } from '../';
-
-describe('MonitoringViewBaseTableController', function () {
-  let ctrl;
-  let $injector;
-  let $scope;
-  let opts;
-  let timefilter;
-  let titleService;
-  let executorService;
-
-  before(() => {
-    timefilter = {
-      enableTimeRangeSelector: spy(),
-      enableAutoRefreshSelector: spy(),
-      isTimeRangeSelectorEnabled: () => true,
-      isAutoRefreshSelectorEnabled: () => true,
-    };
-    titleService = spy();
-    executorService = {
-      register: spy(),
-      start: spy(),
-    };
-
-    const injectorGetStub = stub();
-    injectorGetStub.withArgs('title').returns(titleService);
-    injectorGetStub.withArgs('timefilter').returns(timefilter);
-    injectorGetStub.withArgs('$executor').returns(executorService);
-    injectorGetStub.withArgs('localStorage').returns({
-      get: stub().returns({
-        testoStorageKey: {
-          pageIndex: 9000,
-          filterText: 'table-ctrl-testoStorageKey',
-          sortKey: 'test.testoStorageKey',
-          sortOrder: -1,
-        },
-      }),
-    });
-    $injector = { get: injectorGetStub };
-
-    $scope = {
-      cluster: { cluster_uuid: 'foo' },
-      $on: stub(),
-    };
-
-    opts = {
-      title: 'testoTitle',
-      getPageData: () => Promise.resolve({ data: { test: true } }),
-      storageKey: 'testoStorageKey',
-      $injector,
-      $scope,
-    };
-
-    ctrl = new MonitoringViewBaseTableController(opts);
-  });
-
-  it('initializes scope data from storage', () => {
-    expect(ctrl.pageIndex).to.be(9000);
-    expect(ctrl.filterText).to.be('table-ctrl-testoStorageKey');
-    expect(ctrl.sortKey).to.be('test.testoStorageKey');
-    expect(ctrl.sortOrder).to.be(-1);
-  });
-
-  it('creates functions for event handling and fetching data', () => {
-    expect(ctrl.onNewState).to.be.a('function');
-    expect(ctrl.updateData).to.be.a('function');
-  });
-
-  it('enables timepicker', () => {
-    expect(timefilter.isTimeRangeSelectorEnabled()).to.be(true);
-    expect(timefilter.isAutoRefreshSelectorEnabled()).to.be(true);
-  });
-
-  it('sets page title', () => {
-    expect(titleService.calledOnce).to.be(true);
-    const { args } = titleService.getCall(0);
-    expect(args).to.eql([{ cluster_uuid: 'foo' }, 'testoTitle']);
-  });
-
-  it('starts data poller', () => {
-    expect(executorService.register.calledOnce).to.be(true);
-    expect(executorService.start.calledOnce).to.be(true);
-  });
-});

From 8f7d213944b7112669bbfe11133e782440e1455f Mon Sep 17 00:00:00 2001
From: Dima Arnautov <dmitrii.arnautov@elastic.co>
Date: Wed, 19 Aug 2020 16:22:26 +0200
Subject: [PATCH 20/85] [ML] Inference models management (#74978)

* [ML] init tabs

* [ML] init inference API service in UI

* [ML] server-side routes

* [ML] basic table

* [ML] support deletion

* [ML] delete multiple models

* [ML] WIP expanded row

* [ML] fix types

* [ML] expanded row

* [ML] fix types

* [ML] fix i18n id

* [ML] change server-side permission check

* [ML] refactor types

* [ML] show success toast on model deletion, fix models counter

* [ML] update expanded row

* [ML] pipelines stats

* [ML] use refresh observable

* [ML] endpoint to fetch associated pipelines

* [ML] update the endpoint to fetch associated pipelines

* [ML] show pipelines definition in expanded row

* [ML] change stats layout

* [ML] fix headers

* [ML] change breadcrumb title

* [ML] fetch models config with pipelines

* [ML] change default size to 1000

* [ML] fix collections keys, fix double fetch on initial page load

* [ML] adjust models deletion text

* [ML] fix DFA jobs on the management page

* [ML] small tabs in expanded row

* [ML] fix headers text

* [ML] fix models fetching without pipelines get permissions

* [ML] stats rendering as a description list

* [ML] fix i18n id

* [ML] remove an extra copyright comment, add selectable messages

* [ML] update stats on refresh
---
 .../ml/common/types/data_frame_analytics.ts   |  70 +++
 x-pack/plugins/ml/common/types/inference.ts   |  81 +++
 .../application/components/stats_bar/index.ts |   2 +-
 .../components/stats_bar/stats_bar.tsx        |   6 +-
 .../data_frame_analytics/common/analytics.ts  |  89 +--
 .../data_frame_analytics/common/fields.ts     |   2 +-
 .../common/get_index_data.ts                  |   3 +-
 .../data_frame_analytics/common/index.ts      |   6 +-
 .../pages/analytics_creation/page.tsx         |   2 +-
 .../analytics_list/analytics_list.tsx         |  12 +-
 .../analytics_navigation_bar.tsx              |  60 +++
 .../analytics_navigation_bar/index.ts         |   7 +
 .../models_management/delete_models_modal.tsx |  93 ++++
 .../models_management/expanded_row.tsx        | 370 +++++++++++++
 .../components/models_management/index.ts     |  13 +
 .../models_management/models_list.tsx         | 509 ++++++++++++++++++
 .../hooks/use_create_analytics_form/state.ts  |   9 +-
 .../pages/analytics_management/page.tsx       |  17 +-
 .../routes/data_frame_analytics/index.ts      |   1 +
 .../data_frame_analytics/models_list.tsx      |  40 ++
 .../services/ml_api_service/inference.ts      | 135 +++++
 .../plugins/ml/server/client/error_wrapper.ts |   4 +-
 .../{index.js => index.ts}                    |   1 +
 .../data_frame_analytics/models_provider.ts   |  42 ++
 x-pack/plugins/ml/server/plugin.ts            |   3 +
 x-pack/plugins/ml/server/routes/inference.ts  | 163 ++++++
 .../server/routes/schemas/inference_schema.ts |  26 +
 .../ml/data_frame_analytics_creation.ts       |   8 +-
 28 files changed, 1678 insertions(+), 96 deletions(-)
 create mode 100644 x-pack/plugins/ml/common/types/inference.ts
 create mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_navigation_bar/analytics_navigation_bar.tsx
 create mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_navigation_bar/index.ts
 create mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/models_management/delete_models_modal.tsx
 create mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/models_management/expanded_row.tsx
 create mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/models_management/index.ts
 create mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/models_management/models_list.tsx
 create mode 100644 x-pack/plugins/ml/public/application/routing/routes/data_frame_analytics/models_list.tsx
 create mode 100644 x-pack/plugins/ml/public/application/services/ml_api_service/inference.ts
 rename x-pack/plugins/ml/server/models/data_frame_analytics/{index.js => index.ts} (86%)
 create mode 100644 x-pack/plugins/ml/server/models/data_frame_analytics/models_provider.ts
 create mode 100644 x-pack/plugins/ml/server/routes/inference.ts
 create mode 100644 x-pack/plugins/ml/server/routes/schemas/inference_schema.ts

diff --git a/x-pack/plugins/ml/common/types/data_frame_analytics.ts b/x-pack/plugins/ml/common/types/data_frame_analytics.ts
index 5ba7f9c191a7f..f0aac75047585 100644
--- a/x-pack/plugins/ml/common/types/data_frame_analytics.ts
+++ b/x-pack/plugins/ml/common/types/data_frame_analytics.ts
@@ -5,7 +5,77 @@
  */
 
 import { CustomHttpResponseOptions, ResponseError } from 'kibana/server';
+
 export interface DeleteDataFrameAnalyticsWithIndexStatus {
   success: boolean;
   error?: CustomHttpResponseOptions<ResponseError>;
 }
+
+export type IndexName = string;
+export type DataFrameAnalyticsId = string;
+
+export interface OutlierAnalysis {
+  [key: string]: {};
+
+  outlier_detection: {};
+}
+
+interface Regression {
+  dependent_variable: string;
+  training_percent?: number;
+  num_top_feature_importance_values?: number;
+  prediction_field_name?: string;
+}
+
+interface Classification {
+  dependent_variable: string;
+  training_percent?: number;
+  num_top_classes?: string;
+  num_top_feature_importance_values?: number;
+  prediction_field_name?: string;
+}
+
+export interface RegressionAnalysis {
+  [key: string]: Regression;
+
+  regression: Regression;
+}
+
+export interface ClassificationAnalysis {
+  [key: string]: Classification;
+
+  classification: Classification;
+}
+
+interface GenericAnalysis {
+  [key: string]: Record<string, any>;
+}
+
+export type AnalysisConfig =
+  | OutlierAnalysis
+  | RegressionAnalysis
+  | ClassificationAnalysis
+  | GenericAnalysis;
+
+export interface DataFrameAnalyticsConfig {
+  id: DataFrameAnalyticsId;
+  description?: string;
+  dest: {
+    index: IndexName;
+    results_field: string;
+  };
+  source: {
+    index: IndexName | IndexName[];
+    query?: any;
+  };
+  analysis: AnalysisConfig;
+  analyzed_fields: {
+    includes: string[];
+    excludes: string[];
+  };
+  model_memory_limit: string;
+  max_num_threads?: number;
+  create_time: number;
+  version: string;
+  allow_lazy_start?: boolean;
+}
diff --git a/x-pack/plugins/ml/common/types/inference.ts b/x-pack/plugins/ml/common/types/inference.ts
new file mode 100644
index 0000000000000..c70ee264e6fc8
--- /dev/null
+++ b/x-pack/plugins/ml/common/types/inference.ts
@@ -0,0 +1,81 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { DataFrameAnalyticsConfig } from './data_frame_analytics';
+
+export interface IngestStats {
+  count: number;
+  time_in_millis: number;
+  current: number;
+  failed: number;
+}
+
+export interface TrainedModelStat {
+  model_id: string;
+  pipeline_count: number;
+  inference_stats?: {
+    failure_count: number;
+    inference_count: number;
+    cache_miss_count: number;
+    missing_all_fields_count: number;
+    timestamp: number;
+  };
+  ingest?: {
+    total: IngestStats;
+    pipelines: Record<
+      string,
+      IngestStats & {
+        processors: Array<
+          Record<
+            string,
+            {
+              // TODO use type from ingest_pipelines plugin
+              type: string;
+              stats: IngestStats;
+            }
+          >
+        >;
+      }
+    >;
+  };
+}
+
+export interface ModelConfigResponse {
+  created_by: string;
+  create_time: string;
+  default_field_map: Record<string, string>;
+  estimated_heap_memory_usage_bytes: number;
+  estimated_operations: number;
+  license_level: string;
+  metadata?:
+    | {
+        analytics_config: DataFrameAnalyticsConfig;
+        input: any;
+      }
+    | Record<string, any>;
+  model_id: string;
+  tags: string;
+  version: string;
+  inference_config?: Record<string, any>;
+  pipelines?: Record<string, PipelineDefinition> | null;
+}
+
+export interface PipelineDefinition {
+  processors?: Array<Record<string, any>>;
+  description?: string;
+}
+
+export interface ModelPipelines {
+  model_id: string;
+  pipelines: Record<string, PipelineDefinition>;
+}
+
+/**
+ * Get inference response from the ES endpoint
+ */
+export interface InferenceConfigResponse {
+  trained_model_configs: ModelConfigResponse[];
+}
diff --git a/x-pack/plugins/ml/public/application/components/stats_bar/index.ts b/x-pack/plugins/ml/public/application/components/stats_bar/index.ts
index 597975d0b150b..c8023b13cf74e 100644
--- a/x-pack/plugins/ml/public/application/components/stats_bar/index.ts
+++ b/x-pack/plugins/ml/public/application/components/stats_bar/index.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { StatsBar, AnalyticStatsBarStats, JobStatsBarStats } from './stats_bar';
+export { StatsBar, AnalyticStatsBarStats, JobStatsBarStats, ModelsBarStats } from './stats_bar';
diff --git a/x-pack/plugins/ml/public/application/components/stats_bar/stats_bar.tsx b/x-pack/plugins/ml/public/application/components/stats_bar/stats_bar.tsx
index 0bd33a8c99f49..c4d64e48151b3 100644
--- a/x-pack/plugins/ml/public/application/components/stats_bar/stats_bar.tsx
+++ b/x-pack/plugins/ml/public/application/components/stats_bar/stats_bar.tsx
@@ -23,7 +23,11 @@ export interface AnalyticStatsBarStats extends Stats {
   stopped: StatsBarStat;
 }
 
-export type StatsBarStats = JobStatsBarStats | AnalyticStatsBarStats;
+export interface ModelsBarStats {
+  total: StatsBarStat;
+}
+
+export type StatsBarStats = JobStatsBarStats | AnalyticStatsBarStats | ModelsBarStats;
 type StatsKey = keyof StatsBarStats;
 
 interface StatsBarProps {
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/common/analytics.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/common/analytics.ts
index 561e8642772f0..8ad861e616b7a 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/common/analytics.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/common/analytics.ts
@@ -5,18 +5,21 @@
  */
 
 import { useEffect } from 'react';
-import { BehaviorSubject } from 'rxjs';
-import { filter, distinctUntilChanged } from 'rxjs/operators';
-import { Subscription } from 'rxjs';
+import { BehaviorSubject, Subscription } from 'rxjs';
+import { distinctUntilChanged, filter } from 'rxjs/operators';
 import { cloneDeep } from 'lodash';
 import { ml } from '../../services/ml_api_service';
 import { Dictionary } from '../../../../common/types/common';
 import { getErrorMessage } from '../../../../common/util/errors';
 import { SavedSearchQuery } from '../../contexts/ml';
+import {
+  AnalysisConfig,
+  ClassificationAnalysis,
+  OutlierAnalysis,
+  RegressionAnalysis,
+} from '../../../../common/types/data_frame_analytics';
 
-export type IndexName = string;
 export type IndexPattern = string;
-export type DataFrameAnalyticsId = string;
 
 export enum ANALYSIS_CONFIG_TYPE {
   OUTLIER_DETECTION = 'outlier_detection',
@@ -46,34 +49,6 @@ export enum OUTLIER_ANALYSIS_METHOD {
   DISTANCE_KNN = 'distance_knn',
 }
 
-interface OutlierAnalysis {
-  [key: string]: {};
-  outlier_detection: {};
-}
-
-interface Regression {
-  dependent_variable: string;
-  training_percent?: number;
-  num_top_feature_importance_values?: number;
-  prediction_field_name?: string;
-}
-export interface RegressionAnalysis {
-  [key: string]: Regression;
-  regression: Regression;
-}
-
-interface Classification {
-  dependent_variable: string;
-  training_percent?: number;
-  num_top_classes?: string;
-  num_top_feature_importance_values?: number;
-  prediction_field_name?: string;
-}
-export interface ClassificationAnalysis {
-  [key: string]: Classification;
-  classification: Classification;
-}
-
 export interface LoadExploreDataArg {
   filterByIsTraining?: boolean;
   searchQuery: SavedSearchQuery;
@@ -165,22 +140,12 @@ export interface ClassificationEvaluateResponse {
   };
 }
 
-interface GenericAnalysis {
-  [key: string]: Record<string, any>;
-}
-
 interface LoadEvaluateResult {
   success: boolean;
   eval: RegressionEvaluateResponse | ClassificationEvaluateResponse | null;
   error: string | null;
 }
 
-type AnalysisConfig =
-  | OutlierAnalysis
-  | RegressionAnalysis
-  | ClassificationAnalysis
-  | GenericAnalysis;
-
 export const getAnalysisType = (analysis: AnalysisConfig): string => {
   const keys = Object.keys(analysis);
 
@@ -342,29 +307,6 @@ export interface UpdateDataFrameAnalyticsConfig {
   max_num_threads?: number;
 }
 
-export interface DataFrameAnalyticsConfig {
-  id: DataFrameAnalyticsId;
-  description?: string;
-  dest: {
-    index: IndexName;
-    results_field: string;
-  };
-  source: {
-    index: IndexName | IndexName[];
-    query?: any;
-  };
-  analysis: AnalysisConfig;
-  analyzed_fields: {
-    includes: string[];
-    excludes: string[];
-  };
-  model_memory_limit: string;
-  max_num_threads?: number;
-  create_time: number;
-  version: string;
-  allow_lazy_start?: boolean;
-}
-
 export enum REFRESH_ANALYTICS_LIST_STATE {
   ERROR = 'error',
   IDLE = 'idle',
@@ -379,7 +321,8 @@ export const useRefreshAnalyticsList = (
   callback: {
     isLoading?(d: boolean): void;
     onRefresh?(): void;
-  } = {}
+  } = {},
+  isManagementTable = false
 ) => {
   useEffect(() => {
     const distinct$ = refreshAnalyticsList$.pipe(distinctUntilChanged());
@@ -387,13 +330,17 @@ export const useRefreshAnalyticsList = (
     const subscriptions: Subscription[] = [];
 
     if (typeof callback.onRefresh === 'function') {
-      // initial call to refresh
-      callback.onRefresh();
+      // required in order to fetch the DFA jobs on the management page
+      if (isManagementTable) callback.onRefresh();
 
       subscriptions.push(
         distinct$
           .pipe(filter((state) => state === REFRESH_ANALYTICS_LIST_STATE.REFRESH))
-          .subscribe(() => typeof callback.onRefresh === 'function' && callback.onRefresh())
+          .subscribe(() => {
+            if (typeof callback.onRefresh === 'function') {
+              callback.onRefresh();
+            }
+          })
       );
     }
 
@@ -410,7 +357,7 @@ export const useRefreshAnalyticsList = (
     return () => {
       subscriptions.map((sub) => sub.unsubscribe());
     };
-  }, []);
+  }, [callback.onRefresh]);
 
   return {
     refresh: () => {
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/common/fields.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/common/fields.ts
index 1b99aac812fcd..847aefefbc6c8 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/common/fields.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/common/fields.ts
@@ -13,13 +13,13 @@ import {
   isClassificationAnalysis,
   isOutlierAnalysis,
   isRegressionAnalysis,
-  DataFrameAnalyticsConfig,
 } from './analytics';
 import { Field } from '../../../../common/types/fields';
 import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
 import { newJobCapsService } from '../../services/new_job_capabilities_service';
 
 import { FEATURE_IMPORTANCE, FEATURE_INFLUENCE, OUTLIER_SCORE, TOP_CLASSES } from './constants';
+import { DataFrameAnalyticsConfig } from '../../../../common/types/data_frame_analytics';
 
 export type EsId = string;
 export type EsDocSource = Record<string, any>;
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/common/get_index_data.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/common/get_index_data.ts
index eb38a23d10eef..c162cb2754c10 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/common/get_index_data.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/common/get_index_data.ts
@@ -12,7 +12,8 @@ import { ml } from '../../services/ml_api_service';
 import { isKeywordAndTextType } from '../common/fields';
 import { SavedSearchQuery } from '../../contexts/ml';
 
-import { DataFrameAnalyticsConfig, INDEX_STATUS } from './analytics';
+import { INDEX_STATUS } from './analytics';
+import { DataFrameAnalyticsConfig } from '../../../../common/types/data_frame_analytics';
 
 export const getIndexData = async (
   jobConfig: DataFrameAnalyticsConfig | undefined,
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/common/index.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/common/index.ts
index 65531009e4436..00d735d9a866e 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/common/index.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/common/index.ts
@@ -11,10 +11,7 @@ export {
   isOutlierAnalysis,
   refreshAnalyticsList$,
   useRefreshAnalyticsList,
-  DataFrameAnalyticsId,
-  DataFrameAnalyticsConfig,
   UpdateDataFrameAnalyticsConfig,
-  IndexName,
   IndexPattern,
   REFRESH_ANALYTICS_LIST_STATE,
   ANALYSIS_CONFIG_TYPE,
@@ -45,3 +42,6 @@ export { getIndexData } from './get_index_data';
 export { getIndexFields } from './get_index_fields';
 
 export { useResultsViewConfig } from './use_results_view_config';
+export { DataFrameAnalyticsConfig } from '../../../../common/types/data_frame_analytics';
+export { DataFrameAnalyticsId } from '../../../../common/types/data_frame_analytics';
+export { IndexName } from '../../../../common/types/data_frame_analytics';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/page.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/page.tsx
index 2f0e2ed3428c0..da5caf8e3875a 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/page.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/page.tsx
@@ -23,10 +23,10 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { useMlContext } from '../../../contexts/ml';
 import { newJobCapsService } from '../../../services/new_job_capabilities_service';
 import { ml } from '../../../services/ml_api_service';
-import { DataFrameAnalyticsId } from '../../common/analytics';
 import { useCreateAnalyticsForm } from '../analytics_management/hooks/use_create_analytics_form';
 import { CreateAnalyticsAdvancedEditor } from './components/create_analytics_advanced_editor';
 import { AdvancedStep, ConfigurationStep, CreateStep, DetailsStep } from './components';
+import { DataFrameAnalyticsId } from '../../../../../common/types/data_frame_analytics';
 
 export enum ANALYTICS_STEPS {
   CONFIGURATION,
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/analytics_list.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/analytics_list.tsx
index 0652ec5f8acb1..81494a43193dc 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/analytics_list.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/analytics_list.tsx
@@ -120,10 +120,13 @@ export const DataFrameAnalyticsList: FC<Props> = ({
   }, [selectedIdFromUrlInitialized, analytics]);
 
   // Subscribe to the refresh observable to trigger reloading the analytics list.
-  useRefreshAnalyticsList({
-    isLoading: setIsLoading,
-    onRefresh: () => getAnalytics(true),
-  });
+  useRefreshAnalyticsList(
+    {
+      isLoading: setIsLoading,
+      onRefresh: () => getAnalytics(true),
+    },
+    isManagementTable
+  );
 
   const { columns, modals } = useColumns(
     expandedRowItemIds,
@@ -271,6 +274,7 @@ export const DataFrameAnalyticsList: FC<Props> = ({
   return (
     <>
       {modals}
+      <EuiSpacer size="m" />
       <EuiFlexGroup justifyContent="spaceBetween">
         <EuiFlexItem grow={false}>
           {analyticsStats && (
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_navigation_bar/analytics_navigation_bar.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_navigation_bar/analytics_navigation_bar.tsx
new file mode 100644
index 0000000000000..bd59749517052
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_navigation_bar/analytics_navigation_bar.tsx
@@ -0,0 +1,60 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC, useCallback, useMemo } from 'react';
+import { i18n } from '@kbn/i18n';
+import { EuiTab, EuiTabs } from '@elastic/eui';
+import { useNavigateToPath } from '../../../../../contexts/kibana';
+
+interface Tab {
+  id: string;
+  name: string;
+  path: string;
+}
+
+export const AnalyticsNavigationBar: FC<{ selectedTabId?: string }> = ({ selectedTabId }) => {
+  const navigateToPath = useNavigateToPath();
+
+  const tabs = useMemo(
+    () => [
+      {
+        id: 'data_frame_analytics',
+        name: i18n.translate('xpack.ml.dataframe.jobsTabLabel', {
+          defaultMessage: 'Jobs',
+        }),
+        path: '/data_frame_analytics',
+      },
+      {
+        id: 'models',
+        name: i18n.translate('xpack.ml.dataframe.modelsTabLabel', {
+          defaultMessage: 'Models',
+        }),
+        path: '/data_frame_analytics/models',
+      },
+    ],
+    []
+  );
+
+  const onTabClick = useCallback(async (tab: Tab) => {
+    await navigateToPath(tab.path);
+  }, []);
+
+  return (
+    <EuiTabs>
+      {tabs.map((tab) => {
+        return (
+          <EuiTab
+            key={`tab-${tab.id}`}
+            isSelected={tab.id === selectedTabId}
+            onClick={onTabClick.bind(null, tab)}
+          >
+            {tab.name}
+          </EuiTab>
+        );
+      })}
+    </EuiTabs>
+  );
+};
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_navigation_bar/index.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_navigation_bar/index.ts
new file mode 100644
index 0000000000000..594033f3f8d2c
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_navigation_bar/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export * from './analytics_navigation_bar';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/models_management/delete_models_modal.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/models_management/delete_models_modal.tsx
new file mode 100644
index 0000000000000..83010c684473e
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/models_management/delete_models_modal.tsx
@@ -0,0 +1,93 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC } from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import {
+  EuiOverlayMask,
+  EuiModal,
+  EuiModalHeader,
+  EuiModalHeaderTitle,
+  EuiModalBody,
+  EuiModalFooter,
+  EuiButtonEmpty,
+  EuiButton,
+  EuiSpacer,
+  EuiCallOut,
+} from '@elastic/eui';
+import { ModelItemFull } from './models_list';
+
+interface DeleteModelsModalProps {
+  models: ModelItemFull[];
+  onClose: (deletionApproved?: boolean) => void;
+}
+
+export const DeleteModelsModal: FC<DeleteModelsModalProps> = ({ models, onClose }) => {
+  const modelsWithPipelines = models
+    .filter((model) => !!model.pipelines)
+    .map((model) => model.model_id);
+
+  return (
+    <EuiOverlayMask>
+      <EuiModal onClose={onClose.bind(null, false)} initialFocus="[name=cancelModelDeletion]">
+        <EuiModalHeader>
+          <EuiModalHeaderTitle>
+            <FormattedMessage
+              id="xpack.ml.inference.modelsList.deleteModal.header"
+              defaultMessage="Delete {modelsCount, plural, one {{modelId}} other {# models}}"
+              values={{
+                modelId: models[0].model_id,
+                modelsCount: models.length,
+              }}
+            />
+          </EuiModalHeaderTitle>
+        </EuiModalHeader>
+
+        <EuiModalBody>
+          <FormattedMessage
+            id="xpack.ml.inference.modelsList.deleteModal.warningMessage"
+            defaultMessage="Are you sure you want to delete {modelsCount, plural, one{this model} other {these models}}?"
+            values={{ modelsCount: models.length }}
+          />
+          <EuiSpacer size="m" />
+          {modelsWithPipelines.length > 0 && (
+            <EuiCallOut
+              data-test-subj="modelsWithPipelinesWarning"
+              color={'danger'}
+              iconType={'alert'}
+              size="s"
+            >
+              <FormattedMessage
+                id="xpack.ml.inference.modelsList.deleteModal.modelsWithPipelinesWarningMessage"
+                defaultMessage="{modelsWithPipelinesCount, plural, one{Model} other {Models}} {modelsWithPipelines} {modelsWithPipelinesCount, plural, one{has} other {have}} associated pipelines!"
+                values={{
+                  modelsWithPipelinesCount: modelsWithPipelines.length,
+                  modelsWithPipelines: modelsWithPipelines.join(', '),
+                }}
+              />
+            </EuiCallOut>
+          )}
+        </EuiModalBody>
+
+        <EuiModalFooter>
+          <EuiButtonEmpty onClick={onClose.bind(null, false)} name="cancelModelDeletion">
+            <FormattedMessage
+              id="xpack.ml.inference.modelsList.deleteModal.cancelButtonLabel"
+              defaultMessage="Cancel"
+            />
+          </EuiButtonEmpty>
+
+          <EuiButton onClick={onClose.bind(null, true)} fill color="danger">
+            <FormattedMessage
+              id="xpack.ml.inference.modelsList.deleteModal.deleteButtonLabel"
+              defaultMessage="Delete"
+            />
+          </EuiButton>
+        </EuiModalFooter>
+      </EuiModal>
+    </EuiOverlayMask>
+  );
+};
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/models_management/expanded_row.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/models_management/expanded_row.tsx
new file mode 100644
index 0000000000000..7b9329fee783b
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/models_management/expanded_row.tsx
@@ -0,0 +1,370 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC, Fragment } from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import {
+  EuiDescriptionList,
+  EuiPanel,
+  EuiSpacer,
+  EuiTabbedContent,
+  EuiTitle,
+  EuiNotificationBadge,
+  EuiFlexGrid,
+  EuiFlexItem,
+  EuiCodeBlock,
+  EuiText,
+  EuiHorizontalRule,
+  EuiFlexGroup,
+  EuiTextColor,
+} from '@elastic/eui';
+// @ts-ignore
+import { formatDate } from '@elastic/eui/lib/services/format';
+import { ModelItemFull } from './models_list';
+import { TIME_FORMAT } from '../../../../../../../common/constants/time_format';
+
+interface ExpandedRowProps {
+  item: ModelItemFull;
+}
+
+export const ExpandedRow: FC<ExpandedRowProps> = ({ item }) => {
+  const {
+    inference_config: inferenceConfig,
+    stats,
+    metadata,
+    tags,
+    version,
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    estimated_operations,
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    estimated_heap_memory_usage_bytes,
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    default_field_map,
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    license_level,
+    pipelines,
+  } = item;
+
+  const details = {
+    tags,
+    version,
+    estimated_operations,
+    estimated_heap_memory_usage_bytes,
+    default_field_map,
+    license_level,
+  };
+
+  function formatToListItems(items: Record<string, any>) {
+    return Object.entries(items)
+      .map(([title, value]) => {
+        if (title.includes('timestamp')) {
+          value = formatDate(value, TIME_FORMAT);
+        }
+        return { title, description: typeof value === 'object' ? JSON.stringify(value) : value };
+      })
+      .filter(({ description }) => {
+        return description !== undefined;
+      });
+  }
+
+  const tabs = [
+    {
+      id: 'details',
+      name: (
+        <FormattedMessage
+          id="xpack.ml.inference.modelsList.expandedRow.detailsTabLabel"
+          defaultMessage="Details"
+        />
+      ),
+      content: (
+        <>
+          <EuiSpacer size={'m'} />
+          <EuiFlexGrid columns={2} gutterSize={'m'}>
+            <EuiFlexItem>
+              <EuiPanel>
+                <EuiTitle size={'xs'}>
+                  <h5>
+                    <FormattedMessage
+                      id="xpack.ml.inference.modelsList.expandedRow.detailsTitle"
+                      defaultMessage="Details"
+                    />
+                  </h5>
+                </EuiTitle>
+                <EuiSpacer size={'m'} />
+                <EuiDescriptionList
+                  compressed={true}
+                  type="column"
+                  listItems={formatToListItems(details)}
+                />
+              </EuiPanel>
+            </EuiFlexItem>
+          </EuiFlexGrid>
+        </>
+      ),
+    },
+    ...(inferenceConfig
+      ? [
+          {
+            id: 'config',
+            name: (
+              <FormattedMessage
+                id="xpack.ml.inference.modelsList.expandedRow.configTabLabel"
+                defaultMessage="Config"
+              />
+            ),
+            content: (
+              <>
+                <EuiSpacer size={'m'} />
+                <EuiFlexGrid columns={2} gutterSize={'m'}>
+                  <EuiFlexItem>
+                    <EuiPanel>
+                      <EuiTitle size={'xs'}>
+                        <h5>
+                          <FormattedMessage
+                            id="xpack.ml.inference.modelsList.expandedRow.inferenceConfigTitle"
+                            defaultMessage="Inference configuration"
+                          />
+                        </h5>
+                      </EuiTitle>
+                      <EuiSpacer size={'m'} />
+                      <EuiDescriptionList
+                        compressed={true}
+                        type="column"
+                        listItems={formatToListItems(
+                          inferenceConfig[Object.keys(inferenceConfig)[0]]
+                        )}
+                      />
+                    </EuiPanel>
+                  </EuiFlexItem>
+                  {metadata?.analytics_config && (
+                    <EuiFlexItem>
+                      <EuiPanel>
+                        <EuiTitle size={'xs'}>
+                          <h5>
+                            <FormattedMessage
+                              id="xpack.ml.inference.modelsList.expandedRow.analyticsConfigTitle"
+                              defaultMessage="Analytics configuration"
+                            />
+                          </h5>
+                        </EuiTitle>
+                        <EuiSpacer size={'m'} />
+                        <EuiDescriptionList
+                          compressed={true}
+                          type="column"
+                          listItems={formatToListItems(metadata.analytics_config)}
+                        />
+                      </EuiPanel>
+                    </EuiFlexItem>
+                  )}
+                </EuiFlexGrid>
+              </>
+            ),
+          },
+        ]
+      : []),
+    {
+      id: 'stats',
+      name: (
+        <FormattedMessage
+          id="xpack.ml.inference.modelsList.expandedRow.statsTabLabel"
+          defaultMessage="Stats"
+        />
+      ),
+      content: (
+        <>
+          <EuiSpacer size={'m'} />
+          <EuiFlexGrid columns={2}>
+            {stats.inference_stats && (
+              <EuiFlexItem>
+                <EuiPanel>
+                  <EuiTitle size={'xs'}>
+                    <h5>
+                      <FormattedMessage
+                        id="xpack.ml.inference.modelsList.expandedRow.inferenceStatsTitle"
+                        defaultMessage="Inference stats"
+                      />
+                    </h5>
+                  </EuiTitle>
+                  <EuiSpacer size={'m'} />
+                  <EuiDescriptionList
+                    compressed={true}
+                    type="column"
+                    listItems={formatToListItems(stats.inference_stats)}
+                  />
+                </EuiPanel>
+              </EuiFlexItem>
+            )}
+            {stats.ingest?.total && (
+              <EuiFlexItem>
+                <EuiPanel style={{ maxHeight: '400px', overflow: 'auto' }}>
+                  <EuiTitle size={'xs'}>
+                    <h5>
+                      <FormattedMessage
+                        id="xpack.ml.inference.modelsList.expandedRow.ingestStatsTitle"
+                        defaultMessage="Ingest stats"
+                      />
+                    </h5>
+                  </EuiTitle>
+                  <EuiSpacer size={'m'} />
+                  <EuiDescriptionList
+                    compressed={true}
+                    type="column"
+                    listItems={formatToListItems(stats.ingest.total)}
+                  />
+
+                  {stats.ingest?.pipelines && (
+                    <>
+                      <EuiSpacer size={'m'} />
+                      <EuiTitle size={'xs'}>
+                        <h5>
+                          <FormattedMessage
+                            id="xpack.ml.inference.modelsList.expandedRow.byPipelineTitle"
+                            defaultMessage="By pipeline"
+                          />
+                        </h5>
+                      </EuiTitle>
+                      <EuiSpacer size={'s'} />
+                      {Object.entries(stats.ingest.pipelines).map(
+                        ([pipelineName, { processors, ...pipelineStats }], i) => {
+                          return (
+                            <Fragment key={pipelineName}>
+                              <EuiFlexGroup>
+                                <EuiFlexItem grow={false}>
+                                  <EuiTitle size={'xs'}>
+                                    <EuiTextColor color="subdued">
+                                      <h5>
+                                        {i + 1}. {pipelineName}
+                                      </h5>
+                                    </EuiTextColor>
+                                  </EuiTitle>
+                                </EuiFlexItem>
+                                <EuiFlexItem>
+                                  <EuiHorizontalRule size={'full'} margin={'s'} />
+                                </EuiFlexItem>
+                              </EuiFlexGroup>
+                              <EuiSpacer size={'m'} />
+                              <EuiDescriptionList
+                                compressed={true}
+                                type="column"
+                                listItems={formatToListItems(pipelineStats)}
+                              />
+                              <EuiSpacer size={'m'} />
+                              <EuiTitle size={'xxs'}>
+                                <h6>
+                                  <FormattedMessage
+                                    id="xpack.ml.inference.modelsList.expandedRow.byProcessorTitle"
+                                    defaultMessage="By processor"
+                                  />
+                                </h6>
+                              </EuiTitle>
+                              <EuiSpacer size={'s'} />
+                              <>
+                                {processors.map((processor) => {
+                                  const name = Object.keys(processor)[0];
+                                  const { stats: processorStats } = processor[name];
+                                  return (
+                                    <Fragment key={name}>
+                                      <EuiFlexGroup>
+                                        <EuiFlexItem grow={false}>
+                                          <EuiTitle size={'xxs'}>
+                                            <EuiTextColor color="subdued">
+                                              <h6>{name}</h6>
+                                            </EuiTextColor>
+                                          </EuiTitle>
+                                        </EuiFlexItem>
+                                        <EuiFlexItem>
+                                          <EuiHorizontalRule size={'full'} margin={'s'} />
+                                        </EuiFlexItem>
+                                      </EuiFlexGroup>
+                                      <EuiSpacer size={'m'} />
+                                      <EuiDescriptionList
+                                        compressed={true}
+                                        type="column"
+                                        listItems={formatToListItems(processorStats)}
+                                      />
+                                    </Fragment>
+                                  );
+                                })}
+                              </>
+                            </Fragment>
+                          );
+                        }
+                      )}
+                    </>
+                  )}
+                </EuiPanel>
+              </EuiFlexItem>
+            )}
+          </EuiFlexGrid>
+        </>
+      ),
+    },
+    ...(pipelines && Object.keys(pipelines).length > 0
+      ? [
+          {
+            id: 'pipelines',
+            name: (
+              <>
+                <FormattedMessage
+                  id="xpack.ml.inference.modelsList.expandedRow.pipelinesTabLabel"
+                  defaultMessage="Pipelines"
+                />{' '}
+                <EuiNotificationBadge>{stats.pipeline_count}</EuiNotificationBadge>
+              </>
+            ),
+            content: (
+              <>
+                <EuiSpacer size={'m'} />
+                <EuiFlexGrid columns={2} gutterSize={'m'}>
+                  {Object.entries(pipelines).map(([pipelineName, { processors, description }]) => {
+                    return (
+                      <EuiFlexItem key={pipelineName}>
+                        <EuiPanel>
+                          <EuiTitle size={'xs'}>
+                            <h5>{pipelineName}</h5>
+                          </EuiTitle>
+                          {description && <EuiText>{description}</EuiText>}
+                          <EuiSpacer size={'m'} />
+                          <EuiTitle size={'xxs'}>
+                            <h6>
+                              <FormattedMessage
+                                id="xpack.ml.inference.modelsList.expandedRow.processorsTitle"
+                                defaultMessage="Processors"
+                              />
+                            </h6>
+                          </EuiTitle>
+                          <EuiCodeBlock
+                            language="painless"
+                            fontSize="m"
+                            paddingSize="m"
+                            overflowHeight={300}
+                            isCopyable
+                          >
+                            {JSON.stringify(processors, null, 2)}
+                          </EuiCodeBlock>
+                        </EuiPanel>
+                      </EuiFlexItem>
+                    );
+                  })}
+                </EuiFlexGrid>
+              </>
+            ),
+          },
+        ]
+      : []),
+  ];
+
+  return (
+    <EuiTabbedContent
+      size="s"
+      style={{ width: '100%' }}
+      tabs={tabs}
+      initialSelectedTab={tabs[0]}
+      autoFocus="selected"
+      onTabClick={(tab) => {}}
+    />
+  );
+};
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/models_management/index.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/models_management/index.ts
new file mode 100644
index 0000000000000..7c70a25071640
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/models_management/index.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export * from './models_list';
+
+export enum ModelsTableToConfigMapping {
+  id = 'model_id',
+  createdAt = 'create_time',
+  type = 'type',
+}
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/models_management/models_list.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/models_management/models_list.tsx
new file mode 100644
index 0000000000000..3104ec55c3a6d
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/models_management/models_list.tsx
@@ -0,0 +1,509 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC, useState, useCallback, useMemo } from 'react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import {
+  Direction,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiInMemoryTable,
+  EuiTitle,
+  EuiButton,
+  EuiSearchBarProps,
+  EuiSpacer,
+  EuiButtonIcon,
+  EuiBadge,
+} from '@elastic/eui';
+// @ts-ignore
+import { formatDate } from '@elastic/eui/lib/services/format';
+import { EuiBasicTableColumn } from '@elastic/eui/src/components/basic_table/basic_table';
+import { EuiTableSelectionType } from '@elastic/eui/src/components/basic_table/table_types';
+import { Action } from '@elastic/eui/src/components/basic_table/action_types';
+import { StatsBar, ModelsBarStats } from '../../../../../components/stats_bar';
+import { useInferenceApiService } from '../../../../../services/ml_api_service/inference';
+import { ModelsTableToConfigMapping } from './index';
+import { TIME_FORMAT } from '../../../../../../../common/constants/time_format';
+import { DeleteModelsModal } from './delete_models_modal';
+import { useMlKibana, useNotifications } from '../../../../../contexts/kibana';
+import { ExpandedRow } from './expanded_row';
+import { getResultsUrl } from '../analytics_list/common';
+import {
+  ModelConfigResponse,
+  ModelPipelines,
+  TrainedModelStat,
+} from '../../../../../../../common/types/inference';
+import {
+  REFRESH_ANALYTICS_LIST_STATE,
+  refreshAnalyticsList$,
+  useRefreshAnalyticsList,
+} from '../../../../common';
+
+type Stats = Omit<TrainedModelStat, 'model_id'>;
+
+export type ModelItem = ModelConfigResponse & {
+  type?: string;
+  stats?: Stats;
+  pipelines?: ModelPipelines['pipelines'] | null;
+};
+
+export type ModelItemFull = Required<ModelItem>;
+
+export const ModelsList: FC = () => {
+  const {
+    services: {
+      application: { navigateToUrl, capabilities },
+    },
+  } = useMlKibana();
+
+  const canDeleteDataFrameAnalytics = capabilities.ml.canDeleteDataFrameAnalytics as boolean;
+
+  const inferenceApiService = useInferenceApiService();
+  const { toasts } = useNotifications();
+
+  const [searchQueryText, setSearchQueryText] = useState('');
+
+  const [pageIndex, setPageIndex] = useState(0);
+  const [pageSize, setPageSize] = useState(10);
+  const [sortField, setSortField] = useState<string>(ModelsTableToConfigMapping.id);
+  const [sortDirection, setSortDirection] = useState<Direction>('asc');
+
+  const [isLoading, setIsLoading] = useState(false);
+  const [items, setItems] = useState<ModelItem[]>([]);
+  const [selectedModels, setSelectedModels] = useState<ModelItem[]>([]);
+
+  const [modelsToDelete, setModelsToDelete] = useState<ModelItemFull[]>([]);
+
+  const [itemIdToExpandedRowMap, setItemIdToExpandedRowMap] = useState<Record<string, JSX.Element>>(
+    {}
+  );
+
+  /**
+   * Fetches inference trained models.
+   */
+  const fetchData = useCallback(async () => {
+    try {
+      const response = await inferenceApiService.getInferenceModel(undefined, {
+        with_pipelines: true,
+        size: 1000,
+      });
+
+      const newItems = [];
+      const expandedItemsToRefresh = [];
+
+      for (const model of response) {
+        const tableItem = {
+          ...model,
+          ...(typeof model.inference_config === 'object'
+            ? { type: Object.keys(model.inference_config)[0] }
+            : {}),
+        };
+        newItems.push(tableItem);
+
+        if (itemIdToExpandedRowMap[model.model_id]) {
+          expandedItemsToRefresh.push(tableItem);
+        }
+      }
+
+      setItems(newItems);
+
+      if (expandedItemsToRefresh.length > 0) {
+        await fetchModelsStats(expandedItemsToRefresh);
+
+        setItemIdToExpandedRowMap(
+          expandedItemsToRefresh.reduce((acc, item) => {
+            acc[item.model_id] = <ExpandedRow item={item as ModelItemFull} />;
+            return acc;
+          }, {} as Record<string, JSX.Element>)
+        );
+      }
+    } catch (error) {
+      toasts.addError(new Error(error.body?.message), {
+        title: i18n.translate('xpack.ml.inference.modelsList.fetchFailedErrorMessage', {
+          defaultMessage: 'Models fetch failed',
+        }),
+      });
+    }
+    setIsLoading(false);
+    refreshAnalyticsList$.next(REFRESH_ANALYTICS_LIST_STATE.IDLE);
+  }, [itemIdToExpandedRowMap]);
+
+  // Subscribe to the refresh observable to trigger reloading the model list.
+  useRefreshAnalyticsList({
+    isLoading: setIsLoading,
+    onRefresh: fetchData,
+  });
+
+  const modelsStats: ModelsBarStats = useMemo(() => {
+    return {
+      total: {
+        show: true,
+        value: items.length,
+        label: i18n.translate('xpack.ml.inference.modelsList.totalAmountLabel', {
+          defaultMessage: 'Total inference trained models',
+        }),
+      },
+    };
+  }, [items]);
+
+  /**
+   * Fetches models stats and update the original object
+   */
+  const fetchModelsStats = useCallback(async (models: ModelItem[]) => {
+    const modelIdsToFetch = models.map((model) => model.model_id);
+
+    try {
+      const {
+        trained_model_stats: modelsStatsResponse,
+      } = await inferenceApiService.getInferenceModelStats(modelIdsToFetch);
+
+      for (const { model_id: id, ...stats } of modelsStatsResponse) {
+        const model = models.find((m) => m.model_id === id);
+        model!.stats = stats;
+      }
+      return true;
+    } catch (error) {
+      toasts.addError(new Error(error.body.message), {
+        title: i18n.translate('xpack.ml.inference.modelsList.fetchModelStatsErrorMessage', {
+          defaultMessage: 'Fetch model stats failed',
+        }),
+      });
+    }
+  }, []);
+
+  /**
+   * Unique inference types from models
+   */
+  const inferenceTypesOptions = useMemo(() => {
+    const result = items.reduce((acc, item) => {
+      const type = item.inference_config && Object.keys(item.inference_config)[0];
+      if (type) {
+        acc.add(type);
+      }
+      return acc;
+    }, new Set<string>());
+    return [...result].map((v) => ({
+      value: v,
+      name: v,
+    }));
+  }, [items]);
+
+  async function prepareModelsForDeletion(models: ModelItem[]) {
+    // Fetch model stats to check associated pipelines
+    if (await fetchModelsStats(models)) {
+      setModelsToDelete(models as ModelItemFull[]);
+    } else {
+      toasts.addDanger(
+        i18n.translate('xpack.ml.inference.modelsList.unableToDeleteModelsErrorMessage', {
+          defaultMessage: 'Unable to delete models',
+        })
+      );
+    }
+  }
+
+  /**
+   * Deletes the models marked for deletion.
+   */
+  async function deleteModels() {
+    const modelsToDeleteIds = modelsToDelete.map((model) => model.model_id);
+
+    try {
+      await Promise.all(
+        modelsToDeleteIds.map((modelId) => inferenceApiService.deleteInferenceModel(modelId))
+      );
+      setItems(
+        items.filter(
+          (model) => !modelsToDelete.some((toDelete) => toDelete.model_id === model.model_id)
+        )
+      );
+      toasts.addSuccess(
+        i18n.translate('xpack.ml.inference.modelsList.successfullyDeletedMessage', {
+          defaultMessage:
+            '{modelsCount, plural, one {Model {modelsToDeleteIds}} other {# models}} {modelsCount, plural, one {has} other {have}} been successfully deleted',
+          values: {
+            modelsCount: modelsToDeleteIds.length,
+            modelsToDeleteIds: modelsToDeleteIds.join(', '),
+          },
+        })
+      );
+    } catch (error) {
+      toasts.addError(new Error(error?.body?.message), {
+        title: i18n.translate('xpack.ml.inference.modelsList.fetchDeletionErrorMessage', {
+          defaultMessage: '{modelsCount, plural, one {Model} other {Models}} deletion failed',
+          values: {
+            modelsCount: modelsToDeleteIds.length,
+          },
+        }),
+      });
+    }
+  }
+
+  /**
+   * Table actions
+   */
+  const actions: Array<Action<ModelItem>> = [
+    {
+      name: i18n.translate('xpack.ml.inference.modelsList.viewTrainingDataActionLabel', {
+        defaultMessage: 'View training data',
+      }),
+      description: i18n.translate('xpack.ml.inference.modelsList.viewTrainingDataActionLabel', {
+        defaultMessage: 'View training data',
+      }),
+      icon: 'list',
+      type: 'icon',
+      available: (item) => item.metadata?.analytics_config?.id,
+      onClick: async (item) => {
+        await navigateToUrl(
+          getResultsUrl(
+            item.metadata?.analytics_config.id,
+            Object.keys(item.metadata?.analytics_config.analysis)[0]
+          )
+        );
+      },
+      isPrimary: true,
+    },
+    {
+      name: i18n.translate('xpack.ml.inference.modelsList.deleteModelActionLabel', {
+        defaultMessage: 'Delete model',
+      }),
+      description: i18n.translate('xpack.ml.inference.modelsList.deleteModelActionLabel', {
+        defaultMessage: 'Delete model',
+      }),
+      icon: 'trash',
+      type: 'icon',
+      color: 'danger',
+      isPrimary: false,
+      onClick: async (model) => {
+        await prepareModelsForDeletion([model]);
+      },
+      available: (item) => canDeleteDataFrameAnalytics,
+      enabled: (item) => {
+        // TODO check for permissions to delete ingest pipelines.
+        // ATM undefined means pipelines fetch failed server-side.
+        return !item.pipelines;
+      },
+    },
+  ];
+
+  const toggleDetails = async (item: ModelItem) => {
+    const itemIdToExpandedRowMapValues = { ...itemIdToExpandedRowMap };
+    if (itemIdToExpandedRowMapValues[item.model_id]) {
+      delete itemIdToExpandedRowMapValues[item.model_id];
+    } else {
+      await fetchModelsStats([item]);
+      itemIdToExpandedRowMapValues[item.model_id] = <ExpandedRow item={item as ModelItemFull} />;
+    }
+    setItemIdToExpandedRowMap(itemIdToExpandedRowMapValues);
+  };
+
+  const columns: Array<EuiBasicTableColumn<ModelItem>> = [
+    {
+      align: 'left',
+      width: '40px',
+      isExpander: true,
+      render: (item: ModelItem) => (
+        <EuiButtonIcon
+          onClick={toggleDetails.bind(null, item)}
+          aria-label={
+            itemIdToExpandedRowMap[item.model_id]
+              ? i18n.translate('xpack.ml.inference.modelsList.collapseRow', {
+                  defaultMessage: 'Collapse',
+                })
+              : i18n.translate('xpack.ml.inference.modelsList.expandRow', {
+                  defaultMessage: 'Expand',
+                })
+          }
+          iconType={itemIdToExpandedRowMap[item.model_id] ? 'arrowUp' : 'arrowDown'}
+        />
+      ),
+    },
+    {
+      field: ModelsTableToConfigMapping.id,
+      name: i18n.translate('xpack.ml.inference.modelsList.modelIdHeader', {
+        defaultMessage: 'ID',
+      }),
+      sortable: true,
+      truncateText: true,
+    },
+    {
+      field: ModelsTableToConfigMapping.type,
+      name: i18n.translate('xpack.ml.inference.modelsList.typeHeader', {
+        defaultMessage: 'Type',
+      }),
+      sortable: true,
+      align: 'left',
+      render: (type: string) => <EuiBadge color="hollow">{type}</EuiBadge>,
+    },
+    {
+      field: ModelsTableToConfigMapping.createdAt,
+      name: i18n.translate('xpack.ml.inference.modelsList.createdAtHeader', {
+        defaultMessage: 'Created at',
+      }),
+      dataType: 'date',
+      render: (date: string) => formatDate(date, TIME_FORMAT),
+      sortable: true,
+    },
+    {
+      name: i18n.translate('xpack.ml.inference.modelsList.actionsHeader', {
+        defaultMessage: 'Actions',
+      }),
+      actions,
+    },
+  ];
+
+  const pagination = {
+    initialPageIndex: pageIndex,
+    initialPageSize: pageSize,
+    totalItemCount: items.length,
+    pageSizeOptions: [10, 20, 50],
+    hidePerPageOptions: false,
+  };
+
+  const sorting = {
+    sort: {
+      field: sortField,
+      direction: sortDirection,
+    },
+  };
+  const search: EuiSearchBarProps = {
+    query: searchQueryText,
+    onChange: (searchChange) => {
+      if (searchChange.error !== null) {
+        return false;
+      }
+      setSearchQueryText(searchChange.queryText);
+      return true;
+    },
+    box: {
+      incremental: true,
+    },
+    ...(inferenceTypesOptions && inferenceTypesOptions.length > 0
+      ? {
+          filters: [
+            {
+              type: 'field_value_selection',
+              field: 'type',
+              name: i18n.translate('xpack.ml.dataframe.analyticsList.typeFilter', {
+                defaultMessage: 'Type',
+              }),
+              multiSelect: 'or',
+              options: inferenceTypesOptions,
+            },
+          ],
+        }
+      : {}),
+    ...(selectedModels.length > 0
+      ? {
+          toolsLeft: (
+            <EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
+              <EuiFlexItem grow={false}>
+                <EuiTitle size="s">
+                  <h5>
+                    <FormattedMessage
+                      id="xpack.ml.inference.modelsList.selectedModelsMessage"
+                      defaultMessage="{modelsCount, plural, one{# model} other {# models}} selected"
+                      values={{ modelsCount: selectedModels.length }}
+                    />
+                  </h5>
+                </EuiTitle>
+              </EuiFlexItem>
+              <EuiFlexItem>
+                <EuiButton
+                  color="danger"
+                  onClick={prepareModelsForDeletion.bind(null, selectedModels)}
+                >
+                  <FormattedMessage
+                    id="xpack.ml.inference.modelsList.deleteModelsButtonLabel"
+                    defaultMessage="Delete"
+                  />
+                </EuiButton>
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          ),
+        }
+      : {}),
+  };
+
+  const onTableChange: EuiInMemoryTable<ModelItem>['onTableChange'] = ({
+    page = { index: 0, size: 10 },
+    sort = { field: ModelsTableToConfigMapping.id, direction: 'asc' },
+  }) => {
+    const { index, size } = page;
+    setPageIndex(index);
+    setPageSize(size);
+
+    const { field, direction } = sort;
+    setSortField(field);
+    setSortDirection(direction);
+  };
+
+  const isSelectionAllowed = canDeleteDataFrameAnalytics;
+
+  const selection: EuiTableSelectionType<ModelItem> | undefined = isSelectionAllowed
+    ? {
+        selectableMessage: (selectable, item) => {
+          return selectable
+            ? i18n.translate('xpack.ml.inference.modelsList.selectableMessage', {
+                defaultMessage: 'Select a model',
+              })
+            : i18n.translate('xpack.ml.inference.modelsList.disableSelectableMessage', {
+                defaultMessage: 'Model has associated pipelines',
+              });
+        },
+        selectable: (item) => !item.pipelines,
+        onSelectionChange: (selectedItems) => {
+          setSelectedModels(selectedItems);
+        },
+      }
+    : undefined;
+
+  return (
+    <>
+      <EuiSpacer size="m" />
+      <EuiFlexGroup justifyContent="spaceBetween">
+        {modelsStats && (
+          <EuiFlexItem grow={false}>
+            <StatsBar stats={modelsStats} dataTestSub={'mlInferenceModelsStatsBar'} />
+          </EuiFlexItem>
+        )}
+      </EuiFlexGroup>
+      <EuiSpacer size="m" />
+      <div data-test-subj="mlModelsTableContainer">
+        <EuiInMemoryTable
+          allowNeutralSort={false}
+          columns={columns}
+          hasActions={true}
+          isExpandable={true}
+          itemIdToExpandedRowMap={itemIdToExpandedRowMap}
+          isSelectable={false}
+          items={items}
+          itemId={ModelsTableToConfigMapping.id}
+          loading={isLoading}
+          onTableChange={onTableChange}
+          pagination={pagination}
+          sorting={sorting}
+          search={search}
+          selection={selection}
+          rowProps={(item) => ({
+            'data-test-subj': `mlModelsTableRow row-${item.model_id}`,
+          })}
+        />
+      </div>
+      {modelsToDelete.length > 0 && (
+        <DeleteModelsModal
+          onClose={async (deletionApproved) => {
+            if (deletionApproved) {
+              await deleteModels();
+            }
+            setModelsToDelete([]);
+          }}
+          models={modelsToDelete}
+        />
+      )}
+    </>
+  );
+};
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/state.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/state.ts
index f932e4d0db7d7..4926decaa7f9c 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/state.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/state.ts
@@ -8,13 +8,12 @@ import { DeepPartial, DeepReadonly } from '../../../../../../../common/types/com
 import { checkPermission } from '../../../../../capabilities/check_capabilities';
 import { mlNodesAvailable } from '../../../../../ml_nodes_check';
 
+import { ANALYSIS_CONFIG_TYPE, defaultSearchQuery } from '../../../../common/analytics';
+import { CloneDataFrameAnalyticsConfig } from '../../components/action_clone';
 import {
-  DataFrameAnalyticsId,
   DataFrameAnalyticsConfig,
-  ANALYSIS_CONFIG_TYPE,
-  defaultSearchQuery,
-} from '../../../../common/analytics';
-import { CloneDataFrameAnalyticsConfig } from '../../components/action_clone';
+  DataFrameAnalyticsId,
+} from '../../../../../../../common/types/data_frame_analytics';
 
 export enum DEFAULT_MODEL_MEMORY_LIMIT {
   regression = '100mb',
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/page.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/page.tsx
index 1e83e6c7d0e03..7ffd477039e78 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/page.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/page.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { FC, Fragment, useState } from 'react';
+import React, { FC, Fragment, useMemo, useState } from 'react';
 
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
@@ -21,6 +21,7 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 
+import { useLocation } from 'react-router-dom';
 import { NavigationMenu } from '../../../components/navigation_menu';
 import { DatePickerWrapper } from '../../../components/navigation_menu/date_picker_wrapper';
 import { DataFrameAnalyticsList } from './components/analytics_list';
@@ -28,12 +29,17 @@ import { useRefreshInterval } from './components/analytics_list/use_refresh_inte
 import { RefreshAnalyticsListButton } from './components/refresh_analytics_list_button';
 import { NodeAvailableWarning } from '../../../components/node_available_warning';
 import { UpgradeWarning } from '../../../components/upgrade';
+import { AnalyticsNavigationBar } from './components/analytics_navigation_bar';
+import { ModelsList } from './components/models_management';
 
 export const Page: FC = () => {
   const [blockRefresh, setBlockRefresh] = useState(false);
 
   useRefreshInterval(setBlockRefresh);
 
+  const location = useLocation();
+  const selectedTabId = useMemo(() => location.pathname.split('/').pop(), [location]);
+
   return (
     <Fragment>
       <NavigationMenu tabId="data_frame_analytics" />
@@ -45,7 +51,7 @@ export const Page: FC = () => {
                 <h1>
                   <FormattedMessage
                     id="xpack.ml.dataframe.analyticsList.title"
-                    defaultMessage="Data frame analytics jobs"
+                    defaultMessage="Data frame analytics"
                   />
                   <span>&nbsp;</span>
                   <EuiBetaBadge
@@ -81,7 +87,12 @@ export const Page: FC = () => {
           <UpgradeWarning />
 
           <EuiPageContent>
-            <DataFrameAnalyticsList blockRefresh={blockRefresh} />
+            <AnalyticsNavigationBar selectedTabId={selectedTabId} />
+
+            {selectedTabId === 'data_frame_analytics' && (
+              <DataFrameAnalyticsList blockRefresh={blockRefresh} />
+            )}
+            {selectedTabId === 'models' && <ModelsList />}
           </EuiPageContent>
         </EuiPageBody>
       </EuiPage>
diff --git a/x-pack/plugins/ml/public/application/routing/routes/data_frame_analytics/index.ts b/x-pack/plugins/ml/public/application/routing/routes/data_frame_analytics/index.ts
index 9b6bcc25c8c7e..c75a8240d28fb 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/data_frame_analytics/index.ts
+++ b/x-pack/plugins/ml/public/application/routing/routes/data_frame_analytics/index.ts
@@ -7,3 +7,4 @@
 export * from './analytics_jobs_list';
 export * from './analytics_job_exploration';
 export * from './analytics_job_creation';
+export * from './models_list';
diff --git a/x-pack/plugins/ml/public/application/routing/routes/data_frame_analytics/models_list.tsx b/x-pack/plugins/ml/public/application/routing/routes/data_frame_analytics/models_list.tsx
new file mode 100644
index 0000000000000..7bf7784d1b559
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/routing/routes/data_frame_analytics/models_list.tsx
@@ -0,0 +1,40 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC } from 'react';
+import { i18n } from '@kbn/i18n';
+
+import { NavigateToPath } from '../../../contexts/kibana';
+
+import { MlRoute, PageLoader, PageProps } from '../../router';
+import { useResolver } from '../../use_resolver';
+import { basicResolvers } from '../../resolvers';
+import { Page } from '../../../data_frame_analytics/pages/analytics_management';
+import { getBreadcrumbWithUrlForApp } from '../../breadcrumbs';
+
+export const modelsListRouteFactory = (navigateToPath: NavigateToPath): MlRoute => ({
+  path: '/data_frame_analytics/models',
+  render: (props, deps) => <PageWrapper {...props} deps={deps} />,
+  breadcrumbs: [
+    getBreadcrumbWithUrlForApp('ML_BREADCRUMB', navigateToPath),
+    getBreadcrumbWithUrlForApp('DATA_FRAME_ANALYTICS_BREADCRUMB', navigateToPath),
+    {
+      text: i18n.translate('xpack.ml.dataFrameAnalyticsBreadcrumbs.modelsListLabel', {
+        defaultMessage: 'Model Management',
+      }),
+      href: '',
+    },
+  ],
+});
+
+const PageWrapper: FC<PageProps> = ({ location, deps }) => {
+  const { context } = useResolver('', undefined, deps.config, basicResolvers(deps));
+  return (
+    <PageLoader context={context}>
+      <Page />
+    </PageLoader>
+  );
+};
diff --git a/x-pack/plugins/ml/public/application/services/ml_api_service/inference.ts b/x-pack/plugins/ml/public/application/services/ml_api_service/inference.ts
new file mode 100644
index 0000000000000..0206037b680bb
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/services/ml_api_service/inference.ts
@@ -0,0 +1,135 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useMemo } from 'react';
+import { HttpFetchQuery } from 'kibana/public';
+import { HttpService } from '../http_service';
+import { basePath } from './index';
+import { useMlKibana } from '../../contexts/kibana';
+import {
+  ModelConfigResponse,
+  ModelPipelines,
+  TrainedModelStat,
+} from '../../../../common/types/inference';
+
+export interface InferenceQueryParams {
+  decompress_definition?: boolean;
+  from?: number;
+  include_model_definition?: boolean;
+  size?: number;
+  tags?: string;
+  // Custom kibana endpoint query params
+  with_pipelines?: boolean;
+}
+
+export interface InferenceStatsQueryParams {
+  from?: number;
+  size?: number;
+}
+
+export interface IngestStats {
+  count: number;
+  time_in_millis: number;
+  current: number;
+  failed: number;
+}
+
+export interface InferenceStatsResponse {
+  count: number;
+  trained_model_stats: TrainedModelStat[];
+}
+
+/**
+ * Service with APIs calls to perform inference operations.
+ * @param httpService
+ */
+export function inferenceApiProvider(httpService: HttpService) {
+  const apiBasePath = basePath();
+
+  return {
+    /**
+     * Fetches configuration information for a trained inference model.
+     *
+     * @param modelId - Model ID, collection of Model IDs or Model ID pattern.
+     *                  Fetches all In case nothing is provided.
+     * @param params - Optional query params
+     */
+    getInferenceModel(modelId?: string | string[], params?: InferenceQueryParams) {
+      let model = modelId ?? '';
+      if (Array.isArray(modelId)) {
+        model = modelId.join(',');
+      }
+
+      return httpService.http<ModelConfigResponse[]>({
+        path: `${apiBasePath}/inference${model && `/${model}`}`,
+        method: 'GET',
+        ...(params ? { query: params as HttpFetchQuery } : {}),
+      });
+    },
+
+    /**
+     * Fetches usage information for trained inference models.
+     *
+     * @param modelId - Model ID, collection of Model IDs or Model ID pattern.
+     *                  Fetches all In case nothing is provided.
+     * @param params - Optional query params
+     */
+    getInferenceModelStats(modelId?: string | string[], params?: InferenceStatsQueryParams) {
+      let model = modelId ?? '_all';
+      if (Array.isArray(modelId)) {
+        model = modelId.join(',');
+      }
+
+      return httpService.http<InferenceStatsResponse>({
+        path: `${apiBasePath}/inference/${model}/_stats`,
+        method: 'GET',
+      });
+    },
+
+    /**
+     * Fetches pipelines associated with provided models
+     *
+     * @param modelId - Model ID, collection of Model IDs.
+     */
+    getInferenceModelPipelines(modelId: string | string[]) {
+      let model = modelId;
+      if (Array.isArray(modelId)) {
+        model = modelId.join(',');
+      }
+
+      return httpService.http<ModelPipelines[]>({
+        path: `${apiBasePath}/inference/${model}/pipelines`,
+        method: 'GET',
+      });
+    },
+
+    /**
+     * Deletes an existing trained inference model.
+     *
+     * @param modelId - Model ID
+     */
+    deleteInferenceModel(modelId: string) {
+      return httpService.http<any>({
+        path: `${apiBasePath}/inference/${modelId}`,
+        method: 'DELETE',
+      });
+    },
+  };
+}
+
+type InferenceApiService = ReturnType<typeof inferenceApiProvider>;
+
+/**
+ * Hooks for accessing {@link InferenceApiService} in React components.
+ */
+export function useInferenceApiService(): InferenceApiService {
+  const {
+    services: {
+      mlServices: { httpService },
+    },
+  } = useMlKibana();
+  return useMemo(() => inferenceApiProvider(httpService), [httpService]);
+}
diff --git a/x-pack/plugins/ml/server/client/error_wrapper.ts b/x-pack/plugins/ml/server/client/error_wrapper.ts
index de53e4d4345a9..c635eb74e1f19 100644
--- a/x-pack/plugins/ml/server/client/error_wrapper.ts
+++ b/x-pack/plugins/ml/server/client/error_wrapper.ts
@@ -8,7 +8,9 @@ import { boomify, isBoom } from 'boom';
 import { ResponseError, CustomHttpResponseOptions } from 'kibana/server';
 
 export function wrapError(error: any): CustomHttpResponseOptions<ResponseError> {
-  const boom = isBoom(error) ? error : boomify(error, { statusCode: error.status });
+  const boom = isBoom(error)
+    ? error
+    : boomify(error, { statusCode: error.status ?? error.statusCode });
   const statusCode = boom.output.statusCode;
   return {
     body: {
diff --git a/x-pack/plugins/ml/server/models/data_frame_analytics/index.js b/x-pack/plugins/ml/server/models/data_frame_analytics/index.ts
similarity index 86%
rename from x-pack/plugins/ml/server/models/data_frame_analytics/index.js
rename to x-pack/plugins/ml/server/models/data_frame_analytics/index.ts
index 1d6b05e4a5759..fc18436ff5216 100644
--- a/x-pack/plugins/ml/server/models/data_frame_analytics/index.js
+++ b/x-pack/plugins/ml/server/models/data_frame_analytics/index.ts
@@ -5,3 +5,4 @@
  */
 
 export { analyticsAuditMessagesProvider } from './analytics_audit_messages';
+export { modelsProvider } from './models_provider';
diff --git a/x-pack/plugins/ml/server/models/data_frame_analytics/models_provider.ts b/x-pack/plugins/ml/server/models/data_frame_analytics/models_provider.ts
new file mode 100644
index 0000000000000..b2a4ccdab43dc
--- /dev/null
+++ b/x-pack/plugins/ml/server/models/data_frame_analytics/models_provider.ts
@@ -0,0 +1,42 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { IScopedClusterClient } from 'kibana/server';
+import { PipelineDefinition } from '../../../common/types/inference';
+
+export function modelsProvider(client: IScopedClusterClient) {
+  return {
+    /**
+     * Retrieves the map of model ids and associated pipelines.
+     * @param modelIds
+     */
+    async getModelsPipelines(modelIds: string[]) {
+      const modelIdsMap = new Map<string, Record<string, PipelineDefinition> | null>(
+        modelIds.map((id: string) => [id, null])
+      );
+
+      const { body } = await client.asCurrentUser.ingest.getPipeline();
+
+      for (const [pipelineName, pipelineDefinition] of Object.entries(body)) {
+        const { processors } = pipelineDefinition as { processors: Array<Record<string, any>> };
+
+        for (const processor of processors) {
+          const id = processor.inference?.model_id;
+          if (modelIdsMap.has(id)) {
+            const obj = modelIdsMap.get(id);
+            if (obj === null) {
+              modelIdsMap.set(id, { [pipelineName]: pipelineDefinition });
+            } else {
+              obj![pipelineName] = pipelineDefinition;
+            }
+          }
+        }
+      }
+
+      return modelIdsMap;
+    },
+  };
+}
diff --git a/x-pack/plugins/ml/server/plugin.ts b/x-pack/plugins/ml/server/plugin.ts
index 3c3824a785032..f6d47639ef7c5 100644
--- a/x-pack/plugins/ml/server/plugin.ts
+++ b/x-pack/plugins/ml/server/plugin.ts
@@ -48,6 +48,7 @@ import { createSharedServices, SharedServices } from './shared_services';
 import { getPluginPrivileges } from '../common/types/capabilities';
 import { setupCapabilitiesSwitcher } from './lib/capabilities';
 import { registerKibanaSettings } from './lib/register_settings';
+import { inferenceRoutes } from './routes/inference';
 
 declare module 'kibana/server' {
   interface RequestHandlerContext {
@@ -172,6 +173,8 @@ export class MlServerPlugin implements Plugin<MlPluginSetup, MlPluginStart, Plug
     initMlServerLog({ log: this.log });
     initMlTelemetry(coreSetup, plugins.usageCollection);
 
+    inferenceRoutes(routeInit);
+
     return {
       ...createSharedServices(this.mlLicense, plugins.spaces, plugins.cloud, resolveMlCapabilities),
       mlClient,
diff --git a/x-pack/plugins/ml/server/routes/inference.ts b/x-pack/plugins/ml/server/routes/inference.ts
new file mode 100644
index 0000000000000..4c7aabb365423
--- /dev/null
+++ b/x-pack/plugins/ml/server/routes/inference.ts
@@ -0,0 +1,163 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { RouteInitialization } from '../types';
+import { wrapError } from '../client/error_wrapper';
+import {
+  getInferenceQuerySchema,
+  modelIdSchema,
+  optionalModelIdSchema,
+} from './schemas/inference_schema';
+import { modelsProvider } from '../models/data_frame_analytics';
+import { InferenceConfigResponse } from '../../common/types/inference';
+
+export function inferenceRoutes({ router, mlLicense }: RouteInitialization) {
+  /**
+   * @apiGroup Inference
+   *
+   * @api {get} /api/ml/inference/:modelId Get info of a trained inference model
+   * @apiName GetInferenceModel
+   * @apiDescription Retrieves configuration information for a trained inference model.
+   */
+  router.get(
+    {
+      path: '/api/ml/inference/{modelId?}',
+      validate: {
+        params: optionalModelIdSchema,
+        query: getInferenceQuerySchema,
+      },
+      options: {
+        tags: ['access:ml:canGetDataFrameAnalytics'],
+      },
+    },
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
+      try {
+        const { modelId } = request.params;
+        const { with_pipelines: withPipelines, ...query } = request.query;
+        const { body } = await client.asInternalUser.ml.getTrainedModels<InferenceConfigResponse>({
+          size: 1000,
+          ...query,
+          ...(modelId ? { model_id: modelId } : {}),
+        });
+        const result = body.trained_model_configs;
+        try {
+          if (withPipelines) {
+            const pipelinesResponse = await modelsProvider(client).getModelsPipelines(
+              result.map(({ model_id: id }: { model_id: string }) => id)
+            );
+            for (const model of result) {
+              model.pipelines = pipelinesResponse.get(model.model_id)!;
+            }
+          }
+        } catch (e) {
+          // the user might not have required permissions to fetch pipelines
+          // eslint-disable-next-line no-console
+          console.log(e);
+        }
+
+        return response.ok({
+          body: result,
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  /**
+   * @apiGroup Inference
+   *
+   * @api {get} /api/ml/inference/:modelId/_stats Get stats of a trained inference model
+   * @apiName GetInferenceModelStats
+   * @apiDescription Retrieves usage information for trained inference models.
+   */
+  router.get(
+    {
+      path: '/api/ml/inference/{modelId}/_stats',
+      validate: {
+        params: modelIdSchema,
+      },
+      options: {
+        tags: ['access:ml:canGetDataFrameAnalytics'],
+      },
+    },
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
+      try {
+        const { modelId } = request.params;
+        const { body } = await client.asInternalUser.ml.getTrainedModelsStats({
+          ...(modelId ? { model_id: modelId } : {}),
+        });
+        return response.ok({
+          body,
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  /**
+   * @apiGroup Inference
+   *
+   * @api {get} /api/ml/inference/:modelId/pipelines Get model pipelines
+   * @apiName GetModelPipelines
+   * @apiDescription Retrieves pipelines associated with a model
+   */
+  router.get(
+    {
+      path: '/api/ml/inference/{modelId}/pipelines',
+      validate: {
+        params: modelIdSchema,
+      },
+      options: {
+        tags: ['access:ml:canGetDataFrameAnalytics'],
+      },
+    },
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
+      try {
+        const { modelId } = request.params;
+        const result = await modelsProvider(client).getModelsPipelines(modelId.split(','));
+        return response.ok({
+          body: [...result].map(([id, pipelines]) => ({ model_id: id, pipelines })),
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  /**
+   * @apiGroup Inference
+   *
+   * @api {delete} /api/ml/inference/:modelId Get stats of a trained inference model
+   * @apiName DeleteInferenceModel
+   * @apiDescription Deletes an existing trained inference model that is currently not referenced by an ingest pipeline.
+   */
+  router.delete(
+    {
+      path: '/api/ml/inference/{modelId}',
+      validate: {
+        params: modelIdSchema,
+      },
+      options: {
+        tags: ['access:ml:canDeleteDataFrameAnalytics'],
+      },
+    },
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
+      try {
+        const { modelId } = request.params;
+        const { body } = await client.asInternalUser.ml.deleteTrainedModel({
+          model_id: modelId,
+        });
+        return response.ok({
+          body,
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+}
diff --git a/x-pack/plugins/ml/server/routes/schemas/inference_schema.ts b/x-pack/plugins/ml/server/routes/schemas/inference_schema.ts
new file mode 100644
index 0000000000000..896449be7896a
--- /dev/null
+++ b/x-pack/plugins/ml/server/routes/schemas/inference_schema.ts
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { schema } from '@kbn/config-schema';
+
+export const modelIdSchema = schema.object({
+  /**
+   * Model ID
+   */
+  modelId: schema.string(),
+});
+
+export const optionalModelIdSchema = schema.object({
+  /**
+   * Model ID
+   */
+  modelId: schema.maybe(schema.string()),
+});
+
+export const getInferenceQuerySchema = schema.object({
+  size: schema.maybe(schema.string()),
+  with_pipelines: schema.maybe(schema.string()),
+});
diff --git a/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts b/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts
index 474d6845ef3ec..cdd26b60d3be0 100644
--- a/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts
+++ b/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts
@@ -5,14 +5,14 @@
  */
 import expect from '@kbn/expect';
 import { DataFrameAnalyticsConfig } from '../../../../plugins/ml/public/application/data_frame_analytics/common';
-import {
-  ClassificationAnalysis,
-  RegressionAnalysis,
-} from '../../../../plugins/ml/public/application/data_frame_analytics/common/analytics';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { MlCommon } from './common';
 import { MlApi } from './api';
+import {
+  ClassificationAnalysis,
+  RegressionAnalysis,
+} from '../../../../plugins/ml/common/types/data_frame_analytics';
 
 enum ANALYSIS_CONFIG_TYPE {
   OUTLIER_DETECTION = 'outlier_detection',

From e61a4b63a6e7a626dbb53f371dd9752a7e66c696 Mon Sep 17 00:00:00 2001
From: Walter Rafelsberger <walter@rafelsberger.at>
Date: Wed, 19 Aug 2020 16:25:00 +0200
Subject: [PATCH 21/85] [ML] DF Analytics / Transforms: Fix job row actions
 menu invalid DOM nesting warning (#74499)

Refactors the action buttons for transforms and analytics job list to no longer produce nested button elements and throw a React error.
---
 .../annotations_table/annotations_table.js    |   2 +-
 .../components/anomalies_table/links_menu.js  |   2 +-
 .../anomaly_results_view_selector.tsx         |   4 +-
 .../view_results_panel/view_results_panel.tsx |   2 +-
 ...tton.test.ts => clone_action_name.test.ts} |   2 +-
 ...clone_button.tsx => clone_action_name.tsx} |  61 ++------
 .../components/action_clone/index.ts          |   5 +-
 .../action_clone/use_clone_action.tsx         |  41 +++++
 ...tton_modal.tsx => delete_action_modal.tsx} |   2 +-
 ...e.test.tsx => delete_action_name.test.tsx} |  35 +++--
 ...lete_button.tsx => delete_action_name.tsx} |  35 ++---
 .../components/action_delete/index.ts         |   4 +-
 ...delete_action.ts => use_delete_action.tsx} |  42 +++--
 ...tton_flyout.tsx => edit_action_flyout.tsx} |   2 +-
 .../{edit_button.tsx => edit_action_name.tsx} |  35 ++---
 .../components/action_edit/index.ts           |   3 +-
 ...use_edit_action.ts => use_edit_action.tsx} |  22 ++-
 .../components/action_start/index.ts          |   3 +-
 ...utton_modal.tsx => start_action_modal.tsx} |   2 +-
 ...start_button.tsx => start_action_name.tsx} |  36 ++---
 .../action_start/use_start_action.ts          |  41 -----
 .../action_start/use_start_action.tsx         |  80 ++++++++++
 .../components/action_stop/index.ts           |   5 +-
 ...button_modal.tsx => stop_action_modal.tsx} |   8 +-
 .../action_stop/stop_action_name.tsx          |  38 +++++
 .../components/action_stop/stop_button.tsx    |  54 -------
 .../action_stop/use_force_stop_action.ts      |  38 -----
 .../action_stop/use_stop_action.tsx           |  67 ++++++++
 .../action_view/get_view_action.tsx           |  20 ---
 .../components/action_view/index.ts           |   2 +-
 .../action_view/use_view_action.tsx           |  45 ++++++
 .../components/action_view/view_button.tsx    |  42 ++---
 .../components/analytics_list/common.ts       |  10 +-
 .../components/analytics_list/use_actions.tsx | 148 +++---------------
 .../use_create_analytics_form/reducer.ts      |   2 +-
 .../analytics_service/delete_analytics.ts     |  23 ++-
 .../explorer_charts_container.js              |   2 +-
 .../components/job_actions/results.js         |   4 +-
 .../forecasts_table/forecasts_table.js        |   2 +-
 .../components/analytics_panel/actions.tsx    |  54 +++++++
 .../components/analytics_panel/table.tsx      |   9 +-
 .../anomaly_detection_panel/actions.tsx       |   6 +-
 .../services/toast_notification_service.ts    |   4 +
 .../forecasting_modal/forecasts_list.js       |   2 +-
 .../open_in_anomaly_explorer_action.tsx       |   2 +-
 .../transform/public/app/common/index.ts      |   2 +-
 .../public/app/common/transform_list.ts       |  10 ++
 .../action_clone/clone_action_name.tsx        |  34 ++++
 .../components/action_clone/clone_button.tsx  |  62 --------
 .../components/action_clone/index.ts          |   2 +-
 .../action_clone/use_clone_action.tsx         |  43 +++++
 .../delete_action_name.test.tsx.snap          |   7 +
 .../__snapshots__/delete_button.test.tsx.snap |  22 ---
 ...tton_modal.tsx => delete_action_modal.tsx} |   2 +-
 ...n.test.tsx => delete_action_name.test.tsx} |  18 +--
 ...lete_button.tsx => delete_action_name.tsx} |  66 ++++----
 .../components/action_delete/index.ts         |   4 +-
 ...delete_action.ts => use_delete_action.tsx} |  38 ++++-
 .../{edit_button.tsx => edit_action_name.tsx} |  39 ++---
 .../components/action_edit/index.ts           |   1 -
 .../components/action_edit/use_edit_action.ts |  26 ---
 .../action_edit/use_edit_action.tsx           |  45 ++++++
 ...x.snap => start_action_name.test.tsx.snap} |  13 +-
 .../components/action_start/index.ts          |   4 +-
 ...utton_modal.tsx => start_action_modal.tsx} |   7 +-
 ...on.test.tsx => start_action_name.test.tsx} |   9 +-
 ...start_button.tsx => start_action_name.tsx} |  60 +++----
 .../action_start/use_start_action.ts          |  42 -----
 .../action_start/use_start_action.tsx         |  66 ++++++++
 ...sx.snap => stop_action_name.test.tsx.snap} |  13 +-
 .../components/action_stop/index.ts           |   3 +-
 ...ton.test.tsx => stop_action_name.test.tsx} |   8 +-
 .../{stop_button.tsx => stop_action_name.tsx} |  57 +++----
 .../action_stop/use_stop_action.tsx           |  45 ++++++
 .../transform_list/transform_list.tsx         |  38 +++--
 .../transform_list/use_actions.test.tsx       |  17 +-
 .../components/transform_list/use_actions.tsx |  71 +++------
 .../translations/translations/ja-JP.json      |  11 --
 .../translations/translations/zh-CN.json      |  11 --
 79 files changed, 1002 insertions(+), 942 deletions(-)
 rename x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/{clone_button.test.ts => clone_action_name.test.ts} (99%)
 rename x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/{clone_button.tsx => clone_action_name.tsx} (88%)
 create mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/use_clone_action.tsx
 rename x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/{delete_button_modal.tsx => delete_action_modal.tsx} (98%)
 rename x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/{action_delete.test.tsx => delete_action_name.test.tsx} (73%)
 rename x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/{delete_button.tsx => delete_action_name.tsx} (62%)
 rename x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/{use_delete_action.ts => use_delete_action.tsx} (77%)
 rename x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/{edit_button_flyout.tsx => edit_action_flyout.tsx} (99%)
 rename x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/{edit_button.tsx => edit_action_name.tsx} (50%)
 rename x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/{use_edit_action.ts => use_edit_action.tsx} (56%)
 rename x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/{start_button_modal.tsx => start_action_modal.tsx} (96%)
 rename x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/{start_button.tsx => start_action_name.tsx} (65%)
 delete mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/use_start_action.ts
 create mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/use_start_action.tsx
 rename x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/{stop_button_modal.tsx => stop_action_modal.tsx} (91%)
 create mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/stop_action_name.tsx
 delete mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/stop_button.tsx
 delete mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/use_force_stop_action.ts
 create mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/use_stop_action.tsx
 delete mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_view/get_view_action.tsx
 create mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_view/use_view_action.tsx
 create mode 100644 x-pack/plugins/ml/public/application/overview/components/analytics_panel/actions.tsx
 create mode 100644 x-pack/plugins/transform/public/app/sections/transform_management/components/action_clone/clone_action_name.tsx
 delete mode 100644 x-pack/plugins/transform/public/app/sections/transform_management/components/action_clone/clone_button.tsx
 create mode 100644 x-pack/plugins/transform/public/app/sections/transform_management/components/action_clone/use_clone_action.tsx
 create mode 100644 x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/__snapshots__/delete_action_name.test.tsx.snap
 delete mode 100644 x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/__snapshots__/delete_button.test.tsx.snap
 rename x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/{delete_button_modal.tsx => delete_action_modal.tsx} (99%)
 rename x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/{delete_button.test.tsx => delete_action_name.test.tsx} (53%)
 rename x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/{delete_button.tsx => delete_action_name.tsx} (51%)
 rename x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/{use_delete_action.ts => use_delete_action.tsx} (66%)
 rename x-pack/plugins/transform/public/app/sections/transform_management/components/action_edit/{edit_button.tsx => edit_action_name.tsx} (52%)
 delete mode 100644 x-pack/plugins/transform/public/app/sections/transform_management/components/action_edit/use_edit_action.ts
 create mode 100644 x-pack/plugins/transform/public/app/sections/transform_management/components/action_edit/use_edit_action.tsx
 rename x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/__snapshots__/{start_button.test.tsx.snap => start_action_name.test.tsx.snap} (56%)
 rename x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/{start_button_modal.tsx => start_action_modal.tsx} (94%)
 rename x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/{start_button.test.tsx => start_action_name.test.tsx} (77%)
 rename x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/{start_button.tsx => start_action_name.tsx} (73%)
 delete mode 100644 x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/use_start_action.ts
 create mode 100644 x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/use_start_action.tsx
 rename x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/__snapshots__/{stop_button.test.tsx.snap => stop_action_name.test.tsx.snap} (56%)
 rename x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/{stop_button.test.tsx => stop_action_name.test.tsx} (79%)
 rename x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/{stop_button.tsx => stop_action_name.tsx} (67%)
 create mode 100644 x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/use_stop_action.tsx

diff --git a/x-pack/plugins/ml/public/application/components/annotations/annotations_table/annotations_table.js b/x-pack/plugins/ml/public/application/components/annotations/annotations_table/annotations_table.js
index c6ca4fb821984..9dabfce163dbb 100644
--- a/x-pack/plugins/ml/public/application/components/annotations/annotations_table/annotations_table.js
+++ b/x-pack/plugins/ml/public/application/components/annotations/annotations_table/annotations_table.js
@@ -506,7 +506,7 @@ export class AnnotationsTable extends Component {
               <EuiButtonIcon
                 onClick={() => this.openSingleMetricView(annotation)}
                 disabled={!isDrillDownAvailable}
-                iconType="stats"
+                iconType="visLine"
                 aria-label={openInSingleMetricViewerAriaLabelText}
               />
             </EuiToolTip>
diff --git a/x-pack/plugins/ml/public/application/components/anomalies_table/links_menu.js b/x-pack/plugins/ml/public/application/components/anomalies_table/links_menu.js
index 0e4d736a01e47..5a7d2a9c3ddaa 100644
--- a/x-pack/plugins/ml/public/application/components/anomalies_table/links_menu.js
+++ b/x-pack/plugins/ml/public/application/components/anomalies_table/links_menu.js
@@ -415,7 +415,7 @@ class LinksMenuUI extends Component {
       items.push(
         <EuiContextMenuItem
           key="view_series"
-          icon="stats"
+          icon="visLine"
           onClick={() => {
             this.closePopover();
             this.viewSeries();
diff --git a/x-pack/plugins/ml/public/application/components/anomaly_results_view_selector/anomaly_results_view_selector.tsx b/x-pack/plugins/ml/public/application/components/anomaly_results_view_selector/anomaly_results_view_selector.tsx
index b9eaf6c5d56ec..78acb422851e3 100644
--- a/x-pack/plugins/ml/public/application/components/anomaly_results_view_selector/anomaly_results_view_selector.tsx
+++ b/x-pack/plugins/ml/public/application/components/anomaly_results_view_selector/anomaly_results_view_selector.tsx
@@ -27,7 +27,7 @@ export const AnomalyResultsViewSelector: FC<Props> = ({ viewId }) => {
         label: i18n.translate('xpack.ml.anomalyResultsViewSelector.singleMetricViewerLabel', {
           defaultMessage: 'View results in the Single Metric Viewer',
         }),
-        iconType: 'stats',
+        iconType: 'visLine',
         value: 'timeseriesexplorer',
         'data-test-subj': 'mlAnomalyResultsViewSelectorSingleMetricViewer',
       },
@@ -36,7 +36,7 @@ export const AnomalyResultsViewSelector: FC<Props> = ({ viewId }) => {
         label: i18n.translate('xpack.ml.anomalyResultsViewSelector.anomalyExplorerLabel', {
           defaultMessage: 'View results in the Anomaly Explorer',
         }),
-        iconType: 'tableOfContents',
+        iconType: 'visTable',
         value: 'explorer',
         'data-test-subj': 'mlAnomalyResultsViewSelectorExplorer',
       },
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/view_results_panel/view_results_panel.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/view_results_panel/view_results_panel.tsx
index 13706eb548ec8..23a16ba84ef92 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/view_results_panel/view_results_panel.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/view_results_panel/view_results_panel.tsx
@@ -28,7 +28,7 @@ export const ViewResultsPanel: FC<Props> = ({ jobId, analysisType }) => {
     <Fragment>
       <EuiCard
         className="dfAnalyticsCreationWizard__card"
-        icon={<EuiIcon size="xxl" type="tableDensityNormal" />}
+        icon={<EuiIcon size="xxl" type="visTable" />}
         title={i18n.translate('xpack.ml.dataframe.analytics.create.viewResultsCardTitle', {
           defaultMessage: 'View Results',
         })}
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_button.test.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_action_name.test.ts
similarity index 99%
rename from x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_button.test.ts
rename to x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_action_name.test.ts
index 9db32e298691e..ee59b0c6c6388 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_button.test.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_action_name.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { isAdvancedConfig } from './clone_button';
+import { isAdvancedConfig } from './clone_action_name';
 
 describe('Analytics job clone action', () => {
   describe('isAdvancedConfig', () => {
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_button.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_action_name.tsx
similarity index 88%
rename from x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_button.tsx
rename to x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_action_name.tsx
index d78e1bcc1a913..60c699ba0d370 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_button.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_action_name.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiButtonEmpty, EuiToolTip } from '@elastic/eui';
+import { EuiToolTip } from '@elastic/eui';
 import React, { FC } from 'react';
 import { isEqual, cloneDeep } from 'lodash';
 import { i18n } from '@kbn/i18n';
@@ -14,10 +14,7 @@ import { DataFrameAnalyticsConfig, isOutlierAnalysis } from '../../../../common'
 import { isClassificationAnalysis, isRegressionAnalysis } from '../../../../common/analytics';
 import { DEFAULT_RESULTS_FIELD } from '../../../../common/constants';
 import { useMlKibana, useNavigateToPath } from '../../../../../contexts/kibana';
-import {
-  CreateAnalyticsFormProps,
-  DEFAULT_NUM_TOP_FEATURE_IMPORTANCE_VALUES,
-} from '../../hooks/use_create_analytics_form';
+import { DEFAULT_NUM_TOP_FEATURE_IMPORTANCE_VALUES } from '../../hooks/use_create_analytics_form';
 import { State } from '../../hooks/use_create_analytics_form/state';
 import { DataFrameAnalyticsListRow } from '../analytics_list/common';
 import { extractErrorMessage } from '../../../../../../../common/util/errors';
@@ -328,25 +325,12 @@ export function extractCloningConfig({
   }) as unknown) as CloneDataFrameAnalyticsConfig;
 }
 
-const buttonText = i18n.translate('xpack.ml.dataframe.analyticsList.cloneJobButtonLabel', {
-  defaultMessage: 'Clone job',
-});
-
-export function getCloneAction(createAnalyticsForm: CreateAnalyticsFormProps) {
-  const { actions } = createAnalyticsForm;
-
-  const onClick = async (item: DeepReadonly<DataFrameAnalyticsListRow>) => {
-    await actions.setJobClone(item.config);
-  };
-
-  return {
-    name: buttonText,
-    description: buttonText,
-    icon: 'copy',
-    onClick,
-    'data-test-subj': 'mlAnalyticsJobCloneButton',
-  };
-}
+export const cloneActionNameText = i18n.translate(
+  'xpack.ml.dataframe.analyticsList.cloneActionNameText',
+  {
+    defaultMessage: 'Clone',
+  }
+);
 
 export const useNavigateToWizardWithClonedJob = () => {
   const {
@@ -405,32 +389,11 @@ export const useNavigateToWizardWithClonedJob = () => {
   };
 };
 
-interface CloneButtonProps {
+interface CloneActionNameProps {
   isDisabled: boolean;
-  onClick: () => void;
 }
 
-/**
- * Temp component to have Clone job button with the same look as the other actions.
- * Replace with {@link getCloneAction} as soon as all the actions are refactored
- * to support EuiContext with a valid DOM structure without nested buttons.
- */
-export const CloneButton: FC<CloneButtonProps> = ({ isDisabled, onClick }) => {
-  const button = (
-    <EuiButtonEmpty
-      aria-label={buttonText}
-      color="text"
-      data-test-subj="mlAnalyticsJobCloneButton"
-      flush="left"
-      iconType="copy"
-      isDisabled={isDisabled}
-      onClick={onClick}
-      size="xs"
-    >
-      {buttonText}
-    </EuiButtonEmpty>
-  );
-
+export const CloneActionName: FC<CloneActionNameProps> = ({ isDisabled }) => {
   if (isDisabled) {
     return (
       <EuiToolTip
@@ -439,10 +402,10 @@ export const CloneButton: FC<CloneButtonProps> = ({ isDisabled, onClick }) => {
           defaultMessage: 'You do not have permission to clone analytics jobs.',
         })}
       >
-        {button}
+        <>{cloneActionNameText}</>
       </EuiToolTip>
     );
   }
 
-  return button;
+  return <>{cloneActionNameText}</>;
 };
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/index.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/index.ts
index 4e6357c4ea454..723279d04388e 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/index.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/index.ts
@@ -7,7 +7,6 @@
 export {
   extractCloningConfig,
   isAdvancedConfig,
-  useNavigateToWizardWithClonedJob,
-  CloneButton,
   CloneDataFrameAnalyticsConfig,
-} from './clone_button';
+} from './clone_action_name';
+export { useCloneAction } from './use_clone_action';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/use_clone_action.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/use_clone_action.tsx
new file mode 100644
index 0000000000000..53043d4e503fe
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/use_clone_action.tsx
@@ -0,0 +1,41 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useCallback, useMemo } from 'react';
+
+import { DataFrameAnalyticsListAction, DataFrameAnalyticsListRow } from '../analytics_list/common';
+
+import {
+  cloneActionNameText,
+  useNavigateToWizardWithClonedJob,
+  CloneActionName,
+} from './clone_action_name';
+
+export type CloneAction = ReturnType<typeof useCloneAction>;
+export const useCloneAction = (canCreateDataFrameAnalytics: boolean) => {
+  const navigateToWizardWithClonedJob = useNavigateToWizardWithClonedJob();
+
+  const clickHandler = useCallback((item: DataFrameAnalyticsListRow) => {
+    navigateToWizardWithClonedJob(item);
+  }, []);
+
+  const action: DataFrameAnalyticsListAction = useMemo(
+    () => ({
+      name: (item: DataFrameAnalyticsListRow) => (
+        <CloneActionName isDisabled={!canCreateDataFrameAnalytics} />
+      ),
+      enabled: () => canCreateDataFrameAnalytics,
+      description: cloneActionNameText,
+      icon: 'copy',
+      type: 'icon',
+      onClick: clickHandler,
+      'data-test-subj': 'mlAnalyticsJobCloneButton',
+    }),
+    []
+  );
+
+  return { action };
+};
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_button_modal.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_modal.tsx
similarity index 98%
rename from x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_button_modal.tsx
rename to x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_modal.tsx
index f94dccee479bd..5ffa5e304b996 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_button_modal.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_modal.tsx
@@ -18,7 +18,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 
 import { DeleteAction } from './use_delete_action';
 
-export const DeleteButtonModal: FC<DeleteAction> = ({
+export const DeleteActionModal: FC<DeleteAction> = ({
   closeModal,
   deleteAndCloseModal,
   deleteTargetIndex,
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/action_delete.test.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_name.test.tsx
similarity index 73%
rename from x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/action_delete.test.tsx
rename to x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_name.test.tsx
index 99455a33cf084..e033af6436130 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/action_delete.test.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_name.test.tsx
@@ -14,8 +14,8 @@ import {
   i18nServiceMock,
 } from '../../../../../../../../../../src/core/public/mocks';
 
-import { DeleteButton } from './delete_button';
-import { DeleteButtonModal } from './delete_button_modal';
+import { DeleteActionName } from './delete_action_name';
+import { DeleteActionModal } from './delete_action_modal';
 import { useDeleteAction } from './use_delete_action';
 
 jest.mock('../../../../../capabilities/check_capabilities', () => ({
@@ -49,38 +49,39 @@ describe('DeleteAction', () => {
     jest.clearAllMocks();
   });
 
-  test('When isDisabled prop is true, inner button should be disabled.', () => {
-    const { getByTestId } = render(
-      <DeleteButton isDisabled={true} item={mockAnalyticsListItem} onClick={() => {}} />
+  it('should display a tooltip when isDisabled prop is true.', () => {
+    const { container } = render(
+      <DeleteActionName isDisabled={true} item={mockAnalyticsListItem} />
     );
 
-    expect(getByTestId('mlAnalyticsJobDeleteButton')).toHaveAttribute('disabled');
+    expect(container.querySelector('.euiToolTipAnchor')).toBeInTheDocument();
   });
 
-  test('When isDisabled prop is true, inner button should not be disabled.', () => {
-    const { getByTestId } = render(
-      <DeleteButton isDisabled={false} item={mockAnalyticsListItem} onClick={() => {}} />
+  it('should not display a tooltip when isDisabled prop is false.', () => {
+    const { container } = render(
+      <DeleteActionName isDisabled={false} item={mockAnalyticsListItem} />
     );
 
-    expect(getByTestId('mlAnalyticsJobDeleteButton')).not.toHaveAttribute('disabled');
+    expect(container.querySelector('.euiToolTipAnchor')).not.toBeInTheDocument();
   });
 
   describe('When delete model is open', () => {
-    test('should allow to delete target index by default.', () => {
+    it('should allow to delete target index by default.', () => {
       const mock = jest.spyOn(CheckPrivilige, 'checkPermission');
       mock.mockImplementation((p) => p === 'canDeleteDataFrameAnalytics');
 
       const TestComponent = () => {
-        const deleteAction = useDeleteAction();
+        const deleteAction = useDeleteAction(true);
 
         return (
           <>
-            {deleteAction.isModalVisible && <DeleteButtonModal {...deleteAction} />}
-            <DeleteButton
-              isDisabled={false}
-              item={mockAnalyticsListItem}
+            {deleteAction.isModalVisible && <DeleteActionModal {...deleteAction} />}
+            <button
+              data-test-subj="mlAnalyticsJobDeleteButton"
               onClick={() => deleteAction.openModal(mockAnalyticsListItem)}
-            />
+            >
+              <DeleteActionName isDisabled={false} item={mockAnalyticsListItem} />
+            </button>
           </>
         );
       };
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_button.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_name.tsx
similarity index 62%
rename from x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_button.tsx
rename to x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_name.tsx
index 2bc3935c3b9f1..ccf45da81670c 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_button.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_name.tsx
@@ -6,36 +6,23 @@
 
 import React, { FC } from 'react';
 import { i18n } from '@kbn/i18n';
-import { EuiButtonEmpty, EuiToolTip } from '@elastic/eui';
+import { EuiToolTip } from '@elastic/eui';
 import { createPermissionFailureMessage } from '../../../../../capabilities/check_capabilities';
 import { isDataFrameAnalyticsRunning, DataFrameAnalyticsListRow } from '../analytics_list/common';
 
-const buttonText = i18n.translate('xpack.ml.dataframe.analyticsList.deleteActionName', {
-  defaultMessage: 'Delete',
-});
+export const deleteActionNameText = i18n.translate(
+  'xpack.ml.dataframe.analyticsList.deleteActionNameText',
+  {
+    defaultMessage: 'Delete',
+  }
+);
 
-interface DeleteButtonProps {
+interface DeleteActionNameProps {
   isDisabled: boolean;
   item: DataFrameAnalyticsListRow;
-  onClick: () => void;
 }
 
-export const DeleteButton: FC<DeleteButtonProps> = ({ isDisabled, item, onClick }) => {
-  const button = (
-    <EuiButtonEmpty
-      aria-label={buttonText}
-      color="text"
-      data-test-subj="mlAnalyticsJobDeleteButton"
-      flush="left"
-      iconType="trash"
-      isDisabled={isDisabled}
-      onClick={onClick}
-      size="xs"
-    >
-      {buttonText}
-    </EuiButtonEmpty>
-  );
-
+export const DeleteActionName: FC<DeleteActionNameProps> = ({ isDisabled, item }) => {
   if (isDisabled) {
     return (
       <EuiToolTip
@@ -51,10 +38,10 @@ export const DeleteButton: FC<DeleteButtonProps> = ({ isDisabled, item, onClick
             : createPermissionFailureMessage('canStartStopDataFrameAnalytics')
         }
       >
-        {button}
+        <>{deleteActionNameText}</>
       </EuiToolTip>
     );
   }
 
-  return button;
+  return <>{deleteActionNameText}</>;
 };
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/index.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/index.ts
index ef891d7c4a128..640cc39c90662 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/index.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/index.ts
@@ -4,6 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { DeleteButton } from './delete_button';
-export { DeleteButtonModal } from './delete_button_modal';
+export { DeleteActionName } from './delete_action_name';
+export { DeleteActionModal } from './delete_action_modal';
 export { useDeleteAction } from './use_delete_action';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.tsx
similarity index 77%
rename from x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.ts
rename to x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.tsx
index 461b1749c7936..60a7267db1e25 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { useEffect, useState } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 
 import { i18n } from '@kbn/i18n';
 
@@ -21,10 +21,16 @@ import {
   canDeleteIndex,
 } from '../../services/analytics_service';
 
-import { DataFrameAnalyticsListRow } from '../analytics_list/common';
+import {
+  isDataFrameAnalyticsRunning,
+  DataFrameAnalyticsListAction,
+  DataFrameAnalyticsListRow,
+} from '../analytics_list/common';
+
+import { deleteActionNameText, DeleteActionName } from './delete_action_name';
 
 export type DeleteAction = ReturnType<typeof useDeleteAction>;
-export const useDeleteAction = () => {
+export const useDeleteAction = (canDeleteDataFrameAnalytics: boolean) => {
   const [item, setItem] = useState<DataFrameAnalyticsListRow>();
 
   const [isModalVisible, setModalVisible] = useState(false);
@@ -33,7 +39,7 @@ export const useDeleteAction = () => {
   const [userCanDeleteIndex, setUserCanDeleteIndex] = useState<boolean>(false);
   const [indexPatternExists, setIndexPatternExists] = useState<boolean>(false);
 
-  const { savedObjects, notifications } = useMlKibana().services;
+  const { savedObjects } = useMlKibana().services;
   const savedObjectsClient = savedObjects.client;
 
   const indexName = item?.config.dest.index ?? '';
@@ -58,10 +64,9 @@ export const useDeleteAction = () => {
         setIndexPatternExists(false);
       }
     } catch (e) {
-      const { toasts } = notifications;
       const error = extractErrorMessage(e);
 
-      toasts.addDanger(
+      toastNotificationService.displayDangerToast(
         i18n.translate(
           'xpack.ml.dataframe.analyticsList.errorWithCheckingIfIndexPatternExistsNotificationErrorMessage',
           {
@@ -75,15 +80,14 @@ export const useDeleteAction = () => {
   };
   const checkUserIndexPermission = () => {
     try {
-      const userCanDelete = canDeleteIndex(indexName);
+      const userCanDelete = canDeleteIndex(indexName, toastNotificationService);
       if (userCanDelete) {
         setUserCanDeleteIndex(true);
       }
     } catch (e) {
-      const { toasts } = notifications;
       const error = extractErrorMessage(e);
 
-      toasts.addDanger(
+      toastNotificationService.displayDangerToast(
         i18n.translate(
           'xpack.ml.dataframe.analyticsList.errorWithCheckingIfUserCanDeleteIndexNotificationErrorMessage',
           {
@@ -130,7 +134,27 @@ export const useDeleteAction = () => {
     setModalVisible(true);
   };
 
+  const action: DataFrameAnalyticsListAction = useMemo(
+    () => ({
+      name: (i: DataFrameAnalyticsListRow) => (
+        <DeleteActionName
+          isDisabled={isDataFrameAnalyticsRunning(i.stats.state) || !canDeleteDataFrameAnalytics}
+          item={i}
+        />
+      ),
+      enabled: (i: DataFrameAnalyticsListRow) =>
+        !isDataFrameAnalyticsRunning(i.stats.state) && canDeleteDataFrameAnalytics,
+      description: deleteActionNameText,
+      icon: 'trash',
+      type: 'icon',
+      onClick: (i: DataFrameAnalyticsListRow) => openModal(i),
+      'data-test-subj': 'mlAnalyticsJobDeleteButton',
+    }),
+    []
+  );
+
   return {
+    action,
     closeModal,
     deleteAndCloseModal,
     deleteTargetIndex,
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_button_flyout.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_action_flyout.tsx
similarity index 99%
rename from x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_button_flyout.tsx
rename to x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_action_flyout.tsx
index 14b743997f30a..867f89d9e5e4a 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_button_flyout.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_action_flyout.tsx
@@ -43,7 +43,7 @@ import { EditAction } from './use_edit_action';
 
 let mmLValidator: (value: any) => MemoryInputValidatorResult;
 
-export const EditButtonFlyout: FC<Required<EditAction>> = ({ closeFlyout, item }) => {
+export const EditActionFlyout: FC<Required<EditAction>> = ({ closeFlyout, item }) => {
   const { id: jobId, config } = item;
   const { state } = item.stats;
   const initialAllowLazyStart =
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_button.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_action_name.tsx
similarity index 50%
rename from x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_button.tsx
rename to x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_action_name.tsx
index e17862bf326f1..5b7f40c81f118 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_button.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_action_name.tsx
@@ -8,33 +8,20 @@ import React, { FC } from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import { EuiButtonEmpty, EuiToolTip } from '@elastic/eui';
+import { EuiToolTip } from '@elastic/eui';
 
-const buttonText = i18n.translate('xpack.ml.dataframe.analyticsList.editActionName', {
-  defaultMessage: 'Edit',
-});
+export const editActionNameText = i18n.translate(
+  'xpack.ml.dataframe.analyticsList.editActionNameText',
+  {
+    defaultMessage: 'Edit',
+  }
+);
 
-interface EditButtonProps {
+interface EditActionNameProps {
   isDisabled: boolean;
-  onClick: () => void;
 }
 
-export const EditButton: FC<EditButtonProps> = ({ isDisabled, onClick }) => {
-  const button = (
-    <EuiButtonEmpty
-      aria-label={buttonText}
-      color="text"
-      data-test-subj="mlAnalyticsJobEditButton"
-      flush="left"
-      iconType="pencil"
-      isDisabled={isDisabled}
-      onClick={onClick}
-      size="xs"
-    >
-      {buttonText}
-    </EuiButtonEmpty>
-  );
-
+export const EditActionName: FC<EditActionNameProps> = ({ isDisabled }) => {
   if (isDisabled) {
     return (
       <EuiToolTip
@@ -43,10 +30,10 @@ export const EditButton: FC<EditButtonProps> = ({ isDisabled, onClick }) => {
           defaultMessage: 'You do not have permission to edit analytics jobs.',
         })}
       >
-        {button}
+        <>{editActionNameText}</>
       </EuiToolTip>
     );
   }
 
-  return button;
+  return <>{editActionNameText}</>;
 };
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/index.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/index.ts
index cfb0bba16ca18..07b3949717797 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/index.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/index.ts
@@ -4,6 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { EditButton } from './edit_button';
-export { EditButtonFlyout } from './edit_button_flyout';
+export { EditActionFlyout } from './edit_action_flyout';
 export { isEditActionFlyoutVisible, useEditAction } from './use_edit_action';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/use_edit_action.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/use_edit_action.tsx
similarity index 56%
rename from x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/use_edit_action.ts
rename to x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/use_edit_action.tsx
index 82a7bcc91997a..67f0d9d059570 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/use_edit_action.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/use_edit_action.tsx
@@ -4,9 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { useState } from 'react';
+import React, { useMemo, useState } from 'react';
 
-import { DataFrameAnalyticsListRow } from '../analytics_list/common';
+import { DataFrameAnalyticsListAction, DataFrameAnalyticsListRow } from '../analytics_list/common';
+
+import { editActionNameText, EditActionName } from './edit_action_name';
 
 export const isEditActionFlyoutVisible = (editAction: any): editAction is Required<EditAction> => {
   return editAction.isFlyoutVisible === true && editAction.item !== undefined;
@@ -18,7 +20,7 @@ export interface EditAction {
   closeFlyout: () => void;
   openFlyout: (newItem: DataFrameAnalyticsListRow) => void;
 }
-export const useEditAction = () => {
+export const useEditAction = (canStartStopDataFrameAnalytics: boolean) => {
   const [item, setItem] = useState<DataFrameAnalyticsListRow>();
 
   const [isFlyoutVisible, setIsFlyoutVisible] = useState(false);
@@ -28,7 +30,21 @@ export const useEditAction = () => {
     setIsFlyoutVisible(true);
   };
 
+  const action: DataFrameAnalyticsListAction = useMemo(
+    () => ({
+      name: () => <EditActionName isDisabled={!canStartStopDataFrameAnalytics} />,
+      enabled: () => canStartStopDataFrameAnalytics,
+      description: editActionNameText,
+      icon: 'pencil',
+      type: 'icon',
+      onClick: (i: DataFrameAnalyticsListRow) => openFlyout(i),
+      'data-test-subj': 'mlAnalyticsJobEditButton',
+    }),
+    [canStartStopDataFrameAnalytics]
+  );
+
   return {
+    action,
     isFlyoutVisible,
     item,
     closeFlyout,
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/index.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/index.ts
index df6bbb7c61908..cda5b0ee1ec79 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/index.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/index.ts
@@ -4,6 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { StartButton } from './start_button';
-export { StartButtonModal } from './start_button_modal';
 export { useStartAction } from './use_start_action';
+export { StartActionModal } from './start_action_modal';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/start_button_modal.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/start_action_modal.tsx
similarity index 96%
rename from x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/start_button_modal.tsx
rename to x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/start_action_modal.tsx
index 664dbe5c62b2f..fa559e807f5ea 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/start_button_modal.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/start_action_modal.tsx
@@ -10,7 +10,7 @@ import { EuiConfirmModal, EuiOverlayMask, EUI_MODAL_CONFIRM_BUTTON } from '@elas
 
 import { StartAction } from './use_start_action';
 
-export const StartButtonModal: FC<StartAction> = ({ closeModal, item, startAndCloseModal }) => {
+export const StartActionModal: FC<StartAction> = ({ closeModal, item, startAndCloseModal }) => {
   return (
     <>
       {item !== undefined && (
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/start_button.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/start_action_name.tsx
similarity index 65%
rename from x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/start_button.tsx
rename to x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/start_action_name.tsx
index 98b9279d8469a..1b39f3c8a7167 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/start_button.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/start_action_name.tsx
@@ -6,44 +6,30 @@
 
 import React, { FC } from 'react';
 import { i18n } from '@kbn/i18n';
-import { EuiButtonEmpty, EuiToolTip } from '@elastic/eui';
+import { EuiToolTip } from '@elastic/eui';
 
 import { createPermissionFailureMessage } from '../../../../../capabilities/check_capabilities';
 
 import { DataFrameAnalyticsListRow } from '../analytics_list/common';
 
-const buttonText = i18n.translate('xpack.ml.dataframe.analyticsList.startActionName', {
-  defaultMessage: 'Start',
-});
+export const startActionNameText = i18n.translate(
+  'xpack.ml.dataframe.analyticsList.startActionNameText',
+  {
+    defaultMessage: 'Start',
+  }
+);
 
-interface StartButtonProps {
+interface StartActionNameProps {
   canStartStopDataFrameAnalytics: boolean;
   isDisabled: boolean;
   item: DataFrameAnalyticsListRow;
-  onClick: () => void;
 }
 
-export const StartButton: FC<StartButtonProps> = ({
+export const StartActionName: FC<StartActionNameProps> = ({
   canStartStopDataFrameAnalytics,
   isDisabled,
   item,
-  onClick,
 }) => {
-  const button = (
-    <EuiButtonEmpty
-      aria-label={buttonText}
-      color="text"
-      data-test-subj="mlAnalyticsJobStartButton"
-      flush="left"
-      iconType="play"
-      isDisabled={isDisabled}
-      onClick={onClick}
-      size="xs"
-    >
-      {buttonText}
-    </EuiButtonEmpty>
-  );
-
   if (isDisabled) {
     return (
       <EuiToolTip
@@ -58,10 +44,10 @@ export const StartButton: FC<StartButtonProps> = ({
               })
         }
       >
-        {button}
+        <>{startActionNameText}</>
       </EuiToolTip>
     );
   }
 
-  return button;
+  return <>{startActionNameText}</>;
 };
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/use_start_action.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/use_start_action.ts
deleted file mode 100644
index 3c1087ff587d8..0000000000000
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/use_start_action.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { useState } from 'react';
-
-import { DataFrameAnalyticsListRow } from '../analytics_list/common';
-import { startAnalytics } from '../../services/analytics_service';
-import { useToastNotificationService } from '../../../../../services/toast_notification_service';
-
-export type StartAction = ReturnType<typeof useStartAction>;
-export const useStartAction = () => {
-  const [isModalVisible, setModalVisible] = useState(false);
-
-  const [item, setItem] = useState<DataFrameAnalyticsListRow>();
-
-  const toastNotificationService = useToastNotificationService();
-
-  const closeModal = () => setModalVisible(false);
-  const startAndCloseModal = () => {
-    if (item !== undefined) {
-      setModalVisible(false);
-      startAnalytics(item, toastNotificationService);
-    }
-  };
-
-  const openModal = (newItem: DataFrameAnalyticsListRow) => {
-    setItem(newItem);
-    setModalVisible(true);
-  };
-
-  return {
-    closeModal,
-    isModalVisible,
-    item,
-    openModal,
-    startAndCloseModal,
-  };
-};
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/use_start_action.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/use_start_action.tsx
new file mode 100644
index 0000000000000..f72c4d8a1f556
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/use_start_action.tsx
@@ -0,0 +1,80 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useMemo, useState } from 'react';
+
+import {
+  isCompletedAnalyticsJob,
+  isDataFrameAnalyticsFailed,
+  isDataFrameAnalyticsRunning,
+  DataFrameAnalyticsListAction,
+  DataFrameAnalyticsListRow,
+} from '../analytics_list/common';
+import { startAnalytics } from '../../services/analytics_service';
+import { useToastNotificationService } from '../../../../../services/toast_notification_service';
+
+import { startActionNameText, StartActionName } from './start_action_name';
+
+export type StartAction = ReturnType<typeof useStartAction>;
+export const useStartAction = (canStartStopDataFrameAnalytics: boolean) => {
+  const [isModalVisible, setModalVisible] = useState(false);
+
+  const [item, setItem] = useState<DataFrameAnalyticsListRow>();
+
+  const toastNotificationService = useToastNotificationService();
+
+  const closeModal = () => setModalVisible(false);
+  const startAndCloseModal = () => {
+    if (item !== undefined) {
+      setModalVisible(false);
+      startAnalytics(item, toastNotificationService);
+    }
+  };
+
+  const openModal = (newItem: DataFrameAnalyticsListRow) => {
+    setItem(newItem);
+    setModalVisible(true);
+  };
+
+  const startButtonEnabled = (i: DataFrameAnalyticsListRow) => {
+    if (!isDataFrameAnalyticsRunning(i.stats.state)) {
+      // Disable start for analytics jobs which have completed.
+      const completeAnalytics = isCompletedAnalyticsJob(i.stats);
+      return canStartStopDataFrameAnalytics && !completeAnalytics;
+    }
+    return canStartStopDataFrameAnalytics;
+  };
+
+  const action: DataFrameAnalyticsListAction = useMemo(
+    () => ({
+      name: (i: DataFrameAnalyticsListRow) => (
+        <StartActionName
+          isDisabled={!startButtonEnabled(i)}
+          item={i}
+          canStartStopDataFrameAnalytics={canStartStopDataFrameAnalytics}
+        />
+      ),
+      available: (i: DataFrameAnalyticsListRow) =>
+        !isDataFrameAnalyticsRunning(i.stats.state) && !isDataFrameAnalyticsFailed(i.stats.state),
+      enabled: startButtonEnabled,
+      description: startActionNameText,
+      icon: 'play',
+      type: 'icon',
+      onClick: openModal,
+      'data-test-subj': 'mlAnalyticsJobStartButton',
+    }),
+    []
+  );
+
+  return {
+    action,
+    closeModal,
+    isModalVisible,
+    item,
+    openModal,
+    startAndCloseModal,
+  };
+};
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/index.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/index.ts
index ce03305e3d859..f45b90222611b 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/index.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/index.ts
@@ -4,6 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { StopButton } from './stop_button';
-export { StopButtonModal } from './stop_button_modal';
-export { useForceStopAction } from './use_force_stop_action';
+export { useStopAction } from './use_stop_action';
+export { StopActionModal } from './stop_action_modal';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/stop_button_modal.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/stop_action_modal.tsx
similarity index 91%
rename from x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/stop_button_modal.tsx
rename to x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/stop_action_modal.tsx
index 387f42cc85ef3..0b483ce4cad16 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/stop_button_modal.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/stop_action_modal.tsx
@@ -9,13 +9,9 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiConfirmModal, EuiOverlayMask, EUI_MODAL_CONFIRM_BUTTON } from '@elastic/eui';
 
-import { ForceStopAction } from './use_force_stop_action';
+import { StopAction } from './use_stop_action';
 
-export const StopButtonModal: FC<ForceStopAction> = ({
-  closeModal,
-  item,
-  forceStopAndCloseModal,
-}) => {
+export const StopActionModal: FC<StopAction> = ({ closeModal, item, forceStopAndCloseModal }) => {
   return (
     <>
       {item !== undefined && (
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/stop_action_name.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/stop_action_name.tsx
new file mode 100644
index 0000000000000..99c8d960cf3b9
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/stop_action_name.tsx
@@ -0,0 +1,38 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC } from 'react';
+import { i18n } from '@kbn/i18n';
+
+import { EuiToolTip } from '@elastic/eui';
+
+import { createPermissionFailureMessage } from '../../../../../capabilities/check_capabilities';
+
+export const stopActionNameText = i18n.translate(
+  'xpack.ml.dataframe.analyticsList.stopActionNameText',
+  {
+    defaultMessage: 'Stop',
+  }
+);
+
+interface StopActionNameProps {
+  isDisabled: boolean;
+}
+
+export const StopActionName: FC<StopActionNameProps> = ({ isDisabled }) => {
+  if (isDisabled) {
+    return (
+      <EuiToolTip
+        position="top"
+        content={createPermissionFailureMessage('canStartStopDataFrameAnalytics')}
+      >
+        <>{stopActionNameText}</>
+      </EuiToolTip>
+    );
+  }
+
+  return <>{stopActionNameText}</>;
+};
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/stop_button.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/stop_button.tsx
deleted file mode 100644
index 3bac183d9f391..0000000000000
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/stop_button.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { FC } from 'react';
-import { i18n } from '@kbn/i18n';
-
-import { EuiButtonEmpty, EuiToolTip } from '@elastic/eui';
-
-import { createPermissionFailureMessage } from '../../../../../capabilities/check_capabilities';
-
-import { DataFrameAnalyticsListRow } from '../analytics_list/common';
-
-const buttonText = i18n.translate('xpack.ml.dataframe.analyticsList.stopActionName', {
-  defaultMessage: 'Stop',
-});
-
-interface StopButtonProps {
-  isDisabled: boolean;
-  item: DataFrameAnalyticsListRow;
-  onClick: () => void;
-}
-
-export const StopButton: FC<StopButtonProps> = ({ isDisabled, item, onClick }) => {
-  const button = (
-    <EuiButtonEmpty
-      aria-label={buttonText}
-      color="text"
-      data-test-subj="mlAnalyticsJobStopButton"
-      flush="left"
-      iconType="stop"
-      isDisabled={isDisabled}
-      onClick={onClick}
-      size="xs"
-    >
-      {buttonText}
-    </EuiButtonEmpty>
-  );
-
-  if (isDisabled) {
-    return (
-      <EuiToolTip
-        position="top"
-        content={createPermissionFailureMessage('canStartStopDataFrameAnalytics')}
-      >
-        {button}
-      </EuiToolTip>
-    );
-  }
-
-  return button;
-};
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/use_force_stop_action.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/use_force_stop_action.ts
deleted file mode 100644
index 5a4e748948731..0000000000000
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/use_force_stop_action.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { useState } from 'react';
-
-import { DataFrameAnalyticsListRow } from '../analytics_list/common';
-import { stopAnalytics } from '../../services/analytics_service';
-
-export type ForceStopAction = ReturnType<typeof useForceStopAction>;
-export const useForceStopAction = () => {
-  const [isModalVisible, setModalVisible] = useState(false);
-
-  const [item, setItem] = useState<DataFrameAnalyticsListRow>();
-
-  const closeModal = () => setModalVisible(false);
-  const forceStopAndCloseModal = () => {
-    if (item !== undefined) {
-      setModalVisible(false);
-      stopAnalytics(item);
-    }
-  };
-
-  const openModal = (newItem: DataFrameAnalyticsListRow) => {
-    setItem(newItem);
-    setModalVisible(true);
-  };
-
-  return {
-    closeModal,
-    isModalVisible,
-    item,
-    openModal,
-    forceStopAndCloseModal,
-  };
-};
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/use_stop_action.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/use_stop_action.tsx
new file mode 100644
index 0000000000000..546744c992709
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/use_stop_action.tsx
@@ -0,0 +1,67 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useCallback, useMemo, useState } from 'react';
+
+import {
+  isDataFrameAnalyticsFailed,
+  isDataFrameAnalyticsRunning,
+  DataFrameAnalyticsListAction,
+  DataFrameAnalyticsListRow,
+} from '../analytics_list/common';
+import { stopAnalytics } from '../../services/analytics_service';
+
+import { stopActionNameText, StopActionName } from './stop_action_name';
+
+export type StopAction = ReturnType<typeof useStopAction>;
+export const useStopAction = (canStartStopDataFrameAnalytics: boolean) => {
+  const [isModalVisible, setModalVisible] = useState(false);
+
+  const [item, setItem] = useState<DataFrameAnalyticsListRow>();
+
+  const closeModal = () => setModalVisible(false);
+  const forceStopAndCloseModal = () => {
+    if (item !== undefined) {
+      setModalVisible(false);
+      stopAnalytics(item);
+    }
+  };
+
+  const openModal = (newItem: DataFrameAnalyticsListRow) => {
+    setItem(newItem);
+    setModalVisible(true);
+  };
+
+  const clickHandler = useCallback(
+    (i: DataFrameAnalyticsListRow) => {
+      if (canStartStopDataFrameAnalytics) {
+        if (isDataFrameAnalyticsFailed(i.stats.state)) {
+          openModal(i);
+        } else {
+          stopAnalytics(i);
+        }
+      }
+    },
+    [stopAnalytics]
+  );
+
+  const action: DataFrameAnalyticsListAction = useMemo(
+    () => ({
+      name: () => <StopActionName isDisabled={!canStartStopDataFrameAnalytics} />,
+      available: (i: DataFrameAnalyticsListRow) =>
+        isDataFrameAnalyticsRunning(i.stats.state) || isDataFrameAnalyticsFailed(i.stats.state),
+      enabled: () => canStartStopDataFrameAnalytics,
+      description: stopActionNameText,
+      icon: 'stop',
+      type: 'icon',
+      onClick: clickHandler,
+      'data-test-subj': 'mlAnalyticsJobStopButton',
+    }),
+    [clickHandler]
+  );
+
+  return { action, closeModal, isModalVisible, item, openModal, forceStopAndCloseModal };
+};
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_view/get_view_action.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_view/get_view_action.tsx
deleted file mode 100644
index e123af204b515..0000000000000
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_view/get_view_action.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-
-import { EuiTableActionsColumnType } from '@elastic/eui';
-
-import { DataFrameAnalyticsListRow } from '../analytics_list/common';
-
-import { ViewButton } from './view_button';
-
-export const getViewAction = (): EuiTableActionsColumnType<
-  DataFrameAnalyticsListRow
->['actions'][number] => ({
-  isPrimary: true,
-  render: (item: DataFrameAnalyticsListRow) => <ViewButton item={item} />,
-});
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_view/index.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_view/index.ts
index 5ac12c12071fd..076c07abfe920 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_view/index.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_view/index.ts
@@ -4,5 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { getViewAction } from './get_view_action';
+export { useViewAction } from './use_view_action';
 export { ViewButton } from './view_button';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_view/use_view_action.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_view/use_view_action.tsx
new file mode 100644
index 0000000000000..a3595b51d0a59
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_view/use_view_action.tsx
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useCallback, useMemo } from 'react';
+
+import { getAnalysisType } from '../../../../common/analytics';
+import { useNavigateToPath } from '../../../../../contexts/kibana';
+
+import {
+  getResultsUrl,
+  DataFrameAnalyticsListAction,
+  DataFrameAnalyticsListRow,
+} from '../analytics_list/common';
+
+import { getViewLinkStatus } from './get_view_link_status';
+import { viewActionButtonText, ViewButton } from './view_button';
+
+export type ViewAction = ReturnType<typeof useViewAction>;
+export const useViewAction = () => {
+  const navigateToPath = useNavigateToPath();
+
+  const clickHandler = useCallback((item: DataFrameAnalyticsListRow) => {
+    const analysisType = getAnalysisType(item.config.analysis);
+    navigateToPath(getResultsUrl(item.id, analysisType));
+  }, []);
+
+  const action: DataFrameAnalyticsListAction = useMemo(
+    () => ({
+      isPrimary: true,
+      name: (item: DataFrameAnalyticsListRow) => <ViewButton item={item} />,
+      enabled: (item: DataFrameAnalyticsListRow) => !getViewLinkStatus(item).disabled,
+      description: viewActionButtonText,
+      icon: 'visTable',
+      type: 'icon',
+      onClick: clickHandler,
+      'data-test-subj': 'mlAnalyticsJobViewButton',
+    }),
+    [clickHandler]
+  );
+
+  return { action };
+};
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_view/view_button.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_view/view_button.tsx
index 9472a3af852fc..d46ddf1fcaaba 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_view/view_button.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_view/view_button.tsx
@@ -6,53 +6,33 @@
 
 import React, { FC } from 'react';
 import { i18n } from '@kbn/i18n';
-import { EuiButtonEmpty, EuiToolTip } from '@elastic/eui';
+import { EuiToolTip } from '@elastic/eui';
 
-import { getAnalysisType } from '../../../../common/analytics';
-import { useNavigateToPath } from '../../../../../contexts/kibana';
-
-import { getResultsUrl, DataFrameAnalyticsListRow } from '../analytics_list/common';
+import { DataFrameAnalyticsListRow } from '../analytics_list/common';
 
 import { getViewLinkStatus } from './get_view_link_status';
 
+export const viewActionButtonText = i18n.translate(
+  'xpack.ml.dataframe.analyticsList.viewActionName',
+  {
+    defaultMessage: 'View',
+  }
+);
+
 interface ViewButtonProps {
   item: DataFrameAnalyticsListRow;
 }
 
 export const ViewButton: FC<ViewButtonProps> = ({ item }) => {
-  const navigateToPath = useNavigateToPath();
-
   const { disabled, tooltipContent } = getViewLinkStatus(item);
-  const analysisType = getAnalysisType(item.config.analysis);
-
-  const onClickHandler = () => navigateToPath(getResultsUrl(item.id, analysisType));
-
-  const buttonText = i18n.translate('xpack.ml.dataframe.analyticsList.viewActionName', {
-    defaultMessage: 'View',
-  });
-
-  const button = (
-    <EuiButtonEmpty
-      aria-label={buttonText}
-      color="text"
-      data-test-subj="mlAnalyticsJobViewButton"
-      flush="left"
-      iconType="visTable"
-      isDisabled={disabled}
-      onClick={onClickHandler}
-      size="xs"
-    >
-      {buttonText}
-    </EuiButtonEmpty>
-  );
 
   if (disabled) {
     return (
       <EuiToolTip position="top" content={tooltipContent}>
-        {button}
+        <>{viewActionButtonText}</>
       </EuiToolTip>
     );
   }
 
-  return button;
+  return <>{viewActionButtonText}</>;
 };
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/common.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/common.ts
index 39489836773b3..774864ae964a8 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/common.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/common.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Query, Ast } from '@elastic/eui';
+import { EuiTableActionsColumnType, Query, Ast } from '@elastic/eui';
 
 import { DATA_FRAME_TASK_STATE } from './data_frame_task_state';
 export { DATA_FRAME_TASK_STATE };
@@ -139,3 +139,11 @@ export function isCompletedAnalyticsJob(stats: DataFrameAnalyticsStats) {
 export function getResultsUrl(jobId: string, analysisType: ANALYSIS_CONFIG_TYPE | string) {
   return `#/data_frame_analytics/exploration?_g=(ml:(jobId:${jobId},analysisType:${analysisType}))`;
 }
+
+// The single Action type is not exported as is
+// from EUI so we use that code to get the single
+// Action type from the array of actions.
+type ArrayElement<ArrayType extends readonly unknown[]> = ArrayType[number];
+export type DataFrameAnalyticsListAction = ArrayElement<
+  EuiTableActionsColumnType<DataFrameAnalyticsListRow>['actions']
+>;
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_actions.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_actions.tsx
index d355335039085..20ae48a12ecf9 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_actions.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_actions.tsx
@@ -10,26 +10,14 @@ import { EuiTableActionsColumnType } from '@elastic/eui';
 
 import { checkPermission } from '../../../../../capabilities/check_capabilities';
 
-import { stopAnalytics } from '../../services/analytics_service';
+import { useCloneAction } from '../action_clone';
+import { useDeleteAction, DeleteActionModal } from '../action_delete';
+import { isEditActionFlyoutVisible, useEditAction, EditActionFlyout } from '../action_edit';
+import { useStartAction, StartActionModal } from '../action_start';
+import { useStopAction, StopActionModal } from '../action_stop';
+import { useViewAction } from '../action_view';
 
-import { useNavigateToWizardWithClonedJob, CloneButton } from '../action_clone';
-import { useDeleteAction, DeleteButton, DeleteButtonModal } from '../action_delete';
-import {
-  isEditActionFlyoutVisible,
-  useEditAction,
-  EditButton,
-  EditButtonFlyout,
-} from '../action_edit';
-import { useStartAction, StartButton, StartButtonModal } from '../action_start';
-import { StopButton, useForceStopAction, StopButtonModal } from '../action_stop';
-import { getViewAction } from '../action_view';
-
-import {
-  isCompletedAnalyticsJob,
-  isDataFrameAnalyticsRunning,
-  isDataFrameAnalyticsFailed,
-  DataFrameAnalyticsListRow,
-} from './common';
+import { DataFrameAnalyticsListRow } from './common';
 
 export const useActions = (
   isManagementTable: boolean
@@ -41,126 +29,38 @@ export const useActions = (
   const canDeleteDataFrameAnalytics: boolean = checkPermission('canDeleteDataFrameAnalytics');
   const canStartStopDataFrameAnalytics: boolean = checkPermission('canStartStopDataFrameAnalytics');
 
+  const viewAction = useViewAction();
+  const cloneAction = useCloneAction(canCreateDataFrameAnalytics);
+  const deleteAction = useDeleteAction(canDeleteDataFrameAnalytics);
+  const editAction = useEditAction(canStartStopDataFrameAnalytics);
+  const startAction = useStartAction(canStartStopDataFrameAnalytics);
+  const stopAction = useStopAction(canStartStopDataFrameAnalytics);
+
   let modals: JSX.Element | null = null;
 
   const actions: EuiTableActionsColumnType<DataFrameAnalyticsListRow>['actions'] = [
-    getViewAction(),
+    viewAction.action,
   ];
 
   // isManagementTable will be the same for the lifecycle of the component
   // Disabling lint error to fix console error in management list due to action hooks using deps not initialized in management
   if (isManagementTable === false) {
-    /* eslint-disable react-hooks/rules-of-hooks */
-    const deleteAction = useDeleteAction();
-    const editAction = useEditAction();
-    const startAction = useStartAction();
-    const stopAction = useForceStopAction();
-    /* eslint-disable react-hooks/rules-of-hooks */
-
     modals = (
       <>
-        {startAction.isModalVisible && <StartButtonModal {...startAction} />}
-        {stopAction.isModalVisible && <StopButtonModal {...stopAction} />}
-        {deleteAction.isModalVisible && <DeleteButtonModal {...deleteAction} />}
-        {isEditActionFlyoutVisible(editAction) && <EditButtonFlyout {...editAction} />}
+        {startAction.isModalVisible && <StartActionModal {...startAction} />}
+        {stopAction.isModalVisible && <StopActionModal {...stopAction} />}
+        {deleteAction.isModalVisible && <DeleteActionModal {...deleteAction} />}
+        {isEditActionFlyoutVisible(editAction) && <EditActionFlyout {...editAction} />}
       </>
     );
 
-    const startButtonEnabled = (item: DataFrameAnalyticsListRow) => {
-      if (!isDataFrameAnalyticsRunning(item.stats.state)) {
-        // Disable start for analytics jobs which have completed.
-        const completeAnalytics = isCompletedAnalyticsJob(item.stats);
-        return canStartStopDataFrameAnalytics && !completeAnalytics;
-      }
-      return canStartStopDataFrameAnalytics;
-    };
-
-    const navigateToWizardWithClonedJob = useNavigateToWizardWithClonedJob();
-
     actions.push(
       ...[
-        {
-          render: (item: DataFrameAnalyticsListRow) => {
-            if (
-              !isDataFrameAnalyticsRunning(item.stats.state) &&
-              !isDataFrameAnalyticsFailed(item.stats.state)
-            ) {
-              return (
-                <StartButton
-                  canStartStopDataFrameAnalytics={canStartStopDataFrameAnalytics}
-                  isDisabled={!startButtonEnabled(item)}
-                  item={item}
-                  onClick={() => {
-                    if (startButtonEnabled(item)) {
-                      startAction.openModal(item);
-                    }
-                  }}
-                />
-              );
-            }
-
-            return (
-              <StopButton
-                isDisabled={!canStartStopDataFrameAnalytics}
-                item={item}
-                onClick={() => {
-                  if (canStartStopDataFrameAnalytics) {
-                    if (isDataFrameAnalyticsFailed(item.stats.state)) {
-                      stopAction.openModal(item);
-                    } else {
-                      stopAnalytics(item);
-                    }
-                  }
-                }}
-              />
-            );
-          },
-        },
-        {
-          render: (item: DataFrameAnalyticsListRow) => {
-            return (
-              <EditButton
-                isDisabled={!canStartStopDataFrameAnalytics}
-                onClick={() => {
-                  if (canStartStopDataFrameAnalytics) {
-                    editAction.openFlyout(item);
-                  }
-                }}
-              />
-            );
-          },
-        },
-        {
-          render: (item: DataFrameAnalyticsListRow) => {
-            return (
-              <DeleteButton
-                isDisabled={
-                  isDataFrameAnalyticsRunning(item.stats.state) || !canDeleteDataFrameAnalytics
-                }
-                item={item}
-                onClick={() => {
-                  if (canStartStopDataFrameAnalytics) {
-                    deleteAction.openModal(item);
-                  }
-                }}
-              />
-            );
-          },
-        },
-        {
-          render: (item: DataFrameAnalyticsListRow) => {
-            return (
-              <CloneButton
-                isDisabled={!canCreateDataFrameAnalytics}
-                onClick={() => {
-                  if (canCreateDataFrameAnalytics) {
-                    navigateToWizardWithClonedJob(item);
-                  }
-                }}
-              />
-            );
-          },
-        },
+        startAction.action,
+        stopAction.action,
+        editAction.action,
+        cloneAction.action,
+        deleteAction.action,
       ]
     );
   }
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts
index 8d8421a116b91..7cd9fcc052f1a 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts
@@ -45,7 +45,7 @@ import {
   TRAINING_PERCENT_MAX,
 } from '../../../../common/analytics';
 import { indexPatterns } from '../../../../../../../../../../src/plugins/data/public';
-import { isAdvancedConfig } from '../../components/action_clone/clone_button';
+import { isAdvancedConfig } from '../../components/action_clone/clone_action_name';
 
 const mmlAllowedUnitsStr = `${ALLOWED_DATA_UNITS.slice(0, ALLOWED_DATA_UNITS.length - 1).join(
   ', '
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/services/analytics_service/delete_analytics.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/services/analytics_service/delete_analytics.ts
index 7d3ee986a4ef1..9de859742438e 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/services/analytics_service/delete_analytics.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/services/analytics_service/delete_analytics.ts
@@ -5,7 +5,6 @@
  */
 import { i18n } from '@kbn/i18n';
 import { extractErrorMessage } from '../../../../../../../common/util/errors';
-import { getToastNotifications } from '../../../../../util/dependency_cache';
 import { ml } from '../../../../../services/ml_api_service';
 import { ToastNotificationService } from '../../../../../services/toast_notification_service';
 import { refreshAnalyticsList$, REFRESH_ANALYTICS_LIST_STATE } from '../../../../common';
@@ -18,13 +17,12 @@ export const deleteAnalytics = async (
   d: DataFrameAnalyticsListRow,
   toastNotificationService: ToastNotificationService
 ) => {
-  const toastNotifications = getToastNotifications();
   try {
     if (isDataFrameAnalyticsFailed(d.stats.state)) {
       await ml.dataFrameAnalytics.stopDataFrameAnalytics(d.config.id, true);
     }
     await ml.dataFrameAnalytics.deleteDataFrameAnalytics(d.config.id);
-    toastNotifications.addSuccess(
+    toastNotificationService.displaySuccessToast(
       i18n.translate('xpack.ml.dataframe.analyticsList.deleteAnalyticsSuccessMessage', {
         defaultMessage: 'Request to delete data frame analytics job {analyticsId} acknowledged.',
         values: { analyticsId: d.config.id },
@@ -48,7 +46,6 @@ export const deleteAnalyticsAndDestIndex = async (
   deleteDestIndexPattern: boolean,
   toastNotificationService: ToastNotificationService
 ) => {
-  const toastNotifications = getToastNotifications();
   const destinationIndex = Array.isArray(d.config.dest.index)
     ? d.config.dest.index[0]
     : d.config.dest.index;
@@ -62,7 +59,7 @@ export const deleteAnalyticsAndDestIndex = async (
       deleteDestIndexPattern
     );
     if (status.analyticsJobDeleted?.success) {
-      toastNotifications.addSuccess(
+      toastNotificationService.displaySuccessToast(
         i18n.translate('xpack.ml.dataframe.analyticsList.deleteAnalyticsSuccessMessage', {
           defaultMessage: 'Request to delete data frame analytics job {analyticsId} acknowledged.',
           values: { analyticsId: d.config.id },
@@ -80,7 +77,7 @@ export const deleteAnalyticsAndDestIndex = async (
     }
 
     if (status.destIndexDeleted?.success) {
-      toastNotifications.addSuccess(
+      toastNotificationService.displaySuccessToast(
         i18n.translate('xpack.ml.dataframe.analyticsList.deleteAnalyticsWithIndexSuccessMessage', {
           defaultMessage: 'Request to delete destination index {destinationIndex} acknowledged.',
           values: { destinationIndex },
@@ -89,7 +86,7 @@ export const deleteAnalyticsAndDestIndex = async (
     }
     if (status.destIndexDeleted?.error) {
       const error = extractErrorMessage(status.destIndexDeleted.error);
-      toastNotifications.addDanger(
+      toastNotificationService.displayDangerToast(
         i18n.translate('xpack.ml.dataframe.analyticsList.deleteAnalyticsWithIndexErrorMessage', {
           defaultMessage:
             'An error occurred deleting destination index {destinationIndex}: {error}',
@@ -99,7 +96,7 @@ export const deleteAnalyticsAndDestIndex = async (
     }
 
     if (status.destIndexPatternDeleted?.success) {
-      toastNotifications.addSuccess(
+      toastNotificationService.displaySuccessToast(
         i18n.translate(
           'xpack.ml.dataframe.analyticsList.deleteAnalyticsWithIndexPatternSuccessMessage',
           {
@@ -111,7 +108,7 @@ export const deleteAnalyticsAndDestIndex = async (
     }
     if (status.destIndexPatternDeleted?.error) {
       const error = extractErrorMessage(status.destIndexPatternDeleted.error);
-      toastNotifications.addDanger(
+      toastNotificationService.displayDangerToast(
         i18n.translate(
           'xpack.ml.dataframe.analyticsList.deleteAnalyticsWithIndexPatternErrorMessage',
           {
@@ -133,8 +130,10 @@ export const deleteAnalyticsAndDestIndex = async (
   refreshAnalyticsList$.next(REFRESH_ANALYTICS_LIST_STATE.REFRESH);
 };
 
-export const canDeleteIndex = async (indexName: string) => {
-  const toastNotifications = getToastNotifications();
+export const canDeleteIndex = async (
+  indexName: string,
+  toastNotificationService: ToastNotificationService
+) => {
   try {
     const privilege = await ml.hasPrivileges({
       index: [
@@ -150,7 +149,7 @@ export const canDeleteIndex = async (indexName: string) => {
     return privilege.securityDisabled === true || privilege.has_all_requested === true;
   } catch (e) {
     const error = extractErrorMessage(e);
-    toastNotifications.addDanger(
+    toastNotificationService.displayDangerToast(
       i18n.translate('xpack.ml.dataframe.analyticsList.deleteAnalyticsPrivilegeErrorMessage', {
         defaultMessage: 'User does not have permission to delete index {indexName}: {error}',
         values: { indexName, error },
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_charts_container.js b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_charts_container.js
index 9988298c25c51..4fb783bfb6006 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_charts_container.js
+++ b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_charts_container.js
@@ -104,7 +104,7 @@ function ExplorerChartContainer({ series, severity, tooManyBuckets, wrapLabel })
             <EuiToolTip position="top" content={textViewButton}>
               <EuiButtonEmpty
                 iconSide="right"
-                iconType="stats"
+                iconType="visLine"
                 size="xs"
                 onClick={() => window.open(getExploreSeriesLink(series), '_blank')}
               >
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_actions/results.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_actions/results.js
index 781b9126b7cbe..74072aa7e9638 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_actions/results.js
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_actions/results.js
@@ -51,7 +51,7 @@ export function ResultLinks({ jobs }) {
         <EuiToolTip position="bottom" content={openJobsInSingleMetricViewerText}>
           <EuiButtonIcon
             href={getLink('timeseriesexplorer', jobs)}
-            iconType="stats"
+            iconType="visLine"
             aria-label={openJobsInSingleMetricViewerText}
             className="results-button"
             isDisabled={singleMetricEnabled === false || jobActionsDisabled === true}
@@ -62,7 +62,7 @@ export function ResultLinks({ jobs }) {
       <EuiToolTip position="bottom" content={openJobsInAnomalyExplorerText}>
         <EuiButtonIcon
           href={getLink('explorer', jobs)}
-          iconType="tableOfContents"
+          iconType="visTable"
           aria-label={openJobsInAnomalyExplorerText}
           className="results-button"
           isDisabled={jobActionsDisabled === true}
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/forecasts_table/forecasts_table.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/forecasts_table/forecasts_table.js
index 2f40941fd20fe..b6157c8694a18 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/forecasts_table/forecasts_table.js
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/forecasts_table/forecasts_table.js
@@ -301,7 +301,7 @@ export class ForecastsTable extends Component {
             <EuiButtonIcon
               onClick={() => this.openSingleMetricView(forecast)}
               isDisabled={forecast.forecast_status !== FORECAST_REQUEST_STATE.FINISHED}
-              iconType="stats"
+              iconType="visLine"
               aria-label={viewForecastAriaLabel}
             />
           );
diff --git a/x-pack/plugins/ml/public/application/overview/components/analytics_panel/actions.tsx b/x-pack/plugins/ml/public/application/overview/components/analytics_panel/actions.tsx
new file mode 100644
index 0000000000000..081101e241990
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/overview/components/analytics_panel/actions.tsx
@@ -0,0 +1,54 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useCallback, FC } from 'react';
+import { EuiToolTip, EuiButtonEmpty } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
+import { useNavigateToPath } from '../../../contexts/kibana';
+import { getAnalysisType } from '../../../data_frame_analytics/common/analytics';
+import {
+  getResultsUrl,
+  DataFrameAnalyticsListRow,
+} from '../../../data_frame_analytics/pages/analytics_management/components/analytics_list/common';
+
+interface Props {
+  item: DataFrameAnalyticsListRow;
+}
+
+export const ViewLink: FC<Props> = ({ item }) => {
+  const navigateToPath = useNavigateToPath();
+
+  const clickHandler = useCallback(() => {
+    const analysisType = getAnalysisType(item.config.analysis);
+    navigateToPath(getResultsUrl(item.id, analysisType));
+  }, []);
+
+  const openJobsInAnomalyExplorerText = i18n.translate(
+    'xpack.ml.overview.analytics.resultActions.openJobText',
+    {
+      defaultMessage: 'View job results',
+    }
+  );
+
+  return (
+    <EuiToolTip position="bottom" content={openJobsInAnomalyExplorerText}>
+      <EuiButtonEmpty
+        color="text"
+        size="xs"
+        onClick={clickHandler}
+        iconType="visTable"
+        aria-label={openJobsInAnomalyExplorerText}
+        className="results-button"
+        data-test-subj="mlAnalyticsJobViewButton"
+      >
+        {i18n.translate('xpack.ml.overview.analytics.viewActionName', {
+          defaultMessage: 'View',
+        })}
+      </EuiButtonEmpty>
+    </EuiToolTip>
+  );
+};
diff --git a/x-pack/plugins/ml/public/application/overview/components/analytics_panel/table.tsx b/x-pack/plugins/ml/public/application/overview/components/analytics_panel/table.tsx
index b28729dcf157f..fc0645a0e9498 100644
--- a/x-pack/plugins/ml/public/application/overview/components/analytics_panel/table.tsx
+++ b/x-pack/plugins/ml/public/application/overview/components/analytics_panel/table.tsx
@@ -23,9 +23,10 @@ import {
   getTaskStateBadge,
   progressColumn,
 } from '../../../data_frame_analytics/pages/analytics_management/components/analytics_list/use_columns';
-import { getViewAction } from '../../../data_frame_analytics/pages/analytics_management/components/action_view';
 import { formatHumanReadableDateTimeSeconds } from '../../../util/date_utils';
 
+import { ViewLink } from './actions';
+
 type DataFrameAnalyticsTableColumns = [
   EuiTableFieldDataColumnType<DataFrameAnalyticsListRow>,
   EuiTableComputedColumnType<DataFrameAnalyticsListRow>,
@@ -89,7 +90,11 @@ export const AnalyticsTable: FC<Props> = ({ items }) => {
       name: i18n.translate('xpack.ml.overview.analyticsList.tableActionLabel', {
         defaultMessage: 'Actions',
       }),
-      actions: [getViewAction()],
+      actions: [
+        {
+          render: (item: DataFrameAnalyticsListRow) => <ViewLink item={item} />,
+        },
+      ],
       width: '100px',
     },
   ];
diff --git a/x-pack/plugins/ml/public/application/overview/components/anomaly_detection_panel/actions.tsx b/x-pack/plugins/ml/public/application/overview/components/anomaly_detection_panel/actions.tsx
index 3a64c623dd129..07a555c13dbf5 100644
--- a/x-pack/plugins/ml/public/application/overview/components/anomaly_detection_panel/actions.tsx
+++ b/x-pack/plugins/ml/public/application/overview/components/anomaly_detection_panel/actions.tsx
@@ -30,13 +30,13 @@ export const ExplorerLink: FC<Props> = ({ jobsList }) => {
         color="text"
         size="xs"
         href={getLink('explorer', jobsList)}
-        iconType="tableOfContents"
+        iconType="visTable"
         aria-label={openJobsInAnomalyExplorerText}
         className="results-button"
         data-test-subj={`openOverviewJobsInAnomalyExplorer`}
       >
-        {i18n.translate('xpack.ml.overview.anomalyDetection.exploreActionName', {
-          defaultMessage: 'Explore',
+        {i18n.translate('xpack.ml.overview.anomalyDetection.viewActionName', {
+          defaultMessage: 'View',
         })}
       </EuiButtonEmpty>
     </EuiToolTip>
diff --git a/x-pack/plugins/ml/public/application/services/toast_notification_service.ts b/x-pack/plugins/ml/public/application/services/toast_notification_service.ts
index d93d6833c7cb4..94381ae3f1e51 100644
--- a/x-pack/plugins/ml/public/application/services/toast_notification_service.ts
+++ b/x-pack/plugins/ml/public/application/services/toast_notification_service.ts
@@ -20,6 +20,10 @@ export type ToastNotificationService = ReturnType<typeof toastNotificationServic
 
 export function toastNotificationServiceProvider(toastNotifications: ToastsStart) {
   return {
+    displayDangerToast(toastOrTitle: ToastInput, options?: ToastOptions) {
+      toastNotifications.addDanger(toastOrTitle, options);
+    },
+
     displaySuccessToast(toastOrTitle: ToastInput, options?: ToastOptions) {
       toastNotifications.addSuccess(toastOrTitle, options);
     },
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/components/forecasting_modal/forecasts_list.js b/x-pack/plugins/ml/public/application/timeseriesexplorer/components/forecasting_modal/forecasts_list.js
index 42e9e28f5862d..cbc2c324a8bc6 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/components/forecasting_modal/forecasts_list.js
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/components/forecasting_modal/forecasts_list.js
@@ -65,7 +65,7 @@ function getColumns(viewForecast) {
         return (
           <EuiButtonIcon
             onClick={() => viewForecast(forecast.forecast_id)}
-            iconType="stats"
+            iconType="visLine"
             aria-label={viewForecastAriaLabel}
           />
         );
diff --git a/x-pack/plugins/ml/public/ui_actions/open_in_anomaly_explorer_action.tsx b/x-pack/plugins/ml/public/ui_actions/open_in_anomaly_explorer_action.tsx
index e18f593145f9c..e327befcf7293 100644
--- a/x-pack/plugins/ml/public/ui_actions/open_in_anomaly_explorer_action.tsx
+++ b/x-pack/plugins/ml/public/ui_actions/open_in_anomaly_explorer_action.tsx
@@ -17,7 +17,7 @@ export function createOpenInExplorerAction(getStartServices: MlCoreSetup['getSta
     id: 'open-in-anomaly-explorer',
     type: OPEN_IN_ANOMALY_EXPLORER_ACTION,
     getIconType(context: ActionContextMapping[typeof OPEN_IN_ANOMALY_EXPLORER_ACTION]): string {
-      return 'tableOfContents';
+      return 'visTable';
     },
     getDisplayName() {
       return i18n.translate('xpack.ml.actions.openInAnomalyExplorerTitle', {
diff --git a/x-pack/plugins/transform/public/app/common/index.ts b/x-pack/plugins/transform/public/app/common/index.ts
index 009c8c7a2a9f5..45ddc440057b2 100644
--- a/x-pack/plugins/transform/public/app/common/index.ts
+++ b/x-pack/plugins/transform/public/app/common/index.ts
@@ -31,7 +31,7 @@ export {
   IndexPattern,
   REFRESH_TRANSFORM_LIST_STATE,
 } from './transform';
-export { TRANSFORM_LIST_COLUMN, TransformListRow } from './transform_list';
+export { TRANSFORM_LIST_COLUMN, TransformListAction, TransformListRow } from './transform_list';
 export {
   getTransformProgress,
   isCompletedBatchTransform,
diff --git a/x-pack/plugins/transform/public/app/common/transform_list.ts b/x-pack/plugins/transform/public/app/common/transform_list.ts
index a27fc0b3e0dbb..a2a762a7e2dfb 100644
--- a/x-pack/plugins/transform/public/app/common/transform_list.ts
+++ b/x-pack/plugins/transform/public/app/common/transform_list.ts
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { EuiTableActionsColumnType } from '@elastic/eui';
+
 import { TransformId } from '../../../common';
 import { TransformPivotConfig } from './transform';
 import { TransformStats } from './transform_stats';
@@ -20,3 +22,11 @@ export interface TransformListRow {
   mode?: string; // added property on client side to allow filtering by this field
   stats: TransformStats;
 }
+
+// The single Action type is not exported as is
+// from EUI so we use that code to get the single
+// Action type from the array of actions.
+type ArrayElement<ArrayType extends readonly unknown[]> = ArrayType[number];
+export type TransformListAction = ArrayElement<
+  EuiTableActionsColumnType<TransformListRow>['actions']
+>;
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_clone/clone_action_name.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_clone/clone_action_name.tsx
new file mode 100644
index 0000000000000..7ef634514de80
--- /dev/null
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_clone/clone_action_name.tsx
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC } from 'react';
+import { i18n } from '@kbn/i18n';
+import { EuiToolTip } from '@elastic/eui';
+
+import { createCapabilityFailureMessage } from '../../../../lib/authorization';
+
+export const cloneActionNameText = i18n.translate(
+  'xpack.transform.transformList.cloneActionNameText',
+  {
+    defaultMessage: 'Clone',
+  }
+);
+
+interface CloneActionNameProps {
+  disabled: boolean;
+}
+
+export const CloneActionName: FC<CloneActionNameProps> = ({ disabled }) => {
+  if (disabled) {
+    return (
+      <EuiToolTip position="top" content={createCapabilityFailureMessage('canStartStopTransform')}>
+        <>{cloneActionNameText}</>
+      </EuiToolTip>
+    );
+  }
+
+  return <>{cloneActionNameText}</>;
+};
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_clone/clone_button.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_clone/clone_button.tsx
deleted file mode 100644
index 7b371d35f8d4c..0000000000000
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_clone/clone_button.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { FC, useContext } from 'react';
-import { useHistory } from 'react-router-dom';
-import { i18n } from '@kbn/i18n';
-import { EuiButtonEmpty, EuiToolTip } from '@elastic/eui';
-
-import {
-  createCapabilityFailureMessage,
-  AuthorizationContext,
-} from '../../../../lib/authorization';
-
-import { SECTION_SLUG } from '../../../../constants';
-
-interface CloneActionProps {
-  itemId: string;
-}
-
-export const CloneButton: FC<CloneActionProps> = ({ itemId }) => {
-  const history = useHistory();
-
-  const { canCreateTransform } = useContext(AuthorizationContext).capabilities;
-
-  const buttonText = i18n.translate('xpack.transform.transformList.cloneActionName', {
-    defaultMessage: 'Clone',
-  });
-
-  function clickHandler() {
-    history.push(`/${SECTION_SLUG.CLONE_TRANSFORM}/${itemId}`);
-  }
-
-  const buttonDisabled = !canCreateTransform;
-
-  const button = (
-    <EuiButtonEmpty
-      aria-label={buttonText}
-      color="text"
-      data-test-subj="transformActionClone"
-      flush="left"
-      iconType="copy"
-      isDisabled={buttonDisabled}
-      onClick={clickHandler}
-      size="xs"
-    >
-      {buttonText}
-    </EuiButtonEmpty>
-  );
-
-  if (buttonDisabled) {
-    return (
-      <EuiToolTip position="top" content={createCapabilityFailureMessage('canStartStopTransform')}>
-        {button}
-      </EuiToolTip>
-    );
-  }
-
-  return button;
-};
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_clone/index.ts b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_clone/index.ts
index 727cc87c70f2c..fca9e156d1e9d 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_clone/index.ts
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_clone/index.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { CloneButton } from './clone_button';
+export { useCloneAction } from './use_clone_action';
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_clone/use_clone_action.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_clone/use_clone_action.tsx
new file mode 100644
index 0000000000000..c2d772322ca06
--- /dev/null
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_clone/use_clone_action.tsx
@@ -0,0 +1,43 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useCallback, useContext, useMemo } from 'react';
+import { useHistory } from 'react-router-dom';
+
+import { AuthorizationContext } from '../../../../lib/authorization';
+import { TransformListAction, TransformListRow } from '../../../../common';
+import { SECTION_SLUG } from '../../../../constants';
+
+import { cloneActionNameText, CloneActionName } from './clone_action_name';
+
+export type CloneAction = ReturnType<typeof useCloneAction>;
+export const useCloneAction = (forceDisable: boolean) => {
+  const history = useHistory();
+
+  const { canCreateTransform } = useContext(AuthorizationContext).capabilities;
+
+  const clickHandler = useCallback(
+    (item: TransformListRow) => {
+      history.push(`/${SECTION_SLUG.CLONE_TRANSFORM}/${item.id}`);
+    },
+    [history]
+  );
+
+  const action: TransformListAction = useMemo(
+    () => ({
+      name: (item: TransformListRow) => <CloneActionName disabled={!canCreateTransform} />,
+      enabled: () => canCreateTransform && !forceDisable,
+      description: cloneActionNameText,
+      icon: 'copy',
+      type: 'icon',
+      onClick: clickHandler,
+      'data-test-subj': 'transformActionClone',
+    }),
+    [canCreateTransform, forceDisable, clickHandler]
+  );
+
+  return { action };
+};
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/__snapshots__/delete_action_name.test.tsx.snap b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/__snapshots__/delete_action_name.test.tsx.snap
new file mode 100644
index 0000000000000..fe1e813ca9843
--- /dev/null
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/__snapshots__/delete_action_name.test.tsx.snap
@@ -0,0 +1,7 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Transform: Transform List Actions <DeleteAction /> Minimal initialization 1`] = `
+<Fragment>
+  Delete
+</Fragment>
+`;
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/__snapshots__/delete_button.test.tsx.snap b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/__snapshots__/delete_button.test.tsx.snap
deleted file mode 100644
index 8d4568c5ce20e..0000000000000
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/__snapshots__/delete_button.test.tsx.snap
+++ /dev/null
@@ -1,22 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Transform: Transform List Actions <DeleteAction /> Minimal initialization 1`] = `
-<EuiToolTip
-  content="You do not have permission to delete transforms. Please contact your administrator."
-  delay="regular"
-  position="top"
->
-  <EuiButtonEmpty
-    aria-label="Delete"
-    color="text"
-    data-test-subj="transformActionDelete"
-    flush="left"
-    iconType="trash"
-    isDisabled={true}
-    onClick={[Function]}
-    size="xs"
-  >
-    Delete
-  </EuiButtonEmpty>
-</EuiToolTip>
-`;
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_button_modal.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_action_modal.tsx
similarity index 99%
rename from x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_button_modal.tsx
rename to x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_action_modal.tsx
index 668e535198649..3c06af1eecb59 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_button_modal.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_action_modal.tsx
@@ -20,7 +20,7 @@ import { TRANSFORM_STATE } from '../../../../../../common';
 
 import { DeleteAction } from './use_delete_action';
 
-export const DeleteButtonModal: FC<DeleteAction> = ({
+export const DeleteActionModal: FC<DeleteAction> = ({
   closeModal,
   deleteAndCloseModal,
   deleteDestIndex,
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_button.test.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_action_name.test.tsx
similarity index 53%
rename from x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_button.test.tsx
rename to x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_action_name.test.tsx
index 63f8243b403d3..ecba7a0a24536 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_button.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_action_name.test.tsx
@@ -5,26 +5,22 @@
  */
 
 import { shallow } from 'enzyme';
-import React, { ComponentProps } from 'react';
+import React from 'react';
 
-import { TransformListRow } from '../../../../common';
-import { DeleteButton } from './delete_button';
-
-import transformListRow from '../../../../common/__mocks__/transform_list_row.json';
+import { DeleteActionName, DeleteActionNameProps } from './delete_action_name';
 
 jest.mock('../../../../../shared_imports');
 jest.mock('../../../../../app/app_dependencies');
 
 describe('Transform: Transform List Actions <DeleteAction />', () => {
   test('Minimal initialization', () => {
-    const item: TransformListRow = transformListRow;
-    const props: ComponentProps<typeof DeleteButton> = {
-      forceDisable: false,
-      items: [item],
-      onClick: () => {},
+    const props: DeleteActionNameProps = {
+      canDeleteTransform: true,
+      disabled: false,
+      isBulkAction: false,
     };
 
-    const wrapper = shallow(<DeleteButton {...props} />);
+    const wrapper = shallow(<DeleteActionName {...props} />);
     expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_button.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_action_name.tsx
similarity index 51%
rename from x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_button.tsx
rename to x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_action_name.tsx
index dc6ddcfc45a11..d8ab72f15c59c 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_button.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_action_name.tsx
@@ -4,34 +4,39 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { FC, useContext } from 'react';
+import React, { FC } from 'react';
 import { i18n } from '@kbn/i18n';
-import { EuiButtonEmpty, EuiToolTip } from '@elastic/eui';
+import { EuiToolTip } from '@elastic/eui';
 import { TRANSFORM_STATE } from '../../../../../../common';
-import {
-  AuthorizationContext,
-  createCapabilityFailureMessage,
-} from '../../../../lib/authorization';
+import { createCapabilityFailureMessage } from '../../../../lib/authorization';
 import { TransformListRow } from '../../../../common';
 
-interface DeleteButtonProps {
-  items: TransformListRow[];
-  forceDisable?: boolean;
-  onClick: (items: TransformListRow[]) => void;
-}
-
-const transformCanNotBeDeleted = (i: TransformListRow) =>
-  ![TRANSFORM_STATE.STOPPED, TRANSFORM_STATE.FAILED].includes(i.stats.state);
+export const deleteActionNameText = i18n.translate(
+  'xpack.transform.transformList.deleteActionNameText',
+  {
+    defaultMessage: 'Delete',
+  }
+);
 
-export const DeleteButton: FC<DeleteButtonProps> = ({ items, forceDisable, onClick }) => {
-  const isBulkAction = items.length > 1;
+const transformCanNotBeDeleted = (item: TransformListRow) =>
+  ![TRANSFORM_STATE.STOPPED, TRANSFORM_STATE.FAILED].includes(item.stats.state);
 
+export const isDeleteActionDisabled = (items: TransformListRow[], forceDisable: boolean) => {
   const disabled = items.some(transformCanNotBeDeleted);
-  const { canDeleteTransform } = useContext(AuthorizationContext).capabilities;
+  return forceDisable === true || disabled;
+};
 
-  const buttonText = i18n.translate('xpack.transform.transformList.deleteActionName', {
-    defaultMessage: 'Delete',
-  });
+export interface DeleteActionNameProps {
+  canDeleteTransform: boolean;
+  disabled: boolean;
+  isBulkAction: boolean;
+}
+
+export const DeleteActionName: FC<DeleteActionNameProps> = ({
+  canDeleteTransform,
+  disabled,
+  isBulkAction,
+}) => {
   const bulkDeleteButtonDisabledText = i18n.translate(
     'xpack.transform.transformList.deleteBulkActionDisabledToolTipContent',
     {
@@ -45,23 +50,6 @@ export const DeleteButton: FC<DeleteButtonProps> = ({ items, forceDisable, onCli
     }
   );
 
-  const buttonDisabled = forceDisable === true || disabled || !canDeleteTransform;
-
-  const button = (
-    <EuiButtonEmpty
-      aria-label={buttonText}
-      color="text"
-      data-test-subj="transformActionDelete"
-      flush="left"
-      iconType="trash"
-      isDisabled={buttonDisabled}
-      onClick={() => onClick(items)}
-      size="xs"
-    >
-      {buttonText}
-    </EuiButtonEmpty>
-  );
-
   if (disabled || !canDeleteTransform) {
     let content;
     if (disabled) {
@@ -72,10 +60,10 @@ export const DeleteButton: FC<DeleteButtonProps> = ({ items, forceDisable, onCli
 
     return (
       <EuiToolTip position="top" content={content}>
-        {button}
+        <>{deleteActionNameText}</>
       </EuiToolTip>
     );
   }
 
-  return button;
+  return <>{deleteActionNameText}</>;
 };
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/index.ts b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/index.ts
index ef891d7c4a128..efc849e84add3 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/index.ts
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/index.ts
@@ -4,6 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { DeleteButton } from './delete_button';
-export { DeleteButtonModal } from './delete_button_modal';
 export { useDeleteAction } from './use_delete_action';
+export { DeleteActionModal } from './delete_action_modal';
+export { isDeleteActionDisabled, DeleteActionName } from './delete_action_name';
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/use_delete_action.ts b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/use_delete_action.tsx
similarity index 66%
rename from x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/use_delete_action.ts
rename to x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/use_delete_action.tsx
index d76eebe954d7b..e573709fa6e63 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/use_delete_action.ts
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/use_delete_action.tsx
@@ -4,15 +4,24 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { useMemo, useState } from 'react';
+import React, { useContext, useMemo, useState } from 'react';
 
 import { TRANSFORM_STATE } from '../../../../../../common';
 
-import { TransformListRow } from '../../../../common';
+import { TransformListAction, TransformListRow } from '../../../../common';
 import { useDeleteIndexAndTargetIndex, useDeleteTransforms } from '../../../../hooks';
+import { AuthorizationContext } from '../../../../lib/authorization';
+
+import {
+  deleteActionNameText,
+  isDeleteActionDisabled,
+  DeleteActionName,
+} from './delete_action_name';
 
 export type DeleteAction = ReturnType<typeof useDeleteAction>;
-export const useDeleteAction = () => {
+export const useDeleteAction = (forceDisable: boolean) => {
+  const { canDeleteTransform } = useContext(AuthorizationContext).capabilities;
+
   const deleteTransforms = useDeleteTransforms();
 
   const [isModalVisible, setModalVisible] = useState(false);
@@ -58,7 +67,30 @@ export const useDeleteAction = () => {
     }
   };
 
+  const action: TransformListAction = useMemo(
+    () => ({
+      name: (item: TransformListRow) => (
+        <DeleteActionName
+          {...{
+            canDeleteTransform,
+            disabled: isDeleteActionDisabled([item], forceDisable),
+            isBulkAction: false,
+          }}
+        />
+      ),
+      enabled: (item: TransformListRow) =>
+        !isDeleteActionDisabled([item], forceDisable) && canDeleteTransform,
+      description: deleteActionNameText,
+      icon: 'trash',
+      type: 'icon',
+      onClick: (item: TransformListRow) => openModal([item]),
+      'data-test-subj': 'transformActionDelete',
+    }),
+    [canDeleteTransform, forceDisable]
+  );
+
   return {
+    action,
     closeModal,
     deleteAndCloseModal,
     deleteDestIndex,
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_edit/edit_button.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_edit/edit_action_name.tsx
similarity index 52%
rename from x-pack/plugins/transform/public/app/sections/transform_management/components/action_edit/edit_button.tsx
rename to x-pack/plugins/transform/public/app/sections/transform_management/components/action_edit/edit_action_name.tsx
index 7bae8807425fc..04c6ebe43c8c3 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_edit/edit_button.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_edit/edit_action_name.tsx
@@ -8,47 +8,30 @@ import React, { useContext, FC } from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import { EuiButtonEmpty, EuiToolTip } from '@elastic/eui';
+import { EuiToolTip } from '@elastic/eui';
 
 import {
   createCapabilityFailureMessage,
   AuthorizationContext,
 } from '../../../../lib/authorization';
 
-interface EditButtonProps {
-  onClick: () => void;
-}
-export const EditButton: FC<EditButtonProps> = ({ onClick }) => {
-  const { canCreateTransform } = useContext(AuthorizationContext).capabilities;
-
-  const buttonText = i18n.translate('xpack.transform.transformList.editActionName', {
+export const editActionNameText = i18n.translate(
+  'xpack.transform.transformList.editActionNameText',
+  {
     defaultMessage: 'Edit',
-  });
-
-  const buttonDisabled = !canCreateTransform;
-
-  const button = (
-    <EuiButtonEmpty
-      aria-label={buttonText}
-      color="text"
-      data-test-subj="transformActionEdit"
-      flush="left"
-      iconType="pencil"
-      isDisabled={buttonDisabled}
-      onClick={onClick}
-      size="xs"
-    >
-      {buttonText}
-    </EuiButtonEmpty>
-  );
+  }
+);
+
+export const EditActionName: FC = () => {
+  const { canCreateTransform } = useContext(AuthorizationContext).capabilities;
 
   if (!canCreateTransform) {
     return (
       <EuiToolTip position="top" content={createCapabilityFailureMessage('canStartStopTransform')}>
-        {button}
+        <>{editActionNameText}</>
       </EuiToolTip>
     );
   }
 
-  return button;
+  return <>{editActionNameText}</>;
 };
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_edit/index.ts b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_edit/index.ts
index 17a2ad9444f8d..a3077a8824045 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_edit/index.ts
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_edit/index.ts
@@ -4,5 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { EditButton } from './edit_button';
 export { useEditAction } from './use_edit_action';
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_edit/use_edit_action.ts b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_edit/use_edit_action.ts
deleted file mode 100644
index ace3ec8f636e6..0000000000000
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_edit/use_edit_action.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { useState } from 'react';
-
-import { TransformPivotConfig } from '../../../../common';
-
-export const useEditAction = () => {
-  const [config, setConfig] = useState<TransformPivotConfig>();
-  const [isFlyoutVisible, setIsFlyoutVisible] = useState(false);
-  const closeFlyout = () => setIsFlyoutVisible(false);
-  const showFlyout = (newConfig: TransformPivotConfig) => {
-    setConfig(newConfig);
-    setIsFlyoutVisible(true);
-  };
-
-  return {
-    config,
-    closeFlyout,
-    isFlyoutVisible,
-    showFlyout,
-  };
-};
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_edit/use_edit_action.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_edit/use_edit_action.tsx
new file mode 100644
index 0000000000000..1fe20f1acae5a
--- /dev/null
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_edit/use_edit_action.tsx
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useContext, useMemo, useState } from 'react';
+
+import { TransformListAction, TransformListRow, TransformPivotConfig } from '../../../../common';
+import { AuthorizationContext } from '../../../../lib/authorization';
+
+import { editActionNameText, EditActionName } from './edit_action_name';
+
+export const useEditAction = (forceDisable: boolean) => {
+  const { canCreateTransform } = useContext(AuthorizationContext).capabilities;
+
+  const [config, setConfig] = useState<TransformPivotConfig>();
+  const [isFlyoutVisible, setIsFlyoutVisible] = useState(false);
+  const closeFlyout = () => setIsFlyoutVisible(false);
+  const showFlyout = (newConfig: TransformPivotConfig) => {
+    setConfig(newConfig);
+    setIsFlyoutVisible(true);
+  };
+
+  const action: TransformListAction = useMemo(
+    () => ({
+      name: () => <EditActionName />,
+      enabled: () => canCreateTransform || !forceDisable,
+      description: editActionNameText,
+      icon: 'pencil',
+      type: 'icon',
+      onClick: (item: TransformListRow) => showFlyout(item.config),
+      'data-test-subj': 'transformActionEdit',
+    }),
+    [canCreateTransform, forceDisable]
+  );
+
+  return {
+    action,
+    config,
+    closeFlyout,
+    isFlyoutVisible,
+    showFlyout,
+  };
+};
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/__snapshots__/start_button.test.tsx.snap b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/__snapshots__/start_action_name.test.tsx.snap
similarity index 56%
rename from x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/__snapshots__/start_button.test.tsx.snap
rename to x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/__snapshots__/start_action_name.test.tsx.snap
index 543f8f9dfcffe..5a24e30a0657e 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/__snapshots__/start_button.test.tsx.snap
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/__snapshots__/start_action_name.test.tsx.snap
@@ -6,17 +6,6 @@ exports[`Transform: Transform List Actions <StartAction /> Minimal initializatio
   delay="regular"
   position="top"
 >
-  <EuiButtonEmpty
-    aria-label="Start"
-    color="text"
-    data-test-subj="transformActionStart"
-    flush="left"
-    iconType="play"
-    isDisabled={true}
-    onClick={[Function]}
-    size="xs"
-  >
-    Start
-  </EuiButtonEmpty>
+  Start
 </EuiToolTip>
 `;
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/index.ts b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/index.ts
index df6bbb7c61908..835df35c3c3bc 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/index.ts
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/index.ts
@@ -4,6 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { StartButton } from './start_button';
-export { StartButtonModal } from './start_button_modal';
 export { useStartAction } from './use_start_action';
+export { StartActionModal } from './start_action_modal';
+export { StartActionName } from './start_action_name';
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_button_modal.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_action_modal.tsx
similarity index 94%
rename from x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_button_modal.tsx
rename to x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_action_modal.tsx
index 2ef0d20c45116..9f7dbee10cef0 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_button_modal.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_action_modal.tsx
@@ -10,12 +10,7 @@ import { EuiConfirmModal, EuiOverlayMask, EUI_MODAL_CONFIRM_BUTTON } from '@elas
 
 import { StartAction } from './use_start_action';
 
-export const StartButtonModal: FC<StartAction> = ({
-  closeModal,
-  isModalVisible,
-  items,
-  startAndCloseModal,
-}) => {
+export const StartActionModal: FC<StartAction> = ({ closeModal, items, startAndCloseModal }) => {
   const isBulkAction = items.length > 1;
 
   const bulkStartModalTitle = i18n.translate('xpack.transform.transformList.bulkStartModalTitle', {
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_button.test.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_action_name.test.tsx
similarity index 77%
rename from x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_button.test.tsx
rename to x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_action_name.test.tsx
index b88e1257f56ad..9c06675d69ca4 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_button.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_action_name.test.tsx
@@ -5,10 +5,10 @@
  */
 
 import { shallow } from 'enzyme';
-import React, { ComponentProps } from 'react';
+import React from 'react';
 
 import { TransformListRow } from '../../../../common';
-import { StartButton } from './start_button';
+import { StartActionName, StartActionNameProps } from './start_action_name';
 
 import transformListRow from '../../../../common/__mocks__/transform_list_row.json';
 
@@ -18,13 +18,12 @@ jest.mock('../../../../../app/app_dependencies');
 describe('Transform: Transform List Actions <StartAction />', () => {
   test('Minimal initialization', () => {
     const item: TransformListRow = transformListRow;
-    const props: ComponentProps<typeof StartButton> = {
+    const props: StartActionNameProps = {
       forceDisable: false,
       items: [item],
-      onClick: () => {},
     };
 
-    const wrapper = shallow(<StartButton {...props} />);
+    const wrapper = shallow(<StartActionName {...props} />);
 
     expect(wrapper).toMatchSnapshot();
   });
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_button.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_action_name.tsx
similarity index 73%
rename from x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_button.tsx
rename to x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_action_name.tsx
index 7f5595043b775..191df0c16cba0 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_button.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_action_name.tsx
@@ -6,7 +6,7 @@
 
 import React, { FC, useContext } from 'react';
 import { i18n } from '@kbn/i18n';
-import { EuiButtonEmpty, EuiToolTip } from '@elastic/eui';
+import { EuiToolTip } from '@elastic/eui';
 
 import { TRANSFORM_STATE } from '../../../../../../common';
 
@@ -16,19 +16,37 @@ import {
 } from '../../../../lib/authorization';
 import { TransformListRow, isCompletedBatchTransform } from '../../../../common';
 
-interface StartButtonProps {
+export const startActionNameText = i18n.translate(
+  'xpack.transform.transformList.startActionNameText',
+  {
+    defaultMessage: 'Start',
+  }
+);
+
+export const isStartActionDisabled = (
+  items: TransformListRow[],
+  canStartStopTransform: boolean
+) => {
+  // Disable start for batch transforms which have completed.
+  const completedBatchTransform = items.some((i: TransformListRow) => isCompletedBatchTransform(i));
+  // Disable start action if one of the transforms is already started or trying to restart will throw error
+  const startedTransform = items.some(
+    (i: TransformListRow) => i.stats.state === TRANSFORM_STATE.STARTED
+  );
+
+  return (
+    !canStartStopTransform || completedBatchTransform || startedTransform || items.length === 0
+  );
+};
+
+export interface StartActionNameProps {
   items: TransformListRow[];
   forceDisable?: boolean;
-  onClick: (items: TransformListRow[]) => void;
 }
-export const StartButton: FC<StartButtonProps> = ({ items, forceDisable, onClick }) => {
+export const StartActionName: FC<StartActionNameProps> = ({ items, forceDisable }) => {
   const { canStartStopTransform } = useContext(AuthorizationContext).capabilities;
   const isBulkAction = items.length > 1;
 
-  const buttonText = i18n.translate('xpack.transform.transformList.startActionName', {
-    defaultMessage: 'Start',
-  });
-
   // Disable start for batch transforms which have completed.
   const completedBatchTransform = items.some((i: TransformListRow) => isCompletedBatchTransform(i));
   // Disable start action if one of the transforms is already started or trying to restart will throw error
@@ -70,8 +88,7 @@ export const StartButton: FC<StartButtonProps> = ({ items, forceDisable, onClick
     );
   }
 
-  const actionIsDisabled =
-    !canStartStopTransform || completedBatchTransform || startedTransform || items.length === 0;
+  const actionIsDisabled = isStartActionDisabled(items, canStartStopTransform);
 
   let content: string | undefined;
   if (actionIsDisabled && items.length > 0) {
@@ -84,30 +101,13 @@ export const StartButton: FC<StartButtonProps> = ({ items, forceDisable, onClick
     }
   }
 
-  const buttonDisabled = forceDisable === true || actionIsDisabled;
-
-  const button = (
-    <EuiButtonEmpty
-      aria-label={buttonText}
-      color="text"
-      data-test-subj="transformActionStart"
-      flush="left"
-      iconType="play"
-      isDisabled={buttonDisabled}
-      onClick={() => onClick(items)}
-      size="xs"
-    >
-      {buttonText}
-    </EuiButtonEmpty>
-  );
-
-  if (buttonDisabled && content !== undefined) {
+  if ((forceDisable === true || actionIsDisabled) && content !== undefined) {
     return (
       <EuiToolTip position="top" content={content}>
-        {button}
+        <>{startActionNameText}</>
       </EuiToolTip>
     );
   }
 
-  return button;
+  return <>{startActionNameText}</>;
 };
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/use_start_action.ts b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/use_start_action.ts
deleted file mode 100644
index 32d2dc6dabf86..0000000000000
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/use_start_action.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { useState } from 'react';
-
-import { TransformListRow } from '../../../../common';
-import { useStartTransforms } from '../../../../hooks';
-
-export type StartAction = ReturnType<typeof useStartAction>;
-export const useStartAction = () => {
-  const startTransforms = useStartTransforms();
-
-  const [isModalVisible, setModalVisible] = useState(false);
-  const [items, setItems] = useState<TransformListRow[]>([]);
-
-  const closeModal = () => setModalVisible(false);
-
-  const startAndCloseModal = () => {
-    setModalVisible(false);
-    startTransforms(items);
-  };
-
-  const openModal = (newItems: TransformListRow[]) => {
-    // EUI issue: Might trigger twice, one time as an array,
-    // one time as a single object. See https://github.com/elastic/eui/issues/3679
-    if (Array.isArray(newItems)) {
-      setItems(newItems);
-      setModalVisible(true);
-    }
-  };
-
-  return {
-    closeModal,
-    isModalVisible,
-    items,
-    openModal,
-    startAndCloseModal,
-  };
-};
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/use_start_action.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/use_start_action.tsx
new file mode 100644
index 0000000000000..8d6a4376c55b3
--- /dev/null
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/use_start_action.tsx
@@ -0,0 +1,66 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useContext, useMemo, useState } from 'react';
+
+import { TRANSFORM_STATE } from '../../../../../../common';
+
+import { AuthorizationContext } from '../../../../lib/authorization';
+import { TransformListAction, TransformListRow } from '../../../../common';
+import { useStartTransforms } from '../../../../hooks';
+
+import { isStartActionDisabled, startActionNameText, StartActionName } from './start_action_name';
+
+export type StartAction = ReturnType<typeof useStartAction>;
+export const useStartAction = (forceDisable: boolean) => {
+  const { canStartStopTransform } = useContext(AuthorizationContext).capabilities;
+
+  const startTransforms = useStartTransforms();
+
+  const [isModalVisible, setModalVisible] = useState(false);
+  const [items, setItems] = useState<TransformListRow[]>([]);
+
+  const closeModal = () => setModalVisible(false);
+
+  const startAndCloseModal = () => {
+    setModalVisible(false);
+    startTransforms(items);
+  };
+
+  const openModal = (newItems: TransformListRow[]) => {
+    // EUI issue: Might trigger twice, one time as an array,
+    // one time as a single object. See https://github.com/elastic/eui/issues/3679
+    if (Array.isArray(newItems)) {
+      setItems(newItems);
+      setModalVisible(true);
+    }
+  };
+
+  const action: TransformListAction = useMemo(
+    () => ({
+      name: (item: TransformListRow) => (
+        <StartActionName items={[item]} forceDisable={forceDisable} />
+      ),
+      available: (item: TransformListRow) => item.stats.state === TRANSFORM_STATE.STOPPED,
+      enabled: (item: TransformListRow) => !isStartActionDisabled([item], canStartStopTransform),
+      description: startActionNameText,
+      icon: 'play',
+      type: 'icon',
+      onClick: (item: TransformListRow) => openModal([item]),
+      'data-test-subj': 'transformActionStart',
+    }),
+    [canStartStopTransform, forceDisable]
+  );
+
+  return {
+    action,
+    closeModal,
+    isModalVisible,
+    items,
+    openModal,
+    startAndCloseModal,
+  };
+};
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/__snapshots__/stop_button.test.tsx.snap b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/__snapshots__/stop_action_name.test.tsx.snap
similarity index 56%
rename from x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/__snapshots__/stop_button.test.tsx.snap
rename to x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/__snapshots__/stop_action_name.test.tsx.snap
index 646162d370ac6..e3740ae9a0978 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/__snapshots__/stop_button.test.tsx.snap
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/__snapshots__/stop_action_name.test.tsx.snap
@@ -6,17 +6,6 @@ exports[`Transform: Transform List Actions <StopAction /> Minimal initialization
   delay="regular"
   position="top"
 >
-  <EuiButtonEmpty
-    aria-label="Stop"
-    color="text"
-    data-test-subj="transformActionStop"
-    flush="left"
-    iconType="stop"
-    isDisabled={true}
-    onClick={[Function]}
-    size="xs"
-  >
-    Stop
-  </EuiButtonEmpty>
+  Stop
 </EuiToolTip>
 `;
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/index.ts b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/index.ts
index 858b6c70501b3..3b4da24298a96 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/index.ts
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/index.ts
@@ -4,4 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { StopButton } from './stop_button';
+export { useStopAction } from './use_stop_action';
+export { StopActionName } from './stop_action_name';
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/stop_button.test.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/stop_action_name.test.tsx
similarity index 79%
rename from x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/stop_button.test.tsx
rename to x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/stop_action_name.test.tsx
index d9c07a9dccc8f..643e8c6126f0f 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/stop_button.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/stop_action_name.test.tsx
@@ -5,10 +5,10 @@
  */
 
 import { shallow } from 'enzyme';
-import React, { ComponentProps } from 'react';
+import React from 'react';
 
 import { TransformListRow } from '../../../../common';
-import { StopButton } from './stop_button';
+import { StopActionName, StopActionNameProps } from './stop_action_name';
 
 import transformListRow from '../../../../common/__mocks__/transform_list_row.json';
 
@@ -18,12 +18,12 @@ jest.mock('../../../../../app/app_dependencies');
 describe('Transform: Transform List Actions <StopAction />', () => {
   test('Minimal initialization', () => {
     const item: TransformListRow = transformListRow;
-    const props: ComponentProps<typeof StopButton> = {
+    const props: StopActionNameProps = {
       forceDisable: false,
       items: [item],
     };
 
-    const wrapper = shallow(<StopButton {...props} />);
+    const wrapper = shallow(<StopActionName {...props} />);
 
     expect(wrapper).toMatchSnapshot();
   });
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/stop_button.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/stop_action_name.tsx
similarity index 67%
rename from x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/stop_button.tsx
rename to x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/stop_action_name.tsx
index 1c672193dd1ee..e1ea82cb371e8 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/stop_button.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/stop_action_name.tsx
@@ -6,7 +6,7 @@
 
 import React, { FC, useContext } from 'react';
 import { i18n } from '@kbn/i18n';
-import { EuiButtonEmpty, EuiToolTip } from '@elastic/eui';
+import { EuiToolTip } from '@elastic/eui';
 
 import { TRANSFORM_STATE } from '../../../../../../common';
 
@@ -15,19 +15,34 @@ import {
   createCapabilityFailureMessage,
   AuthorizationContext,
 } from '../../../../lib/authorization';
-import { useStopTransforms } from '../../../../hooks';
 
-interface StopButtonProps {
+export const stopActionNameText = i18n.translate(
+  'xpack.transform.transformList.stopActionNameText',
+  {
+    defaultMessage: 'Stop',
+  }
+);
+
+export const isStopActionDisabled = (
+  items: TransformListRow[],
+  canStartStopTransform: boolean,
+  forceDisable: boolean
+) => {
+  // Disable stop action if one of the transforms is stopped already
+  const stoppedTransform = items.some(
+    (i: TransformListRow) => i.stats.state === TRANSFORM_STATE.STOPPED
+  );
+
+  return forceDisable === true || !canStartStopTransform || stoppedTransform === true;
+};
+
+export interface StopActionNameProps {
   items: TransformListRow[];
   forceDisable?: boolean;
 }
-export const StopButton: FC<StopButtonProps> = ({ items, forceDisable }) => {
+export const StopActionName: FC<StopActionNameProps> = ({ items, forceDisable }) => {
   const isBulkAction = items.length > 1;
   const { canStartStopTransform } = useContext(AuthorizationContext).capabilities;
-  const stopTransforms = useStopTransforms();
-  const buttonText = i18n.translate('xpack.transform.transformList.stopActionName', {
-    defaultMessage: 'Stop',
-  });
 
   // Disable stop action if one of the transforms is stopped already
   const stoppedTransform = items.some(
@@ -52,28 +67,6 @@ export const StopButton: FC<StopButtonProps> = ({ items, forceDisable }) => {
     );
   }
 
-  const handleStop = () => {
-    stopTransforms(items);
-  };
-
-  const buttonDisabled =
-    forceDisable === true || !canStartStopTransform || stoppedTransform === true;
-
-  const button = (
-    <EuiButtonEmpty
-      aria-label={buttonText}
-      color="text"
-      data-test-subj="transformActionStop"
-      flush="left"
-      iconType="stop"
-      isDisabled={buttonDisabled}
-      onClick={handleStop}
-      size="xs"
-    >
-      {buttonText}
-    </EuiButtonEmpty>
-  );
-
   if (!canStartStopTransform || stoppedTransform) {
     return (
       <EuiToolTip
@@ -84,10 +77,10 @@ export const StopButton: FC<StopButtonProps> = ({ items, forceDisable }) => {
             : stoppedTransformMessage
         }
       >
-        {button}
+        <>{stopActionNameText}</>
       </EuiToolTip>
     );
   }
 
-  return button;
+  return <>{stopActionNameText}</>;
 };
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/use_stop_action.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/use_stop_action.tsx
new file mode 100644
index 0000000000000..e0a7e0b489ab6
--- /dev/null
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/use_stop_action.tsx
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useCallback, useContext, useMemo } from 'react';
+
+import { TRANSFORM_STATE } from '../../../../../../common';
+
+import { AuthorizationContext } from '../../../../lib/authorization';
+import { TransformListAction, TransformListRow } from '../../../../common';
+import { useStopTransforms } from '../../../../hooks';
+
+import { isStopActionDisabled, stopActionNameText, StopActionName } from './stop_action_name';
+
+export type StopAction = ReturnType<typeof useStopAction>;
+export const useStopAction = (forceDisable: boolean) => {
+  const { canStartStopTransform } = useContext(AuthorizationContext).capabilities;
+
+  const stopTransforms = useStopTransforms();
+
+  const clickHandler = useCallback((item: TransformListRow) => stopTransforms([item]), [
+    stopTransforms,
+  ]);
+
+  const action: TransformListAction = useMemo(
+    () => ({
+      name: (item: TransformListRow) => (
+        <StopActionName items={[item]} forceDisable={forceDisable} />
+      ),
+      available: (item: TransformListRow) => item.stats.state !== TRANSFORM_STATE.STOPPED,
+      enabled: (item: TransformListRow) =>
+        !isStopActionDisabled([item], canStartStopTransform, forceDisable),
+      description: stopActionNameText,
+      icon: 'stop',
+      type: 'icon',
+      onClick: clickHandler,
+      'data-test-subj': 'transformActionStop',
+    }),
+    [canStartStopTransform, forceDisable, clickHandler]
+  );
+
+  return { action };
+};
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.tsx
index a31251943061a..cf32bf0455a1b 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.tsx
@@ -31,13 +31,19 @@ import {
   TRANSFORM_MODE,
   TRANSFORM_LIST_COLUMN,
 } from '../../../../common';
+import { useStopTransforms } from '../../../../hooks';
 import { AuthorizationContext } from '../../../../lib/authorization';
 
 import { CreateTransformButton } from '../create_transform_button';
 import { RefreshTransformListButton } from '../refresh_transform_list_button';
-import { useDeleteAction, DeleteButton, DeleteButtonModal } from '../action_delete';
-import { useStartAction, StartButton, StartButtonModal } from '../action_start';
-import { StopButton } from '../action_stop';
+import {
+  isDeleteActionDisabled,
+  useDeleteAction,
+  DeleteActionName,
+  DeleteActionModal,
+} from '../action_delete';
+import { useStartAction, StartActionName, StartActionModal } from '../action_start';
+import { StopActionName } from '../action_stop';
 
 import { ItemIdToExpandedRowMap, Clause, TermClause, FieldClause, Value } from './common';
 import { getTaskStateBadge, useColumns } from './use_columns';
@@ -89,8 +95,8 @@ export const TransformList: FC<Props> = ({
 
   const [transformSelection, setTransformSelection] = useState<TransformListRow[]>([]);
   const [isActionsMenuOpen, setIsActionsMenuOpen] = useState(false);
-  const bulkStartAction = useStartAction();
-  const bulkDeleteAction = useDeleteAction();
+  const bulkStartAction = useStartAction(false);
+  const bulkDeleteAction = useDeleteAction(false);
 
   const [searchError, setSearchError] = useState<any>(undefined);
 
@@ -100,6 +106,8 @@ export const TransformList: FC<Props> = ({
   const [sortField, setSortField] = useState<string>(TRANSFORM_LIST_COLUMN.ID);
   const [sortDirection, setSortDirection] = useState<Direction>('asc');
 
+  const stopTransforms = useStopTransforms();
+
   const { capabilities } = useContext(AuthorizationContext);
   const disabled =
     !capabilities.canCreateTransform ||
@@ -257,13 +265,23 @@ export const TransformList: FC<Props> = ({
 
   const bulkActionMenuItems = [
     <div key="startAction" className="transform__BulkActionItem">
-      <StartButton items={transformSelection} onClick={bulkStartAction.openModal} />
+      <EuiButtonEmpty onClick={() => bulkStartAction.openModal(transformSelection)}>
+        <StartActionName items={transformSelection} />
+      </EuiButtonEmpty>
     </div>,
     <div key="stopAction" className="transform__BulkActionItem">
-      <StopButton items={transformSelection} />
+      <EuiButtonEmpty onClick={() => stopTransforms(transformSelection)}>
+        <StopActionName items={transformSelection} />
+      </EuiButtonEmpty>
     </div>,
     <div key="deleteAction" className="transform__BulkActionItem">
-      <DeleteButton items={transformSelection} onClick={bulkDeleteAction.openModal} />
+      <EuiButtonEmpty onClick={() => bulkDeleteAction.openModal(transformSelection)}>
+        <DeleteActionName
+          canDeleteTransform={capabilities.canDeleteTransform}
+          disabled={isDeleteActionDisabled(transformSelection, false)}
+          isBulkAction={true}
+        />
+      </EuiButtonEmpty>
     </div>,
   ];
 
@@ -381,8 +399,8 @@ export const TransformList: FC<Props> = ({
   return (
     <div data-test-subj="transformListTableContainer">
       {/* Bulk Action Modals */}
-      {bulkStartAction.isModalVisible && <StartButtonModal {...bulkStartAction} />}
-      {bulkDeleteAction.isModalVisible && <DeleteButtonModal {...bulkDeleteAction} />}
+      {bulkStartAction.isModalVisible && <StartActionModal {...bulkStartAction} />}
+      {bulkDeleteAction.isModalVisible && <DeleteActionModal {...bulkDeleteAction} />}
 
       {/* Single Action Modals */}
       {singleActionModals}
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_actions.test.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_actions.test.tsx
index e58d5ed572667..dafde8dd58123 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_actions.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_actions.test.tsx
@@ -14,12 +14,17 @@ jest.mock('../../../../../app/app_dependencies');
 describe('Transform: Transform List Actions', () => {
   test('useActions()', () => {
     const { result } = renderHook(() => useActions({ forceDisable: false }));
-    const actions: ReturnType<typeof useActions>['actions'] = result.current.actions;
+    const actions = result.current.actions;
 
-    expect(actions).toHaveLength(4);
-    expect(typeof actions[0].render).toBe('function');
-    expect(typeof actions[1].render).toBe('function');
-    expect(typeof actions[2].render).toBe('function');
-    expect(typeof actions[3].render).toBe('function');
+    // Using `any` for the callback. Somehow the EUI types don't pass
+    // on the `data-test-subj` attribute correctly. We're interested
+    // in the runtime result here anyway.
+    expect(actions.map((a: any) => a['data-test-subj'])).toStrictEqual([
+      'transformActionStart',
+      'transformActionStop',
+      'transformActionEdit',
+      'transformActionClone',
+      'transformActionDelete',
+    ]);
   });
 });
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_actions.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_actions.tsx
index a6b1aa1a1b5c5..616e03a61e0ed 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_actions.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_actions.tsx
@@ -6,74 +6,47 @@
 
 import React from 'react';
 
-import { EuiTableComputedColumnType } from '@elastic/eui';
-
-import { TRANSFORM_STATE } from '../../../../../../common';
+import { EuiTableActionsColumnType } from '@elastic/eui';
 
 import { TransformListRow } from '../../../../common';
 
-import { CloneButton } from '../action_clone';
-import { useDeleteAction, DeleteButton, DeleteButtonModal } from '../action_delete';
+import { useCloneAction } from '../action_clone';
+import { useDeleteAction, DeleteActionModal } from '../action_delete';
 import { EditTransformFlyout } from '../edit_transform_flyout';
-import { useEditAction, EditButton } from '../action_edit';
-import { useStartAction, StartButton, StartButtonModal } from '../action_start';
-import { StopButton } from '../action_stop';
+import { useEditAction } from '../action_edit';
+import { useStartAction, StartActionModal } from '../action_start';
+import { useStopAction } from '../action_stop';
 
 export const useActions = ({
   forceDisable,
 }: {
   forceDisable: boolean;
-}): { actions: Array<EuiTableComputedColumnType<TransformListRow>>; modals: JSX.Element } => {
-  const deleteAction = useDeleteAction();
-  const editAction = useEditAction();
-  const startAction = useStartAction();
+}): {
+  actions: EuiTableActionsColumnType<TransformListRow>['actions'];
+  modals: JSX.Element;
+} => {
+  const cloneAction = useCloneAction(forceDisable);
+  const deleteAction = useDeleteAction(forceDisable);
+  const editAction = useEditAction(forceDisable);
+  const startAction = useStartAction(forceDisable);
+  const stopAction = useStopAction(forceDisable);
 
   return {
     modals: (
       <>
-        {startAction.isModalVisible && <StartButtonModal {...startAction} />}
+        {startAction.isModalVisible && <StartActionModal {...startAction} />}
         {editAction.config && editAction.isFlyoutVisible && (
           <EditTransformFlyout closeFlyout={editAction.closeFlyout} config={editAction.config} />
         )}
-        {deleteAction.isModalVisible && <DeleteButtonModal {...deleteAction} />}
+        {deleteAction.isModalVisible && <DeleteActionModal {...deleteAction} />}
       </>
     ),
     actions: [
-      {
-        render: (item: TransformListRow) => {
-          if (item.stats.state === TRANSFORM_STATE.STOPPED) {
-            return (
-              <StartButton
-                items={[item]}
-                forceDisable={forceDisable}
-                onClick={startAction.openModal}
-              />
-            );
-          }
-          return <StopButton items={[item]} forceDisable={forceDisable} />;
-        },
-      },
-      {
-        render: (item: TransformListRow) => {
-          return <EditButton onClick={() => editAction.showFlyout(item.config)} />;
-        },
-      },
-      {
-        render: (item: TransformListRow) => {
-          return <CloneButton itemId={item.id} />;
-        },
-      },
-      {
-        render: (item: TransformListRow) => {
-          return (
-            <DeleteButton
-              items={[item]}
-              forceDisable={forceDisable}
-              onClick={deleteAction.openModal}
-            />
-          );
-        },
-      },
+      startAction.action,
+      stopAction.action,
+      editAction.action,
+      cloneAction.action,
+      deleteAction.action,
     ],
   };
 };
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 814c532657f60..6a9909c4291ff 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -11187,11 +11187,9 @@
     "xpack.ml.dataframe.analytics.regressionExploration.trainingErrorTitle": "トレーニングエラー",
     "xpack.ml.dataframe.analytics.regressionExploration.trainingFilterText": ".テストデータをフィルタリングしています。",
     "xpack.ml.dataframe.analyticsList.analyticsDetails.tabs.analyticsMessagesLabel": "ジョブメッセージ",
-    "xpack.ml.dataframe.analyticsList.cloneJobButtonLabel": "ジョブのクローンを作成します",
     "xpack.ml.dataframe.analyticsList.completeBatchAnalyticsToolTip": "{analyticsId}は完了済みの分析ジョブで、再度開始できません。",
     "xpack.ml.dataframe.analyticsList.createDataFrameAnalyticsButton": "ジョブを作成",
     "xpack.ml.dataframe.analyticsList.deleteActionDisabledToolTipContent": "削除するにはデータフレーム分析ジョブを停止してください。",
-    "xpack.ml.dataframe.analyticsList.deleteActionName": "削除",
     "xpack.ml.dataframe.analyticsList.deleteAnalyticsErrorMessage": "データフレーム分析ジョブ{analyticsId}の削除中にエラーが発生しました。",
     "xpack.ml.dataframe.analyticsList.deleteAnalyticsPrivilegeErrorMessage": "ユーザーはインデックス{indexName}を削除する権限がありません。{error}",
     "xpack.ml.dataframe.analyticsList.deleteAnalyticsSuccessMessage": "データフレーム分析ジョブ{analyticsId}の削除リクエストが受け付けられました。",
@@ -11206,7 +11204,6 @@
     "xpack.ml.dataframe.analyticsList.deleteModalTitle": "{analyticsId}の削除",
     "xpack.ml.dataframe.analyticsList.description": "説明",
     "xpack.ml.dataframe.analyticsList.destinationIndex": "デスティネーションインデックス",
-    "xpack.ml.dataframe.analyticsList.editActionName": "編集",
     "xpack.ml.dataframe.analyticsList.editActionPermissionTooltip": "分析ジョブを編集する権限がありません。",
     "xpack.ml.dataframe.analyticsList.editFlyout.allowLazyStartAriaLabel": "lazy startの許可を更新します。",
     "xpack.ml.dataframe.analyticsList.editFlyout.allowLazyStartFalseValue": "False",
@@ -11246,7 +11243,6 @@
     "xpack.ml.dataframe.analyticsList.rowExpand": "{analyticsId}の詳細を表示",
     "xpack.ml.dataframe.analyticsList.showDetailsColumn.screenReaderDescription": "このカラムには各ジョブの詳細を示すクリック可能なコントロールが含まれます",
     "xpack.ml.dataframe.analyticsList.sourceIndex": "ソースインデックス",
-    "xpack.ml.dataframe.analyticsList.startActionName": "開始",
     "xpack.ml.dataframe.analyticsList.startAnalyticsErrorTitle": "ジョブの開始エラー",
     "xpack.ml.dataframe.analyticsList.startAnalyticsSuccessMessage": "データフレーム分析 {analyticsId} の開始リクエストが受け付けられました。",
     "xpack.ml.dataframe.analyticsList.startModalBody": "データフレーム分析ジョブは、クラスターの検索とインデックスによる負荷を増やします。過剰な負荷が生じた場合は分析ジョブを停止してください。この分析ジョブを開始してよろしいですか？",
@@ -11255,7 +11251,6 @@
     "xpack.ml.dataframe.analyticsList.startModalTitle": "{analyticsId}の開始",
     "xpack.ml.dataframe.analyticsList.status": "ステータス",
     "xpack.ml.dataframe.analyticsList.statusFilter": "ステータス",
-    "xpack.ml.dataframe.analyticsList.stopActionName": "停止",
     "xpack.ml.dataframe.analyticsList.stopAnalyticsErrorMessage": "データフレーム分析{analyticsId}の停止中にエラーが発生しました。{error}",
     "xpack.ml.dataframe.analyticsList.stopAnalyticsSuccessMessage": "データフレーム分析 {analyticsId} の停止リクエストが受け付けられました。",
     "xpack.ml.dataframe.analyticsList.tableActionLabel": "アクション",
@@ -12305,7 +12300,6 @@
     "xpack.ml.overview.anomalyDetection.emptyPromptText": "異常検知により、時系列データの異常な動作を検出できます。データに隠れた異常を自動的に検出して問題をより素早く解決しましょう。",
     "xpack.ml.overview.anomalyDetection.errorPromptTitle": "異常検出ジョブリストの取得中にエラーが発生しました。",
     "xpack.ml.overview.anomalyDetection.errorWithFetchingAnomalyScoreNotificationErrorMessage": "異常スコアの取得中にエラーが発生しました: {error}",
-    "xpack.ml.overview.anomalyDetection.exploreActionName": "探索",
     "xpack.ml.overview.anomalyDetection.manageJobsButtonText": "ジョブの管理",
     "xpack.ml.overview.anomalyDetection.panelTitle": "異常検知",
     "xpack.ml.overview.anomalyDetection.refreshJobsButtonText": "更新",
@@ -18244,12 +18238,10 @@
     "xpack.transform.transformList.bulkDeleteTransformSuccessMessage": "{count} {count, plural, one {個の変換} other {個の変換}}を正常に削除しました。",
     "xpack.transform.transformList.bulkForceDeleteModalBody": "{count, plural, one {この} other {これらの}} {count} {count, plural, one {変換} other {変換}}を強制的に削除しますか?{count, plural, one {} other {}}現在の状態に関係なく、{count, plural, one {個の変換} other {個の変換}}は削除されます。",
     "xpack.transform.transformList.bulkStartModalTitle": "{count} 件の{count, plural, one {変換} other {変換}}を開始",
-    "xpack.transform.transformList.cloneActionName": "クローンを作成",
     "xpack.transform.transformList.completeBatchTransformBulkActionToolTip": "1 つまたは複数の変換が完了済みの一斉変換で、再度開始できません。",
     "xpack.transform.transformList.completeBatchTransformToolTip": "{transformId} は完了済みの一斉変換で、再度開始できません。",
     "xpack.transform.transformList.createTransformButton": "変換の作成",
     "xpack.transform.transformList.deleteActionDisabledToolTipContent": "削除するにはデータフレームジョブを停止してください。",
-    "xpack.transform.transformList.deleteActionName": "削除",
     "xpack.transform.transformList.deleteBulkActionDisabledToolTipContent": "削除するには、選択された変換のうちの 1 つまたは複数を停止する必要があります。",
     "xpack.transform.transformList.deleteModalBody": "この変換を削除してよろしいですか？",
     "xpack.transform.transformList.deleteModalCancelButton": "キャンセル",
@@ -18258,7 +18250,6 @@
     "xpack.transform.transformList.deleteTransformErrorMessage": "変換 {transformId} の削除中にエラーが発生しました",
     "xpack.transform.transformList.deleteTransformGenericErrorMessage": "変換を削除するための API エンドポイントの呼び出し中にエラーが発生しました。",
     "xpack.transform.transformList.deleteTransformSuccessMessage": "変換 {transformId} の削除リクエストが受け付けられました。",
-    "xpack.transform.transformList.editActionName": "編集",
     "xpack.transform.transformList.editFlyoutCalloutDocs": "ドキュメントを表示",
     "xpack.transform.transformList.editFlyoutCalloutText": "このフォームでは、変換を更新できます。更新できるプロパティのリストは、変換を作成するときに定義できるリストのサブセットです。",
     "xpack.transform.transformList.editFlyoutCancelButtonText": "キャンセル",
@@ -18280,7 +18271,6 @@
     "xpack.transform.transformList.rowCollapse": "{transformId} の詳細を非表示",
     "xpack.transform.transformList.rowExpand": "{transformId} の詳細を表示",
     "xpack.transform.transformList.showDetailsColumn.screenReaderDescription": "このカラムには変換ごとの詳細を示すクリック可能なコントロールが含まれます",
-    "xpack.transform.transformList.startActionName": "開始",
     "xpack.transform.transformList.startedTransformBulkToolTip": "1 つまたは複数の変換が既に開始済みです。",
     "xpack.transform.transformList.startedTransformToolTip": "{transformId} は既に開始済みです。",
     "xpack.transform.transformList.startModalBody": "変換は、クラスターの検索とインデックスによる負荷を増やします。過剰な負荷が生じた場合は変換を停止してください。{count, plural, one {この} other {これら}} {count} 件の{count, plural, one {変換} other {変換}}を開始してよろしいですか？",
@@ -18289,7 +18279,6 @@
     "xpack.transform.transformList.startModalTitle": "{transformId} を開始",
     "xpack.transform.transformList.startTransformErrorMessage": "変換 {transformId} の開始中にエラーが発生しました",
     "xpack.transform.transformList.startTransformSuccessMessage": "変換 {transformId} の開始リクエストが受け付けられました。",
-    "xpack.transform.transformList.stopActionName": "停止",
     "xpack.transform.transformList.stoppedTransformBulkToolTip": "1 つまたは複数の変換が既に開始済みです。",
     "xpack.transform.transformList.stoppedTransformToolTip": "{transformId} は既に停止済みです。",
     "xpack.transform.transformList.stopTransformErrorMessage": "データフレーム変換 {transformId} の停止中にエラーが発生しました",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 667706c886bc8..a2565d8af3ec9 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -11190,11 +11190,9 @@
     "xpack.ml.dataframe.analytics.regressionExploration.trainingErrorTitle": "训练误差",
     "xpack.ml.dataframe.analytics.regressionExploration.trainingFilterText": ".筛留测试数据。",
     "xpack.ml.dataframe.analyticsList.analyticsDetails.tabs.analyticsMessagesLabel": "作业消息",
-    "xpack.ml.dataframe.analyticsList.cloneJobButtonLabel": "克隆作业",
     "xpack.ml.dataframe.analyticsList.completeBatchAnalyticsToolTip": "{analyticsId} 为已完成的分析作业，无法重新启动。",
     "xpack.ml.dataframe.analyticsList.createDataFrameAnalyticsButton": "创建作业",
     "xpack.ml.dataframe.analyticsList.deleteActionDisabledToolTipContent": "停止数据帧分析作业，以便将其删除。",
-    "xpack.ml.dataframe.analyticsList.deleteActionName": "删除",
     "xpack.ml.dataframe.analyticsList.deleteAnalyticsErrorMessage": "删除数据帧分析作业 {analyticsId} 时发生错误",
     "xpack.ml.dataframe.analyticsList.deleteAnalyticsPrivilegeErrorMessage": "用户无权删除索引 {indexName}：{error}",
     "xpack.ml.dataframe.analyticsList.deleteAnalyticsSuccessMessage": "删除的数据帧分析作业 {analyticsId} 的请求已确认。",
@@ -11210,7 +11208,6 @@
     "xpack.ml.dataframe.analyticsList.deleteTargetIndexPatternTitle": "删除索引模式 {indexPattern}",
     "xpack.ml.dataframe.analyticsList.description": "描述",
     "xpack.ml.dataframe.analyticsList.destinationIndex": "目标 IP",
-    "xpack.ml.dataframe.analyticsList.editActionName": "编辑",
     "xpack.ml.dataframe.analyticsList.editActionPermissionTooltip": "您无权编辑分析作业。",
     "xpack.ml.dataframe.analyticsList.editFlyout.allowLazyStartAriaLabel": "更新允许惰性启动。",
     "xpack.ml.dataframe.analyticsList.editFlyout.allowLazyStartFalseValue": "False",
@@ -11250,7 +11247,6 @@
     "xpack.ml.dataframe.analyticsList.rowExpand": "显示 {analyticsId} 的详情",
     "xpack.ml.dataframe.analyticsList.showDetailsColumn.screenReaderDescription": "此列包含可单击控件，用于显示每个作业的更多详情",
     "xpack.ml.dataframe.analyticsList.sourceIndex": "源索引",
-    "xpack.ml.dataframe.analyticsList.startActionName": "开始",
     "xpack.ml.dataframe.analyticsList.startAnalyticsErrorTitle": "启动作业时出错",
     "xpack.ml.dataframe.analyticsList.startAnalyticsSuccessMessage": "数据帧分析 {analyticsId} 启动请求已确认。",
     "xpack.ml.dataframe.analyticsList.startModalBody": "数据帧分析作业将增加集群的搜索和索引负荷。如果负荷超载，请停止分析作业。是否确定要启动此分析作业？",
@@ -11259,7 +11255,6 @@
     "xpack.ml.dataframe.analyticsList.startModalTitle": "启动 {analyticsId}",
     "xpack.ml.dataframe.analyticsList.status": "状态",
     "xpack.ml.dataframe.analyticsList.statusFilter": "状态",
-    "xpack.ml.dataframe.analyticsList.stopActionName": "停止",
     "xpack.ml.dataframe.analyticsList.stopAnalyticsErrorMessage": "停止数据帧分析 {analyticsId} 时发生错误：{error}",
     "xpack.ml.dataframe.analyticsList.stopAnalyticsSuccessMessage": "数据帧分析 {analyticsId} 停止请求已确认。",
     "xpack.ml.dataframe.analyticsList.tableActionLabel": "操作",
@@ -12309,7 +12304,6 @@
     "xpack.ml.overview.anomalyDetection.emptyPromptText": "通过异常检测，可发现时序数据中的异常行为。开始自动发现数据中隐藏的异常并更快捷地解决问题。",
     "xpack.ml.overview.anomalyDetection.errorPromptTitle": "获取异常检测作业列表时出错。",
     "xpack.ml.overview.anomalyDetection.errorWithFetchingAnomalyScoreNotificationErrorMessage": "获取异常分数时出错：{error}",
-    "xpack.ml.overview.anomalyDetection.exploreActionName": "浏览",
     "xpack.ml.overview.anomalyDetection.manageJobsButtonText": "管理作业",
     "xpack.ml.overview.anomalyDetection.panelTitle": "异常检测",
     "xpack.ml.overview.anomalyDetection.refreshJobsButtonText": "刷新",
@@ -18251,12 +18245,10 @@
     "xpack.transform.transformList.bulkDeleteTransformSuccessMessage": "已成功删除 {count} 个{count, plural, one {转换} other {转换}}。",
     "xpack.transform.transformList.bulkForceDeleteModalBody": "确定要强制删除{count, plural, one {这} other {这}} {count} 个{count, plural, one {转换} other {转换}}？无论{count, plural, one {转换} other {转换}}的当前状态如何，都将删除{count, plural, one {} other {}}。",
     "xpack.transform.transformList.bulkStartModalTitle": "启动 {count} 个 {count, plural, one {转换} other {转换}}？",
-    "xpack.transform.transformList.cloneActionName": "克隆",
     "xpack.transform.transformList.completeBatchTransformBulkActionToolTip": "一个或多个转换为已完成批量转换，无法重新启动。",
     "xpack.transform.transformList.completeBatchTransformToolTip": "{transformId} 为已完成批量转换，无法重新启动。",
     "xpack.transform.transformList.createTransformButton": "创建转换",
     "xpack.transform.transformList.deleteActionDisabledToolTipContent": "停止数据帧作业，以便将其删除。",
-    "xpack.transform.transformList.deleteActionName": "删除",
     "xpack.transform.transformList.deleteBulkActionDisabledToolTipContent": "一个或多个选定数据帧转换必须停止，才能删除。",
     "xpack.transform.transformList.deleteModalBody": "是否确定要删除此转换？",
     "xpack.transform.transformList.deleteModalCancelButton": "取消",
@@ -18265,7 +18257,6 @@
     "xpack.transform.transformList.deleteTransformErrorMessage": "删除转换 {transformId} 时发生错误",
     "xpack.transform.transformList.deleteTransformGenericErrorMessage": "调用用于删除转换的 API 终端节点时发生错误。",
     "xpack.transform.transformList.deleteTransformSuccessMessage": "删除转换 {transformId} 的请求已确认。",
-    "xpack.transform.transformList.editActionName": "编辑",
     "xpack.transform.transformList.editFlyoutCalloutDocs": "查看文档",
     "xpack.transform.transformList.editFlyoutCalloutText": "此表单允许您更新转换。可以更新的属性列表是创建转换时可以定义的列表子集。",
     "xpack.transform.transformList.editFlyoutCancelButtonText": "取消",
@@ -18287,7 +18278,6 @@
     "xpack.transform.transformList.rowCollapse": "隐藏 {transformId} 的详情",
     "xpack.transform.transformList.rowExpand": "显示 {transformId} 的详情",
     "xpack.transform.transformList.showDetailsColumn.screenReaderDescription": "此列包含可单击控件，用于显示每个转换的更多详情",
-    "xpack.transform.transformList.startActionName": "开始",
     "xpack.transform.transformList.startedTransformBulkToolTip": "一个或多个选定数据帧转换已启动。",
     "xpack.transform.transformList.startedTransformToolTip": "{transformId} 已启动。",
     "xpack.transform.transformList.startModalBody": "转换将增加集群的搜索和索引负荷。如果负荷超载，请停止转换。是否确定要启动{count, plural, one {这} other {这}} {count} 个 {count, plural, one {转换} other {转换}}？",
@@ -18296,7 +18286,6 @@
     "xpack.transform.transformList.startModalTitle": "启动 {transformId}",
     "xpack.transform.transformList.startTransformErrorMessage": "启动转换 {transformId} 时发生错误",
     "xpack.transform.transformList.startTransformSuccessMessage": "启动转换 {transformId} 的请求已确认。",
-    "xpack.transform.transformList.stopActionName": "停止",
     "xpack.transform.transformList.stoppedTransformBulkToolTip": "一个或多个选定数据帧转换已停止。",
     "xpack.transform.transformList.stoppedTransformToolTip": "{transformId} 已停止。",
     "xpack.transform.transformList.stopTransformErrorMessage": "停止数据帧转换 {transformId} 时发生错误",

From 88802cb488278748e576266cea87ecae36a9d257 Mon Sep 17 00:00:00 2001
From: Alexey Antonov <alexwizp@gmail.com>
Date: Wed, 19 Aug 2020 17:26:41 +0300
Subject: [PATCH 22/85] [Visualize] Horizontal Bar Percentiles Overlapping
 (#75315)

* [Visualize] Horizontal Bar Percentiles Overlapping

Closes: #74986

* add tests

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../point_series/_point_series.js             |   6 +-
 .../point_series/_point_series.test.js        | 114 ++++++++++++++++++
 .../point_series/column_chart.js              |   9 +-
 3 files changed, 124 insertions(+), 5 deletions(-)
 create mode 100644 src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/_point_series.test.js

diff --git a/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/_point_series.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/_point_series.js
index 1b084e4142445..d3829d45a88d5 100644
--- a/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/_point_series.js
+++ b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/_point_series.js
@@ -54,18 +54,18 @@ export class PointSeries {
     }, 0);
   }
 
-  getGroupedNum(data) {
+  getGroupedNum(seriesId) {
     let i = 0;
     const stacks = [];
     for (const seri of this.baseChart.chartConfig.series) {
       const valueAxis = seri.valueAxis || this.baseChart.handler.valueAxes[0].id;
       const isStacked = seri.mode === 'stacked';
       if (!isStacked) {
-        if (seri.data === data) return i;
+        if (seri.data.rawId === seriesId) return i;
         i++;
       } else {
         if (!(valueAxis in stacks)) stacks[valueAxis] = i++;
-        if (seri.data === data) return stacks[valueAxis];
+        if (seri.data.rawId === seriesId) return stacks[valueAxis];
       }
     }
     return 0;
diff --git a/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/_point_series.test.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/_point_series.test.js
new file mode 100644
index 0000000000000..cedbe2f443f41
--- /dev/null
+++ b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/_point_series.test.js
@@ -0,0 +1,114 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { PointSeries } from './_point_series';
+
+describe('Point Series', () => {
+  describe('getGroupedNum', () => {
+    let handler;
+
+    beforeEach(() => {
+      handler = {
+        visConfig: {
+          get: jest.fn(),
+        },
+        pointSeries: {
+          chartConfig: {
+            series: [],
+          },
+          handler: {
+            valueAxes: [{ id: 'stackedId' }],
+          },
+        },
+      };
+    });
+
+    describe('normal mode', () => {
+      let pointSeries;
+
+      beforeEach(() => {
+        handler.pointSeries.chartConfig.series = [
+          {
+            mode: 'normal',
+            data: {
+              label: '1st',
+              rawId: 'col-1',
+            },
+          },
+          {
+            mode: 'normal',
+            data: {
+              label: '2nd',
+              rawId: 'col-2',
+            },
+          },
+        ];
+
+        pointSeries = new PointSeries(handler, [{}], {}, {});
+      });
+
+      test('should calculate correct group num', () => {
+        expect(pointSeries.getGroupedNum('col-2')).toBe(1);
+      });
+
+      test('should return "0" for not found id', () => {
+        expect(pointSeries.getGroupedNum('wrong-id')).toBe(0);
+      });
+    });
+
+    describe('stacked mode', () => {
+      let pointSeries;
+
+      beforeEach(() => {
+        handler.pointSeries.chartConfig.series = [
+          {
+            mode: 'normal',
+            data: {
+              label: '1st',
+              rawId: 'col-1',
+            },
+          },
+          {
+            mode: 'stacked',
+            data: {
+              label: '3rd',
+              rawId: 'col-2',
+            },
+          },
+          {
+            mode: 'stacked',
+            data: {
+              label: '2nd',
+              rawId: 'col-3',
+            },
+          },
+        ];
+
+        pointSeries = new PointSeries(handler, [{}], {}, {});
+      });
+
+      test('should calculate correct group num', () => {
+        expect(pointSeries.getGroupedNum('col-2')).toBe(1);
+      });
+
+      test('should return "0" for not found id', () => {
+        expect(pointSeries.getGroupedNum('wrong-id')).toBe(0);
+      });
+    });
+  });
+});
diff --git a/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/column_chart.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/column_chart.js
index cc64e0d746fbf..1369bf1dff68a 100644
--- a/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/column_chart.js
+++ b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/column_chart.js
@@ -130,8 +130,9 @@ export class ColumnChart extends PointSeries {
     const yMin = yScale.domain()[0];
     const gutterSpacingPercentage = 0.15;
     const chartData = this.chartData;
+    const getGroupedNum = this.getGroupedNum.bind(this);
     const groupCount = this.getGroupedCount();
-    const groupNum = this.getGroupedNum(this.chartData);
+
     let barWidth;
     let gutterWidth;
 
@@ -145,6 +146,8 @@ export class ColumnChart extends PointSeries {
     }
 
     function x(d, i) {
+      const groupNum = getGroupedNum(d.seriesId);
+
       if (isTimeScale) {
         return (
           xScale(d.x) +
@@ -249,12 +252,13 @@ export class ColumnChart extends PointSeries {
     const yScale = this.getValueAxis().getScale();
     const chartData = this.chartData;
     const groupCount = this.getGroupedCount();
-    const groupNum = this.getGroupedNum(this.chartData);
     const gutterSpacingPercentage = 0.15;
     const isTimeScale = this.getCategoryAxis().axisConfig.isTimeDomain();
     const isHorizontal = this.getCategoryAxis().axisConfig.isHorizontal();
     const isLogScale = this.getValueAxis().axisConfig.isLogScale();
     const isLabels = this.labelOptions.show;
+    const getGroupedNum = this.getGroupedNum.bind(this);
+
     let barWidth;
     let gutterWidth;
 
@@ -268,6 +272,7 @@ export class ColumnChart extends PointSeries {
     }
 
     function x(d, i) {
+      const groupNum = getGroupedNum(d.seriesId);
       if (isTimeScale) {
         return (
           xScale(d.x) +

From 385b570bb551abcaab0b75b14eabff7ba1bfd3f2 Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Wed, 19 Aug 2020 17:49:34 +0300
Subject: [PATCH 23/85] MOAR RAM (#75423)

---
 src/dev/typescript/run_type_check_cli.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dev/typescript/run_type_check_cli.ts b/src/dev/typescript/run_type_check_cli.ts
index 5d4cf14c1cd95..9eeaeb4da7042 100644
--- a/src/dev/typescript/run_type_check_cli.ts
+++ b/src/dev/typescript/run_type_check_cli.ts
@@ -88,7 +88,7 @@ export function runTypeCheckCli() {
   }
 
   execInProjects(log, projects, process.execPath, (project) => [
-    ...(project.name.startsWith('x-pack') ? ['--max-old-space-size=4096'] : []),
+    '--max-old-space-size=4096',
     require.resolve('typescript/bin/tsc'),
     ...['--project', project.tsConfigPath],
     ...tscArgs,

From 9a22ef29d4f0385a7cc6a6c9640b3b25fa47e29a Mon Sep 17 00:00:00 2001
From: Stratoula Kalafateli <efstratia.kalafateli@elastic.co>
Date: Wed, 19 Aug 2020 18:04:03 +0300
Subject: [PATCH 24/85] [Functional]Table Vis increase sleep time in order
 filter to be applied (#75138)

* Increase sleep time in order filter to be applied

* revert

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 test/functional/page_objects/visualize_chart_page.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/functional/page_objects/visualize_chart_page.ts b/test/functional/page_objects/visualize_chart_page.ts
index ade78cbb810d5..cb114866322db 100644
--- a/test/functional/page_objects/visualize_chart_page.ts
+++ b/test/functional/page_objects/visualize_chart_page.ts
@@ -244,7 +244,7 @@ export function VisualizeChartPageProvider({ getService, getPageObjects }: FtrPr
         const firstCount = await this.getVisualizationRenderingCount();
         log.debug(`-- firstCount=${firstCount}`);
 
-        await common.sleep(1000);
+        await common.sleep(2000);
 
         const secondCount = await this.getVisualizationRenderingCount();
         log.debug(`-- secondCount=${secondCount}`);

From 9698a0720d424531aa528a4fe71112d53492b837 Mon Sep 17 00:00:00 2001
From: Gidi Meir Morris <github@gidi.io>
Date: Wed, 19 Aug 2020 16:10:33 +0100
Subject: [PATCH 25/85] [Saved objects] Add support for version on create &
 bulkCreate when overwriting a document (#75172)

Adds support for `version` one the SavedObjectsClient's create api.
This sallows us to retain Optimistic concurrency control when using create to overwrite an existing document.
---
 ...ore-server.savedobjectsbulkcreateobject.md |  1 +
 ...er.savedobjectsbulkcreateobject.version.md | 11 +++++
 ...n-core-server.savedobjectscreateoptions.md |  1 +
 ...erver.savedobjectscreateoptions.version.md | 13 ++++++
 .../import/import_saved_objects.ts            |  7 ++-
 .../import/resolve_import_errors.ts           | 12 ++++--
 .../service/lib/repository.test.js            | 43 ++++++++++++++++++-
 .../saved_objects/service/lib/repository.ts   | 12 +++++-
 .../service/saved_objects_client.ts           |  6 +++
 src/core/server/server.api.md                 |  3 ++
 .../services/sample_data/routes/install.ts    |  2 +-
 .../services/epm/kibana/assets/install.ts     |  4 +-
 12 files changed, 105 insertions(+), 10 deletions(-)
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsbulkcreateobject.version.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectscreateoptions.version.md

diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsbulkcreateobject.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsbulkcreateobject.md
index 5a9ca36ba56f4..5ccad134248f6 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsbulkcreateobject.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsbulkcreateobject.md
@@ -20,4 +20,5 @@ export interface SavedObjectsBulkCreateObject<T = unknown>
 |  [migrationVersion](./kibana-plugin-core-server.savedobjectsbulkcreateobject.migrationversion.md) | <code>SavedObjectsMigrationVersion</code> | Information about the migrations that have been applied to this SavedObject. When Kibana starts up, KibanaMigrator detects outdated documents and migrates them based on this value. For each migration that has been applied, the plugin's name is used as a key and the latest migration version as the value. |
 |  [references](./kibana-plugin-core-server.savedobjectsbulkcreateobject.references.md) | <code>SavedObjectReference[]</code> |  |
 |  [type](./kibana-plugin-core-server.savedobjectsbulkcreateobject.type.md) | <code>string</code> |  |
+|  [version](./kibana-plugin-core-server.savedobjectsbulkcreateobject.version.md) | <code>string</code> |  |
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsbulkcreateobject.version.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsbulkcreateobject.version.md
new file mode 100644
index 0000000000000..ca2a38693d036
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsbulkcreateobject.version.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsBulkCreateObject](./kibana-plugin-core-server.savedobjectsbulkcreateobject.md) &gt; [version](./kibana-plugin-core-server.savedobjectsbulkcreateobject.version.md)
+
+## SavedObjectsBulkCreateObject.version property
+
+<b>Signature:</b>
+
+```typescript
+version?: string;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscreateoptions.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscreateoptions.md
index 5e9433c5c9196..c5201efd0608d 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscreateoptions.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectscreateoptions.md
@@ -20,4 +20,5 @@ export interface SavedObjectsCreateOptions extends SavedObjectsBaseOptions
 |  [overwrite](./kibana-plugin-core-server.savedobjectscreateoptions.overwrite.md) | <code>boolean</code> | Overwrite existing documents (defaults to false) |
 |  [references](./kibana-plugin-core-server.savedobjectscreateoptions.references.md) | <code>SavedObjectReference[]</code> |  |
 |  [refresh](./kibana-plugin-core-server.savedobjectscreateoptions.refresh.md) | <code>MutatingOperationRefreshSetting</code> | The Elasticsearch Refresh setting for this operation |
+|  [version](./kibana-plugin-core-server.savedobjectscreateoptions.version.md) | <code>string</code> | An opaque version number which changes on each successful write operation. Can be used in conjunction with <code>overwrite</code> for implementing optimistic concurrency control. |
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscreateoptions.version.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscreateoptions.version.md
new file mode 100644
index 0000000000000..51da57064abb9
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectscreateoptions.version.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsCreateOptions](./kibana-plugin-core-server.savedobjectscreateoptions.md) &gt; [version](./kibana-plugin-core-server.savedobjectscreateoptions.version.md)
+
+## SavedObjectsCreateOptions.version property
+
+An opaque version number which changes on each successful write operation. Can be used in conjunction with `overwrite` for implementing optimistic concurrency control.
+
+<b>Signature:</b>
+
+```typescript
+version?: string;
+```
diff --git a/src/core/server/saved_objects/import/import_saved_objects.ts b/src/core/server/saved_objects/import/import_saved_objects.ts
index 6065e03fb1628..4956491a79aa9 100644
--- a/src/core/server/saved_objects/import/import_saved_objects.ts
+++ b/src/core/server/saved_objects/import/import_saved_objects.ts
@@ -25,6 +25,7 @@ import {
   SavedObjectsImportOptions,
 } from './types';
 import { validateReferences } from './validate_references';
+import { SavedObject } from '../types';
 
 /**
  * Import saved objects from given stream. See the {@link SavedObjectsImportOptions | options} for more
@@ -67,7 +68,7 @@ export async function importSavedObjectsFromStream({
   }
 
   // Create objects in bulk
-  const bulkCreateResult = await savedObjectsClient.bulkCreate(filteredObjects, {
+  const bulkCreateResult = await savedObjectsClient.bulkCreate(omitVersion(filteredObjects), {
     overwrite,
     namespace,
   });
@@ -82,3 +83,7 @@ export async function importSavedObjectsFromStream({
     ...(errorAccumulator.length ? { errors: errorAccumulator } : {}),
   };
 }
+
+export function omitVersion(objects: SavedObject[]): SavedObject[] {
+  return objects.map(({ version, ...object }) => object);
+}
diff --git a/src/core/server/saved_objects/import/resolve_import_errors.ts b/src/core/server/saved_objects/import/resolve_import_errors.ts
index a5175aa080598..dce044a31a577 100644
--- a/src/core/server/saved_objects/import/resolve_import_errors.ts
+++ b/src/core/server/saved_objects/import/resolve_import_errors.ts
@@ -26,6 +26,7 @@ import {
   SavedObjectsResolveImportErrorsOptions,
 } from './types';
 import { validateReferences } from './validate_references';
+import { omitVersion } from './import_saved_objects';
 
 /**
  * Resolve and return saved object import errors.
@@ -91,7 +92,7 @@ export async function resolveSavedObjectsImportErrors({
   // Bulk create in two batches, overwrites and non-overwrites
   const { objectsToOverwrite, objectsToNotOverwrite } = splitOverwrites(filteredObjects, retries);
   if (objectsToOverwrite.length) {
-    const bulkCreateResult = await savedObjectsClient.bulkCreate(objectsToOverwrite, {
+    const bulkCreateResult = await savedObjectsClient.bulkCreate(omitVersion(objectsToOverwrite), {
       overwrite: true,
       namespace,
     });
@@ -102,9 +103,12 @@ export async function resolveSavedObjectsImportErrors({
     successCount += bulkCreateResult.saved_objects.filter((obj) => !obj.error).length;
   }
   if (objectsToNotOverwrite.length) {
-    const bulkCreateResult = await savedObjectsClient.bulkCreate(objectsToNotOverwrite, {
-      namespace,
-    });
+    const bulkCreateResult = await savedObjectsClient.bulkCreate(
+      omitVersion(objectsToNotOverwrite),
+      {
+        namespace,
+      }
+    );
     errorAccumulator = [
       ...errorAccumulator,
       ...extractErrors(bulkCreateResult.saved_objects, objectsToNotOverwrite),
diff --git a/src/core/server/saved_objects/service/lib/repository.test.js b/src/core/server/saved_objects/service/lib/repository.test.js
index 4a9fceb9bf357..941c4091a66a7 100644
--- a/src/core/server/saved_objects/service/lib/repository.test.js
+++ b/src/core/server/saved_objects/service/lib/repository.test.js
@@ -464,8 +464,16 @@ describe('SavedObjectsRepository', () => {
       { method, _index = expect.any(String), getId = () => expect.any(String) }
     ) => {
       const body = [];
-      for (const { type, id } of objects) {
-        body.push({ [method]: { _index, _id: getId(type, id) } });
+      for (const { type, id, if_primary_term: ifPrimaryTerm, if_seq_no: ifSeqNo } of objects) {
+        body.push({
+          [method]: {
+            _index,
+            _id: getId(type, id),
+            ...(ifPrimaryTerm && ifSeqNo
+              ? { if_primary_term: expect.any(Number), if_seq_no: expect.any(Number) }
+              : {}),
+          },
+        });
         body.push(expect.any(Object));
       }
       expect(client.bulk).toHaveBeenCalledWith(
@@ -525,6 +533,27 @@ describe('SavedObjectsRepository', () => {
         expectClientCallArgsAction([obj1, obj2], { method: 'index' });
       });
 
+      it(`should use the ES index method with version if ID and version are defined and overwrite=true`, async () => {
+        await bulkCreateSuccess(
+          [
+            {
+              ...obj1,
+              version: mockVersion,
+            },
+            obj2,
+          ],
+          { overwrite: true }
+        );
+
+        const obj1WithSeq = {
+          ...obj1,
+          if_seq_no: mockVersionProps._seq_no,
+          if_primary_term: mockVersionProps._primary_term,
+        };
+
+        expectClientCallArgsAction([obj1WithSeq, obj2], { method: 'index' });
+      });
+
       it(`should use the ES create method if ID is defined and overwrite=false`, async () => {
         await bulkCreateSuccess([obj1, obj2]);
         expectClientCallArgsAction([obj1, obj2], { method: 'create' });
@@ -1516,6 +1545,16 @@ describe('SavedObjectsRepository', () => {
         expect(client.index).toHaveBeenCalled();
       });
 
+      it(`should use the ES index with version if ID and version are defined and overwrite=true`, async () => {
+        await createSuccess(type, attributes, { id, overwrite: true, version: mockVersion });
+        expect(client.index).toHaveBeenCalled();
+
+        expect(client.index.mock.calls[0][0]).toMatchObject({
+          if_seq_no: mockVersionProps._seq_no,
+          if_primary_term: mockVersionProps._primary_term,
+        });
+      });
+
       it(`should use the ES create action if ID is defined and overwrite=false`, async () => {
         await createSuccess(type, attributes, { id });
         expect(client.create).toHaveBeenCalled();
diff --git a/src/core/server/saved_objects/service/lib/repository.ts b/src/core/server/saved_objects/service/lib/repository.ts
index d7e1ecba0370b..9f6db446ea195 100644
--- a/src/core/server/saved_objects/service/lib/repository.ts
+++ b/src/core/server/saved_objects/service/lib/repository.ts
@@ -220,6 +220,7 @@ export class SavedObjectsRepository {
       overwrite = false,
       references = [],
       refresh = DEFAULT_REFRESH_SETTING,
+      version,
     } = options;
 
     if (!this._allowedTypes.includes(type)) {
@@ -259,6 +260,7 @@ export class SavedObjectsRepository {
       index: this.getIndexForType(type),
       refresh,
       body: raw._source,
+      ...(overwrite && version ? decodeRequestVersion(version) : {}),
     };
 
     const { body } =
@@ -345,7 +347,12 @@ export class SavedObjectsRepository {
 
       let savedObjectNamespace;
       let savedObjectNamespaces;
-      const { esRequestIndex, object, method } = expectedBulkGetResult.value;
+      let versionProperties;
+      const {
+        esRequestIndex,
+        object: { version, ...object },
+        method,
+      } = expectedBulkGetResult.value;
       if (esRequestIndex !== undefined) {
         const indexFound = bulkGetResponse?.statusCode !== 404;
         const actualResult = indexFound ? bulkGetResponse?.body.docs[esRequestIndex] : undefined;
@@ -362,12 +369,14 @@ export class SavedObjectsRepository {
           };
         }
         savedObjectNamespaces = getSavedObjectNamespaces(namespace, docFound && actualResult);
+        versionProperties = getExpectedVersionProperties(version, actualResult);
       } else {
         if (this._registry.isSingleNamespace(object.type)) {
           savedObjectNamespace = namespace;
         } else if (this._registry.isMultiNamespace(object.type)) {
           savedObjectNamespaces = getSavedObjectNamespaces(namespace);
         }
+        versionProperties = getExpectedVersionProperties(version);
       }
 
       const expectedResult = {
@@ -392,6 +401,7 @@ export class SavedObjectsRepository {
           [method]: {
             _id: expectedResult.rawMigratedDoc._id,
             _index: this.getIndexForType(object.type),
+            ...(overwrite && versionProperties),
           },
         },
         expectedResult.rawMigratedDoc._source
diff --git a/src/core/server/saved_objects/service/saved_objects_client.ts b/src/core/server/saved_objects/service/saved_objects_client.ts
index e15a92c92772f..6a9f4f5143e84 100644
--- a/src/core/server/saved_objects/service/saved_objects_client.ts
+++ b/src/core/server/saved_objects/service/saved_objects_client.ts
@@ -37,6 +37,11 @@ export interface SavedObjectsCreateOptions extends SavedObjectsBaseOptions {
   id?: string;
   /** Overwrite existing documents (defaults to false) */
   overwrite?: boolean;
+  /**
+   * An opaque version number which changes on each successful write operation.
+   * Can be used in conjunction with `overwrite` for implementing optimistic concurrency control.
+   **/
+  version?: string;
   /** {@inheritDoc SavedObjectsMigrationVersion} */
   migrationVersion?: SavedObjectsMigrationVersion;
   references?: SavedObjectReference[];
@@ -52,6 +57,7 @@ export interface SavedObjectsBulkCreateObject<T = unknown> {
   id?: string;
   type: string;
   attributes: T;
+  version?: string;
   references?: SavedObjectReference[];
   /** {@inheritDoc SavedObjectsMigrationVersion} */
   migrationVersion?: SavedObjectsMigrationVersion;
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index 03545284e14fb..01558c1460f1b 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -2044,6 +2044,8 @@ export interface SavedObjectsBulkCreateObject<T = unknown> {
     references?: SavedObjectReference[];
     // (undocumented)
     type: string;
+    // (undocumented)
+    version?: string;
 }
 
 // @public (undocumented)
@@ -2178,6 +2180,7 @@ export interface SavedObjectsCreateOptions extends SavedObjectsBaseOptions {
     // (undocumented)
     references?: SavedObjectReference[];
     refresh?: MutatingOperationRefreshSetting;
+    version?: string;
 }
 
 // @public (undocumented)
diff --git a/src/plugins/home/server/services/sample_data/routes/install.ts b/src/plugins/home/server/services/sample_data/routes/install.ts
index 2d1a53fbb09dc..b94456682afcc 100644
--- a/src/plugins/home/server/services/sample_data/routes/install.ts
+++ b/src/plugins/home/server/services/sample_data/routes/install.ts
@@ -154,7 +154,7 @@ export function createInstallRoute(
       let createResults;
       try {
         createResults = await context.core.savedObjects.client.bulkCreate(
-          sampleDataset.savedObjects,
+          sampleDataset.savedObjects.map(({ version, ...savedObject }) => savedObject),
           { overwrite: true }
         );
       } catch (err) {
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/kibana/assets/install.ts b/x-pack/plugins/ingest_manager/server/services/epm/kibana/assets/install.ts
index 5741764164b83..84892d2027847 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/kibana/assets/install.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/kibana/assets/install.ts
@@ -14,7 +14,9 @@ import * as Registry from '../../registry';
 import { AssetType, KibanaAssetType, AssetReference } from '../../../../types';
 import { savedObjectTypes } from '../../packages';
 
-type SavedObjectToBe = Required<SavedObjectsBulkCreateObject> & { type: AssetType };
+type SavedObjectToBe = Required<Omit<SavedObjectsBulkCreateObject, 'version'>> & {
+  type: AssetType;
+};
 export type ArchiveAsset = Pick<
   SavedObject,
   'id' | 'attributes' | 'migrationVersion' | 'references'

From a68f4beb8a7a04d83154a9eb10415eada07e926b Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Wed, 19 Aug 2020 08:42:11 -0700
Subject: [PATCH 26/85] skip flaky suite (#75386)

---
 .../tests/actions/builtin_action_types/pagerduty.ts            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/pagerduty.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/pagerduty.ts
index c697cf69bb4d5..e81219152c248 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/pagerduty.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/pagerduty.ts
@@ -20,7 +20,8 @@ export default function pagerdutyTest({ getService }: FtrProviderContext) {
   const kibanaServer = getService('kibanaServer');
   const config = getService('config');
 
-  describe('pagerduty action', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/75386
+  describe.skip('pagerduty action', () => {
     let simulatedActionId = '';
     let pagerdutySimulatorURL: string = '<could not determine kibana url>';
     let proxyServer: any;

From f5e5abe50b3791a5dfd3cbc7ac6b22c2563ff64d Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Wed, 19 Aug 2020 08:48:59 -0700
Subject: [PATCH 27/85] skip flaky suite (#75440)

---
 test/plugin_functional/test_suites/core/route.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/plugin_functional/test_suites/core/route.ts b/test/plugin_functional/test_suites/core/route.ts
index becde49a69714..b8febf9fe5571 100644
--- a/test/plugin_functional/test_suites/core/route.ts
+++ b/test/plugin_functional/test_suites/core/route.ts
@@ -24,7 +24,8 @@ import { PluginFunctionalProviderContext } from '../../services';
 export default function ({ getService }: PluginFunctionalProviderContext) {
   const supertest = getService('supertest');
 
-  describe('route', function () {
+  // FLAKY: https://github.com/elastic/kibana/issues/75440
+  describe.skip('route', function () {
     describe('timeouts', function () {
       const writeBodyCharAtATime = (request: Test, body: string, interval: number) => {
         return new Promise((resolve, reject) => {

From 96118624de3d348f5e3d1c81057d2a1ca91a771f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20G=C3=B3mez?=
 <alejandro.fernandez@elastic.co>
Date: Wed, 19 Aug 2020 18:07:33 +0200
Subject: [PATCH 28/85] [Logs UI] Add "View in machine learning" links in the
 anomaly explorer (#74555)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Felix Stürmer <weltenwort@users.noreply.github.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../analyze_in_ml_button.tsx                  |  2 +-
 .../setup_flyout/module_list.tsx              | 12 ++++++--
 .../setup_flyout/module_list_card.tsx         | 30 +++++++++++++++++--
 3 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/x-pack/plugins/infra/public/components/logging/log_analysis_results/analyze_in_ml_button.tsx b/x-pack/plugins/infra/public/components/logging/log_analysis_results/analyze_in_ml_button.tsx
index 5383cb3b09d39..3e54920160c53 100644
--- a/x-pack/plugins/infra/public/components/logging/log_analysis_results/analyze_in_ml_button.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_analysis_results/analyze_in_ml_button.tsx
@@ -40,7 +40,7 @@ export const AnalyzeInMlButton: React.FunctionComponent<{
   );
 };
 
-const getOverallAnomalyExplorerLinkDescriptor = (
+export const getOverallAnomalyExplorerLinkDescriptor = (
   jobId: string,
   timeRange: TimeRange
 ): LinkDescriptor => {
diff --git a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/setup_flyout/module_list.tsx b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/setup_flyout/module_list.tsx
index 2c68aceccaa43..d7414950b35ad 100644
--- a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/setup_flyout/module_list.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/setup_flyout/module_list.tsx
@@ -22,8 +22,14 @@ export const LogAnalysisModuleList: React.FC<{
   onViewModuleSetup: (module: ModuleId) => void;
 }> = ({ onViewModuleSetup }) => {
   const { hasLogAnalysisSetupCapabilities } = useLogAnalysisCapabilitiesContext();
-  const { setupStatus: logEntryRateSetupStatus } = useLogEntryRateModuleContext();
-  const { setupStatus: logEntryCategoriesSetupStatus } = useLogEntryCategoriesModuleContext();
+  const {
+    setupStatus: logEntryRateSetupStatus,
+    jobIds: logEntryRateJobIds,
+  } = useLogEntryRateModuleContext();
+  const {
+    setupStatus: logEntryCategoriesSetupStatus,
+    jobIds: logEntryCategoriesJobIds,
+  } = useLogEntryCategoriesModuleContext();
 
   const viewLogEntryRateSetupFlyout = useCallback(() => {
     onViewModuleSetup('logs_ui_analysis');
@@ -37,6 +43,7 @@ export const LogAnalysisModuleList: React.FC<{
       <EuiFlexGroup>
         <EuiFlexItem>
           <LogAnalysisModuleListCard
+            jobId={logEntryRateJobIds['log-entry-rate']}
             hasSetupCapabilities={hasLogAnalysisSetupCapabilities}
             moduleDescription={logEntryRateModule.moduleDescription}
             moduleName={logEntryRateModule.moduleName}
@@ -46,6 +53,7 @@ export const LogAnalysisModuleList: React.FC<{
         </EuiFlexItem>
         <EuiFlexItem>
           <LogAnalysisModuleListCard
+            jobId={logEntryCategoriesJobIds['log-entry-categories-count']}
             hasSetupCapabilities={hasLogAnalysisSetupCapabilities}
             moduleDescription={logEntryCategoriesModule.moduleDescription}
             moduleName={logEntryCategoriesModule.moduleName}
diff --git a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/setup_flyout/module_list_card.tsx b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/setup_flyout/module_list_card.tsx
index 9e1ba694a7862..67f2c8d58ec0d 100644
--- a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/setup_flyout/module_list_card.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/setup_flyout/module_list_card.tsx
@@ -4,19 +4,28 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiCard, EuiIcon } from '@elastic/eui';
+import { EuiCard, EuiIcon, EuiButtonEmpty, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React from 'react';
 import { SetupStatus } from '../../../../../common/log_analysis';
 import { CreateJobButton, RecreateJobButton } from '../../log_analysis_setup/create_job_button';
+import { useLinkProps } from '../../../../hooks/use_link_props';
 
 export const LogAnalysisModuleListCard: React.FC<{
+  jobId: string;
   hasSetupCapabilities: boolean;
   moduleDescription: string;
   moduleName: string;
   moduleStatus: SetupStatus;
   onViewSetup: () => void;
-}> = ({ hasSetupCapabilities, moduleDescription, moduleName, moduleStatus, onViewSetup }) => {
+}> = ({
+  jobId,
+  hasSetupCapabilities,
+  moduleDescription,
+  moduleName,
+  moduleStatus,
+  onViewSetup,
+}) => {
   const moduleIcon =
     moduleStatus.type === 'required' ? (
       <EuiIcon size="xxl" type="machineLearningApp" />
@@ -24,6 +33,12 @@ export const LogAnalysisModuleListCard: React.FC<{
       <EuiIcon color="secondary" size="xxl" type="check" />
     );
 
+  const viewInMlLinkProps = useLinkProps({
+    app: 'ml',
+    pathname: '/jobs',
+    search: { mlManagement: `(jobId:${jobId})` },
+  });
+
   const moduleSetupButton =
     moduleStatus.type === 'required' ? (
       <CreateJobButton hasSetupCapabilities={hasSetupCapabilities} onClick={onViewSetup}>
@@ -33,7 +48,16 @@ export const LogAnalysisModuleListCard: React.FC<{
         />
       </CreateJobButton>
     ) : (
-      <RecreateJobButton hasSetupCapabilities={hasSetupCapabilities} onClick={onViewSetup} />
+      <>
+        <RecreateJobButton hasSetupCapabilities={hasSetupCapabilities} onClick={onViewSetup} />
+        <EuiSpacer size="xs" />
+        <EuiButtonEmpty {...viewInMlLinkProps}>
+          <FormattedMessage
+            id="xpack.infra.logs.analysis.viewInMlButtonLabel"
+            defaultMessage="View in Machine Learning"
+          />
+        </EuiButtonEmpty>
+      </>
     );
 
   return (

From 0c6f682890b72823d5cfbf0c28ce99b1b03373f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Loix?= <sabee77@gmail.com>
Date: Wed, 19 Aug 2020 18:08:15 +0200
Subject: [PATCH 29/85] =?UTF-8?q?[Form=20lib]=20Allow=20new=20"defaultValu?=
 =?UTF-8?q?e"=20to=20be=20provided=20when=20resetting=20the=E2=80=A6=20(#7?=
 =?UTF-8?q?5302)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../forms/form_wizard/form_wizard_context.tsx |   2 +-
 .../components/use_field.test.tsx             |   2 +-
 .../hook_form_lib/components/use_field.tsx    |  19 ++-
 .../forms/hook_form_lib/hooks/use_field.ts    |  36 ++--
 .../hook_form_lib/hooks/use_form.test.tsx     | 159 +++++++++++++++++-
 .../forms/hook_form_lib/hooks/use_form.ts     |  42 +++--
 .../static/forms/hook_form_lib/types.ts       |   5 +-
 .../configuration_form/configuration_form.tsx |  21 +--
 .../document_fields/document_fields.tsx       |  45 ++++-
 .../fields/create_field/create_field.tsx      |   4 +
 .../fields/edit_field/edit_field.tsx          |   7 -
 .../edit_field/edit_field_container.tsx       |  91 ++++------
 .../edit_field/edit_field_header_form.tsx     |   4 +
 .../fields/edit_field/index.ts                |   6 +-
 .../templates_form/templates_form.tsx         |  21 +--
 .../mappings_editor/use_state_listener.tsx    |   5 +-
 16 files changed, 325 insertions(+), 144 deletions(-)

diff --git a/src/plugins/es_ui_shared/public/forms/form_wizard/form_wizard_context.tsx b/src/plugins/es_ui_shared/public/forms/form_wizard/form_wizard_context.tsx
index 39b91a2e20b53..7719e7748829d 100644
--- a/src/plugins/es_ui_shared/public/forms/form_wizard/form_wizard_context.tsx
+++ b/src/plugins/es_ui_shared/public/forms/form_wizard/form_wizard_context.tsx
@@ -147,7 +147,7 @@ export const FormWizardProvider = WithMultiContent<Props<any>>(function FormWiza
         return nextState;
       });
     },
-    [getStepIndex, validate, onSave, getData]
+    [getStepIndex, validate, onSave, getData, lastStep]
   );
 
   const value: Context = {
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_field.test.tsx b/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_field.test.tsx
index eead90d2f75b7..a55b2f0a8fa29 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_field.test.tsx
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_field.test.tsx
@@ -98,7 +98,7 @@ describe('<UseField />', () => {
 
       useEffect(() => {
         onForm(form);
-      }, [form]);
+      }, [onForm, form]);
 
       return (
         <Form form={form}>
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_field.tsx b/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_field.tsx
index 589879f37900e..3a3ab0dab5e93 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_field.tsx
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_field.tsx
@@ -54,19 +54,24 @@ function UseFieldComp<T = unknown>(props: Props<T>) {
   const propsToForward =
     componentProps !== undefined ? { ...componentProps, ...rest } : { ...rest };
 
-  const fieldConfig =
+  const fieldConfig: FieldConfig<any, T> & { initialValue?: T } =
     config !== undefined
       ? { ...config }
       : ({
           ...form.__readFieldConfigFromSchema(path),
         } as Partial<FieldConfig<any, T>>);
 
-  if (defaultValue === undefined && readDefaultValueOnForm) {
-    // Read the field default value from the "defaultValue" object passed to the form
-    (fieldConfig.defaultValue as any) = form.getFieldDefaultValue(path) ?? fieldConfig.defaultValue;
-  } else if (defaultValue !== undefined) {
-    // Read the field default value from the propvided prop
-    (fieldConfig.defaultValue as any) = defaultValue;
+  if (defaultValue !== undefined) {
+    // update the form "defaultValue" ref object so when/if we reset the form we can go back to this value
+    form.__updateDefaultValueAt(path, defaultValue);
+
+    // Use the defaultValue prop as initial value
+    fieldConfig.initialValue = defaultValue;
+  } else {
+    if (readDefaultValueOnForm) {
+      // Read the field initial value from the "defaultValue" object passed to the form
+      fieldConfig.initialValue = (form.getFieldDefaultValue(path) as T) ?? fieldConfig.defaultValue;
+    }
   }
 
   if (!fieldConfig.path) {
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_field.ts b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_field.ts
index caf75b42598f5..01d9f8a59129a 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_field.ts
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_field.ts
@@ -25,12 +25,13 @@ import { FIELD_TYPES, VALIDATION_TYPES } from '../constants';
 export const useField = <T>(
   form: FormHook,
   path: string,
-  config: FieldConfig<any, T> = {},
+  config: FieldConfig<any, T> & { initialValue?: T } = {},
   valueChangeListener?: (value: T) => void
 ) => {
   const {
     type = FIELD_TYPES.TEXT,
-    defaultValue = '',
+    defaultValue = '', // The value to use a fallback mecanism when no initial value is passed
+    initialValue = config.defaultValue ?? '', // The value explicitly passed
     label = '',
     labelAppend = '',
     helpText = '',
@@ -44,14 +45,22 @@ export const useField = <T>(
 
   const { getFormData, __removeField, __updateFormDataAt, __validateFields } = form;
 
-  const initialValue = useMemo(() => {
-    if (typeof defaultValue === 'function') {
-      return deserializer ? deserializer(defaultValue()) : defaultValue();
-    }
-    return deserializer ? deserializer(defaultValue) : defaultValue;
-  }, [defaultValue, deserializer]) as T;
+  /**
+   * This callback is both used as the initial "value" state getter, **and** for when we reset the form
+   * (and thus reset the field value). When we reset the form, we can provide a new default value (which will be
+   * passed through this "initialValueGetter" handler).
+   */
+  const initialValueGetter = useCallback(
+    (updatedDefaultValue = initialValue) => {
+      if (typeof updatedDefaultValue === 'function') {
+        return deserializer ? deserializer(updatedDefaultValue()) : updatedDefaultValue();
+      }
+      return deserializer ? deserializer(updatedDefaultValue) : updatedDefaultValue;
+    },
+    [initialValue, deserializer]
+  );
 
-  const [value, setStateValue] = useState<T>(initialValue);
+  const [value, setStateValue] = useState<T>(initialValueGetter);
   const [errors, setErrors] = useState<ValidationError[]>([]);
   const [isPristine, setPristine] = useState(true);
   const [isValidating, setValidating] = useState(false);
@@ -429,7 +438,7 @@ export const useField = <T>(
 
   const reset: FieldHook<T>['reset'] = useCallback(
     (resetOptions = { resetValue: true }) => {
-      const { resetValue = true } = resetOptions;
+      const { resetValue = true, defaultValue: updatedDefaultValue } = resetOptions;
 
       setPristine(true);
       setValidating(false);
@@ -438,11 +447,12 @@ export const useField = <T>(
       setErrors([]);
 
       if (resetValue) {
-        setValue(initialValue);
-        return initialValue;
+        const newValue = initialValueGetter(updatedDefaultValue ?? defaultValue);
+        setValue(newValue);
+        return newValue;
       }
     },
-    [setValue, serializeOutput, initialValue]
+    [setValue, initialValueGetter, defaultValue]
   );
 
   // -- EFFECTS
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.test.tsx b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.test.tsx
index b2cc91152b571..007e492243bac 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.test.tsx
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.test.tsx
@@ -33,7 +33,17 @@ interface Props {
   onData: FormSubmitHandler<MyForm>;
 }
 
+let formHook: FormHook<any> | null = null;
+
+const onFormHook = (_form: FormHook<any>) => {
+  formHook = _form;
+};
+
 describe('use_form() hook', () => {
+  beforeEach(() => {
+    formHook = null;
+  });
+
   describe('form.submit() & config.onSubmit()', () => {
     const onFormData = jest.fn();
 
@@ -125,12 +135,6 @@ describe('use_form() hook', () => {
     });
 
     test('should not build the object if the form is not valid', async () => {
-      let formHook: FormHook<MyForm> | null = null;
-
-      const onFormHook = (_form: FormHook<MyForm>) => {
-        formHook = _form;
-      };
-
       const TestComp = ({ onForm }: { onForm: (form: FormHook<MyForm>) => void }) => {
         const { form } = useForm<MyForm>({ defaultValue: { username: 'initialValue' } });
         const validator: ValidationFunc = ({ value }) => {
@@ -141,7 +145,7 @@ describe('use_form() hook', () => {
 
         useEffect(() => {
           onForm(form);
-        }, [form]);
+        }, [onForm, form]);
 
         return (
           <Form form={form}>
@@ -297,4 +301,145 @@ describe('use_form() hook', () => {
       });
     });
   });
+
+  describe('form.reset()', () => {
+    const defaultValue = {
+      username: 'defaultValue',
+      deeply: { nested: { value: 'defaultValue' } },
+    };
+
+    type RestFormTest = typeof defaultValue;
+
+    const TestComp = ({ onForm }: { onForm: (form: FormHook<any>) => void }) => {
+      const { form } = useForm<RestFormTest>({
+        defaultValue,
+        options: { stripEmptyFields: false },
+      });
+
+      useEffect(() => {
+        onForm(form);
+      }, [onForm, form]);
+
+      return (
+        <Form form={form}>
+          <UseField
+            path="username"
+            config={{ defaultValue: 'configDefaultValue' }}
+            data-test-subj="userNameField"
+          />
+          <UseField
+            path="city"
+            config={{ defaultValue: 'configDefaultValue' }}
+            defaultValue="inlineDefaultValue"
+            data-test-subj="cityField"
+          />
+          <UseField path="deeply.nested.value" data-test-subj="deeplyNestedField" />
+        </Form>
+      );
+    };
+
+    const setup = registerTestBed(TestComp, {
+      defaultProps: { onForm: onFormHook },
+      memoryRouter: { wrapComponent: false },
+    });
+
+    test('should put back the defaultValue for each field', async () => {
+      const {
+        form: { setInputValue },
+      } = setup() as TestBed;
+
+      if (!formHook) {
+        throw new Error(
+          `formHook is not defined. Use the onForm() prop to update the reference to the form hook.`
+        );
+      }
+
+      let formData: Partial<RestFormTest> = {};
+
+      await act(async () => {
+        formData = formHook!.getFormData();
+      });
+      expect(formData).toEqual({
+        username: 'defaultValue',
+        city: 'inlineDefaultValue',
+        deeply: { nested: { value: 'defaultValue' } },
+      });
+
+      setInputValue('userNameField', 'changedValue');
+      setInputValue('cityField', 'changedValue');
+      setInputValue('deeplyNestedField', 'changedValue');
+
+      await act(async () => {
+        formData = formHook!.getFormData();
+      });
+      expect(formData).toEqual({
+        username: 'changedValue',
+        city: 'changedValue',
+        deeply: { nested: { value: 'changedValue' } },
+      });
+
+      await act(async () => {
+        formHook!.reset();
+      });
+
+      await act(async () => {
+        formData = formHook!.getFormData();
+      });
+      expect(formData).toEqual({
+        username: 'defaultValue',
+        city: 'inlineDefaultValue', // Inline default value is correctly kept after resetting
+        deeply: { nested: { value: 'defaultValue' } },
+      });
+    });
+
+    test('should allow to pass a new "defaultValue" object for the fields', async () => {
+      const {
+        form: { setInputValue },
+      } = setup() as TestBed;
+
+      if (!formHook) {
+        throw new Error(
+          `formHook is not defined. Use the onForm() prop to update the reference to the form hook.`
+        );
+      }
+
+      setInputValue('userNameField', 'changedValue');
+      setInputValue('cityField', 'changedValue');
+      setInputValue('deeplyNestedField', 'changedValue');
+
+      let formData: Partial<RestFormTest> = {};
+
+      await act(async () => {
+        formHook!.reset({
+          defaultValue: {
+            city: () => 'newDefaultValue', // A function can also be passed
+            deeply: { nested: { value: 'newDefaultValue' } },
+          },
+        });
+      });
+      await act(async () => {
+        formData = formHook!.getFormData();
+      });
+      expect(formData).toEqual({
+        username: 'configDefaultValue', // Back to the config defaultValue as no value was provided when resetting
+        city: 'newDefaultValue',
+        deeply: { nested: { value: 'newDefaultValue' } },
+      });
+
+      // Make sure all field are back to the config defautlValue, even when we have a UseField with inline prop "defaultValue"
+      await act(async () => {
+        formHook!.reset({
+          defaultValue: {},
+        });
+      });
+      await act(async () => {
+        formData = formHook!.getFormData();
+      });
+      expect(formData).toEqual({
+        username: 'configDefaultValue',
+        city: 'configDefaultValue', // Inline default value **is not** kept after resetting with undefined "city" value
+        deeply: { nested: { value: '' } }, // Fallback to empty string as no config was provided
+      });
+    });
+  });
 });
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.ts b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.ts
index 1f51b75a80b21..c3f6ecc7f4831 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.ts
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.ts
@@ -19,6 +19,7 @@
 
 import { useState, useRef, useEffect, useMemo, useCallback } from 'react';
 import { get } from 'lodash';
+import { set } from '@elastic/safer-lodash-set';
 
 import { FormHook, FieldHook, FormData, FieldConfig, FieldsMap, FormConfig } from '../types';
 import { mapFormFields, unflattenObject, Subject, Subscription } from '../lib';
@@ -39,15 +40,19 @@ export function useForm<T extends FormData = FormData>(
   const { onSubmit, schema, serializer, deserializer, options, id = 'default', defaultValue } =
     formConfig ?? {};
 
-  const formDefaultValue = useMemo(() => {
+  const formDefaultValue = useMemo<{ [key: string]: any }>(() => {
     if (defaultValue === undefined || Object.keys(defaultValue).length === 0) {
       return {};
     }
 
-    return Object.entries(defaultValue as object)
+    const defaultValueFiltered = Object.entries(defaultValue as object)
       .filter(({ 1: value }) => value !== undefined)
       .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {});
-  }, [defaultValue]);
+
+    return deserializer ? (deserializer(defaultValueFiltered) as any) : defaultValueFiltered;
+  }, [defaultValue, deserializer]);
+
+  const defaultValueDeserialized = useRef(formDefaultValue);
 
   const { errorDisplayDelay, stripEmptyFields: doStripEmptyFields } = options ?? {};
   const formOptions = useMemo(
@@ -58,11 +63,6 @@ export function useForm<T extends FormData = FormData>(
     [errorDisplayDelay, doStripEmptyFields]
   );
 
-  const defaultValueDeserialized = useMemo(
-    () => (deserializer ? deserializer(formDefaultValue) : formDefaultValue),
-    [formDefaultValue, deserializer]
-  );
-
   const [isSubmitted, setIsSubmitted] = useState(false);
   const [isSubmitting, setSubmitting] = useState(false);
   const [isValid, setIsValid] = useState<boolean | undefined>(undefined);
@@ -125,6 +125,10 @@ export function useForm<T extends FormData = FormData>(
     [getFormData$]
   );
 
+  const updateDefaultValueAt: FormHook<T>['__updateDefaultValueAt'] = useCallback((path, value) => {
+    set(defaultValueDeserialized.current, path, value);
+  }, []);
+
   // -- API
   // ----------------------------------
   const getFormData: FormHook<T>['getFormData'] = useCallback(
@@ -277,8 +281,8 @@ export function useForm<T extends FormData = FormData>(
   const getFields: FormHook<T>['getFields'] = useCallback(() => fieldsRefs.current, []);
 
   const getFieldDefaultValue: FormHook['getFieldDefaultValue'] = useCallback(
-    (fieldName) => get(defaultValueDeserialized, fieldName),
-    [defaultValueDeserialized]
+    (fieldName) => get(defaultValueDeserialized.current, fieldName),
+    []
   );
 
   const readFieldConfigFromSchema: FormHook<T>['__readFieldConfigFromSchema'] = useCallback(
@@ -343,15 +347,23 @@ export function useForm<T extends FormData = FormData>(
    */
   const reset: FormHook<T>['reset'] = useCallback(
     (resetOptions = { resetValues: true }) => {
-      const { resetValues = true } = resetOptions;
+      const { resetValues = true, defaultValue: updatedDefaultValue } = resetOptions;
       const currentFormData = { ...getFormData$().value } as FormData;
+
+      if (updatedDefaultValue) {
+        defaultValueDeserialized.current = deserializer
+          ? (deserializer(updatedDefaultValue) as any)
+          : updatedDefaultValue;
+      }
+
       Object.entries(fieldsRefs.current).forEach(([path, field]) => {
         // By resetting the form, some field might be unmounted. In order
         // to avoid a race condition, we check that the field still exists.
         const isFieldMounted = fieldsRefs.current[path] !== undefined;
         if (isFieldMounted) {
-          const fieldValue = field.reset({ resetValue: resetValues }) ?? currentFormData[path];
-          currentFormData[path] = fieldValue;
+          const fieldDefaultValue = getFieldDefaultValue(path);
+          field.reset({ resetValue: resetValues, defaultValue: fieldDefaultValue });
+          currentFormData[path] = fieldDefaultValue;
         }
       });
       if (resetValues) {
@@ -362,7 +374,7 @@ export function useForm<T extends FormData = FormData>(
       setSubmitting(false);
       setIsValid(undefined);
     },
-    [getFormData$]
+    [getFormData$, deserializer, getFieldDefaultValue]
   );
 
   const form = useMemo<FormHook<T>>(() => {
@@ -383,6 +395,7 @@ export function useForm<T extends FormData = FormData>(
       __options: formOptions,
       __getFormData$: getFormData$,
       __updateFormDataAt: updateFormDataAt,
+      __updateDefaultValueAt: updateDefaultValueAt,
       __readFieldConfigFromSchema: readFieldConfigFromSchema,
       __addField: addField,
       __removeField: removeField,
@@ -405,6 +418,7 @@ export function useForm<T extends FormData = FormData>(
     formOptions,
     getFormData$,
     updateFormDataAt,
+    updateDefaultValueAt,
     readFieldConfigFromSchema,
     addField,
     removeField,
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/types.ts b/src/plugins/es_ui_shared/static/forms/hook_form_lib/types.ts
index 7e38a33f0c684..4b203c3927ffd 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/types.ts
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/types.ts
@@ -38,7 +38,7 @@ export interface FormHook<T extends FormData = FormData> {
   getFieldDefaultValue: (fieldName: string) => unknown;
   /* Returns a list of all errors in the form */
   getErrors: () => string[];
-  reset: (options?: { resetValues?: boolean }) => void;
+  reset: (options?: { resetValues?: boolean; defaultValue?: FormData }) => void;
   readonly __options: Required<FormOptions>;
   __getFormData$: () => Subject<T>;
   __addField: (field: FieldHook) => void;
@@ -47,6 +47,7 @@ export interface FormHook<T extends FormData = FormData> {
     fieldNames: string[]
   ) => Promise<{ areFieldsValid: boolean; isFormValid: boolean | undefined }>;
   __updateFormDataAt: (field: string, value: unknown) => T;
+  __updateDefaultValueAt: (field: string, value: unknown) => void;
   __readFieldConfigFromSchema: (fieldName: string) => FieldConfig;
 }
 
@@ -115,7 +116,7 @@ export interface FieldHook<T = unknown> {
     value?: unknown;
     validationType?: string;
   }) => FieldValidateResponse | Promise<FieldValidateResponse>;
-  reset: (options?: { resetValue: boolean }) => unknown | undefined;
+  reset: (options?: { resetValue?: boolean; defaultValue?: T }) => unknown | undefined;
   __serializeOutput: (rawValue?: unknown) => unknown;
 }
 
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/configuration_form/configuration_form.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/configuration_form/configuration_form.tsx
index 3a3e19783d74d..7ec78646a654e 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/configuration_form/configuration_form.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/configuration_form/configuration_form.tsx
@@ -86,7 +86,7 @@ const formDeserializer = (formData: GenericObject) => {
 };
 
 export const ConfigurationForm = React.memo(({ value }: Props) => {
-  const isMounted = useRef<boolean | undefined>(undefined);
+  const isMounted = useRef(false);
 
   const { form } = useForm<MappingsConfiguration>({
     schema: configurationFormSchema,
@@ -115,23 +115,16 @@ export const ConfigurationForm = React.memo(({ value }: Props) => {
   }, [dispatch, subscribe, submit]);
 
   useEffect(() => {
-    if (isMounted.current === undefined) {
-      // On mount: don't reset the form
-      isMounted.current = true;
-      return;
-    } else if (isMounted.current === false) {
-      // When we save the snapshot on unMount we update the "defaultValue" in our state
-      // wich updates the "value" prop here on the component.
-      // To avoid resetting the form at this stage, we exit early.
-      return;
+    if (isMounted.current) {
+      // If the value has changed (it probably means that we have loaded a new JSON)
+      // we need to reset the form to update the fields values.
+      reset({ resetValues: true, defaultValue: value });
     }
-
-    // If the value has changed (it probably means that we have loaded a new JSON)
-    // we need to reset the form to update the fields values.
-    reset({ resetValues: true });
   }, [value, reset]);
 
   useEffect(() => {
+    isMounted.current = true;
+
     return () => {
       isMounted.current = false;
 
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/document_fields.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/document_fields.tsx
index 4b19b6f7ae5c3..3b9245eebffbd 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/document_fields.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/document_fields.tsx
@@ -3,22 +3,30 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import React, { useMemo, useCallback } from 'react';
+import React, { useMemo, useCallback, useEffect } from 'react';
 import { EuiSpacer } from '@elastic/eui';
 
+import { GlobalFlyout } from '../../shared_imports';
 import { useMappingsState, useDispatch } from '../../mappings_state_context';
 import { deNormalize } from '../../lib';
-import { EditFieldContainer } from './fields';
+import { EditFieldContainer, EditFieldContainerProps, defaultFlyoutProps } from './fields';
 import { DocumentFieldsHeader } from './document_fields_header';
 import { DocumentFieldsJsonEditor } from './fields_json_editor';
 import { DocumentFieldsTreeEditor } from './fields_tree_editor';
 import { SearchResult } from './search_fields';
 
+const { useGlobalFlyout } = GlobalFlyout;
+
 export const DocumentFields = React.memo(() => {
   const { fields, search, documentFields } = useMappingsState();
   const dispatch = useDispatch();
+  const {
+    addContent: addContentToGlobalFlyout,
+    removeContent: removeContentFromGlobalFlyout,
+  } = useGlobalFlyout();
 
   const { editor: editorType } = documentFields;
+  const isEditing = documentFields.status === 'editingField';
 
   const jsonEditorDefaultValue = useMemo(() => {
     if (editorType === 'json') {
@@ -40,6 +48,38 @@ export const DocumentFields = React.memo(() => {
     [dispatch]
   );
 
+  const exitEdit = useCallback(() => {
+    dispatch({ type: 'documentField.changeStatus', value: 'idle' });
+  }, [dispatch]);
+
+  useEffect(() => {
+    if (isEditing) {
+      // Open the flyout with the <EditField /> content
+      addContentToGlobalFlyout<EditFieldContainerProps>({
+        id: 'mappingsEditField',
+        Component: EditFieldContainer,
+        props: { exitEdit },
+        flyoutProps: { ...defaultFlyoutProps, onClose: exitEdit },
+        cleanUpFunc: exitEdit,
+      });
+    }
+  }, [isEditing, addContentToGlobalFlyout, fields.byId, exitEdit]);
+
+  useEffect(() => {
+    if (!isEditing) {
+      removeContentFromGlobalFlyout('mappingsEditField');
+    }
+  }, [isEditing, removeContentFromGlobalFlyout]);
+
+  useEffect(() => {
+    return () => {
+      if (isEditing) {
+        // When the component unmounts, exit edit mode.
+        exitEdit();
+      }
+    };
+  }, [isEditing, exitEdit]);
+
   const searchTerm = search.term.trim();
 
   return (
@@ -51,7 +91,6 @@ export const DocumentFields = React.memo(() => {
       ) : (
         editor
       )}
-      <EditFieldContainer />
     </div>
   );
 });
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/create_field/create_field.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/create_field/create_field.tsx
index ce5f2a60f5165..a8170b1d59fbb 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/create_field/create_field.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/create_field/create_field.tsx
@@ -112,6 +112,10 @@ export const CreateField = React.memo(function CreateFieldComponent({
       {/* Field subType (if any) */}
       <FormDataProvider pathsToWatch="type">
         {({ type }) => {
+          if (type === undefined) {
+            return null;
+          }
+
           const [fieldType] = type;
           return (
             <SubTypeParameter
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/edit_field/edit_field.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/edit_field/edit_field.tsx
index a9bbf008e5129..95575124b6abd 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/edit_field/edit_field.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/edit_field/edit_field.tsx
@@ -43,13 +43,6 @@ export interface Props {
   updateField: UpdateFieldFunc;
 }
 
-export const defaultFlyoutProps = {
-  'data-test-subj': 'mappingsEditorFieldEdit',
-  'aria-labelledby': 'mappingsEditorFieldEditTitle',
-  className: 'mappingsEditor__editField',
-  maxWidth: 720,
-};
-
 // The default FormWrapper is the <EuiForm />, which wrapps the form with
 // a <div>. We can't have a div as first child of the Flyout as it breaks
 // the height calculaction and does not render the footer position correctly.
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/edit_field/edit_field_container.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/edit_field/edit_field_container.tsx
index 4996f59105c04..1f11bac568859 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/edit_field/edit_field_container.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/edit_field/edit_field_container.tsx
@@ -3,31 +3,35 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import React, { useEffect, useCallback, useMemo } from 'react';
+import React, { useEffect, useMemo } from 'react';
 
-import { useForm, GlobalFlyout } from '../../../../shared_imports';
+import { useForm } from '../../../../shared_imports';
 import { useDispatch, useMappingsState } from '../../../../mappings_state_context';
 import { Field } from '../../../../types';
 import { fieldSerializer, fieldDeserializer } from '../../../../lib';
 import { ModalConfirmationDeleteFields } from '../modal_confirmation_delete_fields';
-import { EditField, defaultFlyoutProps, Props as EditFieldProps } from './edit_field';
+import { EditField } from './edit_field';
 import { useUpdateField } from './use_update_field';
 
-const { useGlobalFlyout } = GlobalFlyout;
+export const defaultFlyoutProps = {
+  'data-test-subj': 'mappingsEditorFieldEdit',
+  'aria-labelledby': 'mappingsEditorFieldEditTitle',
+  className: 'mappingsEditor__editField',
+  maxWidth: 720,
+};
 
-export const EditFieldContainer = React.memo(() => {
+export interface Props {
+  exitEdit: () => void;
+}
+
+export const EditFieldContainer = React.memo(({ exitEdit }: Props) => {
   const { fields, documentFields } = useMappingsState();
   const dispatch = useDispatch();
-  const {
-    addContent: addContentToGlobalFlyout,
-    removeContent: removeContentFromGlobalFlyout,
-  } = useGlobalFlyout();
   const { updateField, modal } = useUpdateField();
 
   const { status, fieldToEdit } = documentFields;
   const isEditing = status === 'editingField';
-
-  const field = isEditing ? fields.byId[fieldToEdit!] : undefined;
+  const field = fields.byId[fieldToEdit!];
 
   const formDefaultValue = useMemo(() => {
     return { ...field?.source };
@@ -38,6 +42,7 @@ export const EditFieldContainer = React.memo(() => {
     serializer: fieldSerializer,
     deserializer: fieldDeserializer,
     options: { stripEmptyFields: false },
+    id: 'edit-field',
   });
 
   const { subscribe } = form;
@@ -50,52 +55,24 @@ export const EditFieldContainer = React.memo(() => {
     return subscription.unsubscribe;
   }, [subscribe, dispatch]);
 
-  const exitEdit = useCallback(() => {
-    dispatch({ type: 'documentField.changeStatus', value: 'idle' });
-  }, [dispatch]);
-
-  useEffect(() => {
-    if (isEditing) {
-      // Open the flyout with the <EditField /> content
-      addContentToGlobalFlyout<EditFieldProps>({
-        id: 'mappingsEditField',
-        Component: EditField,
-        props: {
-          form,
-          field: field!,
-          exitEdit,
-          allFields: fields.byId,
-          updateField,
-        },
-        flyoutProps: { ...defaultFlyoutProps, onClose: exitEdit },
-        cleanUpFunc: exitEdit,
-      });
-    }
-  }, [
-    isEditing,
-    field,
-    form,
-    addContentToGlobalFlyout,
-    fields.byId,
-    fieldToEdit,
-    exitEdit,
-    updateField,
-  ]);
+  const renderModal = () => {
+    return modal.isOpen ? <ModalConfirmationDeleteFields {...modal.props} /> : null;
+  };
 
-  useEffect(() => {
-    if (!isEditing) {
-      removeContentFromGlobalFlyout('mappingsEditField');
-    }
-  }, [isEditing, removeContentFromGlobalFlyout]);
-
-  useEffect(() => {
-    return () => {
-      if (isEditing) {
-        // When the component unmounts, exit edit mode.
-        exitEdit();
-      }
-    };
-  }, [isEditing, exitEdit]);
+  if (!isEditing) {
+    return null;
+  }
 
-  return modal.isOpen ? <ModalConfirmationDeleteFields {...modal.props} /> : null;
+  return (
+    <>
+      <EditField
+        form={form}
+        field={field}
+        allFields={fields.byId}
+        exitEdit={exitEdit}
+        updateField={updateField}
+      />
+      {renderModal()}
+    </>
+  );
 });
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/edit_field/edit_field_header_form.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/edit_field/edit_field_header_form.tsx
index b4b5bce21f768..f2ad37cb45818 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/edit_field/edit_field_header_form.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/edit_field/edit_field_header_form.tsx
@@ -37,6 +37,10 @@ export const EditFieldHeaderForm = React.memo(
           {/* Field subType (if any) */}
           <FormDataProvider pathsToWatch="type">
             {({ type }) => {
+              if (type === undefined) {
+                return null;
+              }
+
               const [fieldType] = type;
               return (
                 <SubTypeParameter
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/edit_field/index.ts b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/edit_field/index.ts
index ff74cabca7518..ccc04e544372c 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/edit_field/index.ts
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/edit_field/index.ts
@@ -4,7 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export * from './edit_field_container';
+export {
+  EditFieldContainer,
+  defaultFlyoutProps,
+  Props as EditFieldContainerProps,
+} from './edit_field_container';
 
 export * from './basic_parameters_section';
 
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/templates_form/templates_form.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/templates_form/templates_form.tsx
index 9367eb6faee20..4b813b4edbabd 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/templates_form/templates_form.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/templates_form/templates_form.tsx
@@ -53,7 +53,7 @@ const formDeserializer = (formData: { [key: string]: any }) => {
 };
 
 export const TemplatesForm = React.memo(({ value }: Props) => {
-  const isMounted = useRef<boolean | undefined>(undefined);
+  const isMounted = useRef(false);
 
   const { form } = useForm<any>({
     schema: templatesFormSchema,
@@ -75,23 +75,16 @@ export const TemplatesForm = React.memo(({ value }: Props) => {
   }, [subscribe, dispatch, submitForm]);
 
   useEffect(() => {
-    if (isMounted.current === undefined) {
-      // On mount: don't reset the form
-      isMounted.current = true;
-      return;
-    } else if (isMounted.current === false) {
-      // When we save the snapshot on unMount we update the "defaultValue" in our state
-      // wich updates the "value" prop here on the component.
-      // To avoid resetting the form at this stage, we exit early.
-      return;
+    if (isMounted.current) {
+      // If the value has changed (it probably means that we have loaded a new JSON)
+      // we need to reset the form to update the fields values.
+      reset({ resetValues: true, defaultValue: value });
     }
-
-    // If the value has changed (it probably means that we have loaded a new JSON)
-    // we need to reset the form to update the fields values.
-    reset({ resetValues: true });
   }, [value, reset]);
 
   useEffect(() => {
+    isMounted.current = true;
+
     return () => {
       isMounted.current = false;
 
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/use_state_listener.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/use_state_listener.tsx
index f1ffd5356c977..feba79ce85e85 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/use_state_listener.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/use_state_listener.tsx
@@ -29,15 +29,14 @@ export const useMappingsStateListener = ({ onChange, value }: Args) => {
   const dispatch = useDispatch();
 
   const parsedFieldsDefaultValue = useMemo(() => normalize(value?.fields), [value?.fields]);
-
   useEffect(() => {
     // If we are creating a new field, but haven't entered any name
     // it is valid and we can byPass its form validation (that requires a "name" to be defined)
     const isFieldFormVisible = state.fieldForm !== undefined;
     const emptyNameValue =
       isFieldFormVisible &&
-      state.fieldForm!.data.raw.name !== undefined &&
-      state.fieldForm!.data.raw.name.trim() === '';
+      (state.fieldForm!.data.raw.name === undefined ||
+        state.fieldForm!.data.raw.name.trim() === '');
 
     const bypassFieldFormValidation =
       state.documentFields.status === 'creatingField' && emptyNameValue;

From f983e120b67ded1033c0f543c2e8b0acdca9b96e Mon Sep 17 00:00:00 2001
From: Dmitry Lemeshko <dzmitry.lemechko@elastic.co>
Date: Wed, 19 Aug 2020 18:13:29 +0200
Subject: [PATCH 30/85] [code coverage] always download node before team
 assignment (#75424)

---
 vars/kibanaTeamAssign.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vars/kibanaTeamAssign.groovy b/vars/kibanaTeamAssign.groovy
index e2298ed43d408..a3d9c16ef506e 100644
--- a/vars/kibanaTeamAssign.groovy
+++ b/vars/kibanaTeamAssign.groovy
@@ -1,6 +1,6 @@
 def loadIngestionPipeline(ingestionPipelineName, title) {
   kibanaPipeline.bash("""
-    source src/dev/ci_setup/setup_env.sh
+    source src/dev/ci_setup/setup_env.sh true
     yarn kbn bootstrap --prefer-offline
 
     . src/dev/code_coverage/shell_scripts/assign_teams.sh '${ingestionPipelineName}'

From 32c23eacc9f8c4a3eb5ba12f7c18aff33a27fc30 Mon Sep 17 00:00:00 2001
From: Ryland Herrick <ryalnd@gmail.com>
Date: Wed, 19 Aug 2020 11:25:26 -0500
Subject: [PATCH 31/85] [Security Solution][Detections] Loosen lists
 permissions (#75378)

* Allow read-only lists users to use Detections if lists indexes exist

We were previously showing them a configuration page, which was
incorrect. The only place we require the write permission is the value
lists modal, which is now hidden if that permission is absent.

* Disable the Value Lists modal when the user cannot write lists

If the user does not have permission to write to the lists index, they
should not be able to CRUD value lists.

* style: Remove unnecessary useCallbacks

* Replaces useCallback functions with inline anonymous functions
* Renames the modal state to be more similar to existing analogous
  modal state
---
 .../detection_engine/lists/use_lists_config.tsx    |  2 +-
 .../pages/detection_engine/rules/index.tsx         | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/lists/use_lists_config.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/lists/use_lists_config.tsx
index 71847e7b7d8cb..d12941f35b523 100644
--- a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/lists/use_lists_config.tsx
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/lists/use_lists_config.tsx
@@ -29,7 +29,7 @@ export const useListsConfig = (): UseListsConfigReturn => {
   const hasIndexError = indexError != null;
   const needsIndexConfiguration =
     needsIndex && (canManageIndex === false || (canManageIndex === true && hasIndexError));
-  const needsConfiguration = !enabled || canWriteIndex === false || needsIndexConfiguration;
+  const needsConfiguration = !enabled || needsIndexConfiguration;
 
   useEffect(() => {
     if (needsIndex && canManageIndex) {
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.tsx
index b6f58ef7045f8..92ec0bb5a72cd 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.tsx
@@ -40,9 +40,7 @@ type Func = (refreshPrePackagedRule?: boolean) => void;
 const RulesPageComponent: React.FC = () => {
   const history = useHistory();
   const [showImportModal, setShowImportModal] = useState(false);
-  const [isValueListsModalShown, setIsValueListsModalShown] = useState(false);
-  const showValueListsModal = useCallback(() => setIsValueListsModalShown(true), []);
-  const hideValueListsModal = useCallback(() => setIsValueListsModalShown(false), []);
+  const [showValueListsModal, setShowValueListsModal] = useState(false);
   const refreshRulesData = useRef<null | Func>(null);
   const {
     loading: userInfoLoading,
@@ -54,6 +52,7 @@ const RulesPageComponent: React.FC = () => {
   } = useUserInfo();
   const {
     loading: listsConfigLoading,
+    canWriteIndex: canWriteListsIndex,
     needsConfiguration: needsListsConfiguration,
   } = useListsConfig();
   const loading = userInfoLoading || listsConfigLoading;
@@ -147,7 +146,10 @@ const RulesPageComponent: React.FC = () => {
   return (
     <>
       {userHasNoPermissions(canUserCRUD) && <ReadOnlyCallOut />}
-      <ValueListsModal showModal={isValueListsModalShown} onClose={hideValueListsModal} />
+      <ValueListsModal
+        showModal={showValueListsModal}
+        onClose={() => setShowValueListsModal(false)}
+      />
       <ImportDataModal
         checkBoxLabel={i18n.OVERWRITE_WITH_SAME_NAME}
         closeModal={() => setShowImportModal(false)}
@@ -208,8 +210,8 @@ const RulesPageComponent: React.FC = () => {
                 <EuiButton
                   data-test-subj="open-value-lists-modal-button"
                   iconType="importAction"
-                  isDisabled={userHasNoPermissions(canUserCRUD) || loading}
-                  onClick={showValueListsModal}
+                  isDisabled={!canWriteListsIndex || loading}
+                  onClick={() => setShowValueListsModal(true)}
                 >
                   {i18n.UPLOAD_VALUE_LISTS}
                 </EuiButton>

From 32bd45bfbbea46203e7287f4ef046c7338789dc9 Mon Sep 17 00:00:00 2001
From: Ben Skelker <54019610+benskelker@users.noreply.github.com>
Date: Wed, 19 Aug 2020 19:28:48 +0300
Subject: [PATCH 32/85] updates link to security docs (#75421)

---
 .../pages/detection_engine/detection_engine_no_index.tsx        | 2 +-
 .../detection_engine/detection_engine_user_unauthenticated.tsx  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine_no_index.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine_no_index.tsx
index 648a9405606ef..9bddd9e6f0fe7 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine_no_index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine_no_index.tsx
@@ -32,7 +32,7 @@ const DetectionEngineNoIndexComponent: React.FC<{
       detections: {
         icon: 'documents',
         label: i18n.GO_TO_DOCUMENTATION,
-        url: `${docLinks.ELASTIC_WEBSITE_URL}guide/en/security/${docLinks.DOC_LINK_VERSION}/detection-engine-overview.html#detections-permissions`,
+        url: `${docLinks.ELASTIC_WEBSITE_URL}guide/en/security/${docLinks.DOC_LINK_VERSION}/detections-permissions-section.html`,
         target: '_blank',
       },
     }),
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine_user_unauthenticated.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine_user_unauthenticated.tsx
index 355898cff0120..37abd1f9adc11 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine_user_unauthenticated.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine_user_unauthenticated.tsx
@@ -17,7 +17,7 @@ export const DetectionEngineUserUnauthenticated = React.memo(() => {
       detectionUnauthenticated: {
         icon: 'documents',
         label: i18n.GO_TO_DOCUMENTATION,
-        url: `${docLinks.ELASTIC_WEBSITE_URL}guide/en/security/${docLinks.DOC_LINK_VERSION}/detection-engine-overview.html#detections-permissions`,
+        url: `${docLinks.ELASTIC_WEBSITE_URL}guide/en/security/${docLinks.DOC_LINK_VERSION}/detections-permissions-section.html`,
         target: '_blank',
       },
     }),

From 2c865f5649117330591795375cf5b3d3e586dece Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad.muhammad@elastic.co>
Date: Wed, 19 Aug 2020 19:05:53 +0200
Subject: [PATCH 33/85] [RUM Dashboard] Create new path for client side
 monitoring (#74740)

---
 .../plugins/apm/public/application/csmApp.tsx | 130 ++++++++++++++++++
 .../plugins/apm/public/application/index.tsx  |  20 ++-
 .../app/Main/route_config/index.tsx           |  14 +-
 .../app/Main/route_config/route_names.tsx     |   2 +-
 .../components/app/RumDashboard/RumHome.tsx   |   7 +-
 x-pack/plugins/apm/public/plugin.ts           |  71 ++++++----
 .../services/rest/apm_overview_fetchers.ts    |   2 +
 x-pack/plugins/apm/server/feature.ts          |   6 +-
 .../translations/translations/ja-JP.json      |   1 -
 .../translations/translations/zh-CN.json      |   1 -
 .../apps/apm/feature_controls/apm_security.ts |   9 +-
 11 files changed, 215 insertions(+), 48 deletions(-)
 create mode 100644 x-pack/plugins/apm/public/application/csmApp.tsx

diff --git a/x-pack/plugins/apm/public/application/csmApp.tsx b/x-pack/plugins/apm/public/application/csmApp.tsx
new file mode 100644
index 0000000000000..cf3fe2decfa44
--- /dev/null
+++ b/x-pack/plugins/apm/public/application/csmApp.tsx
@@ -0,0 +1,130 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { Route, Router } from 'react-router-dom';
+import styled, { ThemeProvider, DefaultTheme } from 'styled-components';
+import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
+import euiLightVars from '@elastic/eui/dist/eui_theme_light.json';
+import { CoreStart, AppMountParameters } from 'kibana/public';
+import { ApmPluginSetupDeps } from '../plugin';
+
+import {
+  KibanaContextProvider,
+  useUiSetting$,
+} from '../../../../../src/plugins/kibana_react/public';
+import { px, units } from '../style/variables';
+import { UpdateBreadcrumbs } from '../components/app/Main/UpdateBreadcrumbs';
+import { ScrollToTopOnPathChange } from '../components/app/Main/ScrollToTopOnPathChange';
+import { history, resetHistory } from '../utils/history';
+import 'react-vis/dist/style.css';
+import { RumHome } from '../components/app/RumDashboard/RumHome';
+import { ConfigSchema } from '../index';
+import { BreadcrumbRoute } from '../components/app/Main/ProvideBreadcrumbs';
+import { RouteName } from '../components/app/Main/route_config/route_names';
+import { renderAsRedirectTo } from '../components/app/Main/route_config';
+import { ApmPluginContext } from '../context/ApmPluginContext';
+import { UrlParamsProvider } from '../context/UrlParamsContext';
+import { LoadingIndicatorProvider } from '../context/LoadingIndicatorContext';
+import { createCallApmApi } from '../services/rest/createCallApmApi';
+
+const CsmMainContainer = styled.div`
+  padding: ${px(units.plus)};
+  height: 100%;
+`;
+
+export const rumRoutes: BreadcrumbRoute[] = [
+  {
+    exact: true,
+    path: '/',
+    render: renderAsRedirectTo('/csm'),
+    breadcrumb: 'Client Side Monitoring',
+    name: RouteName.CSM,
+  },
+];
+
+function CsmApp() {
+  const [darkMode] = useUiSetting$<boolean>('theme:darkMode');
+
+  return (
+    <ThemeProvider
+      theme={(outerTheme?: DefaultTheme) => ({
+        ...outerTheme,
+        eui: darkMode ? euiDarkVars : euiLightVars,
+        darkMode,
+      })}
+    >
+      <CsmMainContainer data-test-subj="csmMainContainer" role="main">
+        <UpdateBreadcrumbs routes={rumRoutes} />
+        <Route component={ScrollToTopOnPathChange} />
+        <RumHome />
+      </CsmMainContainer>
+    </ThemeProvider>
+  );
+}
+
+export function CsmAppRoot({
+  core,
+  deps,
+  routerHistory,
+  config,
+}: {
+  core: CoreStart;
+  deps: ApmPluginSetupDeps;
+  routerHistory: typeof history;
+  config: ConfigSchema;
+}) {
+  const i18nCore = core.i18n;
+  const plugins = deps;
+  const apmPluginContextValue = {
+    config,
+    core,
+    plugins,
+  };
+  return (
+    <ApmPluginContext.Provider value={apmPluginContextValue}>
+      <KibanaContextProvider services={{ ...core, ...plugins }}>
+        <i18nCore.Context>
+          <Router history={routerHistory}>
+            <UrlParamsProvider>
+              <LoadingIndicatorProvider>
+                <CsmApp />
+              </LoadingIndicatorProvider>
+            </UrlParamsProvider>
+          </Router>
+        </i18nCore.Context>
+      </KibanaContextProvider>
+    </ApmPluginContext.Provider>
+  );
+}
+
+/**
+ * This module is rendered asynchronously in the Kibana platform.
+ */
+
+export const renderApp = (
+  core: CoreStart,
+  deps: ApmPluginSetupDeps,
+  { element }: AppMountParameters,
+  config: ConfigSchema
+) => {
+  createCallApmApi(core.http);
+
+  resetHistory();
+  ReactDOM.render(
+    <CsmAppRoot
+      core={core}
+      deps={deps}
+      routerHistory={history}
+      config={config}
+    />,
+    element
+  );
+  return () => {
+    ReactDOM.unmountComponentAtNode(element);
+  };
+};
diff --git a/x-pack/plugins/apm/public/application/index.tsx b/x-pack/plugins/apm/public/application/index.tsx
index 0c9c6eb86225b..5e502f58e5f56 100644
--- a/x-pack/plugins/apm/public/application/index.tsx
+++ b/x-pack/plugins/apm/public/application/index.tsx
@@ -20,6 +20,7 @@ import { LocationProvider } from '../context/LocationContext';
 import { MatchedRouteProvider } from '../context/MatchedRouteContext';
 import { UrlParamsProvider } from '../context/UrlParamsContext';
 import { AlertsContextProvider } from '../../../triggers_actions_ui/public';
+import { createStaticIndexPattern } from '../services/rest/index_pattern';
 import {
   KibanaContextProvider,
   useUiSetting$,
@@ -29,6 +30,9 @@ import { UpdateBreadcrumbs } from '../components/app/Main/UpdateBreadcrumbs';
 import { ScrollToTopOnPathChange } from '../components/app/Main/ScrollToTopOnPathChange';
 import { routes } from '../components/app/Main/route_config';
 import { history, resetHistory } from '../utils/history';
+import { setHelpExtension } from '../setHelpExtension';
+import { setReadonlyBadge } from '../updateBadge';
+import { createCallApmApi } from '../services/rest/createCallApmApi';
 import { ConfigSchema } from '..';
 import 'react-vis/dist/style.css';
 
@@ -61,7 +65,7 @@ function App() {
   );
 }
 
-function ApmAppRoot({
+export function ApmAppRoot({
   core,
   deps,
   routerHistory,
@@ -116,13 +120,27 @@ function ApmAppRoot({
 /**
  * This module is rendered asynchronously in the Kibana platform.
  */
+
 export const renderApp = (
   core: CoreStart,
   deps: ApmPluginSetupDeps,
   { element }: AppMountParameters,
   config: ConfigSchema
 ) => {
+  // render APM feedback link in global help menu
+  setHelpExtension(core);
+  setReadonlyBadge(core);
+
+  createCallApmApi(core.http);
+
   resetHistory();
+
+  // Automatically creates static index pattern and stores as saved object
+  createStaticIndexPattern().catch((e) => {
+    // eslint-disable-next-line no-console
+    console.log('Error creating static index pattern', e);
+  });
+
   ReactDOM.render(
     <ApmAppRoot
       core={core}
diff --git a/x-pack/plugins/apm/public/components/app/Main/route_config/index.tsx b/x-pack/plugins/apm/public/components/app/Main/route_config/index.tsx
index 057971b1ca3a4..8caddc94b6907 100644
--- a/x-pack/plugins/apm/public/components/app/Main/route_config/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/Main/route_config/index.tsx
@@ -25,10 +25,9 @@ import { TraceLink } from '../../TraceLink';
 import { CustomizeUI } from '../../Settings/CustomizeUI';
 import { AnomalyDetection } from '../../Settings/anomaly_detection';
 import {
-  EditAgentConfigurationRouteHandler,
   CreateAgentConfigurationRouteHandler,
+  EditAgentConfigurationRouteHandler,
 } from './route_handlers/agent_configuration';
-import { RumHome } from '../../RumDashboard/RumHome';
 
 const metricsBreadcrumb = i18n.translate('xpack.apm.breadcrumb.metricsTitle', {
   defaultMessage: 'Metrics',
@@ -38,7 +37,7 @@ interface RouteParams {
   serviceName: string;
 }
 
-const renderAsRedirectTo = (to: string) => {
+export const renderAsRedirectTo = (to: string) => {
   return ({ location }: RouteComponentProps<RouteParams>) => (
     <Redirect
       to={{
@@ -252,15 +251,6 @@ export const routes: BreadcrumbRoute[] = [
     }),
     name: RouteName.CUSTOMIZE_UI,
   },
-  {
-    exact: true,
-    path: '/rum-preview',
-    component: () => <RumHome />,
-    breadcrumb: i18n.translate('xpack.apm.home.rumOverview.title', {
-      defaultMessage: 'Real User Monitoring',
-    }),
-    name: RouteName.RUM_OVERVIEW,
-  },
   {
     exact: true,
     path: '/settings/anomaly-detection',
diff --git a/x-pack/plugins/apm/public/components/app/Main/route_config/route_names.tsx b/x-pack/plugins/apm/public/components/app/Main/route_config/route_names.tsx
index 37d96e74d8ee6..1bf798e3b26d7 100644
--- a/x-pack/plugins/apm/public/components/app/Main/route_config/route_names.tsx
+++ b/x-pack/plugins/apm/public/components/app/Main/route_config/route_names.tsx
@@ -26,6 +26,6 @@ export enum RouteName {
   SERVICE_NODES = 'nodes',
   LINK_TO_TRACE = 'link_to_trace',
   CUSTOMIZE_UI = 'customize_ui',
-  RUM_OVERVIEW = 'rum_overview',
   ANOMALY_DETECTION = 'anomaly_detection',
+  CSM = 'csm',
 }
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/RumHome.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/RumHome.tsx
index a1b07640b5c17..24da5e9ef3897 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/RumHome.tsx
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/RumHome.tsx
@@ -6,6 +6,7 @@
 
 import { EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui';
 import React from 'react';
+import { i18n } from '@kbn/i18n';
 import { RumOverview } from '../RumDashboard';
 import { RumHeader } from './RumHeader';
 
@@ -16,7 +17,11 @@ export function RumHome() {
         <EuiFlexGroup alignItems="center">
           <EuiFlexItem grow={false}>
             <EuiTitle size="l">
-              <h1>End User Experience</h1>
+              <h1>
+                {i18n.translate('xpack.apm.csm.title', {
+                  defaultMessage: 'Client Side Monitoring',
+                })}
+              </h1>
             </EuiTitle>
           </EuiFlexItem>
         </EuiFlexGroup>
diff --git a/x-pack/plugins/apm/public/plugin.ts b/x-pack/plugins/apm/public/plugin.ts
index f264ae6cd9852..cf729fe0ff301 100644
--- a/x-pack/plugins/apm/public/plugin.ts
+++ b/x-pack/plugins/apm/public/plugin.ts
@@ -7,7 +7,10 @@
 import { i18n } from '@kbn/i18n';
 import { lazy } from 'react';
 import { ConfigSchema } from '.';
-import { ObservabilityPluginSetup } from '../../observability/public';
+import {
+  FetchDataParams,
+  ObservabilityPluginSetup,
+} from '../../observability/public';
 import {
   AppMountParameters,
   CoreSetup,
@@ -33,15 +36,7 @@ import {
 } from '../../triggers_actions_ui/public';
 import { AlertType } from '../common/alert_types';
 import { featureCatalogueEntry } from './featureCatalogueEntry';
-import { createCallApmApi } from './services/rest/createCallApmApi';
-import { setHelpExtension } from './setHelpExtension';
 import { toggleAppLinkInNav } from './toggleAppLinkInNav';
-import { setReadonlyBadge } from './updateBadge';
-import { createStaticIndexPattern } from './services/rest/index_pattern';
-import {
-  fetchOverviewPageData,
-  hasData,
-} from './services/rest/apm_overview_fetchers';
 
 export type ApmPluginSetup = void;
 export type ApmPluginStart = void;
@@ -71,7 +66,6 @@ export class ApmPlugin implements Plugin<ApmPluginSetup, ApmPluginStart> {
     this.initializerContext = initializerContext;
   }
   public setup(core: CoreSetup, plugins: ApmPluginSetupDeps) {
-    createCallApmApi(core.http);
     const config = this.initializerContext.config.get();
     const pluginSetupDeps = plugins;
 
@@ -79,10 +73,27 @@ export class ApmPlugin implements Plugin<ApmPluginSetup, ApmPluginStart> {
     pluginSetupDeps.home.featureCatalogue.register(featureCatalogueEntry);
 
     if (plugins.observability) {
+      const getApmDataHelper = async () => {
+        const {
+          fetchOverviewPageData,
+          hasData,
+          createCallApmApi,
+        } = await import('./services/rest/apm_overview_fetchers');
+        // have to do this here as well in case app isn't mounted yet
+        createCallApmApi(core.http);
+
+        return { fetchOverviewPageData, hasData };
+      };
       plugins.observability.dashboard.register({
         appName: 'apm',
-        fetchData: fetchOverviewPageData,
-        hasData,
+        hasData: async () => {
+          const dataHelper = await getApmDataHelper();
+          return await dataHelper.hasData();
+        },
+        fetchData: async (params: FetchDataParams) => {
+          const dataHelper = await getApmDataHelper();
+          return await dataHelper.fetchOverviewPageData(params);
+        },
       });
     }
 
@@ -96,20 +107,28 @@ export class ApmPlugin implements Plugin<ApmPluginSetup, ApmPluginStart> {
       category: DEFAULT_APP_CATEGORIES.observability,
 
       async mount(params: AppMountParameters<unknown>) {
-        // Load application bundle
-        const { renderApp } = await import('./application');
-        // Get start services
-        const [coreStart] = await core.getStartServices();
-
-        // render APM feedback link in global help menu
-        setHelpExtension(coreStart);
-        setReadonlyBadge(coreStart);
-
-        // Automatically creates static index pattern and stores as saved object
-        createStaticIndexPattern().catch((e) => {
-          // eslint-disable-next-line no-console
-          console.log('Error creating static index pattern', e);
-        });
+        // Load application bundle and Get start services
+        const [{ renderApp }, [coreStart]] = await Promise.all([
+          import('./application'),
+          core.getStartServices(),
+        ]);
+
+        return renderApp(coreStart, pluginSetupDeps, params, config);
+      },
+    });
+
+    core.application.register({
+      id: 'csm',
+      title: 'Client Side Monitoring',
+      order: 8500,
+      category: DEFAULT_APP_CATEGORIES.observability,
+
+      async mount(params: AppMountParameters<unknown>) {
+        // Load application bundle and Get start service
+        const [{ renderApp }, [coreStart]] = await Promise.all([
+          import('./application/csmApp'),
+          core.getStartServices(),
+        ]);
 
         return renderApp(coreStart, pluginSetupDeps, params, config);
       },
diff --git a/x-pack/plugins/apm/public/services/rest/apm_overview_fetchers.ts b/x-pack/plugins/apm/public/services/rest/apm_overview_fetchers.ts
index 78f3a0a0aaa80..a20f89fac2d60 100644
--- a/x-pack/plugins/apm/public/services/rest/apm_overview_fetchers.ts
+++ b/x-pack/plugins/apm/public/services/rest/apm_overview_fetchers.ts
@@ -11,6 +11,8 @@ import {
 } from '../../../../observability/public';
 import { callApmApi } from './createCallApmApi';
 
+export { createCallApmApi } from './createCallApmApi';
+
 export const fetchOverviewPageData = async ({
   absoluteTime,
   relativeTime,
diff --git a/x-pack/plugins/apm/server/feature.ts b/x-pack/plugins/apm/server/feature.ts
index 971bc96234376..0f6061653f352 100644
--- a/x-pack/plugins/apm/server/feature.ts
+++ b/x-pack/plugins/apm/server/feature.ts
@@ -15,7 +15,7 @@ export const APM_FEATURE = {
   order: 900,
   icon: 'apmApp',
   navLinkId: 'apm',
-  app: ['apm', 'kibana'],
+  app: ['apm', 'csm', 'kibana'],
   catalogue: ['apm'],
   management: {
     insightsAndAlerting: ['triggersActions'],
@@ -24,7 +24,7 @@ export const APM_FEATURE = {
   // see x-pack/plugins/features/common/feature_kibana_privileges.ts
   privileges: {
     all: {
-      app: ['apm', 'kibana'],
+      app: ['apm', 'csm', 'kibana'],
       api: ['apm', 'apm_write'],
       catalogue: ['apm'],
       savedObject: {
@@ -40,7 +40,7 @@ export const APM_FEATURE = {
       ui: ['show', 'save', 'alerting:show', 'alerting:save'],
     },
     read: {
-      app: ['apm', 'kibana'],
+      app: ['apm', 'csm', 'kibana'],
       api: ['apm'],
       catalogue: ['apm'],
       savedObject: {
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 6a9909c4291ff..e8fe926ab2a0a 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -4833,7 +4833,6 @@
     "xpack.apm.header.badge.readOnly.tooltip": "を保存できませんでした",
     "xpack.apm.helpMenu.upgradeAssistantLink": "アップグレードアシスタント",
     "xpack.apm.histogram.plot.noDataLabel": "この時間範囲のデータがありません。",
-    "xpack.apm.home.rumOverview.title": "リアルユーザー監視",
     "xpack.apm.home.serviceMapTabLabel": "サービスマップ",
     "xpack.apm.home.servicesTabLabel": "サービス",
     "xpack.apm.home.tracesTabLabel": "トレース",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index a2565d8af3ec9..d11ffde56f37f 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -4834,7 +4834,6 @@
     "xpack.apm.header.badge.readOnly.tooltip": "无法保存",
     "xpack.apm.helpMenu.upgradeAssistantLink": "升级助手",
     "xpack.apm.histogram.plot.noDataLabel": "此时间范围内没有数据。",
-    "xpack.apm.home.rumOverview.title": "真实用户监测",
     "xpack.apm.home.serviceMapTabLabel": "服务地图",
     "xpack.apm.home.servicesTabLabel": "服务",
     "xpack.apm.home.tracesTabLabel": "追溯",
diff --git a/x-pack/test/functional/apps/apm/feature_controls/apm_security.ts b/x-pack/test/functional/apps/apm/feature_controls/apm_security.ts
index 98083f947c9ef..b93039c8fb0e4 100644
--- a/x-pack/test/functional/apps/apm/feature_controls/apm_security.ts
+++ b/x-pack/test/functional/apps/apm/feature_controls/apm_security.ts
@@ -60,7 +60,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       it('shows apm navlink', async () => {
         const navLinks = await appsMenu.readLinks();
-        expect(navLinks.map((link) => link.text)).to.eql(['Overview', 'APM', 'Stack Management']);
+        expect(navLinks.map((link) => link.text)).to.eql([
+          'Overview',
+          'APM',
+          'Client Side Monitoring',
+          'Stack Management',
+        ]);
       });
 
       it('can navigate to APM app', async () => {
@@ -109,7 +114,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       it('shows apm navlink', async () => {
         const navLinks = (await appsMenu.readLinks()).map((link) => link.text);
-        expect(navLinks).to.eql(['Overview', 'APM', 'Stack Management']);
+        expect(navLinks).to.eql(['Overview', 'APM', 'Client Side Monitoring', 'Stack Management']);
       });
 
       it('can navigate to APM app', async () => {

From b944dd3c96213958f41bea66181ac1b06f80a604 Mon Sep 17 00:00:00 2001
From: Liza Katz <lizka.k@gmail.com>
Date: Wed, 19 Aug 2020 20:29:35 +0300
Subject: [PATCH 34/85] [Search] Use new es client (#74529)

* improve test stability

* Use new client

* docs

* Use asyncSearch endpoints

* Clean up types

* Use transport request for now

* fixes

* Fix functional test

* encode

* remove eslint

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../search_examples/public/components/app.tsx |  8 +-
 .../data/common/search/es_search/types.ts     |  5 +-
 src/plugins/data/public/public.api.md         |  2 +-
 .../es_search/es_search_strategy.test.ts      | 20 ++--
 .../search/es_search/es_search_strategy.ts    | 10 +-
 src/plugins/data/server/server.api.md         |  1 +
 .../server/search/es_search_strategy.test.ts  | 49 ++++-----
 .../server/search/es_search_strategy.ts       | 99 +++++++++----------
 8 files changed, 96 insertions(+), 98 deletions(-)

diff --git a/examples/search_examples/public/components/app.tsx b/examples/search_examples/public/components/app.tsx
index 31cc5e420da11..704d31d42e640 100644
--- a/examples/search_examples/public/components/app.tsx
+++ b/examples/search_examples/public/components/app.tsx
@@ -47,7 +47,6 @@ import { NavigationPublicPluginStart } from '../../../../src/plugins/navigation/
 import {
   PLUGIN_ID,
   PLUGIN_NAME,
-  IMyStrategyRequest,
   IMyStrategyResponse,
   SERVER_SEARCH_ROUTE_PATH,
 } from '../../common';
@@ -134,12 +133,9 @@ export const SearchExamplesApp = ({
           query,
         },
       },
-    };
-
-    if (strategy) {
       // Add a custom request parameter to be consumed by `MyStrategy`.
-      (request as IMyStrategyRequest).get_cool = getCool;
-    }
+      ...(strategy ? { get_cool: getCool } : {}),
+    };
 
     // Submit the search request using the `data.search` service.
     const searchSubscription$ = data.search
diff --git a/src/plugins/data/common/search/es_search/types.ts b/src/plugins/data/common/search/es_search/types.ts
index 6fc0923768703..8853e40dd0ad2 100644
--- a/src/plugins/data/common/search/es_search/types.ts
+++ b/src/plugins/data/common/search/es_search/types.ts
@@ -16,14 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { SearchParams, SearchResponse } from 'elasticsearch';
+import { SearchResponse } from 'elasticsearch';
+import { Search } from '@elastic/elasticsearch/api/requestParams';
 import { IKibanaSearchRequest, IKibanaSearchResponse } from '../types';
 
 export const ES_SEARCH_STRATEGY = 'es';
 
 export type ISearchRequestParams = {
   trackTotalHits?: boolean;
-} & SearchParams;
+} & Search;
 
 export interface IEsSearchRequest extends IKibanaSearchRequest {
   params?: ISearchRequestParams;
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index 58c2bd9957ab8..7041bcdfa4221 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -61,7 +61,7 @@ import * as Rx from 'rxjs';
 import { SavedObject } from 'src/core/server';
 import { SavedObject as SavedObject_3 } from 'src/core/public';
 import { SavedObjectsClientContract } from 'src/core/public';
-import { SearchParams } from 'elasticsearch';
+import { Search } from '@elastic/elasticsearch/api/requestParams';
 import { SearchResponse as SearchResponse_2 } from 'elasticsearch';
 import { SerializedFieldFormat as SerializedFieldFormat_2 } from 'src/plugins/expressions/common';
 import { Subscription } from 'rxjs';
diff --git a/src/plugins/data/server/search/es_search/es_search_strategy.test.ts b/src/plugins/data/server/search/es_search/es_search_strategy.test.ts
index 2888f9d9d20b5..11564bb336b08 100644
--- a/src/plugins/data/server/search/es_search/es_search_strategy.test.ts
+++ b/src/plugins/data/server/search/es_search/es_search_strategy.test.ts
@@ -26,15 +26,17 @@ describe('ES search strategy', () => {
     info: () => {},
   };
   const mockApiCaller = jest.fn().mockResolvedValue({
-    _shards: {
-      total: 10,
-      failed: 1,
-      skipped: 2,
-      successful: 7,
+    body: {
+      _shards: {
+        total: 10,
+        failed: 1,
+        skipped: 2,
+        successful: 7,
+      },
     },
   });
   const mockContext = {
-    core: { elasticsearch: { legacy: { client: { callAsCurrentUser: mockApiCaller } } } },
+    core: { elasticsearch: { client: { asCurrentUser: { search: mockApiCaller } } } },
   };
   const mockConfig$ = pluginInitializerContextConfigMock<any>({}).legacy.globalConfig$;
 
@@ -55,8 +57,7 @@ describe('ES search strategy', () => {
     await esSearch.search((mockContext as unknown) as RequestHandlerContext, { params });
 
     expect(mockApiCaller).toBeCalled();
-    expect(mockApiCaller.mock.calls[0][0]).toBe('search');
-    expect(mockApiCaller.mock.calls[0][1]).toEqual({
+    expect(mockApiCaller.mock.calls[0][0]).toEqual({
       ...params,
       timeout: '0ms',
       ignoreUnavailable: true,
@@ -71,8 +72,7 @@ describe('ES search strategy', () => {
     await esSearch.search((mockContext as unknown) as RequestHandlerContext, { params });
 
     expect(mockApiCaller).toBeCalled();
-    expect(mockApiCaller.mock.calls[0][0]).toBe('search');
-    expect(mockApiCaller.mock.calls[0][1]).toEqual({
+    expect(mockApiCaller.mock.calls[0][0]).toEqual({
       ...params,
       restTotalHitsAsInt: true,
     });
diff --git a/src/plugins/data/server/search/es_search/es_search_strategy.ts b/src/plugins/data/server/search/es_search/es_search_strategy.ts
index 234c30376d6db..7f9cb665b96b5 100644
--- a/src/plugins/data/server/search/es_search/es_search_strategy.ts
+++ b/src/plugins/data/server/search/es_search/es_search_strategy.ts
@@ -20,6 +20,7 @@ import { first } from 'rxjs/operators';
 import { SharedGlobalConfig, Logger } from 'kibana/server';
 import { SearchResponse } from 'elasticsearch';
 import { Observable } from 'rxjs';
+import { ApiResponse } from '@elastic/elasticsearch';
 import { SearchUsage } from '../collectors/usage';
 import { ISearchStrategy, getDefaultSearchParams, getTotalLoaded } from '..';
 
@@ -46,11 +47,10 @@ export const esSearchStrategyProvider = (
       };
 
       try {
-        const rawResponse = (await context.core.elasticsearch.legacy.client.callAsCurrentUser(
-          'search',
-          params,
-          options
-        )) as SearchResponse<any>;
+        const esResponse = (await context.core.elasticsearch.client.asCurrentUser.search(
+          params
+        )) as ApiResponse<SearchResponse<any>>;
+        const rawResponse = esResponse.body;
 
         if (usage) usage.trackSuccess(rawResponse.took);
 
diff --git a/src/plugins/data/server/server.api.md b/src/plugins/data/server/server.api.md
index 9c8a79f27a9db..e259a7878398d 100644
--- a/src/plugins/data/server/server.api.md
+++ b/src/plugins/data/server/server.api.md
@@ -131,6 +131,7 @@ import { RequestStatistics } from 'src/plugins/inspector/common';
 import { SavedObject } from 'src/core/server';
 import { SavedObjectsClientContract as SavedObjectsClientContract_2 } from 'src/core/server';
 import { ScrollParams } from 'elasticsearch';
+import { Search } from '@elastic/elasticsearch/api/requestParams';
 import { SearchParams } from 'elasticsearch';
 import { SearchResponse } from 'elasticsearch';
 import { SearchShardsParams } from 'elasticsearch';
diff --git a/x-pack/plugins/data_enhanced/server/search/es_search_strategy.test.ts b/x-pack/plugins/data_enhanced/server/search/es_search_strategy.test.ts
index 4fd1e889ba1a5..5cff7fea601d3 100644
--- a/x-pack/plugins/data_enhanced/server/search/es_search_strategy.test.ts
+++ b/x-pack/plugins/data_enhanced/server/search/es_search_strategy.test.ts
@@ -9,8 +9,21 @@ import { pluginInitializerContextConfigMock } from '../../../../../src/core/serv
 import { enhancedEsSearchStrategyProvider } from './es_search_strategy';
 
 const mockAsyncResponse = {
-  id: 'foo',
-  response: {
+  body: {
+    id: 'foo',
+    response: {
+      _shards: {
+        total: 10,
+        failed: 1,
+        skipped: 2,
+        successful: 7,
+      },
+    },
+  },
+};
+
+const mockRollupResponse = {
+  body: {
     _shards: {
       total: 10,
       failed: 1,
@@ -20,22 +33,15 @@ const mockAsyncResponse = {
   },
 };
 
-const mockRollupResponse = {
-  _shards: {
-    total: 10,
-    failed: 1,
-    skipped: 2,
-    successful: 7,
-  },
-};
-
 describe('ES search strategy', () => {
   const mockApiCaller = jest.fn();
   const mockLogger: any = {
     info: () => {},
   };
   const mockContext = {
-    core: { elasticsearch: { legacy: { client: { callAsCurrentUser: mockApiCaller } } } },
+    core: {
+      elasticsearch: { client: { asCurrentUser: { transport: { request: mockApiCaller } } } },
+    },
   };
   const mockConfig$ = pluginInitializerContextConfigMock<any>({}).legacy.globalConfig$;
 
@@ -58,8 +64,7 @@ describe('ES search strategy', () => {
     await esSearch.search((mockContext as unknown) as RequestHandlerContext, { params });
 
     expect(mockApiCaller).toBeCalled();
-    expect(mockApiCaller.mock.calls[0][0]).toBe('transport.request');
-    const { method, path, body } = mockApiCaller.mock.calls[0][1];
+    const { method, path, body } = mockApiCaller.mock.calls[0][0];
     expect(method).toBe('POST');
     expect(path).toBe('/logstash-*/_async_search');
     expect(body).toEqual({ query: {} });
@@ -74,8 +79,7 @@ describe('ES search strategy', () => {
     await esSearch.search((mockContext as unknown) as RequestHandlerContext, { id: 'foo', params });
 
     expect(mockApiCaller).toBeCalled();
-    expect(mockApiCaller.mock.calls[0][0]).toBe('transport.request');
-    const { method, path, body } = mockApiCaller.mock.calls[0][1];
+    const { method, path, body } = mockApiCaller.mock.calls[0][0];
     expect(method).toBe('GET');
     expect(path).toBe('/_async_search/foo');
     expect(body).toEqual(undefined);
@@ -90,8 +94,7 @@ describe('ES search strategy', () => {
     await esSearch.search((mockContext as unknown) as RequestHandlerContext, { params });
 
     expect(mockApiCaller).toBeCalled();
-    expect(mockApiCaller.mock.calls[0][0]).toBe('transport.request');
-    const { method, path } = mockApiCaller.mock.calls[0][1];
+    const { method, path } = mockApiCaller.mock.calls[0][0];
     expect(method).toBe('POST');
     expect(path).toBe('/foo-%E7%A8%8B/_async_search');
   });
@@ -108,8 +111,7 @@ describe('ES search strategy', () => {
     });
 
     expect(mockApiCaller).toBeCalled();
-    expect(mockApiCaller.mock.calls[0][0]).toBe('transport.request');
-    const { method, path } = mockApiCaller.mock.calls[0][1];
+    const { method, path } = mockApiCaller.mock.calls[0][0];
     expect(method).toBe('POST');
     expect(path).toBe('/foo-%E7%A8%8B/_rollup_search');
   });
@@ -123,9 +125,8 @@ describe('ES search strategy', () => {
     await esSearch.search((mockContext as unknown) as RequestHandlerContext, { params });
 
     expect(mockApiCaller).toBeCalled();
-    expect(mockApiCaller.mock.calls[0][0]).toBe('transport.request');
-    const { query } = mockApiCaller.mock.calls[0][1];
-    expect(query).toHaveProperty('wait_for_completion_timeout');
-    expect(query).toHaveProperty('keep_alive');
+    const { querystring } = mockApiCaller.mock.calls[0][0];
+    expect(querystring).toHaveProperty('wait_for_completion_timeout');
+    expect(querystring).toHaveProperty('keep_alive');
   });
 });
diff --git a/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts b/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts
index 95f1285363f49..f6425a63cef67 100644
--- a/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts
+++ b/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts
@@ -6,41 +6,27 @@
 
 import { first } from 'rxjs/operators';
 import { mapKeys, snakeCase } from 'lodash';
-import { SearchResponse } from 'elasticsearch';
 import { Observable } from 'rxjs';
+import { SearchResponse } from 'elasticsearch';
 import {
-  LegacyAPICaller,
   SharedGlobalConfig,
   RequestHandlerContext,
+  ElasticsearchClient,
   Logger,
 } from '../../../../../src/core/server';
 import {
-  ISearchOptions,
   getDefaultSearchParams,
   getTotalLoaded,
   ISearchStrategy,
   SearchUsage,
+  ISearchOptions,
 } from '../../../../../src/plugins/data/server';
 import { IEnhancedEsSearchRequest } from '../../common';
 import { shimHitsTotal } from './shim_hits_total';
 import { IEsSearchResponse } from '../../../../../src/plugins/data/common/search/es_search';
 
-interface AsyncSearchResponse<T> {
-  id: string;
-  is_partial: boolean;
-  is_running: boolean;
-  response: SearchResponse<T>;
-}
-
-interface EnhancedEsSearchResponse extends IEsSearchResponse {
-  is_partial: boolean;
-  is_running: boolean;
-}
-
-function isEnhancedEsSearchResponse(
-  response: IEsSearchResponse
-): response is EnhancedEsSearchResponse {
-  return response.hasOwnProperty('is_partial') && response.hasOwnProperty('is_running');
+function isEnhancedEsSearchResponse(response: any): response is IEsSearchResponse {
+  return response.hasOwnProperty('isPartial') && response.hasOwnProperty('isRunning');
 }
 
 export const enhancedEsSearchStrategyProvider = (
@@ -55,19 +41,23 @@ export const enhancedEsSearchStrategyProvider = (
   ) => {
     logger.info(`search ${JSON.stringify(request.params) || request.id}`);
     const config = await config$.pipe(first()).toPromise();
-    const caller = context.core.elasticsearch.legacy.client.callAsCurrentUser;
+    const client = context.core.elasticsearch.client.asCurrentUser;
     const defaultParams = getDefaultSearchParams(config);
     const params = { ...defaultParams, ...request.params };
 
+    const isAsync = request.indexType !== 'rollup';
+
     try {
-      const response =
-        request.indexType === 'rollup'
-          ? await rollupSearch(caller, { ...request, params }, options)
-          : await asyncSearch(caller, { ...request, params }, options);
+      const response = isAsync
+        ? await asyncSearch(client, { ...request, params }, options)
+        : await rollupSearch(client, { ...request, params }, options);
 
       if (
         usage &&
-        (!isEnhancedEsSearchResponse(response) || (!response.is_partial && !response.is_running))
+        isAsync &&
+        isEnhancedEsSearchResponse(response) &&
+        !response.isRunning &&
+        !response.isPartial
       ) {
         usage.trackSuccess(response.rawResponse.took);
       }
@@ -81,11 +71,9 @@ export const enhancedEsSearchStrategyProvider = (
 
   const cancel = async (context: RequestHandlerContext, id: string) => {
     logger.info(`cancel ${id}`);
-    const method = 'DELETE';
-    const path = encodeURI(`/_async_search/${id}`);
-    await context.core.elasticsearch.legacy.client.callAsCurrentUser('transport.request', {
-      method,
-      path,
+    await context.core.elasticsearch.client.asCurrentUser.transport.request({
+      method: 'DELETE',
+      path: encodeURI(`/_async_search/${id}`),
     });
   };
 
@@ -93,10 +81,10 @@ export const enhancedEsSearchStrategyProvider = (
 };
 
 async function asyncSearch(
-  caller: LegacyAPICaller,
+  client: ElasticsearchClient,
   request: IEnhancedEsSearchRequest,
   options?: ISearchOptions
-) {
+): Promise<IEsSearchResponse> {
   const { timeout = undefined, restTotalHitsAsInt = undefined, ...params } = {
     ...request.params,
   };
@@ -112,46 +100,57 @@ async function asyncSearch(
   // Only report partial results every 64 shards; this should be reduced when we actually display partial results
   const batchedReduceSize = request.id ? undefined : 64;
 
-  const query = toSnakeCase({
+  const asyncOptions = {
     waitForCompletionTimeout: '100ms', // Wait up to 100ms for the response to return
     keepAlive: '1m', // Extend the TTL for this search request by one minute
+  };
+
+  const querystring = toSnakeCase({
+    ...asyncOptions,
     ...(batchedReduceSize && { batchedReduceSize }),
     ...queryParams,
   });
 
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  const { id, response, is_partial, is_running } = (await caller(
-    'transport.request',
-    { method, path, body, query },
-    options
-  )) as AsyncSearchResponse<any>;
+  // TODO: replace with async endpoints once https://github.com/elastic/elasticsearch-js/issues/1280 is resolved
+  const esResponse = await client.transport.request({
+    method,
+    path,
+    body,
+    querystring,
+  });
 
+  const { id, response, is_partial: isPartial, is_running: isRunning } = esResponse.body;
   return {
     id,
-    isPartial: is_partial,
-    isRunning: is_running,
+    isPartial,
+    isRunning,
     rawResponse: shimHitsTotal(response),
     ...getTotalLoaded(response._shards),
   };
 }
 
 async function rollupSearch(
-  caller: LegacyAPICaller,
+  client: ElasticsearchClient,
   request: IEnhancedEsSearchRequest,
   options?: ISearchOptions
-) {
+): Promise<IEsSearchResponse> {
   const { body, index, ...params } = request.params!;
   const method = 'POST';
   const path = encodeURI(`/${index}/_rollup_search`);
-  const query = toSnakeCase(params);
+  const querystring = toSnakeCase(params);
 
-  const rawResponse = await ((caller(
-    'transport.request',
-    { method, path, body, query },
-    options
-  ) as unknown) as SearchResponse<any>);
+  const esResponse = await client.transport.request({
+    method,
+    path,
+    body,
+    querystring,
+  });
 
-  return { rawResponse, ...getTotalLoaded(rawResponse._shards) };
+  const response = esResponse.body as SearchResponse<any>;
+  return {
+    rawResponse: shimHitsTotal(response),
+    ...getTotalLoaded(response._shards),
+  };
 }
 
 function toSnakeCase(obj: Record<string, any>) {

From 3469e164f4e259a97844700cd40b854eab89a25e Mon Sep 17 00:00:00 2001
From: Quynh Nguyen <43350163+qn895@users.noreply.github.com>
Date: Wed, 19 Aug 2020 13:03:00 -0500
Subject: [PATCH 35/85] [ML] Add option for per-partition categorization to
 categorization job wizard (#75061)

---
 .../plugins/ml/common/constants/anomalies.ts  |   2 +
 .../plugins/ml/common/constants/messages.ts   |  28 +++
 x-pack/plugins/ml/common/types/anomalies.ts   |  17 ++
 .../types/anomaly_detection_jobs/job.ts       |   2 +-
 x-pack/plugins/ml/common/types/results.ts     |   9 +
 x-pack/plugins/ml/common/util/job_utils.ts    |  56 +++++-
 .../public/application/explorer/explorer.js   |  19 +-
 .../job_creator/categorization_job_creator.ts |  31 +++
 .../new_job/common/job_creator/job_creator.ts |  30 +++
 .../common/job_validator/job_validator.ts     |  14 ++
 .../jobs/new_job/common/job_validator/util.ts |  23 +++
 .../advanced_view/detector_list.tsx           |  14 +-
 .../components/advanced_view/extra.tsx        |   9 +-
 .../categorization_field_select.tsx           |  35 ++--
 .../categorization_per_partition.tsx          |  65 +++++++
 .../categorization_per_partition_dropdown.tsx |  67 +++++++
 .../categorization_per_partition_input.tsx    |  55 ++++++
 .../categorization_per_partition_switch.tsx   |  54 +++++
 .../categorization_stop_on_warn_switch.tsx    |  44 +++++
 .../description.tsx                           |  32 +++
 .../categorization_partition_field/index.ts   |   6 +
 .../categorization_view/metric_selection.tsx  |   4 +
 .../application/routing/routes/explorer.tsx   |  28 ++-
 .../services/ml_api_service/results.ts        |  19 +-
 .../models/job_validation/job_validation.ts   |   1 -
 .../models/results_service/results_service.ts | 160 ++++++++++++++-
 .../ml/server/routes/anomaly_detectors.ts     |   1 -
 x-pack/plugins/ml/server/routes/apidoc.json   |   2 +
 .../ml/server/routes/results_service.ts       |  80 ++++++++
 .../routes/schemas/results_service_schema.ts  |  23 +++
 .../apis/ml/results/get_categorizer_stats.ts  | 148 ++++++++++++++
 .../apis/ml/results/get_stopped_partitions.ts | 184 ++++++++++++++++++
 .../api_integration/apis/ml/results/index.ts  |   2 +
 33 files changed, 1230 insertions(+), 34 deletions(-)
 create mode 100644 x-pack/plugins/ml/common/types/results.ts
 create mode 100644 x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_partition_field/categorization_per_partition.tsx
 create mode 100644 x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_partition_field/categorization_per_partition_dropdown.tsx
 create mode 100644 x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_partition_field/categorization_per_partition_input.tsx
 create mode 100644 x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_partition_field/categorization_per_partition_switch.tsx
 create mode 100644 x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_partition_field/categorization_stop_on_warn_switch.tsx
 create mode 100644 x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_partition_field/description.tsx
 create mode 100644 x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_partition_field/index.ts
 create mode 100644 x-pack/test/api_integration/apis/ml/results/get_categorizer_stats.ts
 create mode 100644 x-pack/test/api_integration/apis/ml/results/get_stopped_partitions.ts

diff --git a/x-pack/plugins/ml/common/constants/anomalies.ts b/x-pack/plugins/ml/common/constants/anomalies.ts
index d15033b738b0f..73a24bc11fe66 100644
--- a/x-pack/plugins/ml/common/constants/anomalies.ts
+++ b/x-pack/plugins/ml/common/constants/anomalies.ts
@@ -22,3 +22,5 @@ export enum ANOMALY_THRESHOLD {
 }
 
 export const PARTITION_FIELDS = ['partition_field', 'over_field', 'by_field'] as const;
+export const JOB_ID = 'job_id';
+export const PARTITION_FIELD_VALUE = 'partition_field_value';
diff --git a/x-pack/plugins/ml/common/constants/messages.ts b/x-pack/plugins/ml/common/constants/messages.ts
index b42eacbf7df5c..a9e4cdc4a0434 100644
--- a/x-pack/plugins/ml/common/constants/messages.ts
+++ b/x-pack/plugins/ml/common/constants/messages.ts
@@ -43,6 +43,34 @@ export const getMessages = once(() => {
   const createJobsDocsUrl = `https://www.elastic.co/guide/en/machine-learning/{{version}}/create-jobs.html`;
 
   return {
+    categorizer_detector_missing_per_partition_field: {
+      status: VALIDATION_STATUS.ERROR,
+      text: i18n.translate(
+        'xpack.ml.models.jobValidation.messages.categorizerMissingPerPartitionFieldMessage',
+        {
+          defaultMessage:
+            'Partition field must be set for detectors that reference "mlcategory" when per-partition categorization is enabled.',
+        }
+      ),
+      url:
+        'https://www.elastic.co/guide/en/machine-learning/{{version}}/ml-configuring-categories.html',
+    },
+    categorizer_varying_per_partition_fields: {
+      status: VALIDATION_STATUS.ERROR,
+      text: i18n.translate(
+        'xpack.ml.models.jobValidation.messages.categorizerVaryingPerPartitionFieldNamesMessage',
+        {
+          defaultMessage:
+            'Detectors with keyword "mlcategory" cannot have different partition_field_name when per-partition categorization is enabled. Found [{fields}].',
+
+          values: {
+            fields: '"{{fields}}"',
+          },
+        }
+      ),
+      url:
+        'https://www.elastic.co/guide/en/machine-learning/{{version}}/ml-configuring-categories.html',
+    },
     field_not_aggregatable: {
       status: VALIDATION_STATUS.ERROR,
       text: i18n.translate('xpack.ml.models.jobValidation.messages.fieldNotAggregatableMessage', {
diff --git a/x-pack/plugins/ml/common/types/anomalies.ts b/x-pack/plugins/ml/common/types/anomalies.ts
index a23886e8fcdc6..703d74d1bd5e5 100644
--- a/x-pack/plugins/ml/common/types/anomalies.ts
+++ b/x-pack/plugins/ml/common/types/anomalies.ts
@@ -57,3 +57,20 @@ export interface AnomaliesTableRecord {
 }
 
 export type PartitionFieldsType = typeof PARTITION_FIELDS[number];
+
+export interface AnomalyCategorizerStatsDoc {
+  [key: string]: any;
+  job_id: string;
+  result_type: 'categorizer_stats';
+  partition_field_name?: string;
+  partition_field_value?: string;
+  categorized_doc_count: number;
+  total_category_count: number;
+  frequent_category_count: number;
+  rare_category_count: number;
+  dead_category_count: number;
+  failed_category_count: number;
+  categorization_status: 'ok' | 'warn';
+  log_time: number;
+  timestamp: number;
+}
diff --git a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job.ts b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job.ts
index 744f9c4d759dd..48fd4ec914d07 100644
--- a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job.ts
+++ b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job.ts
@@ -93,6 +93,6 @@ export interface CustomRule {
 }
 
 export interface PerPartitionCategorization {
-  enabled: boolean;
+  enabled?: boolean;
   stop_on_warn?: boolean;
 }
diff --git a/x-pack/plugins/ml/common/types/results.ts b/x-pack/plugins/ml/common/types/results.ts
new file mode 100644
index 0000000000000..c761620589080
--- /dev/null
+++ b/x-pack/plugins/ml/common/types/results.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;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export interface GetStoppedPartitionResult {
+  jobs: string[] | Record<string, string[]>;
+}
diff --git a/x-pack/plugins/ml/common/util/job_utils.ts b/x-pack/plugins/ml/common/util/job_utils.ts
index 8e6933ed5924f..9729240567c24 100644
--- a/x-pack/plugins/ml/common/util/job_utils.ts
+++ b/x-pack/plugins/ml/common/util/job_utils.ts
@@ -23,6 +23,7 @@ import { EntityField } from './anomaly_utils';
 import { MlServerLimits } from '../types/ml_server_info';
 import { JobValidationMessage, JobValidationMessageId } from '../constants/messages';
 import { ES_AGGREGATION, ML_JOB_AGGREGATION } from '../constants/aggregation_types';
+import { MLCATEGORY } from '../constants/field_types';
 
 export interface ValidationResults {
   valid: boolean;
@@ -86,9 +87,9 @@ export function isSourceDataChartableForDetector(job: CombinedJob, detectorIndex
     // whereas the 'function_description' field holds an ML-built display hint for function e.g. 'count'.
     isSourceDataChartable =
       mlFunctionToESAggregation(functionName) !== null &&
-      dtr.by_field_name !== 'mlcategory' &&
-      dtr.partition_field_name !== 'mlcategory' &&
-      dtr.over_field_name !== 'mlcategory';
+      dtr.by_field_name !== MLCATEGORY &&
+      dtr.partition_field_name !== MLCATEGORY &&
+      dtr.over_field_name !== MLCATEGORY;
 
     // If the datafeed uses script fields, we can only plot the time series if
     // model plot is enabled. Without model plot it will be very difficult or impossible
@@ -380,16 +381,25 @@ export function basicJobValidation(
         valid = false;
       }
     }
-
+    let categorizerDetectorMissingPartitionField = false;
     if (job.analysis_config.detectors.length === 0) {
       messages.push({ id: 'detectors_empty' });
       valid = false;
     } else {
       let v = true;
+
       each(job.analysis_config.detectors, (d) => {
         if (isEmpty(d.function)) {
           v = false;
         }
+        // if detector has an ml category, check if the partition_field is missing
+        const needToHavePartitionFieldName =
+          job.analysis_config.per_partition_categorization?.enabled === true &&
+          (d.by_field_name === MLCATEGORY || d.over_field_name === MLCATEGORY);
+
+        if (needToHavePartitionFieldName && d.partition_field_name === undefined) {
+          categorizerDetectorMissingPartitionField = true;
+        }
       });
       if (v) {
         messages.push({ id: 'detectors_function_not_empty' });
@@ -397,10 +407,46 @@ export function basicJobValidation(
         messages.push({ id: 'detectors_function_empty' });
         valid = false;
       }
+      if (categorizerDetectorMissingPartitionField) {
+        messages.push({ id: 'categorizer_detector_missing_per_partition_field' });
+        valid = false;
+      }
     }
 
-    // check for duplicate detectors
     if (job.analysis_config.detectors.length >= 2) {
+      // check if the detectors with mlcategory might have different per_partition_field values
+      // if per_partition_categorization is enabled
+      if (job.analysis_config.per_partition_categorization !== undefined) {
+        if (
+          job.analysis_config.per_partition_categorization.enabled ||
+          (job.analysis_config.per_partition_categorization.stop_on_warn &&
+            Array.isArray(job.analysis_config.detectors) &&
+            job.analysis_config.detectors.length >= 2)
+        ) {
+          const categorizationDetectors = job.analysis_config.detectors.filter(
+            (d) =>
+              d.by_field_name === MLCATEGORY ||
+              d.over_field_name === MLCATEGORY ||
+              d.partition_field_name === MLCATEGORY
+          );
+          const uniqPartitions = [
+            ...new Set(
+              categorizationDetectors
+                .map((d) => d.partition_field_name)
+                .filter((name) => name !== undefined)
+            ),
+          ];
+          if (uniqPartitions.length > 1) {
+            valid = false;
+            messages.push({
+              id: 'categorizer_varying_per_partition_fields',
+              fields: uniqPartitions.join(', '),
+            });
+          }
+        }
+      }
+
+      // check for duplicate detectors
       // create an array of objects with a subset of the attributes
       // where we want to make sure they are not be the same across detectors
       const compareSubSet = job.analysis_config.detectors.map((d) =>
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer.js b/x-pack/plugins/ml/public/application/explorer/explorer.js
index 06cec14578f2a..d78df80fad94e 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer.js
+++ b/x-pack/plugins/ml/public/application/explorer/explorer.js
@@ -205,7 +205,7 @@ export class Explorer extends React.Component {
   updateLanguage = (language) => this.setState({ language });
 
   render() {
-    const { showCharts, severity } = this.props;
+    const { showCharts, severity, stoppedPartitions } = this.props;
 
     const {
       annotations,
@@ -298,6 +298,23 @@ export class Explorer extends React.Component {
 
           <div className={mainColumnClasses}>
             <EuiSpacer size="m" />
+
+            {stoppedPartitions && (
+              <EuiCallOut
+                size={'s'}
+                title={
+                  <FormattedMessage
+                    id="xpack.ml.explorer.stoppedPartitionsExistCallout"
+                    defaultMessage="There may be fewer results than there could have been because stop_on_warn is turned on. Both categorization and subsequent anomaly detection have stopped for some partitions in {jobsWithStoppedPartitions, plural, one {job} other {jobs}} [{stoppedPartitions}] where the categorization status has changed to warn."
+                    values={{
+                      jobsWithStoppedPartitions: stoppedPartitions.length,
+                      stoppedPartitions: stoppedPartitions.join(', '),
+                    }}
+                  />
+                }
+              />
+            )}
+
             <AnomalyTimeline
               explorerState={this.props.explorerState}
               setSelectedCells={this.props.setSelectedCells}
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts
index 852810275139b..a0f2832dc9f97 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts
@@ -41,6 +41,7 @@ export class CategorizationJobCreator extends JobCreator {
     ML_JOB_AGGREGATION.COUNT;
   private _categorizationAnalyzer: CategorizationAnalyzer = {};
   private _defaultCategorizationAnalyzer: CategorizationAnalyzer;
+  private _partitionFieldName: string | null = null;
 
   constructor(
     indexPattern: IndexPattern,
@@ -75,6 +76,11 @@ export class CategorizationJobCreator extends JobCreator {
   private _createDetector(agg: Aggregation, field: Field) {
     const dtr: Detector = createBasicDetector(agg, field);
     dtr.by_field_name = mlCategory.id;
+
+    // API requires if per_partition_categorization is enabled, add partition field to the detector
+    if (this.perPartitionCategorization && this.categorizationPerPartitionField !== null) {
+      dtr.partition_field_name = this.categorizationPerPartitionField;
+    }
     this._addDetector(dtr, agg, mlCategory);
   }
 
@@ -173,4 +179,29 @@ export class CategorizationJobCreator extends JobCreator {
       this.bucketSpan = bs;
     }
   }
+
+  public get categorizationPerPartitionField() {
+    return this._partitionFieldName;
+  }
+
+  public set categorizationPerPartitionField(fieldName: string | null) {
+    if (fieldName === null) {
+      this._detectors.forEach((detector) => {
+        delete detector.partition_field_name;
+      });
+      if (this._partitionFieldName !== null) this.removeInfluencer(this._partitionFieldName);
+      this._partitionFieldName = null;
+    } else {
+      if (this._partitionFieldName !== fieldName) {
+        // remove the previous field from list of influencers
+        // and add the new one
+        if (this._partitionFieldName !== null) this.removeInfluencer(this._partitionFieldName);
+        this.addInfluencer(fieldName);
+        this._partitionFieldName = fieldName;
+        this._detectors.forEach((detector) => {
+          detector.partition_field_name = fieldName;
+        });
+      }
+    }
+  }
 }
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts
index 29e8aafffef7e..4c030a22f54f7 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts
@@ -622,6 +622,36 @@ export class JobCreator {
     return JSON.stringify(this._datafeed_config, null, 2);
   }
 
+  private _initPerPartitionCategorization() {
+    if (this._job_config.analysis_config.per_partition_categorization === undefined) {
+      this._job_config.analysis_config.per_partition_categorization = {};
+    }
+    if (this._job_config.analysis_config.per_partition_categorization?.enabled === undefined) {
+      this._job_config.analysis_config.per_partition_categorization!.enabled = false;
+    }
+    if (this._job_config.analysis_config.per_partition_categorization?.stop_on_warn === undefined) {
+      this._job_config.analysis_config.per_partition_categorization!.stop_on_warn = false;
+    }
+  }
+
+  public get perPartitionCategorization() {
+    return this._job_config.analysis_config.per_partition_categorization?.enabled === true;
+  }
+
+  public set perPartitionCategorization(enabled: boolean) {
+    this._initPerPartitionCategorization();
+    this._job_config.analysis_config.per_partition_categorization!.enabled = enabled;
+  }
+
+  public get perPartitionStopOnWarn() {
+    return this._job_config.analysis_config.per_partition_categorization?.stop_on_warn === true;
+  }
+
+  public set perPartitionStopOnWarn(enabled: boolean) {
+    this._initPerPartitionCategorization();
+    this._job_config.analysis_config.per_partition_categorization!.stop_on_warn = enabled;
+  }
+
   protected _overrideConfigs(job: Job, datafeed: Datafeed) {
     this._job_config = job;
     this._datafeed_config = datafeed;
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_validator/job_validator.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_validator/job_validator.ts
index 242a643ddd3ce..635322a6c4469 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_validator/job_validator.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_validator/job_validator.ts
@@ -51,6 +51,8 @@ export interface BasicValidations {
   queryDelay: Validation;
   frequency: Validation;
   scrollSize: Validation;
+  categorizerMissingPerPartition: Validation;
+  categorizerVaryingPerPartitionField: Validation;
 }
 
 export interface AdvancedValidations {
@@ -76,6 +78,8 @@ export class JobValidator {
     queryDelay: { valid: true },
     frequency: { valid: true },
     scrollSize: { valid: true },
+    categorizerMissingPerPartition: { valid: true },
+    categorizerVaryingPerPartitionField: { valid: true },
   };
   private _advancedValidations: AdvancedValidations = {
     categorizationFieldValid: { valid: true },
@@ -273,6 +277,14 @@ export class JobValidator {
     this._advancedValidations.categorizationFieldValid.valid = valid;
   }
 
+  public get categorizerMissingPerPartition() {
+    return this._basicValidations.categorizerMissingPerPartition;
+  }
+
+  public get categorizerVaryingPerPartitionField() {
+    return this._basicValidations.categorizerVaryingPerPartitionField;
+  }
+
   /**
    * Indicates if the Pick Fields step has a valid input
    */
@@ -283,6 +295,8 @@ export class JobValidator {
         (this._jobCreator.type === JOB_TYPE.ADVANCED && this.modelMemoryLimit.valid)) &&
       this.bucketSpan.valid &&
       this.duplicateDetectors.valid &&
+      this.categorizerMissingPerPartition.valid &&
+      this.categorizerVaryingPerPartitionField.valid &&
       !this.validating &&
       (this._jobCreator.type !== JOB_TYPE.CATEGORIZATION ||
         (this._jobCreator.type === JOB_TYPE.CATEGORIZATION && this.categorizationField))
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_validator/util.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_validator/util.ts
index b97841542f76a..1ce81bf0dcdf0 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_validator/util.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_validator/util.ts
@@ -130,6 +130,29 @@ export function populateValidationMessages(
     basicValidations.duplicateDetectors.message = msg;
   }
 
+  if (validationResults.contains('categorizer_detector_missing_per_partition_field')) {
+    basicValidations.categorizerMissingPerPartition.valid = false;
+    const msg = i18n.translate(
+      'xpack.ml.newJob.wizard.validateJob.categorizerMissingPerPartitionFieldMessage',
+      {
+        defaultMessage:
+          'Partition field must be set for detectors that reference "mlcategory" when per-partition categorization is enabled.',
+      }
+    );
+    basicValidations.categorizerMissingPerPartition.message = msg;
+  }
+  if (validationResults.contains('categorizer_varying_per_partition_fields')) {
+    basicValidations.categorizerVaryingPerPartitionField.valid = false;
+    const msg = i18n.translate(
+      'xpack.ml.newJob.wizard.validateJob.categorizerVaryingPerPartitionFieldNamesMessage',
+      {
+        defaultMessage:
+          'Detectors with keyword "mlcategory" cannot have different partition_field_name when per-partition categorization is enabled.',
+      }
+    );
+    basicValidations.categorizerVaryingPerPartitionField.message = msg;
+  }
+
   if (validationResults.contains('bucket_span_empty')) {
     basicValidations.bucketSpan.valid = false;
     const msg = i18n.translate(
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/advanced_view/detector_list.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/advanced_view/detector_list.tsx
index 38903dd4845a6..ee4bd73755ebe 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/advanced_view/detector_list.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/advanced_view/detector_list.tsx
@@ -46,7 +46,15 @@ export const DetectorList: FC<Props> = ({ isActive, onEditJob, onDeleteJob }) =>
   }, [jobCreatorUpdated]);
 
   useEffect(() => {
-    setValidation(jobValidator.duplicateDetectors);
+    if (!jobValidator.duplicateDetectors.valid) {
+      setValidation(jobValidator.duplicateDetectors);
+    }
+    if (!jobValidator.categorizerVaryingPerPartitionField.valid) {
+      setValidation(jobValidator.categorizerVaryingPerPartitionField);
+    }
+    if (!jobValidator.categorizerMissingPerPartition.valid) {
+      setValidation(jobValidator.categorizerMissingPerPartition);
+    }
   }, [jobValidatorUpdated]);
 
   const Buttons: FC<{ index: number }> = ({ index }) => {
@@ -129,7 +137,7 @@ export const DetectorList: FC<Props> = ({ isActive, onEditJob, onDeleteJob }) =>
           </EuiFlexItem>
         ))}
       </EuiFlexGrid>
-      <DuplicateDetectorsWarning validation={validation} />
+      <DetectorsValidationWarning validation={validation} />
     </Fragment>
   );
 };
@@ -159,7 +167,7 @@ const NoDetectorsWarning: FC<{ show: boolean }> = ({ show }) => {
   );
 };
 
-const DuplicateDetectorsWarning: FC<{ validation: Validation }> = ({ validation }) => {
+const DetectorsValidationWarning: FC<{ validation: Validation }> = ({ validation }) => {
   if (validation.valid === true) {
     return null;
   }
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/advanced_view/extra.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/advanced_view/extra.tsx
index c29ebce41593c..c619f8e4e02dd 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/advanced_view/extra.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/advanced_view/extra.tsx
@@ -4,13 +4,19 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { Fragment, FC } from 'react';
+import React, { Fragment, FC, useContext } from 'react';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 
 import { SummaryCountField } from '../summary_count_field';
 import { CategorizationField } from '../categorization_field';
+import { CategorizationPerPartitionField } from '../categorization_partition_field';
+import { JobCreatorContext } from '../../../job_creator_context';
+import { isAdvancedJobCreator } from '../../../../../common/job_creator';
 
 export const ExtraSettings: FC = () => {
+  const { jobCreator } = useContext(JobCreatorContext);
+  const showCategorizationPerPartitionField =
+    isAdvancedJobCreator(jobCreator) && jobCreator.categorizationFieldName !== null;
   return (
     <Fragment>
       <EuiFlexGroup gutterSize="xl">
@@ -21,6 +27,7 @@ export const ExtraSettings: FC = () => {
           <SummaryCountField />
         </EuiFlexItem>
       </EuiFlexGroup>
+      {showCategorizationPerPartitionField && <CategorizationPerPartitionField />}
     </Fragment>
   );
 };
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_field/categorization_field_select.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_field/categorization_field_select.tsx
index 2f3e8d43bc169..d4c96025f9e36 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_field/categorization_field_select.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_field/categorization_field_select.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { FC, useContext } from 'react';
+import React, { FC, useCallback, useContext, useMemo } from 'react';
 import { EuiComboBox, EuiComboBoxOptionOption } from '@elastic/eui';
 
 import { JobCreatorContext } from '../../../job_creator_context';
@@ -18,24 +18,25 @@ interface Props {
 }
 
 export const CategorizationFieldSelect: FC<Props> = ({ fields, changeHandler, selectedField }) => {
-  const { jobCreator } = useContext(JobCreatorContext);
-  const options: EuiComboBoxOptionOption[] = [
-    ...createFieldOptions(fields, jobCreator.additionalFields),
-  ];
-
-  const selection: EuiComboBoxOptionOption[] = [];
-  if (selectedField !== null) {
-    selection.push({ label: selectedField });
-  }
+  const { jobCreator, jobCreatorUpdated } = useContext(JobCreatorContext);
+  const options: EuiComboBoxOptionOption[] = useMemo(
+    () => [...createFieldOptions(fields, jobCreator.additionalFields)],
+    [fields, jobCreatorUpdated]
+  );
 
-  function onChange(selectedOptions: EuiComboBoxOptionOption[]) {
-    const option = selectedOptions[0];
-    if (typeof option !== 'undefined') {
-      changeHandler(option.label);
-    } else {
-      changeHandler(null);
+  const selection: EuiComboBoxOptionOption[] = useMemo(() => {
+    const selectedOptions: EuiComboBoxOptionOption[] = [];
+    if (selectedField !== null) {
+      selectedOptions.push({ label: selectedField });
     }
-  }
+    return selectedOptions;
+  }, [selectedField]);
+
+  const onChange = useCallback(
+    (selectedOptions: EuiComboBoxOptionOption[]) =>
+      changeHandler((selectedOptions[0] && selectedOptions[0].label) ?? null),
+    [changeHandler]
+  );
 
   return (
     <EuiComboBox
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_partition_field/categorization_per_partition.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_partition_field/categorization_per_partition.tsx
new file mode 100644
index 0000000000000..c5c725447f38c
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_partition_field/categorization_per_partition.tsx
@@ -0,0 +1,65 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC, useContext, useEffect, useState } from 'react';
+import { EuiFormRow } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { JobCreatorContext } from '../../../job_creator_context';
+import {
+  AdvancedJobCreator,
+  CategorizationJobCreator,
+  isCategorizationJobCreator,
+} from '../../../../../common/job_creator';
+
+import { Description } from './description';
+
+import { CategorizationPerPartitionSwitch } from './categorization_per_partition_switch';
+import { CategorizationPerPartitionStopOnWarnSwitch } from './categorization_stop_on_warn_switch';
+import { CategorizationPerPartitionFieldDropdown } from './categorization_per_partition_dropdown';
+
+export const CategorizationPerPartitionField: FC = () => {
+  const { jobCreator: jc, jobCreatorUpdated } = useContext(JobCreatorContext);
+  const jobCreator = jc as AdvancedJobCreator | CategorizationJobCreator;
+  const [enablePerPartitionCategorization, setEnablePerPartitionCategorization] = useState(false);
+  useEffect(() => {
+    setEnablePerPartitionCategorization(jobCreator.perPartitionCategorization);
+  }, [jobCreatorUpdated]);
+
+  return (
+    <Description>
+      <EuiFormRow
+        label={
+          <FormattedMessage
+            id="xpack.ml.newJob.wizard.extraStep.categorizationJob.perPartitionCategorizationLabel"
+            defaultMessage="Enable per-partition categorization"
+          />
+        }
+      >
+        <CategorizationPerPartitionSwitch />
+      </EuiFormRow>
+
+      {enablePerPartitionCategorization && (
+        <>
+          <EuiFormRow
+            label={
+              <FormattedMessage
+                id="xpack.ml.newJob.wizard.extraStep.categorizationJob.stopOnWarnLabel"
+                defaultMessage="Stop on warn"
+              />
+            }
+          >
+            <CategorizationPerPartitionStopOnWarnSwitch />
+          </EuiFormRow>
+        </>
+      )}
+      {isCategorizationJobCreator(jobCreator) && enablePerPartitionCategorization && (
+        <CategorizationPerPartitionFieldDropdown
+          setEnablePerPartitionCategorization={setEnablePerPartitionCategorization}
+        />
+      )}
+    </Description>
+  );
+};
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_partition_field/categorization_per_partition_dropdown.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_partition_field/categorization_per_partition_dropdown.tsx
new file mode 100644
index 0000000000000..a0eccf914af6e
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_partition_field/categorization_per_partition_dropdown.tsx
@@ -0,0 +1,67 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { Dispatch, SetStateAction, useContext, useEffect, useState, useMemo } from 'react';
+import { EuiFormRow } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { JobCreatorContext } from '../../../job_creator_context';
+import { CategorizationJobCreator } from '../../../../../common/job_creator';
+import { newJobCapsService } from '../../../../../../../services/new_job_capabilities_service';
+import { CategorizationPerPartitionFieldSelect } from './categorization_per_partition_input';
+
+export const CategorizationPerPartitionFieldDropdown = ({
+  setEnablePerPartitionCategorization,
+}: {
+  setEnablePerPartitionCategorization: Dispatch<SetStateAction<boolean>>;
+}) => {
+  const { jobCreator: jc, jobCreatorUpdate, jobCreatorUpdated } = useContext(JobCreatorContext);
+  const jobCreator = jc as CategorizationJobCreator;
+
+  const [categorizationPartitionFieldName, setCategorizationPartitionFieldName] = useState<
+    string | null
+  >(jobCreator.categorizationPerPartitionField);
+  const { categoryFields } = newJobCapsService;
+
+  const filteredCategories = useMemo(
+    () => categoryFields.filter((c) => c.id !== jobCreator.categorizationFieldName),
+    [categoryFields, jobCreatorUpdated]
+  );
+  useEffect(() => {
+    jobCreator.categorizationPerPartitionField = categorizationPartitionFieldName;
+    jobCreatorUpdate();
+  }, [categorizationPartitionFieldName]);
+
+  useEffect(() => {
+    // set the first item in category as partition field by default
+    // because API requires partition_field to be defined in each detector with mlcategory
+    // if per-partition categorization is enabled
+    if (
+      jobCreator.perPartitionCategorization &&
+      jobCreator.categorizationPerPartitionField === null &&
+      filteredCategories.length > 0
+    ) {
+      jobCreator.categorizationPerPartitionField = filteredCategories[0].id;
+    }
+    setCategorizationPartitionFieldName(jobCreator.categorizationPerPartitionField);
+    setEnablePerPartitionCategorization(jobCreator.perPartitionCategorization);
+  }, [jobCreatorUpdated]);
+  return (
+    <EuiFormRow
+      label={
+        <FormattedMessage
+          id="xpack.ml.newJob.wizard.extraStep.categorizationJob.categorizationPerPartitionFieldLabel"
+          defaultMessage="Partition field"
+        />
+      }
+    >
+      <CategorizationPerPartitionFieldSelect
+        fields={filteredCategories}
+        changeHandler={setCategorizationPartitionFieldName}
+        selectedField={categorizationPartitionFieldName || ''}
+      />
+    </EuiFormRow>
+  );
+};
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_partition_field/categorization_per_partition_input.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_partition_field/categorization_per_partition_input.tsx
new file mode 100644
index 0000000000000..ec398a810a848
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_partition_field/categorization_per_partition_input.tsx
@@ -0,0 +1,55 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC, useCallback, useContext, useMemo } from 'react';
+import { EuiComboBox, EuiComboBoxOptionOption } from '@elastic/eui';
+
+import { JobCreatorContext } from '../../../job_creator_context';
+import { Field } from '../../../../../../../../../common/types/fields';
+import { createFieldOptions } from '../../../../../common/job_creator/util/general';
+
+interface Props {
+  fields: Field[];
+  changeHandler(i: string | null): void;
+  selectedField: string | null;
+}
+
+export const CategorizationPerPartitionFieldSelect: FC<Props> = ({
+  fields,
+  changeHandler,
+  selectedField,
+}) => {
+  const { jobCreator, jobCreatorUpdated } = useContext(JobCreatorContext);
+  const options: EuiComboBoxOptionOption[] = useMemo(
+    () => [...createFieldOptions(fields, jobCreator.additionalFields)],
+    [fields, jobCreatorUpdated]
+  );
+
+  const selection: EuiComboBoxOptionOption[] = useMemo(() => {
+    const selectedOptions: EuiComboBoxOptionOption[] = [];
+    if (selectedField !== null) {
+      selectedOptions.push({ label: selectedField });
+    }
+    return selectedOptions;
+  }, [selectedField]);
+
+  const onChange = useCallback(
+    (selectedOptions: EuiComboBoxOptionOption[]) =>
+      changeHandler((selectedOptions[0] && selectedOptions[0].label) ?? null),
+    [changeHandler]
+  );
+
+  return (
+    <EuiComboBox
+      singleSelection={{ asPlainText: true }}
+      options={options}
+      selectedOptions={selection}
+      onChange={onChange}
+      isClearable={true}
+      data-test-subj="mlJobWizardCategorizationPerPartitionFieldNameSelect"
+    />
+  );
+};
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_partition_field/categorization_per_partition_switch.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_partition_field/categorization_per_partition_switch.tsx
new file mode 100644
index 0000000000000..4e2c1300b7937
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_partition_field/categorization_per_partition_switch.tsx
@@ -0,0 +1,54 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC, useContext, useEffect, useCallback, useState } from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiSwitch } from '@elastic/eui';
+import { JobCreatorContext } from '../../../job_creator_context';
+import { AdvancedJobCreator, CategorizationJobCreator } from '../../../../../common/job_creator';
+
+export const CategorizationPerPartitionSwitch: FC = () => {
+  const { jobCreator: jc, jobCreatorUpdate, jobCreatorUpdated } = useContext(JobCreatorContext);
+  const jobCreator = jc as AdvancedJobCreator | CategorizationJobCreator;
+  const [enablePerPartitionCategorization, setEnablePerPartitionCategorization] = useState(
+    jobCreator.perPartitionCategorization
+  );
+
+  const toggleEnablePerPartitionCategorization = useCallback(
+    () => setEnablePerPartitionCategorization(!enablePerPartitionCategorization),
+    [enablePerPartitionCategorization]
+  );
+
+  useEffect(() => {
+    setEnablePerPartitionCategorization(jobCreator.perPartitionCategorization);
+  }, [jobCreatorUpdated]);
+
+  useEffect(() => {
+    // also turn off stop on warn if per_partition_categorization is turned off
+    if (enablePerPartitionCategorization === false) {
+      jobCreator.perPartitionStopOnWarn = false;
+    }
+
+    jobCreator.perPartitionCategorization = enablePerPartitionCategorization;
+    jobCreatorUpdate();
+  }, [enablePerPartitionCategorization]);
+
+  return (
+    <EuiSwitch
+      name="categorizationPerPartitionSwitch"
+      disabled={false}
+      checked={enablePerPartitionCategorization}
+      onChange={toggleEnablePerPartitionCategorization}
+      data-test-subj="mlJobWizardSwitchCategorizationPerPartition"
+      label={
+        <FormattedMessage
+          id="xpack.ml.newJob.wizard.perPartitionCategorizationSwitchLabel"
+          defaultMessage="Enable per-partition categorization"
+        />
+      }
+    />
+  );
+};
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_partition_field/categorization_stop_on_warn_switch.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_partition_field/categorization_stop_on_warn_switch.tsx
new file mode 100644
index 0000000000000..8bbf03a999f88
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_partition_field/categorization_stop_on_warn_switch.tsx
@@ -0,0 +1,44 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC, useCallback, useContext, useEffect, useState } from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiSwitch } from '@elastic/eui';
+import { JobCreatorContext } from '../../../job_creator_context';
+import { AdvancedJobCreator, CategorizationJobCreator } from '../../../../../common/job_creator';
+
+export const CategorizationPerPartitionStopOnWarnSwitch: FC = () => {
+  const { jobCreator: jc, jobCreatorUpdate, jobCreatorUpdated } = useContext(JobCreatorContext);
+  const jobCreator = jc as AdvancedJobCreator | CategorizationJobCreator;
+  const [stopOnWarn, setStopOnWarn] = useState(jobCreator.perPartitionStopOnWarn);
+
+  const toggleStopOnWarn = useCallback(() => setStopOnWarn(!stopOnWarn), [stopOnWarn]);
+
+  useEffect(() => {
+    jobCreator.perPartitionStopOnWarn = stopOnWarn;
+    jobCreatorUpdate();
+  }, [stopOnWarn]);
+
+  useEffect(() => {
+    setStopOnWarn(jobCreator.perPartitionStopOnWarn);
+  }, [jobCreatorUpdated]);
+
+  return (
+    <EuiSwitch
+      name="categorizationPerPartitionStopOnWarnSwitch"
+      disabled={false}
+      checked={stopOnWarn}
+      onChange={toggleStopOnWarn}
+      data-test-subj="mlJobWizardSwitchCategorizationPerPartitionStopOnWarn"
+      label={
+        <FormattedMessage
+          id="xpack.ml.newJob.wizard.perPartitionCategorizationtopOnWarnSwitchLabel"
+          defaultMessage="Stop on warn"
+        />
+      }
+    />
+  );
+};
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_partition_field/description.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_partition_field/description.tsx
new file mode 100644
index 0000000000000..01369ca425391
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_partition_field/description.tsx
@@ -0,0 +1,32 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { memo, FC } from 'react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiDescribedFormGroup } from '@elastic/eui';
+
+interface Props {
+  children: React.ReactNode;
+}
+export const Description: FC<Props> = memo(({ children }) => {
+  const title = i18n.translate('xpack.ml.newJob.wizard.perPartitionCategorization.enable.title', {
+    defaultMessage: 'Enable per-partition categorization',
+  });
+  return (
+    <EuiDescribedFormGroup
+      title={<h3>{title}</h3>}
+      description={
+        <FormattedMessage
+          id="xpack.ml.newJob.wizard.perPartitionCategorization.enable.description"
+          defaultMessage="If per-partition categorization is enabled then categories are determined independently for each value of the partition field."
+        />
+      }
+    >
+      <>{children}</>
+    </EuiDescribedFormGroup>
+  );
+});
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_partition_field/index.ts b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_partition_field/index.ts
new file mode 100644
index 0000000000000..f3b50a19c021e
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_partition_field/index.ts
@@ -0,0 +1,6 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+export { CategorizationPerPartitionField } from './categorization_per_partition';
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/metric_selection.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/metric_selection.tsx
index f5c3e90d63418..cbbddb5bbc5b8 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/metric_selection.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/metric_selection.tsx
@@ -12,6 +12,8 @@ import { JobCreatorContext } from '../../../job_creator_context';
 import { CategorizationJobCreator } from '../../../../../common/job_creator';
 import { CategorizationField } from '../categorization_field';
 import { CategorizationDetector } from '../categorization_detector';
+import { CategorizationPerPartitionField } from '../categorization_partition_field';
+
 import { FieldExamples } from './field_examples';
 import { ExamplesValidCallout } from './examples_valid_callout';
 import {
@@ -126,6 +128,8 @@ export const CategorizationDetectors: FC<Props> = ({ setIsValid }) => {
           <FieldExamples fieldExamples={fieldExamples} />
         </>
       )}
+      <EuiHorizontalRule />
+      <CategorizationPerPartitionField />
     </>
   );
 };
diff --git a/x-pack/plugins/ml/public/application/routing/routes/explorer.tsx b/x-pack/plugins/ml/public/application/routing/routes/explorer.tsx
index a2030776773a9..62d7e82a214b5 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/explorer.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/explorer.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { FC, useEffect, useState } from 'react';
+import React, { FC, useEffect, useState, useCallback } from 'react';
 import useObservable from 'react-use/lib/useObservable';
 
 import { i18n } from '@kbn/i18n';
@@ -32,6 +32,7 @@ import { useUrlState } from '../../util/url_state';
 import { getBreadcrumbWithUrlForApp } from '../breadcrumbs';
 import { useTimefilter } from '../../contexts/kibana';
 import { isViewBySwimLaneData } from '../../explorer/swimlane_container';
+import { JOB_ID } from '../../../../common/constants/anomalies';
 
 export const explorerRouteFactory = (navigateToPath: NavigateToPath): MlRoute => ({
   path: '/explorer',
@@ -70,6 +71,8 @@ const ExplorerUrlStateManager: FC<ExplorerUrlStateManagerProps> = ({ jobsWithTim
   const [appState, setAppState] = useUrlState('_a');
   const [globalState, setGlobalState] = useUrlState('_g');
   const [lastRefresh, setLastRefresh] = useState(0);
+  const [stoppedPartitions, setStoppedPartitions] = useState<string[] | undefined>();
+
   const timefilter = useTimefilter({ timeRangeSelector: true, autoRefreshSelector: true });
 
   const { jobIds } = useJobSelection(jobsWithTimeRange);
@@ -109,9 +112,31 @@ const ExplorerUrlStateManager: FC<ExplorerUrlStateManagerProps> = ({ jobsWithTim
     }
   }, [globalState?.time?.from, globalState?.time?.to]);
 
+  const getJobsWithStoppedPartitions = useCallback(async (selectedJobIds: string[]) => {
+    try {
+      const fetchedStoppedPartitions = await ml.results.getCategoryStoppedPartitions(
+        selectedJobIds,
+        JOB_ID
+      );
+      if (
+        fetchedStoppedPartitions &&
+        Array.isArray(fetchedStoppedPartitions.jobs) &&
+        fetchedStoppedPartitions.jobs.length > 0
+      ) {
+        setStoppedPartitions(fetchedStoppedPartitions.jobs);
+      } else {
+        setStoppedPartitions(undefined);
+      }
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.error(error);
+    }
+  }, []);
+
   useEffect(() => {
     if (jobIds.length > 0) {
       explorerService.updateJobSelection(jobIds);
+      getJobsWithStoppedPartitions(jobIds);
     } else {
       explorerService.clearJobs();
     }
@@ -209,6 +234,7 @@ const ExplorerUrlStateManager: FC<ExplorerUrlStateManagerProps> = ({ jobsWithTim
           setSelectedCells,
           showCharts,
           severity: tableSeverity.val,
+          stoppedPartitions,
         }}
       />
     </div>
diff --git a/x-pack/plugins/ml/public/application/services/ml_api_service/results.ts b/x-pack/plugins/ml/public/application/services/ml_api_service/results.ts
index 08c3853ace6f8..65bd4fb1eccc2 100644
--- a/x-pack/plugins/ml/public/application/services/ml_api_service/results.ts
+++ b/x-pack/plugins/ml/public/application/services/ml_api_service/results.ts
@@ -5,11 +5,11 @@
  */
 
 // Service for obtaining data for the ML Results dashboards.
+import { GetStoppedPartitionResult } from '../../../../common/types/results';
 import { HttpService } from '../http_service';
-
 import { basePath } from './index';
-
 import { JobId } from '../../../../common/types/anomaly_detection_jobs';
+import { JOB_ID, PARTITION_FIELD_VALUE } from '../../../../common/constants/anomalies';
 import { PartitionFieldsDefinition } from '../results_service/result_service_rx';
 
 export const resultsApiProvider = (httpService: HttpService) => ({
@@ -114,4 +114,19 @@ export const resultsApiProvider = (httpService: HttpService) => ({
       body,
     });
   },
+
+  getCategoryStoppedPartitions(
+    jobIds: string[],
+    fieldToBucket?: typeof JOB_ID | typeof PARTITION_FIELD_VALUE
+  ) {
+    const body = JSON.stringify({
+      jobIds,
+      fieldToBucket,
+    });
+    return httpService.http<GetStoppedPartitionResult>({
+      path: `${basePath()}/results/category_stopped_partitions`,
+      method: 'POST',
+      body,
+    });
+  },
 });
diff --git a/x-pack/plugins/ml/server/models/job_validation/job_validation.ts b/x-pack/plugins/ml/server/models/job_validation/job_validation.ts
index 118e923283b3f..6692ecb22bd9e 100644
--- a/x-pack/plugins/ml/server/models/job_validation/job_validation.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/job_validation.ts
@@ -7,7 +7,6 @@
 import { i18n } from '@kbn/i18n';
 import Boom from 'boom';
 import { ILegacyScopedClusterClient } from 'kibana/server';
-
 import { TypeOf } from '@kbn/config-schema';
 import { fieldsServiceProvider } from '../fields_service';
 import { renderTemplate } from '../../../common/util/string_utils';
diff --git a/x-pack/plugins/ml/server/models/results_service/results_service.ts b/x-pack/plugins/ml/server/models/results_service/results_service.ts
index 8e71384942b57..7be8bac61e69d 100644
--- a/x-pack/plugins/ml/server/models/results_service/results_service.ts
+++ b/x-pack/plugins/ml/server/models/results_service/results_service.ts
@@ -10,11 +10,19 @@ import get from 'lodash/get';
 import moment from 'moment';
 import { SearchResponse } from 'elasticsearch';
 import { ILegacyScopedClusterClient } from 'kibana/server';
+import Boom from 'boom';
 import { buildAnomalyTableItems } from './build_anomaly_table_items';
 import { ML_RESULTS_INDEX_PATTERN } from '../../../common/constants/index_patterns';
 import { ANOMALIES_TABLE_DEFAULT_QUERY_SIZE } from '../../../common/constants/search';
 import { getPartitionFieldsValuesFactory } from './get_partition_fields_values';
-import { AnomaliesTableRecord, AnomalyRecordDoc } from '../../../common/types/anomalies';
+import {
+  AnomaliesTableRecord,
+  AnomalyCategorizerStatsDoc,
+  AnomalyRecordDoc,
+} from '../../../common/types/anomalies';
+import { JOB_ID, PARTITION_FIELD_VALUE } from '../../../common/constants/anomalies';
+import { GetStoppedPartitionResult } from '../../../common/types/results';
+import { MlJobsResponse } from '../job_service/jobs';
 
 // Service for carrying out Elasticsearch queries to obtain data for the
 // ML Results dashboards.
@@ -432,6 +440,154 @@ export function resultsServiceProvider(mlClusterClient: ILegacyScopedClusterClie
     return definition;
   }
 
+  async function getCategorizerStats(jobId: string, partitionByValue?: string) {
+    const mustMatchClauses: Array<Record<'match', Record<string, string>>> = [
+      {
+        match: {
+          result_type: 'categorizer_stats',
+        },
+      },
+    ];
+
+    if (typeof partitionByValue === 'string') {
+      mustMatchClauses.push({
+        match: {
+          partition_by_value: partitionByValue,
+        },
+      });
+    }
+    const results: SearchResponse<AnomalyCategorizerStatsDoc> = await callAsInternalUser('search', {
+      index: ML_RESULTS_INDEX_PATTERN,
+      body: {
+        query: {
+          bool: {
+            must: mustMatchClauses,
+            filter: [
+              {
+                term: {
+                  job_id: jobId,
+                },
+              },
+            ],
+          },
+        },
+      },
+    });
+    return results ? results.hits.hits.map((r) => r._source) : [];
+  }
+
+  async function getCategoryStoppedPartitions(
+    jobIds: string[],
+    fieldToBucket: typeof JOB_ID | typeof PARTITION_FIELD_VALUE = PARTITION_FIELD_VALUE
+  ): Promise<GetStoppedPartitionResult> {
+    let finalResults: GetStoppedPartitionResult = {
+      jobs: {},
+    };
+    // first determine from job config if stop_on_warn is true
+    // if false return []
+    const jobConfigResponse: MlJobsResponse = await callAsInternalUser('ml.jobs', {
+      jobId: jobIds,
+    });
+
+    if (!jobConfigResponse || jobConfigResponse.jobs.length < 1) {
+      throw Boom.notFound(`Unable to find anomaly detector jobs ${jobIds.join(', ')}`);
+    }
+
+    const jobIdsWithStopOnWarnSet = jobConfigResponse.jobs
+      .filter(
+        (jobConfig) =>
+          jobConfig.analysis_config?.per_partition_categorization?.stop_on_warn === true
+      )
+      .map((j) => j.job_id);
+
+    let aggs: any;
+    if (fieldToBucket === JOB_ID) {
+      // if bucketing by job_id, then return list of job_ids with at least one stopped_partitions
+      aggs = {
+        unique_terms: {
+          terms: {
+            field: JOB_ID,
+          },
+        },
+      };
+    } else {
+      // if bucketing by partition field value, then return list of unique stopped_partitions for each job
+      aggs = {
+        jobs: {
+          terms: {
+            field: JOB_ID,
+          },
+          aggs: {
+            unique_stopped_partitions: {
+              terms: {
+                field: PARTITION_FIELD_VALUE,
+              },
+            },
+          },
+        },
+      };
+    }
+
+    if (jobIdsWithStopOnWarnSet.length > 0) {
+      // search for categorizer_stats documents for the current job where the categorization_status is warn
+      // Return all the partition_field_value values from the documents found
+      const mustMatchClauses: Array<Record<'match', Record<string, string>>> = [
+        {
+          match: {
+            result_type: 'categorizer_stats',
+          },
+        },
+        {
+          match: {
+            categorization_status: 'warn',
+          },
+        },
+      ];
+      const results: SearchResponse<any> = await callAsInternalUser('search', {
+        index: ML_RESULTS_INDEX_PATTERN,
+        size: 0,
+        body: {
+          query: {
+            bool: {
+              must: mustMatchClauses,
+              filter: [
+                {
+                  terms: {
+                    job_id: jobIdsWithStopOnWarnSet,
+                  },
+                },
+              ],
+            },
+          },
+          aggs,
+        },
+      });
+      if (fieldToBucket === JOB_ID) {
+        finalResults = {
+          jobs: results.aggregations?.unique_terms?.buckets.map(
+            (b: { key: string; doc_count: number }) => b.key
+          ),
+        };
+      } else if (fieldToBucket === PARTITION_FIELD_VALUE) {
+        const jobs: Record<string, string[]> = jobIdsWithStopOnWarnSet.reduce(
+          (obj: Record<string, string[]>, jobId: string) => {
+            obj[jobId] = [];
+            return obj;
+          },
+          {}
+        );
+        results.aggregations.jobs.buckets.forEach(
+          (bucket: { key: string | number; unique_stopped_partitions: { buckets: any[] } }) => {
+            jobs[bucket.key] = bucket.unique_stopped_partitions.buckets.map((b) => b.key);
+          }
+        );
+        finalResults.jobs = jobs;
+      }
+    }
+
+    return finalResults;
+  }
+
   return {
     getAnomaliesTableData,
     getCategoryDefinition,
@@ -439,5 +595,7 @@ export function resultsServiceProvider(mlClusterClient: ILegacyScopedClusterClie
     getLatestBucketTimestampByJob,
     getMaxAnomalyScore,
     getPartitionFieldsValues: getPartitionFieldsValuesFactory(mlClusterClient),
+    getCategorizerStats,
+    getCategoryStoppedPartitions,
   };
 }
diff --git a/x-pack/plugins/ml/server/routes/anomaly_detectors.ts b/x-pack/plugins/ml/server/routes/anomaly_detectors.ts
index c6bdb32b262e4..0027bec910134 100644
--- a/x-pack/plugins/ml/server/routes/anomaly_detectors.ts
+++ b/x-pack/plugins/ml/server/routes/anomaly_detectors.ts
@@ -20,7 +20,6 @@ import {
   getModelSnapshotsSchema,
   updateModelSnapshotSchema,
 } from './schemas/anomaly_detectors_schema';
-
 /**
  * Routes for the anomaly detectors
  */
diff --git a/x-pack/plugins/ml/server/routes/apidoc.json b/x-pack/plugins/ml/server/routes/apidoc.json
index f360da5df5392..86a62b28abb5e 100644
--- a/x-pack/plugins/ml/server/routes/apidoc.json
+++ b/x-pack/plugins/ml/server/routes/apidoc.json
@@ -49,6 +49,8 @@
     "GetCategoryExamples",
     "GetPartitionFieldsValues",
     "AnomalySearch",
+    "GetCategorizerStats",
+    "GetCategoryStoppedPartitions",
 
     "Modules",
     "DataRecognizer",
diff --git a/x-pack/plugins/ml/server/routes/results_service.ts b/x-pack/plugins/ml/server/routes/results_service.ts
index 0d619bf63b8e7..2af37c17f714a 100644
--- a/x-pack/plugins/ml/server/routes/results_service.ts
+++ b/x-pack/plugins/ml/server/routes/results_service.ts
@@ -17,6 +17,11 @@ import {
 } from './schemas/results_service_schema';
 import { resultsServiceProvider } from '../models/results_service';
 import { ML_RESULTS_INDEX_PATTERN } from '../../common/constants/index_patterns';
+import { jobIdSchema } from './schemas/anomaly_detectors_schema';
+import {
+  getCategorizerStatsSchema,
+  getCategorizerStoppedPartitionsSchema,
+} from './schemas/results_service_schema';
 
 function getAnomaliesTableData(legacyClient: ILegacyScopedClusterClient, payload: any) {
   const rs = resultsServiceProvider(legacyClient);
@@ -71,6 +76,19 @@ function getPartitionFieldsValues(legacyClient: ILegacyScopedClusterClient, payl
   return rs.getPartitionFieldsValues(jobId, searchTerm, criteriaFields, earliestMs, latestMs);
 }
 
+function getCategorizerStats(legacyClient: ILegacyScopedClusterClient, params: any, query: any) {
+  const { jobId } = params;
+  const { partitionByValue } = query;
+  const rs = resultsServiceProvider(legacyClient);
+  return rs.getCategorizerStats(jobId, partitionByValue);
+}
+
+function getCategoryStoppedPartitions(legacyClient: ILegacyScopedClusterClient, payload: any) {
+  const { jobIds, fieldToBucket } = payload;
+  const rs = resultsServiceProvider(legacyClient);
+  return rs.getCategoryStoppedPartitions(jobIds, fieldToBucket);
+}
+
 /**
  * Routes for results service
  */
@@ -265,4 +283,66 @@ export function resultsServiceRoutes({ router, mlLicense }: RouteInitialization)
       }
     })
   );
+
+  /**
+   * @apiGroup ResultsService
+   *
+   * @api {get} /api/ml/results/:jobId/categorizer_stats
+   * @apiName GetCategorizerStats
+   * @apiDescription Returns the categorizer stats for the specified job ID
+   * @apiSchema (params) jobIdSchema
+   * @apiSchema (query) getCategorizerStatsSchema
+   */
+  router.get(
+    {
+      path: '/api/ml/results/{jobId}/categorizer_stats',
+      validate: {
+        params: jobIdSchema,
+        query: getCategorizerStatsSchema,
+      },
+      options: {
+        tags: ['access:ml:canGetJobs'],
+      },
+    },
+    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+      try {
+        const resp = await getCategorizerStats(legacyClient, request.params, request.query);
+        return response.ok({
+          body: resp,
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  /**
+   * @apiGroup ResultsService
+   *
+   * @api {get} /api/ml/results/category_stopped_partitions
+   * @apiName GetCategoryStoppedPartitions
+   * @apiDescription Returns information on the partitions that have stopped being categorized due to the categorization status changing from ok to warn. Can return either the list of stopped partitions for each job, or just the list of job IDs.
+   * @apiSchema (body) getCategorizerStoppedPartitionsSchema
+   */
+  router.post(
+    {
+      path: '/api/ml/results/category_stopped_partitions',
+      validate: {
+        body: getCategorizerStoppedPartitionsSchema,
+      },
+      options: {
+        tags: ['access:ml:canGetJobs'],
+      },
+    },
+    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+      try {
+        const resp = await getCategoryStoppedPartitions(legacyClient, request.body);
+        return response.ok({
+          body: resp,
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
 }
diff --git a/x-pack/plugins/ml/server/routes/schemas/results_service_schema.ts b/x-pack/plugins/ml/server/routes/schemas/results_service_schema.ts
index f7317e534b33b..0bf37826b6146 100644
--- a/x-pack/plugins/ml/server/routes/schemas/results_service_schema.ts
+++ b/x-pack/plugins/ml/server/routes/schemas/results_service_schema.ts
@@ -52,3 +52,26 @@ export const partitionFieldValuesSchema = schema.object({
   earliestMs: schema.number(),
   latestMs: schema.number(),
 });
+
+export const getCategorizerStatsSchema = schema.nullable(
+  schema.object({
+    /**
+     * Optional value to fetch the categorizer stats
+     * where results are filtered by partition_by_value = value
+     */
+    partitionByValue: schema.maybe(schema.string()),
+  })
+);
+
+export const getCategorizerStoppedPartitionsSchema = schema.object({
+  /**
+   * List of jobIds to fetch the categorizer partitions for
+   */
+  jobIds: schema.arrayOf(schema.string()),
+  /**
+   * Field to aggregate results by: 'job_id' or 'partition_field_value'
+   * If by job_id, will return list of jobIds with at least one partition that have stopped
+   * If by partition_field_value, it will return a list of categorizer stopped partitions for each job_id
+   */
+  fieldToBucket: schema.maybe(schema.string()),
+});
diff --git a/x-pack/test/api_integration/apis/ml/results/get_categorizer_stats.ts b/x-pack/test/api_integration/apis/ml/results/get_categorizer_stats.ts
new file mode 100644
index 0000000000000..a9d863b7526f9
--- /dev/null
+++ b/x-pack/test/api_integration/apis/ml/results/get_categorizer_stats.ts
@@ -0,0 +1,148 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../ftr_provider_context';
+import { USER } from '../../../../functional/services/ml/security_common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
+import { AnomalyCategorizerStatsDoc } from '../../../../../plugins/ml/common/types/anomalies';
+
+export default ({ getService }: FtrProviderContext) => {
+  const esArchiver = getService('esArchiver');
+  const supertest = getService('supertestWithoutAuth');
+  const ml = getService('ml');
+
+  const jobId = `sample_logs_${Date.now()}`;
+  const PARTITION_FIELD_NAME = 'event.dataset';
+  const testJobConfig = {
+    job_id: jobId,
+    groups: ['sample_logs', 'bootstrap', 'categorization'],
+    description: "count by mlcategory (message) on 'sample logs' dataset with 15m bucket span",
+    analysis_config: {
+      bucket_span: '15m',
+      categorization_field_name: 'message',
+      per_partition_categorization: { enabled: true, stop_on_warn: true },
+      detectors: [
+        {
+          function: 'count',
+          by_field_name: 'mlcategory',
+          partition_field_name: PARTITION_FIELD_NAME,
+        },
+      ],
+      influencers: ['mlcategory'],
+    },
+    analysis_limits: { model_memory_limit: '26MB' },
+    data_description: { time_field: '@timestamp', time_format: 'epoch_ms' },
+    model_plot_config: { enabled: false, annotations_enabled: true },
+    model_snapshot_retention_days: 10,
+    daily_model_snapshot_retention_after_days: 1,
+    allow_lazy_open: false,
+  };
+  const testDatafeedConfig: Datafeed = {
+    datafeed_id: `datafeed-${jobId}`,
+    indices: ['ft_module_sample_logs'],
+    job_id: jobId,
+    query: { bool: { must: [{ match_all: {} }] } },
+  };
+
+  describe('get categorizer_stats', function () {
+    before(async () => {
+      await esArchiver.loadIfNeeded('ml/module_sample_logs');
+      await ml.testResources.setKibanaTimeZoneToUTC();
+      await ml.api.createAndRunAnomalyDetectionLookbackJob(testJobConfig, testDatafeedConfig);
+    });
+
+    after(async () => {
+      await ml.testResources.deleteIndexPatternByTitle('ft_module_sample_logs');
+      await ml.api.cleanMlIndices();
+    });
+
+    it('should fetch all the categorizer stats for job id', async () => {
+      const { body } = await supertest
+        .get(`/api/ml/results/${jobId}/categorizer_stats`)
+        .auth(USER.ML_POWERUSER, ml.securityCommon.getPasswordForUser(USER.ML_POWERUSER))
+        .set(COMMON_REQUEST_HEADERS)
+        .expect(200);
+
+      body.forEach((doc: AnomalyCategorizerStatsDoc) => {
+        expect(doc.job_id).to.eql(jobId);
+        expect(doc.result_type).to.eql('categorizer_stats');
+        expect(doc.partition_field_name).to.be(PARTITION_FIELD_NAME);
+        expect(doc.partition_field_value).to.not.be(undefined);
+      });
+    });
+
+    it('should fetch categorizer stats for job id for user with view permission', async () => {
+      const { body } = await supertest
+        .get(`/api/ml/results/${jobId}/categorizer_stats`)
+        .auth(USER.ML_VIEWER, ml.securityCommon.getPasswordForUser(USER.ML_VIEWER))
+        .set(COMMON_REQUEST_HEADERS)
+        .expect(200);
+
+      body.forEach((doc: AnomalyCategorizerStatsDoc) => {
+        expect(doc.job_id).to.eql(jobId);
+        expect(doc.result_type).to.eql('categorizer_stats');
+        expect(doc.partition_field_name).to.be(PARTITION_FIELD_NAME);
+        expect(doc.partition_field_value).to.not.be(undefined);
+      });
+    });
+
+    it('should not fetch categorizer stats for job id for unauthorized user', async () => {
+      const { body } = await supertest
+        .get(`/api/ml/results/${jobId}/categorizer_stats`)
+        .auth(USER.ML_UNAUTHORIZED, ml.securityCommon.getPasswordForUser(USER.ML_UNAUTHORIZED))
+        .set(COMMON_REQUEST_HEADERS)
+        .expect(404);
+
+      expect(body.error).to.be('Not Found');
+      expect(body.message).to.be('Not Found');
+    });
+
+    it('should fetch all the categorizer stats with per-partition value for job id', async () => {
+      const { body } = await supertest
+        .get(`/api/ml/results/${jobId}/categorizer_stats`)
+        .query({ partitionByValue: 'sample_web_logs' })
+        .auth(USER.ML_POWERUSER, ml.securityCommon.getPasswordForUser(USER.ML_POWERUSER))
+        .set(COMMON_REQUEST_HEADERS)
+        .expect(200);
+      body.forEach((doc: AnomalyCategorizerStatsDoc) => {
+        expect(doc.job_id).to.eql(jobId);
+        expect(doc.result_type).to.eql('categorizer_stats');
+        expect(doc.partition_field_name).to.be(PARTITION_FIELD_NAME);
+        expect(doc.partition_field_value).to.be('sample_web_logs');
+      });
+    });
+
+    it('should fetch categorizer stats with per-partition value for user with view permission', async () => {
+      const { body } = await supertest
+        .get(`/api/ml/results/${jobId}/categorizer_stats`)
+        .query({ partitionByValue: 'sample_web_logs' })
+        .auth(USER.ML_VIEWER, ml.securityCommon.getPasswordForUser(USER.ML_VIEWER))
+        .set(COMMON_REQUEST_HEADERS)
+        .expect(200);
+
+      body.forEach((doc: AnomalyCategorizerStatsDoc) => {
+        expect(doc.job_id).to.eql(jobId);
+        expect(doc.result_type).to.eql('categorizer_stats');
+        expect(doc.partition_field_name).to.be(PARTITION_FIELD_NAME);
+        expect(doc.partition_field_value).to.be('sample_web_logs');
+      });
+    });
+
+    it('should not fetch categorizer stats with per-partition value for unauthorized user', async () => {
+      const { body } = await supertest
+        .get(`/api/ml/results/${jobId}/categorizer_stats`)
+        .query({ partitionByValue: 'sample_web_logs' })
+        .auth(USER.ML_UNAUTHORIZED, ml.securityCommon.getPasswordForUser(USER.ML_UNAUTHORIZED))
+        .set(COMMON_REQUEST_HEADERS)
+        .expect(404);
+
+      expect(body.error).to.be('Not Found');
+      expect(body.message).to.be('Not Found');
+    });
+  });
+};
diff --git a/x-pack/test/api_integration/apis/ml/results/get_stopped_partitions.ts b/x-pack/test/api_integration/apis/ml/results/get_stopped_partitions.ts
new file mode 100644
index 0000000000000..424bc8c333aab
--- /dev/null
+++ b/x-pack/test/api_integration/apis/ml/results/get_stopped_partitions.ts
@@ -0,0 +1,184 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import { Datafeed, Job } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
+import { FtrProviderContext } from '../../../ftr_provider_context';
+import { USER } from '../../../../functional/services/ml/security_common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+
+export default ({ getService }: FtrProviderContext) => {
+  const esArchiver = getService('esArchiver');
+  const supertest = getService('supertestWithoutAuth');
+  const ml = getService('ml');
+
+  const testJobId = `sample_logs_${Date.now()}`;
+  // non-aggregatable field to cause some partitions to change status to warn
+  const PARTITION_FIELD_NAME = 'agent';
+
+  interface TestConfig {
+    testDescription: string;
+    jobId: string;
+    jobConfig: Job;
+    datafeedConfig: Datafeed;
+  }
+  const setupTestConfigs = (
+    jobId: string,
+    stopOnWarn: boolean,
+    enabledPerPartitionCat: boolean = true
+  ): TestConfig => {
+    const commonJobConfig = {
+      groups: ['sample_logs', 'bootstrap', 'categorization'],
+      description: "count by mlcategory (message) on 'sample logs' dataset with 15m bucket span",
+      analysis_limits: { model_memory_limit: '26MB' },
+      data_description: { time_field: '@timestamp', time_format: 'epoch_ms' },
+      model_snapshot_retention_days: 10,
+      daily_model_snapshot_retention_after_days: 1,
+      allow_lazy_open: false,
+    };
+    const datafeedConfig: Datafeed = {
+      datafeed_id: `datafeed-${jobId}`,
+      indices: ['ft_module_sample_logs'],
+      job_id: jobId,
+      query: { bool: { must: [{ match_all: {} }] } },
+    };
+
+    return {
+      testDescription: `stop_on_warn is ${stopOnWarn}`,
+      jobId,
+      jobConfig: {
+        job_id: jobId,
+        ...commonJobConfig,
+        analysis_config: {
+          bucket_span: '1m',
+          categorization_field_name: 'message',
+          per_partition_categorization: {
+            enabled: enabledPerPartitionCat,
+            stop_on_warn: stopOnWarn,
+          },
+          detectors: [
+            {
+              function: 'count',
+              by_field_name: 'mlcategory',
+              partition_field_name: PARTITION_FIELD_NAME,
+            },
+          ],
+          influencers: ['mlcategory'],
+        },
+      },
+      datafeedConfig,
+    };
+  };
+
+  const testSetUps: TestConfig[] = [
+    setupTestConfigs(`${testJobId}_t`, true),
+    setupTestConfigs(`${testJobId}_f`, false),
+    setupTestConfigs(`${testJobId}_viewer`, true),
+    setupTestConfigs(`${testJobId}_unauthorized`, true),
+  ];
+
+  const testJobIds = testSetUps.map((t) => t.jobId);
+
+  describe('get stopped_partitions', function () {
+    before(async () => {
+      await esArchiver.loadIfNeeded('ml/module_sample_logs');
+      await ml.testResources.setKibanaTimeZoneToUTC();
+      for (const testData of testSetUps) {
+        const { jobConfig, datafeedConfig } = testData;
+        await ml.api.createAndRunAnomalyDetectionLookbackJob(jobConfig, datafeedConfig);
+      }
+    });
+
+    after(async () => {
+      await ml.testResources.deleteIndexPatternByTitle('ft_module_sample_logs');
+      await ml.api.cleanMlIndices();
+    });
+
+    it('should fetch all the stopped partitions correctly', async () => {
+      const { jobId } = testSetUps[0];
+      const { body } = await supertest
+        .post(`/api/ml/results/category_stopped_partitions`)
+        .auth(USER.ML_POWERUSER, ml.securityCommon.getPasswordForUser(USER.ML_POWERUSER))
+        .send({ jobIds: [jobId] })
+        .set(COMMON_REQUEST_HEADERS)
+        .expect(200);
+      expect(body.jobs).to.not.be(undefined);
+      expect(body.jobs[jobId]).to.be.an('array');
+      expect(body.jobs[jobId].length).to.be.greaterThan(0);
+    });
+
+    it('should not return jobId in response if stopped_on_warn is false', async () => {
+      const { jobId } = testSetUps[1];
+      const { body } = await supertest
+        .post(`/api/ml/results/category_stopped_partitions`)
+        .auth(USER.ML_POWERUSER, ml.securityCommon.getPasswordForUser(USER.ML_POWERUSER))
+        .send({ jobIds: [jobId] })
+        .set(COMMON_REQUEST_HEADERS)
+        .expect(200);
+      expect(body.jobs).to.not.be(undefined);
+      expect(body.jobs).to.not.have.property(jobId);
+    });
+
+    it('should fetch stopped partitions for user with view permission', async () => {
+      const { jobId } = testSetUps[2];
+      const { body } = await supertest
+        .post(`/api/ml/results/category_stopped_partitions`)
+        .auth(USER.ML_VIEWER, ml.securityCommon.getPasswordForUser(USER.ML_VIEWER))
+        .send({ jobIds: [jobId] })
+        .set(COMMON_REQUEST_HEADERS)
+        .expect(200);
+
+      expect(body.jobs).to.not.be(undefined);
+      expect(body.jobs[jobId]).to.be.an('array');
+      expect(body.jobs[jobId].length).to.be.greaterThan(0);
+    });
+
+    it('should not fetch stopped partitions for unauthorized user', async () => {
+      const { jobId } = testSetUps[3];
+
+      const { body } = await supertest
+        .post(`/api/ml/results/category_stopped_partitions`)
+        .auth(USER.ML_UNAUTHORIZED, ml.securityCommon.getPasswordForUser(USER.ML_UNAUTHORIZED))
+        .send({ jobIds: [jobId] })
+        .set(COMMON_REQUEST_HEADERS)
+        .expect(404);
+
+      expect(body.error).to.be('Not Found');
+      expect(body.message).to.be('Not Found');
+    });
+
+    it('should fetch stopped partitions for multiple job ids', async () => {
+      const { body } = await supertest
+        .post(`/api/ml/results/category_stopped_partitions`)
+        .auth(USER.ML_POWERUSER, ml.securityCommon.getPasswordForUser(USER.ML_POWERUSER))
+        .send({ jobIds: testJobIds })
+        .set(COMMON_REQUEST_HEADERS)
+        .expect(200);
+      expect(body.jobs).to.not.be(undefined);
+      expect(body.jobs).to.not.have.property(testSetUps[1].jobId);
+
+      Object.keys(body.jobs).forEach((currentJobId: string) => {
+        expect(testJobIds).to.contain(currentJobId);
+        expect(body.jobs[currentJobId]).to.be.an('array');
+        expect(body.jobs[currentJobId].length).to.be.greaterThan(0);
+      });
+    });
+
+    it('should return array of jobIds with stopped_partitions for multiple job ids when bucketed by job_id', async () => {
+      const { body } = await supertest
+        .post(`/api/ml/results/category_stopped_partitions`)
+        .auth(USER.ML_POWERUSER, ml.securityCommon.getPasswordForUser(USER.ML_POWERUSER))
+        .send({ jobIds: testJobIds, fieldToBucket: 'job_id' })
+        .set(COMMON_REQUEST_HEADERS)
+        .expect(200);
+
+      expect(body.jobs).to.not.be(undefined);
+      body.jobs.forEach((currentJobId: string) => {
+        expect(testJobIds).to.contain(currentJobId);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/api_integration/apis/ml/results/index.ts b/x-pack/test/api_integration/apis/ml/results/index.ts
index 7f44ebefc7b2b..f6a7c6ed81843 100644
--- a/x-pack/test/api_integration/apis/ml/results/index.ts
+++ b/x-pack/test/api_integration/apis/ml/results/index.ts
@@ -8,5 +8,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context';
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('ResultsService', () => {
     loadTestFile(require.resolve('./get_anomalies_table_data'));
+    loadTestFile(require.resolve('./get_categorizer_stats'));
+    loadTestFile(require.resolve('./get_stopped_partitions'));
   });
 }

From fb2cac9a8a704e34257718d783fc2945e9be10f9 Mon Sep 17 00:00:00 2001
From: James Gowdy <jgowdy@elastic.co>
Date: Wed, 19 Aug 2020 19:13:12 +0100
Subject: [PATCH 36/85] [ML] Fixing file import button on basic license
 (#75458)

---
 x-pack/plugins/ml/server/routes/system.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/ml/server/routes/system.ts b/x-pack/plugins/ml/server/routes/system.ts
index 99ba9519b6a34..273b86163245f 100644
--- a/x-pack/plugins/ml/server/routes/system.ts
+++ b/x-pack/plugins/ml/server/routes/system.ts
@@ -240,10 +240,10 @@ export function systemRoutes(
         body: schema.object({ index: schema.string() }),
       },
       options: {
-        tags: ['access:ml:canGetJobs'],
+        tags: ['access:ml:canAccessML'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.basicLicenseAPIGuard(async ({ legacyClient, request, response }) => {
       try {
         const { index } = request.body;
 

From 7ac929b4cb97e0657208e02b201d41afce8429b5 Mon Sep 17 00:00:00 2001
From: Brent Kimmel <bkimmel@users.noreply.github.com>
Date: Wed, 19 Aug 2020 14:27:48 -0400
Subject: [PATCH 37/85] [Security Solution][Resolver] enzyme semantics (#75311)

* remove old edgeline method on simulator

* [Security Solution][Resolver] Enzyme test treeitem/tree roles
---
 .../test_utilities/simulator/index.tsx        |  7 -----
 .../resolver/view/clickthrough.test.tsx       | 30 +++++++++++++++++--
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/resolver/test_utilities/simulator/index.tsx b/x-pack/plugins/security_solution/public/resolver/test_utilities/simulator/index.tsx
index 47e92320c4c20..b79b7df48a6de 100644
--- a/x-pack/plugins/security_solution/public/resolver/test_utilities/simulator/index.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/test_utilities/simulator/index.tsx
@@ -220,13 +220,6 @@ export class Simulator {
     return this.wrapper.debug();
   }
 
-  /**
-   * Lines that connect the nodes in the graph
-   */
-  public edgeLines(): ReactWrapper {
-    return this.domNodes('[data-test-subj="resolver:graph:edgeline"]');
-  }
-
   /**
    * This manually runs the animation frames tied to a configurable timestamp in the future.
    */
diff --git a/x-pack/plugins/security_solution/public/resolver/view/clickthrough.test.tsx b/x-pack/plugins/security_solution/public/resolver/view/clickthrough.test.tsx
index 7a2301b7bb515..358fcd17b998a 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/clickthrough.test.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/clickthrough.test.tsx
@@ -73,6 +73,32 @@ describe('Resolver, when analyzing a tree that has no ancestors and 2 children',
       });
     });
 
+    it('should render 3 elements with "treeitem" roles, each owned by an element with a "tree" role', async () => {
+      await expect(
+        simulator.map(() => ({
+          nodesOwnedByTrees: simulator.testSubject('resolver:node').filterWhere((domNode) => {
+            /**
+             * This test verifies corectness w.r.t. the tree/treeitem roles
+             * From W3C: `Authors MUST ensure elements with role treeitem are contained in, or owned by, an element with the role group or tree.`
+             *
+             * https://www.w3.org/TR/wai-aria-1.1/#tree
+             * https://www.w3.org/TR/wai-aria-1.1/#treeitem
+             *
+             * w3c defines two ways for an element to be an "owned element"
+             *  1. Any DOM descendant
+             *  2. Any element specified as a child via aria-owns
+             *  (see: https://www.w3.org/TR/wai-aria-1.1/#dfn-owned-element)
+             *
+             * In the context of Resolver (as of this writing) nodes/treeitems are children of the tree,
+             * but they could be moved out of the tree, provided that the tree is given an `aria-owns`
+             * attribute referring to them (method 2 above).
+             */
+            return domNode.closest('[role="tree"]').length === 1;
+          }).length,
+        }))
+      ).toYieldEqualTo({ nodesOwnedByTrees: 3 });
+    });
+
     it(`should show links to the 3 nodes (with icons) in the node list.`, async () => {
       await expect(
         simulator.map(() => simulator.testSubject('resolver:node-list:node-link:title').length)
@@ -252,7 +278,7 @@ function computedNodeBoundaries(entityID: string): AABB {
  * Coordinates for where the edgelines "start"
  */
 function computedEdgeStartingCoordinates(): Vector2[] {
-  return simulator.edgeLines().map((edge) => {
+  return simulator.testSubject('resolver:graph:edgeline').map((edge) => {
     const { left, top } = getComputedStyle(edge.getDOMNode());
     return [pxNum(left), pxNum(top)];
   });
@@ -262,7 +288,7 @@ function computedEdgeStartingCoordinates(): Vector2[] {
  * Coordinates for where edgelines "end" (after application of transform)
  */
 function computedEdgeTerminalCoordinates(): Vector2[] {
-  return simulator.edgeLines().map((edge) => {
+  return simulator.testSubject('resolver:graph:edgeline').map((edge) => {
     const { left, top, width, transform } = getComputedStyle(edge.getDOMNode());
     /**
      * Without the transform in the rotation, edgelines lay flat across the x-axis.

From 02fcbaa794ada3464a5588913f3b31ce898edcf3 Mon Sep 17 00:00:00 2001
From: Frank Hassanabad <frank.hassanabad@elastic.co>
Date: Wed, 19 Aug 2020 12:30:11 -0600
Subject: [PATCH 38/85] Fixed bug where list index privileges was returned
 twice instead of list item index (#75256)

## Summary

Fixes a bug where the list privileges was returning the `.list` privileges twice instead of returning it once and returning the `.items` privileges second with the call. No UI has to change as the way it was written was dynamic to grab the first key found.

This also adds the functional tests to `x-pack/scripts/functional_tests.js` which was not there originally so the end to tend tests should actually run on the CI machine where it was not running on CI before.

Adds the functional tests to the code owners file as well.

Ensure that you go to the test results page from the Jenkins build:
<img width="901" alt="Screen Shot 2020-08-18 at 1 13 18 AM" src="https://user-images.githubusercontent.com/1151048/90482180-13f7c800-e0f0-11ea-92f2-b30a8fffe84e.png">

And ensure you see the tests under:

```
X-Pack Lists Integration Tests
```

Then click through it and ensure they are shown as running and passing

### Checklist

- [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios
---
 .github/CODEOWNERS                            |   1 +
 .../routes/read_privileges_route.mock.ts      | 181 ++++++++++++++++++
 .../server/routes/read_privileges_route.ts    |   2 +-
 x-pack/scripts/functional_tests.js            |   1 +
 .../security_and_spaces/tests/index.ts        |   1 +
 .../tests/read_list_privileges.ts             |  85 ++++++++
 6 files changed, 270 insertions(+), 1 deletion(-)
 create mode 100644 x-pack/plugins/lists/server/routes/read_privileges_route.mock.ts
 create mode 100644 x-pack/test/lists_api_integration/security_and_spaces/tests/read_list_privileges.ts

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7e34c931c5feb..52df586b8bda7 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -267,6 +267,7 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 /x-pack/plugins/security_solution/ @elastic/siem @elastic/endpoint-app-team
 /x-pack/plugins/security_solution/**/*.scss @elastic/security-design
 /x-pack/test/detection_engine_api_integration @elastic/siem @elastic/endpoint-app-team
+/x-pack/test/lists_api_integration @elastic/siem @elastic/endpoint-app-team
 /x-pack/test/api_integration/apis/security_solution @elastic/siem @elastic/endpoint-app-team
 /x-pack/plugins/case @elastic/siem @elastic/endpoint-app-team
 /x-pack/plugins/lists @elastic/siem @elastic/endpoint-app-team
diff --git a/x-pack/plugins/lists/server/routes/read_privileges_route.mock.ts b/x-pack/plugins/lists/server/routes/read_privileges_route.mock.ts
new file mode 100644
index 0000000000000..cef6233440db6
--- /dev/null
+++ b/x-pack/plugins/lists/server/routes/read_privileges_route.mock.ts
@@ -0,0 +1,181 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+interface Cluster {
+  monitor_ml: boolean;
+  manage_ccr: boolean;
+  manage_index_templates: boolean;
+  monitor_watcher: boolean;
+  monitor_transform: boolean;
+  read_ilm: boolean;
+  manage_security: boolean;
+  manage_own_api_key: boolean;
+  manage_saml: boolean;
+  all: boolean;
+  manage_ilm: boolean;
+  manage_ingest_pipelines: boolean;
+  read_ccr: boolean;
+  manage_rollup: boolean;
+  monitor: boolean;
+  manage_watcher: boolean;
+  manage: boolean;
+  manage_transform: boolean;
+  manage_api_key: boolean;
+  manage_token: boolean;
+  manage_ml: boolean;
+  manage_pipeline: boolean;
+  monitor_rollup: boolean;
+  transport_client: boolean;
+  create_snapshot: boolean;
+}
+
+interface Index {
+  [indexName: string]: {
+    all: boolean;
+    manage_ilm: boolean;
+    read: boolean;
+    create_index: boolean;
+    read_cross_cluster: boolean;
+    index: boolean;
+    monitor: boolean;
+    delete: boolean;
+    manage: boolean;
+    delete_index: boolean;
+    create_doc: boolean;
+    view_index_metadata: boolean;
+    create: boolean;
+    manage_follow_index: boolean;
+    manage_leader_index: boolean;
+    write: boolean;
+  };
+}
+
+interface IndexPrivilege {
+  application: {};
+  cluster: Cluster;
+  has_all_requested: boolean;
+  index: Index;
+  username: string;
+}
+
+export interface Privilege {
+  listItems: IndexPrivilege;
+  lists: IndexPrivilege;
+  is_authenticated: boolean;
+}
+
+export const getReadPrivilegeMock = (
+  listIndex: string = '.lists-default',
+  listItemsIndex: string = '.items-default',
+  username = 'elastic',
+  booleanValues: boolean = true
+): Privilege => ({
+  is_authenticated: true,
+  listItems: {
+    application: {},
+    cluster: {
+      all: booleanValues,
+      create_snapshot: booleanValues,
+      manage: booleanValues,
+      manage_api_key: booleanValues,
+      manage_ccr: booleanValues,
+      manage_ilm: booleanValues,
+      manage_index_templates: booleanValues,
+      manage_ingest_pipelines: booleanValues,
+      manage_ml: booleanValues,
+      manage_own_api_key: false,
+      manage_pipeline: booleanValues,
+      manage_rollup: booleanValues,
+      manage_saml: booleanValues,
+      manage_security: booleanValues,
+      manage_token: booleanValues,
+      manage_transform: booleanValues,
+      manage_watcher: booleanValues,
+      monitor: booleanValues,
+      monitor_ml: booleanValues,
+      monitor_rollup: booleanValues,
+      monitor_transform: booleanValues,
+      monitor_watcher: booleanValues,
+      read_ccr: booleanValues,
+      read_ilm: booleanValues,
+      transport_client: booleanValues,
+    },
+    has_all_requested: false,
+    index: {
+      [listItemsIndex]: {
+        all: booleanValues,
+        create: booleanValues,
+        create_doc: booleanValues,
+        create_index: booleanValues,
+        delete: booleanValues,
+        delete_index: booleanValues,
+        index: booleanValues,
+        manage: booleanValues,
+        manage_follow_index: booleanValues,
+        manage_ilm: booleanValues,
+        manage_leader_index: booleanValues,
+        monitor: booleanValues,
+        read: booleanValues,
+        read_cross_cluster: booleanValues,
+        view_index_metadata: booleanValues,
+        write: booleanValues,
+      },
+    },
+    username,
+  },
+  lists: {
+    application: {},
+    cluster: {
+      all: booleanValues,
+      create_snapshot: booleanValues,
+      manage: booleanValues,
+      manage_api_key: booleanValues,
+      manage_ccr: booleanValues,
+      manage_ilm: booleanValues,
+      manage_index_templates: booleanValues,
+      manage_ingest_pipelines: booleanValues,
+      manage_ml: booleanValues,
+      manage_own_api_key: false,
+      manage_pipeline: booleanValues,
+      manage_rollup: booleanValues,
+      manage_saml: booleanValues,
+      manage_security: booleanValues,
+      manage_token: booleanValues,
+      manage_transform: booleanValues,
+      manage_watcher: booleanValues,
+      monitor: booleanValues,
+      monitor_ml: booleanValues,
+      monitor_rollup: booleanValues,
+      monitor_transform: booleanValues,
+      monitor_watcher: booleanValues,
+      read_ccr: booleanValues,
+      read_ilm: booleanValues,
+      transport_client: booleanValues,
+    },
+    has_all_requested: false,
+    index: {
+      [listIndex]: {
+        all: booleanValues,
+        create: booleanValues,
+        create_doc: booleanValues,
+        create_index: booleanValues,
+        delete: booleanValues,
+        delete_index: booleanValues,
+        index: booleanValues,
+        manage: booleanValues,
+        manage_follow_index: booleanValues,
+        manage_ilm: booleanValues,
+        manage_leader_index: booleanValues,
+        monitor: booleanValues,
+        read: booleanValues,
+        read_cross_cluster: booleanValues,
+        view_index_metadata: booleanValues,
+        write: booleanValues,
+      },
+    },
+    username,
+  },
+});
diff --git a/x-pack/plugins/lists/server/routes/read_privileges_route.ts b/x-pack/plugins/lists/server/routes/read_privileges_route.ts
index a4ec878613608..9d695b348b422 100644
--- a/x-pack/plugins/lists/server/routes/read_privileges_route.ts
+++ b/x-pack/plugins/lists/server/routes/read_privileges_route.ts
@@ -36,7 +36,7 @@ export const readPrivilegesRoute = (
         );
         const clusterPrivilegesListItems = await readPrivileges(
           clusterClient.callAsCurrentUser,
-          lists.getListIndex()
+          lists.getListItemIndex()
         );
         const privileges = merge(
           {
diff --git a/x-pack/scripts/functional_tests.js b/x-pack/scripts/functional_tests.js
index 205ff500a36ec..ef646343871d3 100644
--- a/x-pack/scripts/functional_tests.js
+++ b/x-pack/scripts/functional_tests.js
@@ -26,6 +26,7 @@ const onlyNotInCoverageTests = [
   require.resolve('../test/apm_api_integration/trial/config.ts'),
   require.resolve('../test/detection_engine_api_integration/security_and_spaces/config.ts'),
   require.resolve('../test/detection_engine_api_integration/basic/config.ts'),
+  require.resolve('../test/lists_api_integration/security_and_spaces/config.ts'),
   require.resolve('../test/plugin_api_integration/config.ts'),
   require.resolve('../test/kerberos_api_integration/config.ts'),
   require.resolve('../test/kerberos_api_integration/anonymous_access.config.ts'),
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/index.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/index.ts
index 5458b4a9a7db2..9e619811d67ee 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/index.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/index.ts
@@ -33,5 +33,6 @@ export default ({ loadTestFile }: FtrProviderContext): void => {
     loadTestFile(require.resolve('./delete_exception_list_items'));
     loadTestFile(require.resolve('./find_exception_lists'));
     loadTestFile(require.resolve('./find_exception_list_items'));
+    loadTestFile(require.resolve('./read_list_privileges'));
   });
 };
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/read_list_privileges.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/read_list_privileges.ts
new file mode 100644
index 0000000000000..c1696d3205294
--- /dev/null
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/read_list_privileges.ts
@@ -0,0 +1,85 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+
+import { getReadPrivilegeMock } from '../../../../plugins/lists/server/routes/read_privileges_route.mock';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import { LIST_PRIVILEGES_URL } from '../../../../plugins/lists/common/constants';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext) => {
+  const supertest = getService('supertest');
+  const security = getService('security');
+  const spacesService = getService('spaces');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+  describe('read_list_privileges', () => {
+    const space1Id = 'space_1';
+
+    const user1 = {
+      username: 'user_1',
+      roleName: 'user_1',
+      password: 'user_1-password',
+    };
+
+    beforeEach(async () => {
+      await spacesService.create({
+        id: space1Id,
+        name: space1Id,
+        disabledFeatures: [],
+      });
+
+      await security.role.create(user1.roleName, {
+        kibana: [
+          {
+            feature: {
+              dashboard: ['all'],
+              siem: ['all', 'read'],
+            },
+            spaces: [space1Id],
+          },
+        ],
+      });
+
+      await security.user.create(user1.username, {
+        password: user1.password,
+        roles: [user1.roleName],
+      });
+    });
+
+    afterEach(async () => {
+      await spacesService.delete(space1Id);
+    });
+
+    it('should return true for all privileges when its the system user of "elastic" in space of "default"', async () => {
+      const { body } = await supertest.get(LIST_PRIVILEGES_URL).set('kbn-xsrf', 'true').expect(200);
+      expect(body).to.eql(getReadPrivilegeMock());
+    });
+
+    it('should return true for all privileges when its the system user of "elastic" in space of "space_1"', async () => {
+      const { body } = await supertest.get(LIST_PRIVILEGES_URL).set('kbn-xsrf', 'true').expect(200);
+      expect(body).to.eql(getReadPrivilegeMock());
+    });
+
+    it('should return false for all privileges when its the system user of "user_1" in a space of "space_1"', async () => {
+      const { body } = await supertestWithoutAuth
+        .get(`/s/${space1Id}${LIST_PRIVILEGES_URL}`)
+        .auth(user1.username, user1.password)
+        .send()
+        .expect(200);
+
+      const privilege = getReadPrivilegeMock(
+        `.lists-${space1Id}`,
+        `.items-${space1Id}`,
+        user1.username,
+        false
+      );
+
+      expect(body).to.eql(privilege);
+    });
+  });
+};

From d46227421e361fd5ea29cbb6e512c9df66448d5e Mon Sep 17 00:00:00 2001
From: Paul Tavares <56442535+paul-tavares@users.noreply.github.com>
Date: Wed, 19 Aug 2020 14:32:43 -0400
Subject: [PATCH 39/85] [SECURITY_SOLUTION][ENDPOINT] Add creation of Trusted
 Apps Agnostic List (#74868)

* Add method to ExceptionsListClient for creating trusted apps list
---
 x-pack/plugins/lists/common/constants.ts      |  9 +++
 .../create_endpoint_trusted_apps_list.ts      | 77 +++++++++++++++++++
 .../exception_lists/exception_list_client.ts  | 13 ++++
 3 files changed, 99 insertions(+)
 create mode 100644 x-pack/plugins/lists/server/services/exception_lists/create_endpoint_trusted_apps_list.ts

diff --git a/x-pack/plugins/lists/common/constants.ts b/x-pack/plugins/lists/common/constants.ts
index 6c73dc1656302..1851487b824a2 100644
--- a/x-pack/plugins/lists/common/constants.ts
+++ b/x-pack/plugins/lists/common/constants.ts
@@ -50,3 +50,12 @@ export const ENDPOINT_LIST_NAME = 'Elastic Endpoint Security Exception List';
 export const ENDPOINT_LIST_DESCRIPTION = 'Elastic Endpoint Security Exception List';
 
 export const MAX_EXCEPTION_LIST_SIZE = 10000;
+
+/** ID of trusted apps agnostic list */
+export const ENDPOINT_TRUSTED_APPS_LIST_ID = 'endpoint_trusted_apps';
+
+/** Name of trusted apps agnostic list */
+export const ENDPOINT_TRUSTED_APPS_LIST_NAME = 'Elastic Endpoint Security Trusted Apps List';
+
+/** Description of trusted apps agnostic list */
+export const ENDPOINT_TRUSTED_APPS_LIST_DESCRIPTION = 'Elastic Endpoint Security Trusted Apps List';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/create_endpoint_trusted_apps_list.ts b/x-pack/plugins/lists/server/services/exception_lists/create_endpoint_trusted_apps_list.ts
new file mode 100644
index 0000000000000..c782cdd302666
--- /dev/null
+++ b/x-pack/plugins/lists/server/services/exception_lists/create_endpoint_trusted_apps_list.ts
@@ -0,0 +1,77 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { SavedObjectsClientContract } from 'kibana/server';
+import uuid from 'uuid';
+
+import {
+  ENDPOINT_TRUSTED_APPS_LIST_DESCRIPTION,
+  ENDPOINT_TRUSTED_APPS_LIST_ID,
+  ENDPOINT_TRUSTED_APPS_LIST_NAME,
+} from '../../../common/constants';
+import { ExceptionListSchema, ExceptionListSoSchema, Version } from '../../../common/schemas';
+
+import { getSavedObjectType, transformSavedObjectToExceptionList } from './utils';
+
+interface CreateEndpointListOptions {
+  savedObjectsClient: SavedObjectsClientContract;
+  user: string;
+  tieBreaker?: string;
+  version: Version;
+}
+
+/**
+ * Creates the Endpoint Trusted Apps agnostic list if it does not yet exist
+ *
+ * @param savedObjectsClient
+ * @param user
+ * @param tieBreaker
+ * @param version
+ */
+export const createEndpointTrustedAppsList = async ({
+  savedObjectsClient,
+  user,
+  tieBreaker,
+  version,
+}: CreateEndpointListOptions): Promise<ExceptionListSchema | null> => {
+  const savedObjectType = getSavedObjectType({ namespaceType: 'agnostic' });
+  const dateNow = new Date().toISOString();
+  try {
+    const savedObject = await savedObjectsClient.create<ExceptionListSoSchema>(
+      savedObjectType,
+      {
+        _tags: [],
+        comments: undefined,
+        created_at: dateNow,
+        created_by: user,
+        description: ENDPOINT_TRUSTED_APPS_LIST_DESCRIPTION,
+        entries: undefined,
+        immutable: false,
+        item_id: undefined,
+        list_id: ENDPOINT_TRUSTED_APPS_LIST_ID,
+        list_type: 'list',
+        meta: undefined,
+        name: ENDPOINT_TRUSTED_APPS_LIST_NAME,
+        tags: [],
+        tie_breaker_id: tieBreaker ?? uuid.v4(),
+        type: 'endpoint',
+        updated_by: user,
+        version,
+      },
+      {
+        // We intentionally hard coding the id so that there can only be one Trusted apps list within the space
+        id: ENDPOINT_TRUSTED_APPS_LIST_ID,
+      }
+    );
+    return transformSavedObjectToExceptionList({ savedObject });
+  } catch (err) {
+    if (savedObjectsClient.errors.isConflictError(err)) {
+      return null;
+    } else {
+      throw err;
+    }
+  }
+};
diff --git a/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts b/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts
index 83b44ababf9de..747458175e3b8 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts
@@ -46,6 +46,7 @@ import { findExceptionListItem } from './find_exception_list_item';
 import { findExceptionList } from './find_exception_list';
 import { findExceptionListsItem } from './find_exception_list_items';
 import { createEndpointList } from './create_endpoint_list';
+import { createEndpointTrustedAppsList } from './create_endpoint_trusted_apps_list';
 
 export class ExceptionListClient {
   private readonly user: string;
@@ -90,6 +91,18 @@ export class ExceptionListClient {
     });
   };
 
+  /**
+   * Create the Trusted Apps Agnostic list if it does not yet exist (`null` is returned if it does exist)
+   */
+  public createTrustedAppsList = async (): Promise<ExceptionListSchema | null> => {
+    const { savedObjectsClient, user } = this;
+    return createEndpointTrustedAppsList({
+      savedObjectsClient,
+      user,
+      version: 1,
+    });
+  };
+
   /**
    * This is the same as "createListItem" except it applies specifically to the agnostic endpoint list and will
    * auto-call the "createEndpointList" for you so that you have the best chance of the agnostic endpoint

From eb3cb8258fb6ddd61fa0cecaf03b43a33ab54c65 Mon Sep 17 00:00:00 2001
From: Chris Roberson <chrisronline@gmail.com>
Date: Wed, 19 Aug 2020 14:57:53 -0400
Subject: [PATCH 40/85] Add loading page (#75362)

---
 .../public/directives/main/index.js           |  5 ++
 x-pack/plugins/monitoring/public/views/all.js |  1 +
 .../public/views/cluster/listing/index.js     |  2 +-
 .../public/views/cluster/overview/index.html  |  2 +-
 .../public/views/cluster/overview/index.js    |  3 +
 .../public/views/loading/index.html           |  5 ++
 .../monitoring/public/views/loading/index.js  | 67 +++++++++++++++++++
 7 files changed, 83 insertions(+), 2 deletions(-)
 create mode 100644 x-pack/plugins/monitoring/public/views/loading/index.html
 create mode 100644 x-pack/plugins/monitoring/public/views/loading/index.js

diff --git a/x-pack/plugins/monitoring/public/directives/main/index.js b/x-pack/plugins/monitoring/public/directives/main/index.js
index d682e87b7ca95..cee18004c5777 100644
--- a/x-pack/plugins/monitoring/public/directives/main/index.js
+++ b/x-pack/plugins/monitoring/public/directives/main/index.js
@@ -205,6 +205,7 @@ export class MonitoringMainController {
 
 export function monitoringMainProvider(breadcrumbs, license, $injector) {
   const $executor = $injector.get('$executor');
+  const $parse = $injector.get('$parse');
 
   return {
     restrict: 'E',
@@ -221,6 +222,10 @@ export function monitoringMainProvider(breadcrumbs, license, $injector) {
         Object.keys(setupObj.attributes).forEach((key) => {
           attributes.$observe(key, () => controller.setup(getSetupObj()));
         });
+        if (attributes.onLoaded) {
+          const onLoaded = $parse(attributes.onLoaded)(scope);
+          onLoaded();
+        }
       });
 
       initSetupModeState(scope, $injector, () => {
diff --git a/x-pack/plugins/monitoring/public/views/all.js b/x-pack/plugins/monitoring/public/views/all.js
index d192b366fec33..e4903ea974a18 100644
--- a/x-pack/plugins/monitoring/public/views/all.js
+++ b/x-pack/plugins/monitoring/public/views/all.js
@@ -35,3 +35,4 @@ import './beats/beat';
 import './apm/overview';
 import './apm/instances';
 import './apm/instance';
+import './loading';
diff --git a/x-pack/plugins/monitoring/public/views/cluster/listing/index.js b/x-pack/plugins/monitoring/public/views/cluster/listing/index.js
index b00945ca37e19..db1408e3905f0 100644
--- a/x-pack/plugins/monitoring/public/views/cluster/listing/index.js
+++ b/x-pack/plugins/monitoring/public/views/cluster/listing/index.js
@@ -79,4 +79,4 @@ uiRoutes
       }
     },
   })
-  .otherwise({ redirectTo: '/no-data' });
+  .otherwise({ redirectTo: '/loading' });
diff --git a/x-pack/plugins/monitoring/public/views/cluster/overview/index.html b/x-pack/plugins/monitoring/public/views/cluster/overview/index.html
index 7ea786510bf19..1762ee1c2a282 100644
--- a/x-pack/plugins/monitoring/public/views/cluster/overview/index.html
+++ b/x-pack/plugins/monitoring/public/views/cluster/overview/index.html
@@ -1,3 +1,3 @@
-<monitoring-main name="overview" data-test-subj="clusterOverviewContainer">
+<monitoring-main name="overview" data-test-subj="clusterOverviewContainer" on-loaded="monitoringClusterOverview.init">
   <div id="monitoringClusterOverviewApp"></div>
 </monitoring-main>
diff --git a/x-pack/plugins/monitoring/public/views/cluster/overview/index.js b/x-pack/plugins/monitoring/public/views/cluster/overview/index.js
index f3e6d5def9b6f..09aef1d431071 100644
--- a/x-pack/plugins/monitoring/public/views/cluster/overview/index.js
+++ b/x-pack/plugins/monitoring/public/views/cluster/overview/index.js
@@ -25,6 +25,7 @@ uiRoutes.when('/overview', {
       return routeInit({ codePaths: CODE_PATHS });
     },
   },
+  controllerAs: 'monitoringClusterOverview',
   controller: class extends MonitoringViewBaseController {
     constructor($injector, $scope) {
       const monitoringClusters = $injector.get('monitoringClusters');
@@ -52,6 +53,8 @@ uiRoutes.when('/overview', {
         },
       });
 
+      this.init = () => this.renderReact(null);
+
       $scope.$watch(
         () => this.data,
         async (data) => {
diff --git a/x-pack/plugins/monitoring/public/views/loading/index.html b/x-pack/plugins/monitoring/public/views/loading/index.html
new file mode 100644
index 0000000000000..9a5971a65bc39
--- /dev/null
+++ b/x-pack/plugins/monitoring/public/views/loading/index.html
@@ -0,0 +1,5 @@
+<monitoring-main name="no-data" on-loaded="monitoringLoading.init">
+  <div data-test-subj="monitoringLoadingContainer">
+    <div id="monitoringLoadingReact"></div>
+  </div>
+</monitoring-main>
diff --git a/x-pack/plugins/monitoring/public/views/loading/index.js b/x-pack/plugins/monitoring/public/views/loading/index.js
new file mode 100644
index 0000000000000..04e0325aa70e2
--- /dev/null
+++ b/x-pack/plugins/monitoring/public/views/loading/index.js
@@ -0,0 +1,67 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+/**
+ * Controller for single index detail
+ */
+import React from 'react';
+import { render } from 'react-dom';
+import { i18n } from '@kbn/i18n';
+import { uiRoutes } from '../../angular/helpers/routes';
+import { routeInitProvider } from '../../lib/route_init';
+import template from './index.html';
+import { Legacy } from '../../legacy_shims';
+import { CODE_PATH_ELASTICSEARCH } from '../../../common/constants';
+import { PageLoading } from '../../components';
+
+const CODE_PATHS = [CODE_PATH_ELASTICSEARCH];
+uiRoutes.when('/loading', {
+  template,
+  controllerAs: 'monitoringLoading',
+  controller: class {
+    constructor($injector, $scope) {
+      const Private = $injector.get('Private');
+      const titleService = $injector.get('title');
+      titleService(
+        $scope.cluster,
+        i18n.translate('xpack.monitoring.loading.pageTitle', {
+          defaultMessage: 'Loading',
+        })
+      );
+
+      this.init = () => {
+        const reactNodeId = 'monitoringLoadingReact';
+        const renderElement = document.getElementById(reactNodeId);
+        if (!renderElement) {
+          console.warn(`"#${reactNodeId}" element has not been added to the DOM yet`);
+          return;
+        }
+        const I18nContext = Legacy.shims.I18nContext;
+        render(
+          <I18nContext>
+            <PageLoading />
+          </I18nContext>,
+          renderElement
+        );
+      };
+
+      const routeInit = Private(routeInitProvider);
+      routeInit({ codePaths: CODE_PATHS, fetchAllClusters: true }).then((clusters) => {
+        if (!clusters || !clusters.length) {
+          window.location.hash = '#/no-data';
+          return;
+        }
+        if (clusters.length === 1) {
+          // Bypass the cluster listing if there is just 1 cluster
+          window.history.replaceState(null, null, '#/overview');
+          return;
+        }
+
+        window.history.replaceState(null, null, '#/home');
+      });
+    }
+  },
+});

From 9111d5096566b0d3c6659895b40f01f66450520e Mon Sep 17 00:00:00 2001
From: Steph Milovic <stephanie.milovic@elastic.co>
Date: Wed, 19 Aug 2020 13:15:55 -0600
Subject: [PATCH 41/85] fix tests and enable in CI (#75313)

---
 x-pack/scripts/functional_tests.js            |  1 +
 .../basic/tests/configure/get_connectors.ts   | 18 ++++++++--
 .../case_api_integration/common/config.ts     |  3 +-
 .../case_api_integration/common/lib/utils.ts  | 35 ++++++++++++++++++-
 4 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/x-pack/scripts/functional_tests.js b/x-pack/scripts/functional_tests.js
index ef646343871d3..a6550bef46d4a 100644
--- a/x-pack/scripts/functional_tests.js
+++ b/x-pack/scripts/functional_tests.js
@@ -22,6 +22,7 @@ const onlyNotInCoverageTests = [
   require.resolve('../test/alerting_api_integration/basic/config.ts'),
   require.resolve('../test/alerting_api_integration/spaces_only/config.ts'),
   require.resolve('../test/alerting_api_integration/security_and_spaces/config.ts'),
+  require.resolve('../test/case_api_integration/basic/config.ts'),
   require.resolve('../test/apm_api_integration/basic/config.ts'),
   require.resolve('../test/apm_api_integration/trial/config.ts'),
   require.resolve('../test/detection_engine_api_integration/security_and_spaces/config.ts'),
diff --git a/x-pack/test/case_api_integration/basic/tests/configure/get_connectors.ts b/x-pack/test/case_api_integration/basic/tests/configure/get_connectors.ts
index f5f290476dd0b..5ba1aac4c8f92 100644
--- a/x-pack/test/case_api_integration/basic/tests/configure/get_connectors.ts
+++ b/x-pack/test/case_api_integration/basic/tests/configure/get_connectors.ts
@@ -9,7 +9,11 @@ import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 import { CASE_CONFIGURE_CONNECTORS_URL } from '../../../../../plugins/case/common/constants';
 import { ObjectRemover as ActionsRemover } from '../../../../alerting_api_integration/common/lib';
-import { getServiceNowConnector, getJiraConnector } from '../../../common/lib/utils';
+import {
+  getServiceNowConnector,
+  getJiraConnector,
+  getResilientConnector,
+} from '../../../common/lib/utils';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
@@ -61,9 +65,16 @@ export default ({ getService }: FtrProviderContext): void => {
         .send(getJiraConnector())
         .expect(200);
 
+      const { body: connectorFour } = await supertest
+        .post('/api/actions/action')
+        .set('kbn-xsrf', 'true')
+        .send(getResilientConnector())
+        .expect(200);
+
       actionsRemover.add('default', connectorOne.id, 'action', 'actions');
       actionsRemover.add('default', connectorTwo.id, 'action', 'actions');
       actionsRemover.add('default', connectorThree.id, 'action', 'actions');
+      actionsRemover.add('default', connectorFour.id, 'action', 'actions');
 
       const { body: connectors } = await supertest
         .get(`${CASE_CONFIGURE_CONNECTORS_URL}/_find`)
@@ -71,13 +82,16 @@ export default ({ getService }: FtrProviderContext): void => {
         .send()
         .expect(200);
 
-      expect(connectors.length).to.equal(2);
+      expect(connectors.length).to.equal(3);
       expect(
         connectors.some((c: { actionTypeId: string }) => c.actionTypeId === '.servicenow')
       ).to.equal(true);
       expect(connectors.some((c: { actionTypeId: string }) => c.actionTypeId === '.jira')).to.equal(
         true
       );
+      expect(
+        connectors.some((c: { actionTypeId: string }) => c.actionTypeId === '.resilient')
+      ).to.equal(true);
     });
   });
 };
diff --git a/x-pack/test/case_api_integration/common/config.ts b/x-pack/test/case_api_integration/common/config.ts
index 098d94f35d9ca..9b048813b479a 100644
--- a/x-pack/test/case_api_integration/common/config.ts
+++ b/x-pack/test/case_api_integration/common/config.ts
@@ -21,10 +21,11 @@ interface CreateTestConfigOptions {
 const enabledActionTypes = [
   '.email',
   '.index',
+  '.jira',
   '.pagerduty',
+  '.resilient',
   '.server-log',
   '.servicenow',
-  '.jira',
   '.slack',
   '.webhook',
   'test.authorization',
diff --git a/x-pack/test/case_api_integration/common/lib/utils.ts b/x-pack/test/case_api_integration/common/lib/utils.ts
index a24e17f9e5efb..fb6f4fce3c29a 100644
--- a/x-pack/test/case_api_integration/common/lib/utils.ts
+++ b/x-pack/test/case_api_integration/common/lib/utils.ts
@@ -33,7 +33,7 @@ export const getServiceNowConnector = () => ({
   },
   config: {
     apiUrl: 'http://some.non.existent.com',
-    casesConfiguration: {
+    incidentConfiguration: {
       mapping: [
         {
           source: 'title',
@@ -52,6 +52,7 @@ export const getServiceNowConnector = () => ({
         },
       ],
     },
+    isCaseOwned: true,
   },
 });
 
@@ -87,6 +88,38 @@ export const getJiraConnector = () => ({
   },
 });
 
+export const getResilientConnector = () => ({
+  name: 'Resilient Connector',
+  actionTypeId: '.resilient',
+  secrets: {
+    apiKeyId: 'id',
+    apiKeySecret: 'secret',
+  },
+  config: {
+    apiUrl: 'http://some.non.existent.com',
+    orgId: 'pkey',
+    casesConfiguration: {
+      mapping: [
+        {
+          source: 'title',
+          target: 'summary',
+          actionType: 'overwrite',
+        },
+        {
+          source: 'description',
+          target: 'description',
+          actionType: 'overwrite',
+        },
+        {
+          source: 'comments',
+          target: 'comments',
+          actionType: 'append',
+        },
+      ],
+    },
+  },
+});
+
 export const removeServerGeneratedPropertiesFromConfigure = (
   config: Partial<CasesConfigureResponse>
 ): Partial<CasesConfigureResponse> => {

From ad5c0f58fe2eac946a21a23f56f51cea74d1ab6b Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Wed, 19 Aug 2020 13:52:06 -0700
Subject: [PATCH 42/85] [Ingest Manager] Rename agent/package config(s) to
 agent/package policy(ies) (#74914)

* Initial pass at updating client routes, variables names, code comments, and UI copy

* Adjust server routes and param names, more var names and i18n fixes

* Fix test

* More var renaming

* Rest of server-side var renaming

* Rest of client side var renaming

* Rename agent SO attributes and add migrations

* Remove agent prefix from policy fields

* Rename agent policy SO attributes and add migrations

* Rename enrollment api key SO attributes and add migrations

* Rename package policy SO attributes and add migrations

* Rename agent event SO attributes and add migrations

* Rename subtype CONFIG to POLICY (I don't think this string is ever sent by agent, though)

* Update snapshot

* Remove unnecessary cloning in migrations

* Fix migration typos

* Update naming in tests and es archiver data

* Rename file names in /common

* Rename /server files

* Rename /public files

* Rename test file names

* Rename missed files

* Revert "Rename subtype CONFIG to POLICY (I don't think this string is ever sent by agent, though)"

This reverts commit 3c91e01ed98d34de18a06ae8cb06dadf3b2c77be.

* Add migration version to updated es archiver data to fix tests
---
 x-pack/plugins/ingest_manager/README.md       |   2 +-
 .../ingest_manager/common/constants/agent.ts  |   4 +-
 .../common/constants/agent_config.ts          |  20 -
 .../common/constants/agent_policy.ts          |  20 +
 .../ingest_manager/common/constants/index.ts  |   4 +-
 .../{package_config.ts => package_policy.ts}  |   2 +-
 .../ingest_manager/common/constants/routes.ts |  38 +-
 x-pack/plugins/ingest_manager/common/mocks.ts |  12 +-
 .../common/openapi/spec_oas3.json             | 176 +++----
 ...o_yaml.ts => full_agent_policy_to_yaml.ts} |  12 +-
 .../ingest_manager/common/services/index.ts   |   8 +-
 .../common/services/limited_package.ts        |  14 +-
 ... package_policies_to_agent_inputs.test.ts} |  38 +-
 ...ts => package_policies_to_agent_inputs.ts} |  32 +-
 ...t.ts => package_to_package_policy.test.ts} |  56 +--
 ...config.ts => package_to_package_policy.ts} |  64 +--
 .../ingest_manager/common/services/routes.ts  |  52 +--
 .../ingest_manager/common/types/index.ts      |   4 +-
 .../common/types/models/agent.ts              |   6 +-
 .../{agent_config.ts => agent_policy.ts}      |  26 +-
 .../common/types/models/enrollment_api_key.ts |  12 +-
 .../common/types/models/index.ts              |   4 +-
 .../common/types/models/package_config.ts     |  73 ---
 .../common/types/models/package_policy.ts     |  73 +++
 .../common/types/rest_spec/agent.ts           |   4 +-
 .../common/types/rest_spec/agent_config.ts    |  83 ----
 .../common/types/rest_spec/agent_policy.ts    |  83 ++++
 .../types/rest_spec/enrollment_api_key.ts     |   2 +-
 .../common/types/rest_spec/index.ts           |   4 +-
 .../common/types/rest_spec/package_config.ts  |  59 ---
 .../common/types/rest_spec/package_policy.ts  |  59 +++
 .../dev_docs/actions_and_events.md            |   2 +-
 .../dev_docs/api/agents_enroll.md             |   2 +-
 .../ingest_manager/dev_docs/definitions.md    |  21 +-
 x-pack/plugins/ingest_manager/dev_docs/epm.md |  22 +-
 .../fleet_agents_interactions_detailed.md     |  14 +-
 .../dev_docs/schema/agent_checkin.mml         |   6 +-
 .../dev_docs/schema/saved_objects.mml         |  26 +-
 .../tutorial_directory_notice.tsx             |   2 +-
 .../tutorial_module_notice.tsx                |   2 +-
 .../components/settings_flyout.tsx            |   4 +-
 .../ingest_manager/constants/index.ts         |   4 +-
 .../ingest_manager/constants/page_paths.ts    |  38 +-
 .../ingest_manager/hooks/use_breadcrumbs.tsx  |  54 +--
 .../hooks/use_request/agent_config.ts         | 109 -----
 .../hooks/use_request/agent_policy.ts         | 109 +++++
 .../ingest_manager/hooks/use_request/index.ts |   4 +-
 .../hooks/use_request/package_config.ts       |  62 ---
 .../hooks/use_request/package_policy.ts       |  62 +++
 .../applications/ingest_manager/index.tsx     |   8 +-
 .../ingest_manager/layouts/default.tsx        |   9 +-
 .../sections/agent_config/components/index.ts |  12 -
 .../components/custom_package_config.tsx      |  61 ---
 .../details_page/components/index.ts          |   8 -
 .../components/package_configs/index.tsx      |  23 -
 .../sections/agent_config/index.tsx           |  36 --
 .../components/actions_menu.tsx               |  44 +-
 .../agent_policy_copy_provider.tsx}           |  94 ++--
 .../agent_policy_delete_provider.tsx}         |  82 ++--
 .../components/agent_policy_form.tsx}         | 126 +++--
 .../components/agent_policy_yaml_flyout.tsx}  |  38 +-
 .../components/confirm_deploy_modal.tsx       |  26 +-
 .../danger_eui_context_menu_item.tsx          |   0
 .../sections/agent_policy/components/index.ts |  14 +
 .../components/linked_agent_count.tsx         |   8 +-
 .../package_policy_delete_provider.tsx}       |  82 ++--
 .../components/custom_package_policy.tsx      |  61 +++
 .../components/index.ts                       |   8 +-
 .../components/layout.tsx                     |  44 +-
 .../package_policy_input_config.tsx}          |  42 +-
 .../package_policy_input_panel.tsx}           |  82 ++--
 .../package_policy_input_stream.tsx}          |  42 +-
 .../package_policy_input_var_field.tsx}       |   4 +-
 .../create_package_policy_page}/index.tsx     | 244 +++++-----
 .../has_invalid_but_required_var.test.ts      |   0
 .../services/has_invalid_but_required_var.ts  |  14 +-
 .../services/index.ts                         |  12 +-
 .../services/is_advanced_var.test.ts          |   0
 .../services/is_advanced_var.ts               |   0
 .../validate_package_policy.test..ts}         |  56 +--
 .../services/validate_package_policy.ts}      |  74 +--
 .../step_configure_package.tsx                |  52 +--
 .../step_define_package_policy.tsx}           |  94 ++--
 .../step_select_agent_policy.tsx}             | 202 ++++----
 .../step_select_package.tsx                   |  58 +--
 .../create_package_policy_page}/types.ts      |   4 +-
 .../details_page/components/index.ts          |   8 +
 .../components/package_policies/index.tsx     |  23 +
 .../package_policies/no_package_policies.tsx} |  12 +-
 .../package_policies_table.tsx}               | 116 ++---
 .../components/settings/index.tsx             |  80 ++--
 .../details_page/hooks/index.ts               |   2 +-
 .../details_page/hooks/use_agent_status.tsx   |   4 +-
 .../details_page/hooks/use_config.tsx         |   6 +-
 .../details_page/index.tsx                    | 134 +++---
 .../edit_package_policy_page}/index.tsx       | 220 ++++-----
 .../sections/agent_policy/index.tsx           |  36 ++
 .../components/create_agent_policy.tsx}       |  64 +--
 .../list_page/components/index.ts             |   2 +-
 .../list_page/index.tsx                       | 151 +++---
 .../sections/data_stream/list_page/index.tsx  |   2 +-
 .../ingest_manager/sections/epm/index.tsx     |   6 +-
 .../detail/confirm_package_uninstall.tsx      |   2 +-
 .../sections/epm/screens/detail/content.tsx   |   4 +-
 .../sections/epm/screens/detail/index.tsx     |   4 +-
 ...s_panel.tsx => package_policies_panel.tsx} |   4 +-
 .../epm/screens/detail/settings_panel.tsx     |  14 +-
 .../epm/screens/detail/side_nav_links.tsx     |   2 +-
 .../components/actions_menu.tsx               |   8 +-
 .../components/agent_details.tsx              |  18 +-
 .../components/type_labels.tsx                |   4 +-
 .../fleet/agent_details_page/index.tsx        |  40 +-
 .../sections/fleet/agent_list_page/index.tsx  | 126 ++---
 ...lection.tsx => agent_policy_selection.tsx} |  82 ++--
 .../agent_enrollment_flyout/index.tsx         |  10 +-
 .../managed_instructions.tsx                  |  10 +-
 .../standalone_instructions.tsx               |  48 +-
 .../agent_enrollment_flyout/steps.tsx         |  24 +-
 ...es.tsx => agent_policy_package_badges.tsx} |  32 +-
 .../index.tsx                                 |  63 +--
 .../sections/fleet/components/index.tsx       |   2 +-
 .../sections/fleet/components/list_layout.tsx |  12 +-
 .../components/new_enrollment_key_flyout.tsx  |  33 +-
 .../enrollment_token_list_page/index.tsx      |  20 +-
 .../sections/fleet/setup_page/index.tsx       |   4 +-
 .../ingest_manager/sections/index.tsx         |   4 +-
 ...n_section.tsx => agent_policy_section.tsx} |  36 +-
 .../overview/components/agent_section.tsx     |   2 +-
 .../components/integration_section.tsx        |   2 +-
 .../sections/overview/index.tsx               |  16 +-
 .../ingest_manager/services/index.ts          |  12 +-
 .../ingest_manager/types/index.ts             |  56 +--
 .../types/intra_app_route_state.ts            |  24 +-
 x-pack/plugins/ingest_manager/public/index.ts |  10 +-
 .../plugins/ingest_manager/public/plugin.ts   |   6 +-
 .../server/collectors/agent_collectors.ts     |   4 +-
 .../server/collectors/package_collectors.ts   |  23 +-
 .../ingest_manager/server/constants/index.ts  |  14 +-
 x-pack/plugins/ingest_manager/server/index.ts |  14 +-
 .../server/integration_tests/router.test.ts   |  42 +-
 x-pack/plugins/ingest_manager/server/mocks.ts |   8 +-
 .../plugins/ingest_manager/server/plugin.ts   |  30 +-
 .../server/routes/agent/handlers.ts           |  11 +-
 .../server/routes/agent/index.ts              |   6 +-
 .../server/routes/agent_config/index.ts       | 108 -----
 .../handlers.ts                               | 174 +++----
 .../server/routes/agent_policy/index.ts       | 108 +++++
 .../routes/enrollment_api_key/handler.ts      |   2 +-
 .../ingest_manager/server/routes/index.ts     |   4 +-
 .../server/routes/package_config/index.ts     |  73 ---
 .../handlers.test.ts                          |  56 +--
 .../handlers.ts                               |  90 ++--
 .../server/routes/package_policy/index.ts     |  73 +++
 .../server/saved_objects/index.ts             |  53 ++-
 .../saved_objects/migrations/to_v7_10_0.ts    |  72 +++
 .../server/services/agent_config.ts           | 442 ------------------
 ...nt_config.test.ts => agent_policy.test.ts} |  34 +-
 .../server/services/agent_policy.ts           | 442 ++++++++++++++++++
 ...onfig_update.ts => agent_policy_update.ts} |  14 +-
 .../server/services/agents/acks.test.ts       |  16 +-
 .../server/services/agents/acks.ts            |  20 +-
 .../server/services/agents/checkin/index.ts   |   2 +-
 .../agents/checkin/state_new_actions.ts       |  78 ++--
 .../server/services/agents/enroll.ts          |   6 +-
 .../server/services/agents/reassign.ts        |  14 +-
 .../server/services/agents/status.ts          |  18 +-
 .../server/services/agents/update.ts          |   7 +-
 .../services/api_keys/enrollment_api_key.ts   |  25 +-
 .../server/services/api_keys/index.ts         |   6 +-
 .../ingest_manager/server/services/config.ts  |   2 +-
 .../server/services/epm/agent/agent.ts        |   6 +-
 .../server/services/epm/packages/get.ts       |   2 +-
 .../server/services/epm/packages/remove.ts    |  10 +-
 .../ingest_manager/server/services/index.ts   |   4 +-
 ..._config.test.ts => package_policy.test.ts} |  22 +-
 .../{package_config.ts => package_policy.ts}  | 218 ++++-----
 .../ingest_manager/server/services/setup.ts   |  62 +--
 .../ingest_manager/server/types/index.tsx     |  28 +-
 .../server/types/models/agent.ts              |   2 +-
 .../{agent_config.ts => agent_policy.ts}      |  22 +-
 .../server/types/models/enrollment_api_key.ts |  12 +-
 .../server/types/models/index.ts              |   4 +-
 .../{package_config.ts => package_policy.ts}  |  16 +-
 .../server/types/rest_spec/agent.ts           |   4 +-
 .../{agent_config.ts => agent_policy.ts}      |  30 +-
 .../types/rest_spec/enrollment_api_key.ts     |   2 +-
 .../server/types/rest_spec/index.ts           |   4 +-
 .../server/types/rest_spec/package_config.ts  |  33 --
 .../server/types/rest_spec/package_policy.ts  |  33 ++
 .../common/endpoint/generate_data.ts          |  20 +-
 .../common/endpoint/types.ts                  |   8 +-
 .../use_navigate_to_app_event_handler.ts      |   4 +-
 .../mock/endpoint/dependencies_start_mock.ts  |   4 +-
 .../pages/endpoint_hosts/store/middleware.ts  |  24 +-
 .../store/mock_endpoint_result_list.ts        |  30 +-
 .../view/details/endpoint_details.tsx         |   4 +-
 .../pages/endpoint_hosts/view/index.test.tsx  |  12 +-
 .../pages/endpoint_hosts/view/index.tsx       |  14 +-
 .../policy/store/policy_details/index.test.ts |   4 +-
 .../policy/store/policy_details/middleware.ts |  22 +-
 .../policy/store/policy_details/selectors.ts  |   2 +-
 .../pages/policy/store/policy_list/action.ts  |   2 +-
 .../policy/store/policy_list/index.test.ts    |  28 +-
 .../policy/store/policy_list/middleware.ts    |  22 +-
 .../store/policy_list/services/ingest.test.ts |  30 +-
 .../store/policy_list/services/ingest.ts      |  82 ++--
 .../store/policy_list/test_mock_utils.ts      |   6 +-
 .../public/management/pages/policy/types.ts   |  16 +-
 ...onfig.tsx => configure_package_policy.tsx} |  36 +-
 .../pages/policy/view/policy_details.test.tsx |  24 +-
 .../pages/policy/view/policy_details.tsx      |   2 +-
 .../pages/policy/view/policy_list.test.tsx    |   2 +-
 .../pages/policy/view/policy_list.tsx         |  26 +-
 .../security_solution/public/plugin.tsx       |   6 +-
 .../endpoint/endpoint_app_context_services.ts |   6 +-
 .../endpoint/ingest_integration.test.ts       |  20 +-
 .../server/endpoint/ingest_integration.ts     |  30 +-
 .../server/endpoint/lib/artifacts/mocks.ts    |  20 +-
 .../server/endpoint/lib/artifacts/task.ts     |   2 +-
 .../server/endpoint/mocks.ts                  |   4 +-
 .../manifest_manager/manifest_manager.mock.ts |  26 +-
 .../manifest_manager/manifest_manager.test.ts |  20 +-
 .../manifest_manager/manifest_manager.ts      |  30 +-
 .../security_solution/server/plugin.ts        |   2 +-
 .../server/usage/endpoints/endpoint.mocks.ts  |  10 +-
 .../translations/translations/ja-JP.json      | 410 ++++++++--------
 .../translations/translations/zh-CN.json      | 410 ++++++++--------
 .../endpoint/artifacts/api_feature/data.json  |  14 +-
 .../es_archives/fleet/agents/data.json        |  35 +-
 .../es_archives/fleet/agents/mappings.json    |  15 +-
 .../es_archives/lists/mappings.json           |  12 +-
 .../canvas_disallowed_url/mappings.json       |  12 +-
 .../agent_policy.ts}                          |  34 +-
 .../{agent_config => agent_policy}/index.js   |   2 +-
 .../apis/fleet/agents/complete_flow.ts        |   6 +-
 .../apis/fleet/agents/enroll.ts               |   2 +-
 .../apis/fleet/enrollment_api_keys/crud.ts    |  14 +-
 .../apis/index.js                             |  13 +-
 .../create.ts                                 |  40 +-
 .../{package_config => package_policy}/get.ts |  34 +-
 .../update.ts                                 |  42 +-
 .../es_archives/export_rule/mappings.json     |  10 +-
 .../apps/endpoint/endpoint_list.ts            |   2 +-
 .../apps/endpoint/policy_details.ts           |  48 +-
 .../apps/endpoint/policy_list.ts              |  42 +-
 .../page_objects/index.ts                     |   4 +-
 ...est_manager_create_package_policy_page.ts} |  50 +-
 .../page_objects/policy_page.ts               |   6 +-
 .../services/endpoint_policy.ts               | 150 +++---
 249 files changed, 4845 insertions(+), 4720 deletions(-)
 delete mode 100644 x-pack/plugins/ingest_manager/common/constants/agent_config.ts
 create mode 100644 x-pack/plugins/ingest_manager/common/constants/agent_policy.ts
 rename x-pack/plugins/ingest_manager/common/constants/{package_config.ts => package_policy.ts} (79%)
 rename x-pack/plugins/ingest_manager/common/services/{config_to_yaml.ts => full_agent_policy_to_yaml.ts} (70%)
 rename x-pack/plugins/ingest_manager/common/services/{package_configs_to_agent_inputs.test.ts => package_policies_to_agent_inputs.test.ts} (80%)
 rename x-pack/plugins/ingest_manager/common/services/{package_configs_to_agent_inputs.ts => package_policies_to_agent_inputs.ts} (62%)
 rename x-pack/plugins/ingest_manager/common/services/{package_to_config.test.ts => package_to_package_policy.test.ts} (88%)
 rename x-pack/plugins/ingest_manager/common/services/{package_to_config.ts => package_to_package_policy.ts} (65%)
 rename x-pack/plugins/ingest_manager/common/types/models/{agent_config.ts => agent_policy.ts} (65%)
 delete mode 100644 x-pack/plugins/ingest_manager/common/types/models/package_config.ts
 create mode 100644 x-pack/plugins/ingest_manager/common/types/models/package_policy.ts
 delete mode 100644 x-pack/plugins/ingest_manager/common/types/rest_spec/agent_config.ts
 create mode 100644 x-pack/plugins/ingest_manager/common/types/rest_spec/agent_policy.ts
 delete mode 100644 x-pack/plugins/ingest_manager/common/types/rest_spec/package_config.ts
 create mode 100644 x-pack/plugins/ingest_manager/common/types/rest_spec/package_policy.ts
 delete mode 100644 x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/agent_config.ts
 create mode 100644 x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/agent_policy.ts
 delete mode 100644 x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/package_config.ts
 create mode 100644 x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/package_policy.ts
 delete mode 100644 x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/index.ts
 delete mode 100644 x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/custom_package_config.tsx
 delete mode 100644 x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/index.ts
 delete mode 100644 x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/index.tsx
 delete mode 100644 x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/index.tsx
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config => agent_policy}/components/actions_menu.tsx (74%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/components/config_copy_provider.tsx => agent_policy/components/agent_policy_copy_provider.tsx} (54%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/components/config_delete_provider.tsx => agent_policy/components/agent_policy_delete_provider.tsx} (62%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/components/config_form.tsx => agent_policy/components/agent_policy_form.tsx} (70%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/components/config_yaml_flyout.tsx => agent_policy/components/agent_policy_yaml_flyout.tsx} (68%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config => agent_policy}/components/confirm_deploy_modal.tsx (72%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config => agent_policy}/components/danger_eui_context_menu_item.tsx (100%)
 create mode 100644 x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/index.ts
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config => agent_policy}/components/linked_agent_count.tsx (77%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/components/package_config_delete_provider.tsx => agent_policy/components/package_policy_delete_provider.tsx} (70%)
 create mode 100644 x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/custom_package_policy.tsx
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page => agent_policy/create_package_policy_page}/components/index.ts (51%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page => agent_policy/create_package_policy_page}/components/layout.tsx (79%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page/components/package_config_input_config.tsx => agent_policy/create_package_policy_page/components/package_policy_input_config.tsx} (83%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page/components/package_config_input_panel.tsx => agent_policy/create_package_policy_page/components/package_policy_input_panel.tsx} (74%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page/components/package_config_input_stream.tsx => agent_policy/create_package_policy_page/components/package_policy_input_stream.tsx} (83%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page/components/package_config_input_var_field.tsx => agent_policy/create_package_policy_page/components/package_policy_input_var_field.tsx} (95%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page => agent_policy/create_package_policy_page}/index.tsx (60%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page => agent_policy/create_package_policy_page}/services/has_invalid_but_required_var.test.ts (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page => agent_policy/create_package_policy_page}/services/has_invalid_but_required_var.ts (60%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page => agent_policy/create_package_policy_page}/services/index.ts (67%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page => agent_policy/create_package_policy_page}/services/is_advanced_var.test.ts (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page => agent_policy/create_package_policy_page}/services/is_advanced_var.ts (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page/services/validate_package_config.ts.test.ts => agent_policy/create_package_policy_page/services/validate_package_policy.test..ts} (91%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page/services/validate_package_config.ts => agent_policy/create_package_policy_page/services/validate_package_policy.ts} (76%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page => agent_policy/create_package_policy_page}/step_configure_package.tsx (68%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page/step_define_package_config.tsx => agent_policy/create_package_policy_page/step_define_package_policy.tsx} (64%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page/step_select_config.tsx => agent_policy/create_package_policy_page/step_select_agent_policy.tsx} (51%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page => agent_policy/create_package_policy_page}/step_select_package.tsx (80%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page => agent_policy/create_package_policy_page}/types.ts (68%)
 create mode 100644 x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/index.ts
 create mode 100644 x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/package_policies/index.tsx
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/details_page/components/package_configs/no_package_configs.tsx => agent_policy/details_page/components/package_policies/no_package_policies.tsx} (68%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/details_page/components/package_configs/package_configs_table.tsx => agent_policy/details_page/components/package_policies/package_policies_table.tsx} (62%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config => agent_policy}/details_page/components/settings/index.tsx (73%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config => agent_policy}/details_page/hooks/index.ts (80%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config => agent_policy}/details_page/hooks/use_agent_status.tsx (93%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config => agent_policy}/details_page/hooks/use_config.tsx (59%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config => agent_policy}/details_page/index.tsx (64%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/edit_package_config_page => agent_policy/edit_package_policy_page}/index.tsx (59%)
 create mode 100644 x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/index.tsx
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/list_page/components/create_config.tsx => agent_policy/list_page/components/create_agent_policy.tsx} (65%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config => agent_policy}/list_page/components/index.ts (78%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config => agent_policy}/list_page/index.tsx (61%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/{package_configs_panel.tsx => package_policies_panel.tsx} (88%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/{config_selection.tsx => agent_policy_selection.tsx} (67%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/{agent_config_package_badges.tsx => agent_policy_package_badges.tsx} (52%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/{agent_reassign_config_flyout => agent_reassign_policy_flyout}/index.tsx (63%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/{configuration_section.tsx => agent_policy_section.tsx} (61%)
 delete mode 100644 x-pack/plugins/ingest_manager/server/routes/agent_config/index.ts
 rename x-pack/plugins/ingest_manager/server/routes/{agent_config => agent_policy}/handlers.ts (54%)
 create mode 100644 x-pack/plugins/ingest_manager/server/routes/agent_policy/index.ts
 delete mode 100644 x-pack/plugins/ingest_manager/server/routes/package_config/index.ts
 rename x-pack/plugins/ingest_manager/server/routes/{package_config => package_policy}/handlers.test.ts (83%)
 rename x-pack/plugins/ingest_manager/server/routes/{package_config => package_policy}/handlers.ts (61%)
 create mode 100644 x-pack/plugins/ingest_manager/server/routes/package_policy/index.ts
 create mode 100644 x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
 delete mode 100644 x-pack/plugins/ingest_manager/server/services/agent_config.ts
 rename x-pack/plugins/ingest_manager/server/services/{agent_config.test.ts => agent_policy.test.ts} (74%)
 create mode 100644 x-pack/plugins/ingest_manager/server/services/agent_policy.ts
 rename x-pack/plugins/ingest_manager/server/services/{agent_config_update.ts => agent_policy_update.ts} (64%)
 rename x-pack/plugins/ingest_manager/server/services/{package_config.test.ts => package_policy.test.ts} (88%)
 rename x-pack/plugins/ingest_manager/server/services/{package_config.ts => package_policy.ts} (58%)
 rename x-pack/plugins/ingest_manager/server/types/models/{agent_config.ts => agent_policy.ts} (60%)
 rename x-pack/plugins/ingest_manager/server/types/models/{package_config.ts => package_policy.ts} (85%)
 rename x-pack/plugins/ingest_manager/server/types/rest_spec/{agent_config.ts => agent_policy.ts} (58%)
 delete mode 100644 x-pack/plugins/ingest_manager/server/types/rest_spec/package_config.ts
 create mode 100644 x-pack/plugins/ingest_manager/server/types/rest_spec/package_policy.ts
 rename x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/{configure_package_config.tsx => configure_package_policy.tsx} (73%)
 rename x-pack/test/ingest_manager_api_integration/apis/{agent_config/agent_config.ts => agent_policy/agent_policy.ts} (71%)
 rename x-pack/test/ingest_manager_api_integration/apis/{agent_config => agent_policy}/index.js (86%)
 rename x-pack/test/ingest_manager_api_integration/apis/{package_config => package_policy}/create.ts (81%)
 rename x-pack/test/ingest_manager_api_integration/apis/{package_config => package_policy}/get.ts (68%)
 rename x-pack/test/ingest_manager_api_integration/apis/{package_config => package_policy}/update.ts (72%)
 rename x-pack/test/security_solution_endpoint/page_objects/{ingest_manager_create_package_config_page.ts => ingest_manager_create_package_policy_page.ts} (56%)

diff --git a/x-pack/plugins/ingest_manager/README.md b/x-pack/plugins/ingest_manager/README.md
index 9fd23e3d41dde..a95a2582f1f60 100644
--- a/x-pack/plugins/ingest_manager/README.md
+++ b/x-pack/plugins/ingest_manager/README.md
@@ -3,7 +3,7 @@
 ## Plugin
 
 - The plugin is enabled by default. See the TypeScript type for the [the available plugin configuration options](https://github.com/elastic/kibana/blob/master/x-pack/plugins/ingest_manager/common/types/index.ts#L9-L27)
-- Adding `xpack.ingestManager.enabled=false` will disable the plugin including the EPM and Fleet features. It will also remove the `PACKAGE_CONFIG_API_ROUTES` and `AGENT_CONFIG_API_ROUTES` values in [`common/constants/routes.ts`](./common/constants/routes.ts)
+- Adding `xpack.ingestManager.enabled=false` will disable the plugin including the EPM and Fleet features. It will also remove the `PACKAGE_POLICY_API_ROUTES` and `AGENT_POLICY_API_ROUTES` values in [`common/constants/routes.ts`](./common/constants/routes.ts)
 - Adding `--xpack.ingestManager.fleet.enabled=false` will disable the Fleet API & UI
   - [code for adding the routes](https://github.com/elastic/kibana/blob/1f27d349533b1c2865c10c45b2cf705d7416fb36/x-pack/plugins/ingest_manager/server/plugin.ts#L115-L133)
   - [Integration tests](server/integration_tests/router.test.ts)
diff --git a/x-pack/plugins/ingest_manager/common/constants/agent.ts b/x-pack/plugins/ingest_manager/common/constants/agent.ts
index d94f536b5659a..6d0d9ee801a94 100644
--- a/x-pack/plugins/ingest_manager/common/constants/agent.ts
+++ b/x-pack/plugins/ingest_manager/common/constants/agent.ts
@@ -17,5 +17,5 @@ export const AGENT_POLLING_INTERVAL = 1000;
 export const AGENT_UPDATE_LAST_CHECKIN_INTERVAL_MS = 30000;
 export const AGENT_UPDATE_ACTIONS_INTERVAL_MS = 5000;
 
-export const AGENT_CONFIG_ROLLOUT_RATE_LIMIT_INTERVAL_MS = 5000;
-export const AGENT_CONFIG_ROLLOUT_RATE_LIMIT_REQUEST_PER_INTERVAL = 25;
+export const AGENT_POLICY_ROLLOUT_RATE_LIMIT_INTERVAL_MS = 5000;
+export const AGENT_POLICY_ROLLOUT_RATE_LIMIT_REQUEST_PER_INTERVAL = 25;
diff --git a/x-pack/plugins/ingest_manager/common/constants/agent_config.ts b/x-pack/plugins/ingest_manager/common/constants/agent_config.ts
deleted file mode 100644
index aa6399b73f14e..0000000000000
--- a/x-pack/plugins/ingest_manager/common/constants/agent_config.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { AgentConfigStatus, DefaultPackages } from '../types';
-
-export const AGENT_CONFIG_SAVED_OBJECT_TYPE = 'ingest-agent-policies';
-
-export const DEFAULT_AGENT_CONFIG = {
-  name: 'Default config',
-  namespace: 'default',
-  description: 'Default agent configuration created by Kibana',
-  status: AgentConfigStatus.Active,
-  package_configs: [],
-  is_default: true,
-  monitoring_enabled: ['logs', 'metrics'] as Array<'logs' | 'metrics'>,
-};
-
-export const DEFAULT_AGENT_CONFIGS_PACKAGES = [DefaultPackages.system];
diff --git a/x-pack/plugins/ingest_manager/common/constants/agent_policy.ts b/x-pack/plugins/ingest_manager/common/constants/agent_policy.ts
new file mode 100644
index 0000000000000..f6261790f6673
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/common/constants/agent_policy.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { AgentPolicyStatus, DefaultPackages } from '../types';
+
+export const AGENT_POLICY_SAVED_OBJECT_TYPE = 'ingest-agent-policies';
+
+export const DEFAULT_AGENT_POLICY = {
+  name: 'Default policy',
+  namespace: 'default',
+  description: 'Default agent policy created by Kibana',
+  status: AgentPolicyStatus.Active,
+  package_policies: [],
+  is_default: true,
+  monitoring_enabled: ['logs', 'metrics'] as Array<'logs' | 'metrics'>,
+};
+
+export const DEFAULT_AGENT_POLICIES_PACKAGES = [DefaultPackages.system];
diff --git a/x-pack/plugins/ingest_manager/common/constants/index.ts b/x-pack/plugins/ingest_manager/common/constants/index.ts
index ed01fcdd316a3..519e2861cdc1d 100644
--- a/x-pack/plugins/ingest_manager/common/constants/index.ts
+++ b/x-pack/plugins/ingest_manager/common/constants/index.ts
@@ -7,8 +7,8 @@ export * from './plugin';
 export * from './routes';
 
 export * from './agent';
-export * from './agent_config';
-export * from './package_config';
+export * from './agent_policy';
+export * from './package_policy';
 export * from './epm';
 export * from './output';
 export * from './enrollment_api_key';
diff --git a/x-pack/plugins/ingest_manager/common/constants/package_config.ts b/x-pack/plugins/ingest_manager/common/constants/package_policy.ts
similarity index 79%
rename from x-pack/plugins/ingest_manager/common/constants/package_config.ts
rename to x-pack/plugins/ingest_manager/common/constants/package_policy.ts
index 48fee967a3d3d..27814e6baafb1 100644
--- a/x-pack/plugins/ingest_manager/common/constants/package_config.ts
+++ b/x-pack/plugins/ingest_manager/common/constants/package_policy.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export const PACKAGE_CONFIG_SAVED_OBJECT_TYPE = 'ingest-package-policies';
+export const PACKAGE_POLICY_SAVED_OBJECT_TYPE = 'ingest-package-policies';
diff --git a/x-pack/plugins/ingest_manager/common/constants/routes.ts b/x-pack/plugins/ingest_manager/common/constants/routes.ts
index 94265c3920922..551a0f7d60164 100644
--- a/x-pack/plugins/ingest_manager/common/constants/routes.ts
+++ b/x-pack/plugins/ingest_manager/common/constants/routes.ts
@@ -7,8 +7,8 @@
 export const API_ROOT = `/api/ingest_manager`;
 export const EPM_API_ROOT = `${API_ROOT}/epm`;
 export const DATA_STREAM_API_ROOT = `${API_ROOT}/data_streams`;
-export const PACKAGE_CONFIG_API_ROOT = `${API_ROOT}/package_configs`;
-export const AGENT_CONFIG_API_ROOT = `${API_ROOT}/agent_configs`;
+export const PACKAGE_POLICY_API_ROOT = `${API_ROOT}/package_policies`;
+export const AGENT_POLICY_API_ROOT = `${API_ROOT}/agent_policies`;
 export const FLEET_API_ROOT = `${API_ROOT}/fleet`;
 
 export const LIMITED_CONCURRENCY_ROUTE_TAG = 'ingest:limited-concurrency';
@@ -32,25 +32,25 @@ export const DATA_STREAM_API_ROUTES = {
   LIST_PATTERN: `${DATA_STREAM_API_ROOT}`,
 };
 
-// Package config API routes
-export const PACKAGE_CONFIG_API_ROUTES = {
-  LIST_PATTERN: `${PACKAGE_CONFIG_API_ROOT}`,
-  INFO_PATTERN: `${PACKAGE_CONFIG_API_ROOT}/{packageConfigId}`,
-  CREATE_PATTERN: `${PACKAGE_CONFIG_API_ROOT}`,
-  UPDATE_PATTERN: `${PACKAGE_CONFIG_API_ROOT}/{packageConfigId}`,
-  DELETE_PATTERN: `${PACKAGE_CONFIG_API_ROOT}/delete`,
+// Package policy API routes
+export const PACKAGE_POLICY_API_ROUTES = {
+  LIST_PATTERN: `${PACKAGE_POLICY_API_ROOT}`,
+  INFO_PATTERN: `${PACKAGE_POLICY_API_ROOT}/{packagePolicyId}`,
+  CREATE_PATTERN: `${PACKAGE_POLICY_API_ROOT}`,
+  UPDATE_PATTERN: `${PACKAGE_POLICY_API_ROOT}/{packagePolicyId}`,
+  DELETE_PATTERN: `${PACKAGE_POLICY_API_ROOT}/delete`,
 };
 
-// Agent config API routes
-export const AGENT_CONFIG_API_ROUTES = {
-  LIST_PATTERN: `${AGENT_CONFIG_API_ROOT}`,
-  INFO_PATTERN: `${AGENT_CONFIG_API_ROOT}/{agentConfigId}`,
-  CREATE_PATTERN: `${AGENT_CONFIG_API_ROOT}`,
-  UPDATE_PATTERN: `${AGENT_CONFIG_API_ROOT}/{agentConfigId}`,
-  COPY_PATTERN: `${AGENT_CONFIG_API_ROOT}/{agentConfigId}/copy`,
-  DELETE_PATTERN: `${AGENT_CONFIG_API_ROOT}/delete`,
-  FULL_INFO_PATTERN: `${AGENT_CONFIG_API_ROOT}/{agentConfigId}/full`,
-  FULL_INFO_DOWNLOAD_PATTERN: `${AGENT_CONFIG_API_ROOT}/{agentConfigId}/download`,
+// Agent policy API routes
+export const AGENT_POLICY_API_ROUTES = {
+  LIST_PATTERN: `${AGENT_POLICY_API_ROOT}`,
+  INFO_PATTERN: `${AGENT_POLICY_API_ROOT}/{agentPolicyId}`,
+  CREATE_PATTERN: `${AGENT_POLICY_API_ROOT}`,
+  UPDATE_PATTERN: `${AGENT_POLICY_API_ROOT}/{agentPolicyId}`,
+  COPY_PATTERN: `${AGENT_POLICY_API_ROOT}/{agentPolicyId}/copy`,
+  DELETE_PATTERN: `${AGENT_POLICY_API_ROOT}/delete`,
+  FULL_INFO_PATTERN: `${AGENT_POLICY_API_ROOT}/{agentPolicyId}/full`,
+  FULL_INFO_DOWNLOAD_PATTERN: `${AGENT_POLICY_API_ROOT}/{agentPolicyId}/download`,
 };
 
 // Output API routes
diff --git a/x-pack/plugins/ingest_manager/common/mocks.ts b/x-pack/plugins/ingest_manager/common/mocks.ts
index e85364f2bb672..1e14245e0f3ef 100644
--- a/x-pack/plugins/ingest_manager/common/mocks.ts
+++ b/x-pack/plugins/ingest_manager/common/mocks.ts
@@ -4,15 +4,15 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { NewPackageConfig, PackageConfig } from './types/models/package_config';
+import { NewPackagePolicy, PackagePolicy } from './types';
 
-export const createNewPackageConfigMock = (): NewPackageConfig => {
+export const createNewPackagePolicyMock = (): NewPackagePolicy => {
   return {
     name: 'endpoint-1',
     description: '',
     namespace: 'default',
     enabled: true,
-    config_id: '93c46720-c217-11ea-9906-b5b8a21b268e',
+    policy_id: '93c46720-c217-11ea-9906-b5b8a21b268e',
     output_id: '',
     package: {
       name: 'endpoint',
@@ -23,10 +23,10 @@ export const createNewPackageConfigMock = (): NewPackageConfig => {
   };
 };
 
-export const createPackageConfigMock = (): PackageConfig => {
-  const newPackageConfig = createNewPackageConfigMock();
+export const createPackagePolicyMock = (): PackagePolicy => {
+  const newPackagePolicy = createNewPackagePolicyMock();
   return {
-    ...newPackageConfig,
+    ...newPackagePolicy,
     id: 'c6d16e42-c32d-4dce-8a88-113cfe276ad1',
     version: 'abcd',
     revision: 1,
diff --git a/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json b/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
index cfae2c450c824..8c9ede1fde9ba 100644
--- a/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
+++ b/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
@@ -17,9 +17,9 @@
     }
   ],
   "paths": {
-    "/agent_configs": {
+    "/agent_policies": {
       "get": {
-        "summary": "Agent Config - List",
+        "summary": "Agent policy - List",
         "tags": [],
         "responses": {
           "200": {
@@ -32,7 +32,7 @@
                     "items": {
                       "type": "array",
                       "items": {
-                        "$ref": "#/components/schemas/AgentConfig"
+                        "$ref": "#/components/schemas/AgentPolicy"
                       }
                     },
                     "total": {
@@ -56,11 +56,11 @@
                       "items": [
                         {
                           "id": "82da1fc0-8fbf-11ea-b2ce-01c4a6127154",
-                          "name": "Default config",
+                          "name": "Default policy",
                           "namespace": "default",
-                          "description": "Default agent configuration created by Kibana",
+                          "description": "Default agent policy created by Kibana",
                           "status": "active",
-                          "packageConfigs": ["8a5679b0-8fbf-11ea-b2ce-01c4a6127154"],
+                          "packagePolicies": ["8a5679b0-8fbf-11ea-b2ce-01c4a6127154"],
                           "is_default": true,
                           "monitoring_enabled": ["logs", "metrics"],
                           "revision": 2,
@@ -80,7 +80,7 @@
             }
           }
         },
-        "operationId": "agent-config-list",
+        "operationId": "agent-policy-list",
         "parameters": [
           {
             "$ref": "#/components/parameters/pageSizeParam"
@@ -95,7 +95,7 @@
         "description": ""
       },
       "post": {
-        "summary": "Agent Config - Create",
+        "summary": "Agent policy - Create",
         "tags": [],
         "responses": {
           "200": {
@@ -106,7 +106,7 @@
                   "type": "object",
                   "properties": {
                     "item": {
-                      "$ref": "#/components/schemas/AgentConfig"
+                      "$ref": "#/components/schemas/AgentPolicy"
                     },
                     "success": {
                       "type": "boolean"
@@ -117,12 +117,12 @@
             }
           }
         },
-        "operationId": "post-agent_configs",
+        "operationId": "post-agent-policy",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/NewAgentConfig"
+                "$ref": "#/components/schemas/NewAgentPolicy"
               }
             }
           }
@@ -135,19 +135,19 @@
         ]
       }
     },
-    "/agent_configs/{agentConfigId}": {
+    "/agent_policies/{agentPolicyId}": {
       "parameters": [
         {
           "schema": {
             "type": "string"
           },
-          "name": "agentConfigId",
+          "name": "agentPolicyId",
           "in": "path",
           "required": true
         }
       ],
       "get": {
-        "summary": "Agent Config - Info",
+        "summary": "Agent policy - Info",
         "tags": [],
         "responses": {
           "200": {
@@ -158,7 +158,7 @@
                   "type": "object",
                   "properties": {
                     "item": {
-                      "$ref": "#/components/schemas/AgentConfig"
+                      "$ref": "#/components/schemas/AgentPolicy"
                     },
                     "success": {
                       "type": "boolean"
@@ -171,11 +171,11 @@
                     "value": {
                       "item": {
                         "id": "82da1fc0-8fbf-11ea-b2ce-01c4a6127154",
-                        "name": "Default config",
+                        "name": "Default policy",
                         "namespace": "default",
-                        "description": "Default agent configuration created by Kibana",
+                        "description": "Default agent policy created by Kibana",
                         "status": "active",
-                        "packageConfigs": [
+                        "packagePolicies": [
                           {
                             "id": "8a5679b0-8fbf-11ea-b2ce-01c4a6127154",
                             "name": "system-1",
@@ -186,7 +186,7 @@
                               "version": "0.0.3"
                             },
                             "enabled": true,
-                            "config_id": "82da1fc0-8fbf-11ea-b2ce-01c4a6127154",
+                            "policy_id": "82da1fc0-8fbf-11ea-b2ce-01c4a6127154",
                             "output_id": "08adc51c-69f3-4294-80e2-24527c6ff73d",
                             "inputs": [
                               {
@@ -716,12 +716,12 @@
             }
           }
         },
-        "operationId": "agent-config-info",
-        "description": "Get one agent config",
+        "operationId": "agent-policy-info",
+        "description": "Get one agent policy",
         "parameters": []
       },
       "put": {
-        "summary": "Agent Config - Update",
+        "summary": "Agent policy - Update",
         "tags": [],
         "responses": {
           "200": {
@@ -732,7 +732,7 @@
                   "type": "object",
                   "properties": {
                     "item": {
-                      "$ref": "#/components/schemas/AgentConfig"
+                      "$ref": "#/components/schemas/AgentPolicy"
                     },
                     "success": {
                       "type": "boolean"
@@ -750,7 +750,7 @@
                         "namespace": "UPDATED namespace",
                         "updated_on": "Fri Feb 28 2020 16:22:31 GMT-0500 (Eastern Standard Time)",
                         "updated_by": "elastic",
-                        "packageConfigs": []
+                        "packagePolicies": []
                       },
                       "success": true
                     }
@@ -760,12 +760,12 @@
             }
           }
         },
-        "operationId": "put-agent_configs-agentConfigId",
+        "operationId": "put-agent-policy-agentPolicyId",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/NewAgentConfig"
+                "$ref": "#/components/schemas/NewAgentPolicy"
               },
               "examples": {
                 "example-1": {
@@ -786,20 +786,20 @@
         ]
       }
     },
-    "/agent_configs/{agentConfigId}/copy": {
+    "/agent_policies/{agentPolicyId}/copy": {
       "parameters": [
         {
           "schema": {
             "type": "string"
           },
-          "name": "agentConfigId",
+          "name": "agentPolicyId",
           "in": "path",
           "required": true
         }
       ],
       "post": {
-        "summary": "Agent config - copy one config",
-        "operationId": "agent-config-copy",
+        "summary": "Agent policy - copy one policy",
+        "operationId": "agent-policy-copy",
         "responses": {
           "200": {
             "description": "OK",
@@ -809,7 +809,7 @@
                   "type": "object",
                   "properties": {
                     "item": {
-                      "$ref": "#/components/schemas/AgentConfig"
+                      "$ref": "#/components/schemas/AgentPolicy"
                     },
                     "success": {
                       "type": "boolean"
@@ -841,13 +841,13 @@
           },
           "description": ""
         },
-        "description": "Copies one agent config"
+        "description": "Copies one agent policy"
       }
     },
-    "/agent_configs/delete": {
+    "/agent_policies/delete": {
       "post": {
-        "summary": "Agent Config - Delete",
-        "operationId": "post-agent_config-delete",
+        "summary": "Agent policy - Delete",
+        "operationId": "post-agent-policy-delete",
         "responses": {
           "200": {
             "description": "OK",
@@ -896,7 +896,7 @@
               "schema": {
                 "type": "object",
                 "properties": {
-                  "agentConfigIds": {
+                  "agentPolicyIds": {
                     "type": "array",
                     "items": {
                       "type": "string"
@@ -907,7 +907,7 @@
               "examples": {
                 "example-1": {
                   "value": {
-                    "agentConfigIds": ["df7d2540-5a47-11ea-80da-89b5a66da347"]
+                    "agentPolicyIds": ["df7d2540-5a47-11ea-80da-89b5a66da347"]
                   }
                 }
               }
@@ -922,9 +922,9 @@
       },
       "parameters": []
     },
-    "/package_configs": {
+    "/package_policies": {
       "get": {
-        "summary": "PackageConfigs - List",
+        "summary": "PackagePolicies - List",
         "tags": [],
         "responses": {
           "200": {
@@ -937,7 +937,7 @@
                     "items": {
                       "type": "array",
                       "items": {
-                        "$ref": "#/components/schemas/PackageConfig"
+                        "$ref": "#/components/schemas/PackagePolicy"
                       }
                     },
                     "total": {
@@ -1166,14 +1166,14 @@
             }
           }
         },
-        "operationId": "get-packageConfigs",
+        "operationId": "get-packagePolicies",
         "security": [],
         "parameters": []
       },
       "parameters": [],
       "post": {
-        "summary": "PackageConfigs - Create",
-        "operationId": "post-packageConfigs",
+        "summary": "PackagePolicies - Create",
+        "operationId": "post-packagePolicies",
         "responses": {
           "200": {
             "description": "OK"
@@ -1183,7 +1183,7 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/NewPackageConfig"
+                "$ref": "#/components/schemas/NewPackagePolicy"
               },
               "examples": {
                 "example-1": {
@@ -1237,9 +1237,9 @@
         ]
       }
     },
-    "/package_configs/{packageConfigId}": {
+    "/package_policies/{packagePolicyId}": {
       "get": {
-        "summary": "PackageConfigs - Info",
+        "summary": "PackagePolicies - Info",
         "tags": [],
         "responses": {
           "200": {
@@ -1250,7 +1250,7 @@
                   "type": "object",
                   "properties": {
                     "item": {
-                      "$ref": "#/components/schemas/PackageConfig"
+                      "$ref": "#/components/schemas/PackagePolicy"
                     },
                     "success": {
                       "type": "boolean"
@@ -1262,21 +1262,21 @@
             }
           }
         },
-        "operationId": "get-packageConfigs-packageConfigId"
+        "operationId": "get-packagePolicies-packagePolicyId"
       },
       "parameters": [
         {
           "schema": {
             "type": "string"
           },
-          "name": "packageConfigId",
+          "name": "packagePolicyId",
           "in": "path",
           "required": true
         }
       ],
       "put": {
-        "summary": "PackageConfigs - Update",
-        "operationId": "put-packageConfigs-packageConfigId",
+        "summary": "PackagePolicies - Update",
+        "operationId": "put-packagePolicies-packagePolicyId",
         "responses": {
           "200": {
             "description": "OK",
@@ -1286,7 +1286,7 @@
                   "type": "object",
                   "properties": {
                     "item": {
-                      "$ref": "#/components/schemas/PackageConfig"
+                      "$ref": "#/components/schemas/PackagePolicy"
                     },
                     "sucess": {
                       "type": "boolean"
@@ -1824,10 +1824,10 @@
                             "path": "telemetry"
                           }
                         ],
-                        "packageConfigs": [
+                        "packagePolicies": [
                           {
                             "name": "endpoint",
-                            "title": "Endpoint package config",
+                            "title": "Endpoint package policy",
                             "description": "Interact with the endpoint.",
                             "inputs": null,
                             "multiple": false
@@ -2119,7 +2119,7 @@
                           }
                         },
                         {
-                          "description": "The log package should be used to create package configs for all type of logs for which an package doesn't exist yet.\n",
+                          "description": "The log package should be used to create package policies for all type of logs for which an package doesn't exist yet.\n",
                           "download": "/epr/log/log-0.9.0.tar.gz",
                           "icons": [
                             {
@@ -2765,7 +2765,7 @@
                         {
                           "id": "205661d0-5e53-11ea-ad31-4f31c06bd9a4",
                           "active": true,
-                          "config_id": "ae556400-5e39-11ea-8b49-f9747e466f7b",
+                          "policy_id": "ae556400-5e39-11ea-8b49-f9747e466f7b",
                           "type": "PERMANENT",
                           "enrolled_at": "2020-03-04T20:02:50.605Z",
                           "user_provided_metadata": {
@@ -2780,7 +2780,7 @@
                           },
                           "actions": [
                             {
-                              "data": "{\"config\":{\"id\":\"ae556400-5e39-11ea-8b49-f9747e466f7b\",\"outputs\":{\"default\":{\"type\":\"elasticsearch\",\"hosts\":[\"http://localhost:9200\"],\"api_key\":\"\",\"api_token\":\"6ckkp3ABz7e_XRqr3LM8:gQuDfUNSRgmY0iziYqP9Hw\"}},\"packageConfigs\":[]}}",
+                              "data": "{\"config\":{\"id\":\"ae556400-5e39-11ea-8b49-f9747e466f7b\",\"outputs\":{\"default\":{\"type\":\"elasticsearch\",\"hosts\":[\"http://localhost:9200\"],\"api_key\":\"\",\"api_token\":\"6ckkp3ABz7e_XRqr3LM8:gQuDfUNSRgmY0iziYqP9Hw\"}},\"packagePolicies\":[]}}",
                               "created_at": "2020-03-04T20:02:56.149Z",
                               "id": "6a95c00a-d76d-4931-97c3-0bf935272d7d",
                               "type": "CONFIG_CHANGE"
@@ -2965,7 +2965,7 @@
                                   "api_key": "Z-XkgHIBvwtjzIKtSCTh:AejRqdKpQx6z-6dqSI1LHg"
                                 }
                               },
-                              "packageConfigs": [
+                              "packagePolicies": [
                                 {
                                   "id": "33d6bd70-a5e0-11ea-a587-5f886c8a849f",
                                   "name": "system-1",
@@ -3433,7 +3433,7 @@
                       "item": {
                         "id": "8086fb1a-72ca-4a67-8533-09300c1639fa",
                         "active": true,
-                        "config_id": "2fe89350-a5e0-11ea-a587-5f886c8a849f",
+                        "policy_id": "2fe89350-a5e0-11ea-a587-5f886c8a849f",
                         "type": "PERMANENT",
                         "enrolled_at": "2020-06-04T13:03:57.856Z",
                         "user_provided_metadata": {
@@ -3562,22 +3562,22 @@
         }
       }
     },
-    "/fleet/config/{configId}/agent-status": {
-      "parameters": [
-        {
-          "schema": {
-            "type": "string"
-          },
-          "name": "configId",
-          "in": "path",
-          "required": true
-        }
-      ],
+    "/fleet/agent-status": {
       "get": {
-        "summary": "Fleet - Agent - Status for config",
+        "summary": "Fleet - Agent - Status for policy",
         "tags": [],
         "responses": {},
-        "operationId": "get-fleet-config-configId-agent-status"
+        "operationId": "get-fleet-agent-status",
+        "parameters": [
+          {
+            "schema": {
+              "type": "string"
+            },
+            "name": "policyId",
+            "in": "query",
+            "required": false
+          }
+        ]
       }
     },
     "/fleet/enrollment-api-keys": {
@@ -3702,10 +3702,10 @@
   },
   "components": {
     "schemas": {
-      "AgentConfig": {
+      "AgentPolicy": {
         "allOf": [
           {
-            "$ref": "#/components/schemas/NewAgentConfig"
+            "$ref": "#/components/schemas/NewAgentPolicy"
           },
           {
             "type": "object",
@@ -3717,7 +3717,7 @@
                 "type": "string",
                 "enum": ["active", "inactive"]
               },
-              "packageConfigs": {
+              "packagePolicies": {
                 "oneOf": [
                   {
                     "items": {
@@ -3726,7 +3726,7 @@
                   },
                   {
                     "items": {
-                      "$ref": "#/components/schemas/PackageConfig"
+                      "$ref": "#/components/schemas/PackagePolicy"
                     }
                   }
                 ],
@@ -3750,8 +3750,8 @@
           }
         ]
       },
-      "PackageConfig": {
-        "title": "PackageConfig",
+      "PackagePolicy": {
+        "title": "PackagePolicy",
         "allOf": [
           {
             "type": "object",
@@ -3770,15 +3770,15 @@
             "required": ["id", "revision"]
           },
           {
-            "$ref": "#/components/schemas/NewPackageConfig"
+            "$ref": "#/components/schemas/NewPackagePolicy"
           }
         ],
         "x-examples": {
           "example-1": {}
         }
       },
-      "NewAgentConfig": {
-        "title": "NewAgentConfig",
+      "NewAgentPolicy": {
+        "title": "NewAgentPolicy",
         "type": "object",
         "properties": {
           "name": {
@@ -3792,8 +3792,8 @@
           }
         }
       },
-      "NewPackageConfig": {
-        "title": "NewPackageConfig",
+      "NewPackagePolicy": {
+        "title": "NewPackagePolicy",
         "type": "object",
         "x-examples": {
           "example-1": {
@@ -3892,7 +3892,7 @@
               "required": ["type", "enabled", "streams"]
             }
           },
-          "config_id": {
+          "policy_id": {
             "type": "string"
           },
           "name": {
@@ -3902,7 +3902,7 @@
             "type": "string"
           }
         },
-        "required": ["output_id", "inputs", "config_id", "name"]
+        "required": ["output_id", "inputs", "policy_id", "name"]
       },
       "PackageInfo": {
         "title": "PackageInfo",
@@ -4140,10 +4140,10 @@
           "default_api_key_id": {
             "type": "string"
           },
-          "config_id": {
+          "policy_id": {
             "type": "string"
           },
-          "config_revision": {
+          "policy_revision": {
             "type": ["number", "null"]
           },
           "last_checkin": {
@@ -4221,7 +4221,7 @@
           "agent_id": {
             "type": "string"
           },
-          "config_id": {
+          "policy_id": {
             "type": "string"
           },
           "stream_id": {
diff --git a/x-pack/plugins/ingest_manager/common/services/config_to_yaml.ts b/x-pack/plugins/ingest_manager/common/services/full_agent_policy_to_yaml.ts
similarity index 70%
rename from x-pack/plugins/ingest_manager/common/services/config_to_yaml.ts
rename to x-pack/plugins/ingest_manager/common/services/full_agent_policy_to_yaml.ts
index e2e6393738d1f..5b4a3b2dacf7b 100644
--- a/x-pack/plugins/ingest_manager/common/services/config_to_yaml.ts
+++ b/x-pack/plugins/ingest_manager/common/services/full_agent_policy_to_yaml.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { safeDump } from 'js-yaml';
-import { FullAgentConfig } from '../types';
+import { FullAgentPolicy } from '../types';
 
-const CONFIG_KEYS_ORDER = [
+const POLICY_KEYS_ORDER = [
   'id',
   'name',
   'revision',
@@ -21,12 +21,12 @@ const CONFIG_KEYS_ORDER = [
   'input',
 ];
 
-export const configToYaml = (config: FullAgentConfig): string => {
-  return safeDump(config, {
+export const fullAgentPolicyToYaml = (policy: FullAgentPolicy): string => {
+  return safeDump(policy, {
     skipInvalid: true,
     sortKeys: (keyA: string, keyB: string) => {
-      const indexA = CONFIG_KEYS_ORDER.indexOf(keyA);
-      const indexB = CONFIG_KEYS_ORDER.indexOf(keyB);
+      const indexA = POLICY_KEYS_ORDER.indexOf(keyA);
+      const indexB = POLICY_KEYS_ORDER.indexOf(keyB);
       if (indexA >= 0 && indexB < 0) {
         return -1;
       }
diff --git a/x-pack/plugins/ingest_manager/common/services/index.ts b/x-pack/plugins/ingest_manager/common/services/index.ts
index 0c91dbbe10354..28fd15b5ea700 100644
--- a/x-pack/plugins/ingest_manager/common/services/index.ts
+++ b/x-pack/plugins/ingest_manager/common/services/index.ts
@@ -5,8 +5,8 @@
  */
 export * from './routes';
 export * as AgentStatusKueryHelper from './agent_status';
-export { packageToPackageConfigInputs, packageToPackageConfig } from './package_to_config';
-export { storedPackageConfigsToAgentInputs } from './package_configs_to_agent_inputs';
-export { configToYaml } from './config_to_yaml';
-export { isPackageLimited, doesAgentConfigAlreadyIncludePackage } from './limited_package';
+export { packageToPackagePolicyInputs, packageToPackagePolicy } from './package_to_package_policy';
+export { storedPackagePoliciesToAgentInputs } from './package_policies_to_agent_inputs';
+export { fullAgentPolicyToYaml } from './full_agent_policy_to_yaml';
+export { isPackageLimited, doesAgentPolicyAlreadyIncludePackage } from './limited_package';
 export { decodeCloudId } from './decode_cloud_id';
diff --git a/x-pack/plugins/ingest_manager/common/services/limited_package.ts b/x-pack/plugins/ingest_manager/common/services/limited_package.ts
index 7ef445d55063c..21d1dbd1556b7 100644
--- a/x-pack/plugins/ingest_manager/common/services/limited_package.ts
+++ b/x-pack/plugins/ingest_manager/common/services/limited_package.ts
@@ -3,21 +3,21 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { PackageInfo, AgentConfig, PackageConfig } from '../types';
+import { PackageInfo, AgentPolicy, PackagePolicy } from '../types';
 
 // Assume packages only ever include 1 config template for now
 export const isPackageLimited = (packageInfo: PackageInfo): boolean => {
   return packageInfo.config_templates?.[0]?.multiple === false;
 };
 
-export const doesAgentConfigAlreadyIncludePackage = (
-  agentConfig: AgentConfig,
+export const doesAgentPolicyAlreadyIncludePackage = (
+  agentPolicy: AgentPolicy,
   packageName: string
 ): boolean => {
-  if (agentConfig.package_configs.length && typeof agentConfig.package_configs[0] === 'string') {
-    throw new Error('Unable to read full package config information');
+  if (agentPolicy.package_policies.length && typeof agentPolicy.package_policies[0] === 'string') {
+    throw new Error('Unable to read full package policy information');
   }
-  return (agentConfig.package_configs as PackageConfig[])
-    .map((packageConfig) => packageConfig.package?.name || '')
+  return (agentPolicy.package_policies as PackagePolicy[])
+    .map((packagePolicy) => packagePolicy.package?.name || '')
     .includes(packageName);
 };
diff --git a/x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.test.ts b/x-pack/plugins/ingest_manager/common/services/package_policies_to_agent_inputs.test.ts
similarity index 80%
rename from x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.test.ts
rename to x-pack/plugins/ingest_manager/common/services/package_policies_to_agent_inputs.test.ts
index d6c09f058ab85..956423a497373 100644
--- a/x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.test.ts
+++ b/x-pack/plugins/ingest_manager/common/services/package_policies_to_agent_inputs.test.ts
@@ -3,19 +3,19 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { PackageConfig, PackageConfigInput } from '../types';
-import { storedPackageConfigsToAgentInputs } from './package_configs_to_agent_inputs';
+import { PackagePolicy, PackagePolicyInput } from '../types';
+import { storedPackagePoliciesToAgentInputs } from './package_policies_to_agent_inputs';
 
-describe('Ingest Manager - storedPackageConfigsToAgentInputs', () => {
-  const mockPackageConfig: PackageConfig = {
+describe('Ingest Manager - storedPackagePoliciesToAgentInputs', () => {
+  const mockPackagePolicy: PackagePolicy = {
     id: 'some-uuid',
-    name: 'mock-package-config',
+    name: 'mock-package-policy',
     description: '',
     created_at: '',
     created_by: '',
     updated_at: '',
     updated_by: '',
-    config_id: '',
+    policy_id: '',
     enabled: true,
     output_id: '',
     namespace: 'default',
@@ -23,7 +23,7 @@ describe('Ingest Manager - storedPackageConfigsToAgentInputs', () => {
     revision: 1,
   };
 
-  const mockInput: PackageConfigInput = {
+  const mockInput: PackagePolicyInput = {
     type: 'test-logs',
     enabled: true,
     vars: {
@@ -74,13 +74,13 @@ describe('Ingest Manager - storedPackageConfigsToAgentInputs', () => {
     ],
   };
 
-  it('returns no inputs for package config with no inputs, or only disabled inputs', () => {
-    expect(storedPackageConfigsToAgentInputs([mockPackageConfig])).toEqual([]);
+  it('returns no inputs for package policy with no inputs, or only disabled inputs', () => {
+    expect(storedPackagePoliciesToAgentInputs([mockPackagePolicy])).toEqual([]);
 
     expect(
-      storedPackageConfigsToAgentInputs([
+      storedPackagePoliciesToAgentInputs([
         {
-          ...mockPackageConfig,
+          ...mockPackagePolicy,
           package: {
             name: 'mock-package',
             title: 'Mock package',
@@ -91,9 +91,9 @@ describe('Ingest Manager - storedPackageConfigsToAgentInputs', () => {
     ).toEqual([]);
 
     expect(
-      storedPackageConfigsToAgentInputs([
+      storedPackagePoliciesToAgentInputs([
         {
-          ...mockPackageConfig,
+          ...mockPackagePolicy,
           inputs: [{ ...mockInput, enabled: false }],
         },
       ])
@@ -102,9 +102,9 @@ describe('Ingest Manager - storedPackageConfigsToAgentInputs', () => {
 
   it('returns agent inputs', () => {
     expect(
-      storedPackageConfigsToAgentInputs([
+      storedPackagePoliciesToAgentInputs([
         {
-          ...mockPackageConfig,
+          ...mockPackagePolicy,
           package: {
             name: 'mock-package',
             title: 'Mock package',
@@ -116,7 +116,7 @@ describe('Ingest Manager - storedPackageConfigsToAgentInputs', () => {
     ).toEqual([
       {
         id: 'some-uuid',
-        name: 'mock-package-config',
+        name: 'mock-package-policy',
         type: 'test-logs',
         data_stream: { namespace: 'default' },
         use_output: 'default',
@@ -144,9 +144,9 @@ describe('Ingest Manager - storedPackageConfigsToAgentInputs', () => {
 
   it('returns agent inputs without disabled streams', () => {
     expect(
-      storedPackageConfigsToAgentInputs([
+      storedPackagePoliciesToAgentInputs([
         {
-          ...mockPackageConfig,
+          ...mockPackagePolicy,
           inputs: [
             {
               ...mockInput,
@@ -158,7 +158,7 @@ describe('Ingest Manager - storedPackageConfigsToAgentInputs', () => {
     ).toEqual([
       {
         id: 'some-uuid',
-        name: 'mock-package-config',
+        name: 'mock-package-policy',
         type: 'test-logs',
         data_stream: { namespace: 'default' },
         use_output: 'default',
diff --git a/x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.ts b/x-pack/plugins/ingest_manager/common/services/package_policies_to_agent_inputs.ts
similarity index 62%
rename from x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.ts
rename to x-pack/plugins/ingest_manager/common/services/package_policies_to_agent_inputs.ts
index b94fc39e0567c..639f20eb08828 100644
--- a/x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.ts
+++ b/x-pack/plugins/ingest_manager/common/services/package_policies_to_agent_inputs.ts
@@ -3,29 +3,29 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { PackageConfig, FullAgentConfigInput, FullAgentConfigInputStream } from '../types';
+import { PackagePolicy, FullAgentPolicyInput, FullAgentPolicyInputStream } from '../types';
 import { DEFAULT_OUTPUT } from '../constants';
 
-export const storedPackageConfigsToAgentInputs = (
-  packageConfigs: PackageConfig[]
-): FullAgentConfigInput[] => {
-  const fullInputs: FullAgentConfigInput[] = [];
+export const storedPackagePoliciesToAgentInputs = (
+  packagePolicies: PackagePolicy[]
+): FullAgentPolicyInput[] => {
+  const fullInputs: FullAgentPolicyInput[] = [];
 
-  packageConfigs.forEach((packageConfig) => {
-    if (!packageConfig.enabled || !packageConfig.inputs || !packageConfig.inputs.length) {
+  packagePolicies.forEach((packagePolicy) => {
+    if (!packagePolicy.enabled || !packagePolicy.inputs || !packagePolicy.inputs.length) {
       return;
     }
-    packageConfig.inputs.forEach((input) => {
+    packagePolicy.inputs.forEach((input) => {
       if (!input.enabled) {
         return;
       }
 
-      const fullInput: FullAgentConfigInput = {
-        id: packageConfig.id || packageConfig.name,
-        name: packageConfig.name,
+      const fullInput: FullAgentPolicyInput = {
+        id: packagePolicy.id || packagePolicy.name,
+        name: packagePolicy.name,
         type: input.type,
         data_stream: {
-          namespace: packageConfig.namespace || 'default',
+          namespace: packagePolicy.namespace || 'default',
         },
         use_output: DEFAULT_OUTPUT.name,
         ...Object.entries(input.config || {}).reduce((acc, [key, { value }]) => {
@@ -35,7 +35,7 @@ export const storedPackageConfigsToAgentInputs = (
         streams: input.streams
           .filter((stream) => stream.enabled)
           .map((stream) => {
-            const fullStream: FullAgentConfigInputStream = {
+            const fullStream: FullAgentPolicyInputStream = {
               id: stream.id,
               data_stream: stream.data_stream,
               ...stream.compiled_stream,
@@ -48,11 +48,11 @@ export const storedPackageConfigsToAgentInputs = (
           }),
       };
 
-      if (packageConfig.package) {
+      if (packagePolicy.package) {
         fullInput.meta = {
           package: {
-            name: packageConfig.package.name,
-            version: packageConfig.package.version,
+            name: packagePolicy.package.name,
+            version: packagePolicy.package.version,
           },
         };
       }
diff --git a/x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts b/x-pack/plugins/ingest_manager/common/services/package_to_package_policy.test.ts
similarity index 88%
rename from x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts
rename to x-pack/plugins/ingest_manager/common/services/package_to_package_policy.test.ts
index 1f4cd43247be1..6c3559d7cc5a0 100644
--- a/x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts
+++ b/x-pack/plugins/ingest_manager/common/services/package_to_package_policy.test.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { PackageInfo, InstallationStatus } from '../types';
-import { packageToPackageConfig, packageToPackageConfigInputs } from './package_to_config';
+import { packageToPackagePolicy, packageToPackagePolicyInputs } from './package_to_package_policy';
 
-describe('Ingest Manager - packageToConfig', () => {
+describe('Ingest Manager - packageToPackagePolicy', () => {
   const mockPackage: PackageInfo = {
     name: 'mock-package',
     title: 'Mock package',
@@ -31,15 +31,15 @@ describe('Ingest Manager - packageToConfig', () => {
     status: InstallationStatus.notInstalled,
   };
 
-  describe('packageToPackageConfigInputs', () => {
+  describe('packageToPackagePolicyInputs', () => {
     it('returns empty array for packages with no config templates', () => {
-      expect(packageToPackageConfigInputs(mockPackage)).toEqual([]);
-      expect(packageToPackageConfigInputs({ ...mockPackage, config_templates: [] })).toEqual([]);
+      expect(packageToPackagePolicyInputs(mockPackage)).toEqual([]);
+      expect(packageToPackagePolicyInputs({ ...mockPackage, config_templates: [] })).toEqual([]);
     });
 
     it('returns empty array for packages with a config template but no inputs', () => {
       expect(
-        packageToPackageConfigInputs(({
+        packageToPackagePolicyInputs(({
           ...mockPackage,
           config_templates: [{ inputs: [] }],
         } as unknown) as PackageInfo)
@@ -48,13 +48,13 @@ describe('Ingest Manager - packageToConfig', () => {
 
     it('returns inputs with no streams for packages with no streams', () => {
       expect(
-        packageToPackageConfigInputs(({
+        packageToPackagePolicyInputs(({
           ...mockPackage,
           config_templates: [{ inputs: [{ type: 'foo' }] }],
         } as unknown) as PackageInfo)
       ).toEqual([{ type: 'foo', enabled: true, streams: [] }]);
       expect(
-        packageToPackageConfigInputs(({
+        packageToPackagePolicyInputs(({
           ...mockPackage,
           config_templates: [{ inputs: [{ type: 'foo' }, { type: 'bar' }] }],
         } as unknown) as PackageInfo)
@@ -66,7 +66,7 @@ describe('Ingest Manager - packageToConfig', () => {
 
     it('returns inputs with streams for packages with streams', () => {
       expect(
-        packageToPackageConfigInputs(({
+        packageToPackagePolicyInputs(({
           ...mockPackage,
           datasets: [
             { type: 'logs', name: 'foo', streams: [{ input: 'foo' }] },
@@ -100,7 +100,7 @@ describe('Ingest Manager - packageToConfig', () => {
 
     it('returns inputs with streams configurations for packages with stream vars', () => {
       expect(
-        packageToPackageConfigInputs(({
+        packageToPackagePolicyInputs(({
           ...mockPackage,
           datasets: [
             {
@@ -171,7 +171,7 @@ describe('Ingest Manager - packageToConfig', () => {
 
     it('returns inputs with streams configurations for packages with stream and input vars', () => {
       expect(
-        packageToPackageConfigInputs(({
+        packageToPackagePolicyInputs(({
           ...mockPackage,
           datasets: [
             {
@@ -315,10 +315,10 @@ describe('Ingest Manager - packageToConfig', () => {
     });
   });
 
-  describe('packageToPackageConfig', () => {
-    it('returns package config with default name', () => {
-      expect(packageToPackageConfig(mockPackage, '1', '2')).toEqual({
-        config_id: '1',
+  describe('packageToPackagePolicy', () => {
+    it('returns package policy with default name', () => {
+      expect(packageToPackagePolicy(mockPackage, '1', '2')).toEqual({
+        policy_id: '1',
         namespace: '',
         enabled: true,
         inputs: [],
@@ -331,13 +331,13 @@ describe('Ingest Manager - packageToConfig', () => {
         },
       });
     });
-    it('returns package config with custom name', () => {
-      expect(packageToPackageConfig(mockPackage, '1', '2', 'default', 'pkgConfig-1')).toEqual({
-        config_id: '1',
+    it('returns package policy with custom name', () => {
+      expect(packageToPackagePolicy(mockPackage, '1', '2', 'default', 'pkgPolicy-1')).toEqual({
+        policy_id: '1',
         namespace: 'default',
         enabled: true,
         inputs: [],
-        name: 'pkgConfig-1',
+        name: 'pkgPolicy-1',
         output_id: '2',
         package: {
           name: 'mock-package',
@@ -346,21 +346,21 @@ describe('Ingest Manager - packageToConfig', () => {
         },
       });
     });
-    it('returns package config with namespace and description', () => {
+    it('returns package policy with namespace and description', () => {
       expect(
-        packageToPackageConfig(
+        packageToPackagePolicy(
           mockPackage,
           '1',
           '2',
           'mock-namespace',
-          'pkgConfig-1',
+          'pkgPolicy-1',
           'Test description'
         )
       ).toEqual({
-        config_id: '1',
+        policy_id: '1',
         enabled: true,
         inputs: [],
-        name: 'pkgConfig-1',
+        name: 'pkgPolicy-1',
         namespace: 'mock-namespace',
         description: 'Test description',
         output_id: '2',
@@ -371,20 +371,20 @@ describe('Ingest Manager - packageToConfig', () => {
         },
       });
     });
-    it('returns package config with inputs', () => {
+    it('returns package policy with inputs', () => {
       const mockPackageWithConfigTemplates = ({
         ...mockPackage,
         config_templates: [{ inputs: [{ type: 'foo' }] }],
       } as unknown) as PackageInfo;
 
       expect(
-        packageToPackageConfig(mockPackageWithConfigTemplates, '1', '2', 'default', 'pkgConfig-1')
+        packageToPackagePolicy(mockPackageWithConfigTemplates, '1', '2', 'default', 'pkgPolicy-1')
       ).toEqual({
-        config_id: '1',
+        policy_id: '1',
         namespace: 'default',
         enabled: true,
         inputs: [{ type: 'foo', enabled: true, streams: [] }],
-        name: 'pkgConfig-1',
+        name: 'pkgPolicy-1',
         output_id: '2',
         package: {
           name: 'mock-package',
diff --git a/x-pack/plugins/ingest_manager/common/services/package_to_config.ts b/x-pack/plugins/ingest_manager/common/services/package_to_package_policy.ts
similarity index 65%
rename from x-pack/plugins/ingest_manager/common/services/package_to_config.ts
rename to x-pack/plugins/ingest_manager/common/services/package_to_package_policy.ts
index 184b44cb9e530..eab2e8ac2d745 100644
--- a/x-pack/plugins/ingest_manager/common/services/package_to_config.ts
+++ b/x-pack/plugins/ingest_manager/common/services/package_to_package_policy.ts
@@ -8,12 +8,12 @@ import {
   RegistryConfigTemplate,
   RegistryVarsEntry,
   RegistryStream,
-  PackageConfig,
-  PackageConfigConfigRecord,
-  PackageConfigConfigRecordEntry,
-  PackageConfigInput,
-  PackageConfigInputStream,
-  NewPackageConfig,
+  PackagePolicy,
+  PackagePolicyConfigRecord,
+  PackagePolicyConfigRecordEntry,
+  PackagePolicyInput,
+  PackagePolicyInputStream,
+  NewPackagePolicy,
 } from '../types';
 
 const getStreamsForInputType = (
@@ -40,27 +40,27 @@ const getStreamsForInputType = (
 };
 
 /*
- * This service creates a package config inputs definition from defaults provided in package info
+ * This service creates a package policy inputs definition from defaults provided in package info
  */
-export const packageToPackageConfigInputs = (packageInfo: PackageInfo): PackageConfig['inputs'] => {
-  const inputs: PackageConfig['inputs'] = [];
+export const packageToPackagePolicyInputs = (packageInfo: PackageInfo): PackagePolicy['inputs'] => {
+  const inputs: PackagePolicy['inputs'] = [];
 
-  // Assume package will only ever ship one package config template for now
-  const packageConfigTemplate: RegistryConfigTemplate | null =
+  // Assume package will only ever ship one package policy template for now
+  const packagePolicyTemplate: RegistryConfigTemplate | null =
     packageInfo.config_templates && packageInfo.config_templates[0]
       ? packageInfo.config_templates[0]
       : null;
 
-  // Create package config input property
-  if (packageConfigTemplate?.inputs?.length) {
-    // Map each package package config input to agent config package config input
-    packageConfigTemplate.inputs.forEach((packageInput) => {
+  // Create package policy input property
+  if (packagePolicyTemplate?.inputs?.length) {
+    // Map each package package policy input to agent policy package policy input
+    packagePolicyTemplate.inputs.forEach((packageInput) => {
       // Reduces registry var def into config object entry
       const varsReducer = (
-        configObject: PackageConfigConfigRecord,
+        configObject: PackagePolicyConfigRecord,
         registryVar: RegistryVarsEntry
-      ): PackageConfigConfigRecord => {
-        const configEntry: PackageConfigConfigRecordEntry = {
+      ): PackagePolicyConfigRecord => {
+        const configEntry: PackagePolicyConfigRecordEntry = {
           value: !registryVar.default && registryVar.multi ? [] : registryVar.default,
         };
         if (registryVar.type) {
@@ -70,12 +70,12 @@ export const packageToPackageConfigInputs = (packageInfo: PackageInfo): PackageC
         return configObject;
       };
 
-      // Map each package input stream into package config input stream
-      const streams: PackageConfigInputStream[] = getStreamsForInputType(
+      // Map each package input stream into package policy input stream
+      const streams: PackagePolicyInputStream[] = getStreamsForInputType(
         packageInput.type,
         packageInfo
       ).map((packageStream) => {
-        const stream: PackageConfigInputStream = {
+        const stream: PackagePolicyInputStream = {
           id: `${packageInput.type}-${packageStream.data_stream.dataset}`,
           enabled: packageStream.enabled === false ? false : true,
           data_stream: packageStream.data_stream,
@@ -86,7 +86,7 @@ export const packageToPackageConfigInputs = (packageInfo: PackageInfo): PackageC
         return stream;
       });
 
-      const input: PackageConfigInput = {
+      const input: PackagePolicyInput = {
         type: packageInput.type,
         enabled: streams.length ? !!streams.find((stream) => stream.enabled) : true,
         streams,
@@ -104,23 +104,23 @@ export const packageToPackageConfigInputs = (packageInfo: PackageInfo): PackageC
 };
 
 /**
- * Builds a `NewPackageConfig` structure based on a package
+ * Builds a `NewPackagePolicy` structure based on a package
  *
  * @param packageInfo
- * @param configId
+ * @param agentPolicyId
  * @param outputId
- * @param packageConfigName
+ * @param packagePolicyName
  */
-export const packageToPackageConfig = (
+export const packageToPackagePolicy = (
   packageInfo: PackageInfo,
-  configId: string,
+  agentPolicyId: string,
   outputId: string,
   namespace: string = '',
-  packageConfigName?: string,
+  packagePolicyName?: string,
   description?: string
-): NewPackageConfig => {
+): NewPackagePolicy => {
   return {
-    name: packageConfigName || `${packageInfo.name}-1`,
+    name: packagePolicyName || `${packageInfo.name}-1`,
     namespace,
     description,
     package: {
@@ -129,8 +129,8 @@ export const packageToPackageConfig = (
       version: packageInfo.version,
     },
     enabled: true,
-    config_id: configId,
+    policy_id: agentPolicyId,
     output_id: outputId,
-    inputs: packageToPackageConfigInputs(packageInfo),
+    inputs: packageToPackagePolicyInputs(packageInfo),
   };
 };
diff --git a/x-pack/plugins/ingest_manager/common/services/routes.ts b/x-pack/plugins/ingest_manager/common/services/routes.ts
index 49de9a4d8fd85..1d802739a1b86 100644
--- a/x-pack/plugins/ingest_manager/common/services/routes.ts
+++ b/x-pack/plugins/ingest_manager/common/services/routes.ts
@@ -6,8 +6,8 @@
 import {
   EPM_API_ROOT,
   EPM_API_ROUTES,
-  PACKAGE_CONFIG_API_ROUTES,
-  AGENT_CONFIG_API_ROUTES,
+  PACKAGE_POLICY_API_ROUTES,
+  AGENT_POLICY_API_ROUTES,
   DATA_STREAM_API_ROUTES,
   FLEET_SETUP_API_ROUTES,
   AGENT_API_ROUTES,
@@ -48,61 +48,61 @@ export const epmRouteService = {
   },
 };
 
-export const packageConfigRouteService = {
+export const packagePolicyRouteService = {
   getListPath: () => {
-    return PACKAGE_CONFIG_API_ROUTES.LIST_PATTERN;
+    return PACKAGE_POLICY_API_ROUTES.LIST_PATTERN;
   },
 
-  getInfoPath: (packageConfigId: string) => {
-    return PACKAGE_CONFIG_API_ROUTES.INFO_PATTERN.replace('{packageConfigId}', packageConfigId);
+  getInfoPath: (packagePolicyId: string) => {
+    return PACKAGE_POLICY_API_ROUTES.INFO_PATTERN.replace('{packagePolicyId}', packagePolicyId);
   },
 
   getCreatePath: () => {
-    return PACKAGE_CONFIG_API_ROUTES.CREATE_PATTERN;
+    return PACKAGE_POLICY_API_ROUTES.CREATE_PATTERN;
   },
 
-  getUpdatePath: (packageConfigId: string) => {
-    return PACKAGE_CONFIG_API_ROUTES.UPDATE_PATTERN.replace('{packageConfigId}', packageConfigId);
+  getUpdatePath: (packagePolicyId: string) => {
+    return PACKAGE_POLICY_API_ROUTES.UPDATE_PATTERN.replace('{packagePolicyId}', packagePolicyId);
   },
 
   getDeletePath: () => {
-    return PACKAGE_CONFIG_API_ROUTES.DELETE_PATTERN;
+    return PACKAGE_POLICY_API_ROUTES.DELETE_PATTERN;
   },
 };
 
-export const agentConfigRouteService = {
+export const agentPolicyRouteService = {
   getListPath: () => {
-    return AGENT_CONFIG_API_ROUTES.LIST_PATTERN;
+    return AGENT_POLICY_API_ROUTES.LIST_PATTERN;
   },
 
-  getInfoPath: (agentConfigId: string) => {
-    return AGENT_CONFIG_API_ROUTES.INFO_PATTERN.replace('{agentConfigId}', agentConfigId);
+  getInfoPath: (agentPolicyId: string) => {
+    return AGENT_POLICY_API_ROUTES.INFO_PATTERN.replace('{agentPolicyId}', agentPolicyId);
   },
 
   getCreatePath: () => {
-    return AGENT_CONFIG_API_ROUTES.CREATE_PATTERN;
+    return AGENT_POLICY_API_ROUTES.CREATE_PATTERN;
   },
 
-  getUpdatePath: (agentConfigId: string) => {
-    return AGENT_CONFIG_API_ROUTES.UPDATE_PATTERN.replace('{agentConfigId}', agentConfigId);
+  getUpdatePath: (agentPolicyId: string) => {
+    return AGENT_POLICY_API_ROUTES.UPDATE_PATTERN.replace('{agentPolicyId}', agentPolicyId);
   },
 
-  getCopyPath: (agentConfigId: string) => {
-    return AGENT_CONFIG_API_ROUTES.COPY_PATTERN.replace('{agentConfigId}', agentConfigId);
+  getCopyPath: (agentPolicyId: string) => {
+    return AGENT_POLICY_API_ROUTES.COPY_PATTERN.replace('{agentPolicyId}', agentPolicyId);
   },
 
   getDeletePath: () => {
-    return AGENT_CONFIG_API_ROUTES.DELETE_PATTERN;
+    return AGENT_POLICY_API_ROUTES.DELETE_PATTERN;
   },
 
-  getInfoFullPath: (agentConfigId: string) => {
-    return AGENT_CONFIG_API_ROUTES.FULL_INFO_PATTERN.replace('{agentConfigId}', agentConfigId);
+  getInfoFullPath: (agentPolicyId: string) => {
+    return AGENT_POLICY_API_ROUTES.FULL_INFO_PATTERN.replace('{agentPolicyId}', agentPolicyId);
   },
 
-  getInfoFullDownloadPath: (agentConfigId: string) => {
-    return AGENT_CONFIG_API_ROUTES.FULL_INFO_DOWNLOAD_PATTERN.replace(
-      '{agentConfigId}',
-      agentConfigId
+  getInfoFullDownloadPath: (agentPolicyId: string) => {
+    return AGENT_POLICY_API_ROUTES.FULL_INFO_DOWNLOAD_PATTERN.replace(
+      '{agentPolicyId}',
+      agentPolicyId
     );
   },
 };
diff --git a/x-pack/plugins/ingest_manager/common/types/index.ts b/x-pack/plugins/ingest_manager/common/types/index.ts
index 69bcc498c18be..cafd0f03f66e2 100644
--- a/x-pack/plugins/ingest_manager/common/types/index.ts
+++ b/x-pack/plugins/ingest_manager/common/types/index.ts
@@ -22,8 +22,8 @@ export interface IngestManagerConfigType {
       host?: string;
       ca_sha256?: string;
     };
-    agentConfigRolloutRateLimitIntervalMs: number;
-    agentConfigRolloutRateLimitRequestPerInterval: number;
+    agentPolicyRolloutRateLimitIntervalMs: number;
+    agentPolicyRolloutRateLimitRequestPerInterval: number;
   };
 }
 
diff --git a/x-pack/plugins/ingest_manager/common/types/models/agent.ts b/x-pack/plugins/ingest_manager/common/types/models/agent.ts
index f31d33e73c76f..2b8a306577e7d 100644
--- a/x-pack/plugins/ingest_manager/common/types/models/agent.ts
+++ b/x-pack/plugins/ingest_manager/common/types/models/agent.ts
@@ -64,7 +64,7 @@ export interface NewAgentEvent {
   payload?: any;
   agent_id: string;
   action_id?: string;
-  config_id?: string;
+  policy_id?: string;
   stream_id?: string;
 }
 
@@ -89,8 +89,8 @@ interface AgentBase {
   access_api_key_id?: string;
   default_api_key?: string;
   default_api_key_id?: string;
-  config_id?: string;
-  config_revision?: number | null;
+  policy_id?: string;
+  policy_revision?: number | null;
   last_checkin?: string;
   last_checkin_status?: 'error' | 'online' | 'degraded';
   user_provided_metadata: AgentMetadata;
diff --git a/x-pack/plugins/ingest_manager/common/types/models/agent_config.ts b/x-pack/plugins/ingest_manager/common/types/models/agent_policy.ts
similarity index 65%
rename from x-pack/plugins/ingest_manager/common/types/models/agent_config.ts
rename to x-pack/plugins/ingest_manager/common/types/models/agent_policy.ts
index cdaea1cc5f9a4..c626c85d3fb24 100644
--- a/x-pack/plugins/ingest_manager/common/types/models/agent_config.ts
+++ b/x-pack/plugins/ingest_manager/common/types/models/agent_policy.ts
@@ -3,15 +3,15 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { PackageConfig, PackageConfigPackage } from './package_config';
+import { PackagePolicy, PackagePolicyPackage } from './package_policy';
 import { Output } from './output';
 
-export enum AgentConfigStatus {
+export enum AgentPolicyStatus {
   Active = 'active',
   Inactive = 'inactive',
 }
 
-export interface NewAgentConfig {
+export interface NewAgentPolicy {
   name: string;
   namespace: string;
   description?: string;
@@ -19,18 +19,18 @@ export interface NewAgentConfig {
   monitoring_enabled?: Array<'logs' | 'metrics'>;
 }
 
-export interface AgentConfig extends NewAgentConfig {
+export interface AgentPolicy extends NewAgentPolicy {
   id: string;
-  status: AgentConfigStatus;
-  package_configs: string[] | PackageConfig[];
+  status: AgentPolicyStatus;
+  package_policies: string[] | PackagePolicy[];
   updated_at: string;
   updated_by: string;
   revision: number;
 }
 
-export type AgentConfigSOAttributes = Omit<AgentConfig, 'id'>;
+export type AgentPolicySOAttributes = Omit<AgentPolicy, 'id'>;
 
-export interface FullAgentConfigInputStream {
+export interface FullAgentPolicyInputStream {
   id: string;
   data_stream: {
     dataset: string;
@@ -39,28 +39,28 @@ export interface FullAgentConfigInputStream {
   [key: string]: any;
 }
 
-export interface FullAgentConfigInput {
+export interface FullAgentPolicyInput {
   id: string;
   name: string;
   type: string;
   data_stream: { namespace: string };
   use_output: string;
   meta?: {
-    package?: Pick<PackageConfigPackage, 'name' | 'version'>;
+    package?: Pick<PackagePolicyPackage, 'name' | 'version'>;
     [key: string]: unknown;
   };
-  streams: FullAgentConfigInputStream[];
+  streams: FullAgentPolicyInputStream[];
   [key: string]: any;
 }
 
-export interface FullAgentConfig {
+export interface FullAgentPolicy {
   id: string;
   outputs: {
     [key: string]: Pick<Output, 'type' | 'hosts' | 'ca_sha256' | 'api_key'> & {
       [key: string]: any;
     };
   };
-  inputs: FullAgentConfigInput[];
+  inputs: FullAgentPolicyInput[];
   revision?: number;
   agent?: {
     monitoring: {
diff --git a/x-pack/plugins/ingest_manager/common/types/models/enrollment_api_key.ts b/x-pack/plugins/ingest_manager/common/types/models/enrollment_api_key.ts
index 204ce4b15ea5b..f39076ce1027b 100644
--- a/x-pack/plugins/ingest_manager/common/types/models/enrollment_api_key.ts
+++ b/x-pack/plugins/ingest_manager/common/types/models/enrollment_api_key.ts
@@ -3,7 +3,6 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { SavedObjectAttributes } from 'src/core/public';
 
 export interface EnrollmentAPIKey {
   id: string;
@@ -11,13 +10,8 @@ export interface EnrollmentAPIKey {
   api_key: string;
   name?: string;
   active: boolean;
-  config_id?: string;
+  policy_id?: string;
+  created_at: string;
 }
 
-export interface EnrollmentAPIKeySOAttributes extends SavedObjectAttributes {
-  api_key_id: string;
-  api_key: string;
-  name?: string;
-  active: boolean;
-  config_id?: string;
-}
+export type EnrollmentAPIKeySOAttributes = Omit<EnrollmentAPIKey, 'id'>;
diff --git a/x-pack/plugins/ingest_manager/common/types/models/index.ts b/x-pack/plugins/ingest_manager/common/types/models/index.ts
index 8ad716a4ba768..ad4c6ad02639e 100644
--- a/x-pack/plugins/ingest_manager/common/types/models/index.ts
+++ b/x-pack/plugins/ingest_manager/common/types/models/index.ts
@@ -5,8 +5,8 @@
  */
 
 export * from './agent';
-export * from './agent_config';
-export * from './package_config';
+export * from './agent_policy';
+export * from './package_policy';
 export * from './data_stream';
 export * from './output';
 export * from './epm';
diff --git a/x-pack/plugins/ingest_manager/common/types/models/package_config.ts b/x-pack/plugins/ingest_manager/common/types/models/package_config.ts
deleted file mode 100644
index 635afbd47850e..0000000000000
--- a/x-pack/plugins/ingest_manager/common/types/models/package_config.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export interface PackageConfigPackage {
-  name: string;
-  title: string;
-  version: string;
-}
-
-export interface PackageConfigConfigRecordEntry {
-  type?: string;
-  value?: any;
-}
-
-export type PackageConfigConfigRecord = Record<string, PackageConfigConfigRecordEntry>;
-
-export interface NewPackageConfigInputStream {
-  id: string;
-  enabled: boolean;
-  data_stream: {
-    dataset: string;
-    type: string;
-  };
-  vars?: PackageConfigConfigRecord;
-  config?: PackageConfigConfigRecord;
-}
-
-export interface PackageConfigInputStream extends NewPackageConfigInputStream {
-  compiled_stream?: any;
-}
-
-export interface NewPackageConfigInput {
-  type: string;
-  enabled: boolean;
-  vars?: PackageConfigConfigRecord;
-  config?: PackageConfigConfigRecord;
-  streams: NewPackageConfigInputStream[];
-}
-
-export interface PackageConfigInput extends Omit<NewPackageConfigInput, 'streams'> {
-  streams: PackageConfigInputStream[];
-}
-
-export interface NewPackageConfig {
-  name: string;
-  description?: string;
-  namespace: string;
-  enabled: boolean;
-  config_id: string;
-  output_id: string;
-  package?: PackageConfigPackage;
-  inputs: NewPackageConfigInput[];
-}
-
-export interface UpdatePackageConfig extends NewPackageConfig {
-  version?: string;
-}
-
-export interface PackageConfig extends Omit<NewPackageConfig, 'inputs'> {
-  id: string;
-  inputs: PackageConfigInput[];
-  version?: string;
-  revision: number;
-  updated_at: string;
-  updated_by: string;
-  created_at: string;
-  created_by: string;
-}
-
-export type PackageConfigSOAttributes = Omit<PackageConfig, 'id' | 'version'>;
diff --git a/x-pack/plugins/ingest_manager/common/types/models/package_policy.ts b/x-pack/plugins/ingest_manager/common/types/models/package_policy.ts
new file mode 100644
index 0000000000000..724dbae5dac85
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/common/types/models/package_policy.ts
@@ -0,0 +1,73 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export interface PackagePolicyPackage {
+  name: string;
+  title: string;
+  version: string;
+}
+
+export interface PackagePolicyConfigRecordEntry {
+  type?: string;
+  value?: any;
+}
+
+export type PackagePolicyConfigRecord = Record<string, PackagePolicyConfigRecordEntry>;
+
+export interface NewPackagePolicyInputStream {
+  id: string;
+  enabled: boolean;
+  data_stream: {
+    dataset: string;
+    type: string;
+  };
+  vars?: PackagePolicyConfigRecord;
+  config?: PackagePolicyConfigRecord;
+}
+
+export interface PackagePolicyInputStream extends NewPackagePolicyInputStream {
+  compiled_stream?: any;
+}
+
+export interface NewPackagePolicyInput {
+  type: string;
+  enabled: boolean;
+  vars?: PackagePolicyConfigRecord;
+  config?: PackagePolicyConfigRecord;
+  streams: NewPackagePolicyInputStream[];
+}
+
+export interface PackagePolicyInput extends Omit<NewPackagePolicyInput, 'streams'> {
+  streams: PackagePolicyInputStream[];
+}
+
+export interface NewPackagePolicy {
+  name: string;
+  description?: string;
+  namespace: string;
+  enabled: boolean;
+  policy_id: string;
+  output_id: string;
+  package?: PackagePolicyPackage;
+  inputs: NewPackagePolicyInput[];
+}
+
+export interface UpdatePackagePolicy extends NewPackagePolicy {
+  version?: string;
+}
+
+export interface PackagePolicy extends Omit<NewPackagePolicy, 'inputs'> {
+  id: string;
+  inputs: PackagePolicyInput[];
+  version?: string;
+  revision: number;
+  updated_at: string;
+  updated_by: string;
+  created_at: string;
+  created_by: string;
+}
+
+export type PackagePolicySOAttributes = Omit<PackagePolicy, 'id' | 'version'>;
diff --git a/x-pack/plugins/ingest_manager/common/types/rest_spec/agent.ts b/x-pack/plugins/ingest_manager/common/types/rest_spec/agent.ts
index 7ec5a8d68311f..4a50938049a7b 100644
--- a/x-pack/plugins/ingest_manager/common/types/rest_spec/agent.ts
+++ b/x-pack/plugins/ingest_manager/common/types/rest_spec/agent.ts
@@ -118,7 +118,7 @@ export interface PutAgentReassignRequest {
   params: {
     agentId: string;
   };
-  body: { config_id: string };
+  body: { policy_id: string };
 }
 
 export interface PutAgentReassignResponse {
@@ -161,7 +161,7 @@ export interface UpdateAgentRequest {
 
 export interface GetAgentStatusRequest {
   query: {
-    configId?: string;
+    policyId?: string;
   };
 }
 
diff --git a/x-pack/plugins/ingest_manager/common/types/rest_spec/agent_config.ts b/x-pack/plugins/ingest_manager/common/types/rest_spec/agent_config.ts
deleted file mode 100644
index 4e1612d144ede..0000000000000
--- a/x-pack/plugins/ingest_manager/common/types/rest_spec/agent_config.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { AgentConfig, NewAgentConfig, FullAgentConfig } from '../models';
-import { ListWithKuery } from './common';
-
-export interface GetAgentConfigsRequest {
-  query: ListWithKuery & {
-    full?: boolean;
-  };
-}
-
-export type GetAgentConfigsResponseItem = AgentConfig & { agents?: number };
-
-export interface GetAgentConfigsResponse {
-  items: GetAgentConfigsResponseItem[];
-  total: number;
-  page: number;
-  perPage: number;
-  success: boolean;
-}
-
-export interface GetOneAgentConfigRequest {
-  params: {
-    agentConfigId: string;
-  };
-}
-
-export interface GetOneAgentConfigResponse {
-  item: AgentConfig;
-  success: boolean;
-}
-
-export interface CreateAgentConfigRequest {
-  body: NewAgentConfig;
-}
-
-export interface CreateAgentConfigResponse {
-  item: AgentConfig;
-  success: boolean;
-}
-
-export type UpdateAgentConfigRequest = GetOneAgentConfigRequest & {
-  body: NewAgentConfig;
-};
-
-export interface UpdateAgentConfigResponse {
-  item: AgentConfig;
-  success: boolean;
-}
-
-export interface CopyAgentConfigRequest {
-  body: Pick<AgentConfig, 'name' | 'description'>;
-}
-
-export interface CopyAgentConfigResponse {
-  item: AgentConfig;
-  success: boolean;
-}
-
-export interface DeleteAgentConfigRequest {
-  body: {
-    agentConfigId: string;
-  };
-}
-
-export interface DeleteAgentConfigResponse {
-  id: string;
-  success: boolean;
-}
-
-export interface GetFullAgentConfigRequest {
-  params: {
-    agentConfigId: string;
-  };
-}
-
-export interface GetFullAgentConfigResponse {
-  item: FullAgentConfig;
-  success: boolean;
-}
diff --git a/x-pack/plugins/ingest_manager/common/types/rest_spec/agent_policy.ts b/x-pack/plugins/ingest_manager/common/types/rest_spec/agent_policy.ts
new file mode 100644
index 0000000000000..4683727ed51ac
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/common/types/rest_spec/agent_policy.ts
@@ -0,0 +1,83 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { AgentPolicy, NewAgentPolicy, FullAgentPolicy } from '../models';
+import { ListWithKuery } from './common';
+
+export interface GetAgentPoliciesRequest {
+  query: ListWithKuery & {
+    full?: boolean;
+  };
+}
+
+export type GetAgentPoliciesResponseItem = AgentPolicy & { agents?: number };
+
+export interface GetAgentPoliciesResponse {
+  items: GetAgentPoliciesResponseItem[];
+  total: number;
+  page: number;
+  perPage: number;
+  success: boolean;
+}
+
+export interface GetOneAgentPolicyRequest {
+  params: {
+    agentPolicyId: string;
+  };
+}
+
+export interface GetOneAgentPolicyResponse {
+  item: AgentPolicy;
+  success: boolean;
+}
+
+export interface CreateAgentPolicyRequest {
+  body: NewAgentPolicy;
+}
+
+export interface CreateAgentPolicyResponse {
+  item: AgentPolicy;
+  success: boolean;
+}
+
+export type UpdateAgentPolicyRequest = GetOneAgentPolicyRequest & {
+  body: NewAgentPolicy;
+};
+
+export interface UpdateAgentPolicyResponse {
+  item: AgentPolicy;
+  success: boolean;
+}
+
+export interface CopyAgentPolicyRequest {
+  body: Pick<AgentPolicy, 'name' | 'description'>;
+}
+
+export interface CopyAgentPolicyResponse {
+  item: AgentPolicy;
+  success: boolean;
+}
+
+export interface DeleteAgentPolicyRequest {
+  body: {
+    agentPolicyId: string;
+  };
+}
+
+export interface DeleteAgentPolicyResponse {
+  id: string;
+  success: boolean;
+}
+
+export interface GetFullAgentPolicyRequest {
+  params: {
+    agentPolicyId: string;
+  };
+}
+
+export interface GetFullAgentPolicyResponse {
+  item: FullAgentPolicy;
+  success: boolean;
+}
diff --git a/x-pack/plugins/ingest_manager/common/types/rest_spec/enrollment_api_key.ts b/x-pack/plugins/ingest_manager/common/types/rest_spec/enrollment_api_key.ts
index 851e6571c0dd2..1929955cac84c 100644
--- a/x-pack/plugins/ingest_manager/common/types/rest_spec/enrollment_api_key.ts
+++ b/x-pack/plugins/ingest_manager/common/types/rest_spec/enrollment_api_key.ts
@@ -47,7 +47,7 @@ export interface DeleteEnrollmentAPIKeyResponse {
 export interface PostEnrollmentAPIKeyRequest {
   body: {
     name?: string;
-    config_id: string;
+    policy_id: string;
     expiration?: string;
   };
 }
diff --git a/x-pack/plugins/ingest_manager/common/types/rest_spec/index.ts b/x-pack/plugins/ingest_manager/common/types/rest_spec/index.ts
index c40940fdbb623..2916347693b98 100644
--- a/x-pack/plugins/ingest_manager/common/types/rest_spec/index.ts
+++ b/x-pack/plugins/ingest_manager/common/types/rest_spec/index.ts
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 export * from './common';
-export * from './package_config';
+export * from './package_policy';
 export * from './data_stream';
 export * from './agent';
-export * from './agent_config';
+export * from './agent_policy';
 export * from './fleet_setup';
 export * from './epm';
 export * from './enrollment_api_key';
diff --git a/x-pack/plugins/ingest_manager/common/types/rest_spec/package_config.ts b/x-pack/plugins/ingest_manager/common/types/rest_spec/package_config.ts
deleted file mode 100644
index e62645debb748..0000000000000
--- a/x-pack/plugins/ingest_manager/common/types/rest_spec/package_config.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { PackageConfig, NewPackageConfig, UpdatePackageConfig } from '../models';
-
-export interface GetPackageConfigsRequest {
-  query: {
-    page: number;
-    perPage: number;
-    kuery?: string;
-  };
-}
-
-export interface GetPackageConfigsResponse {
-  items: PackageConfig[];
-  total: number;
-  page: number;
-  perPage: number;
-  success: boolean;
-}
-
-export interface GetOnePackageConfigRequest {
-  params: {
-    packageConfigId: string;
-  };
-}
-
-export interface GetOnePackageConfigResponse {
-  item: PackageConfig;
-  success: boolean;
-}
-
-export interface CreatePackageConfigRequest {
-  body: NewPackageConfig;
-}
-
-export interface CreatePackageConfigResponse {
-  item: PackageConfig;
-  success: boolean;
-}
-
-export type UpdatePackageConfigRequest = GetOnePackageConfigRequest & {
-  body: UpdatePackageConfig;
-};
-
-export type UpdatePackageConfigResponse = CreatePackageConfigResponse;
-
-export interface DeletePackageConfigsRequest {
-  body: {
-    packageConfigIds: string[];
-  };
-}
-
-export type DeletePackageConfigsResponse = Array<{
-  id: string;
-  success: boolean;
-}>;
diff --git a/x-pack/plugins/ingest_manager/common/types/rest_spec/package_policy.ts b/x-pack/plugins/ingest_manager/common/types/rest_spec/package_policy.ts
new file mode 100644
index 0000000000000..e5bba3d6deab3
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/common/types/rest_spec/package_policy.ts
@@ -0,0 +1,59 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { PackagePolicy, NewPackagePolicy, UpdatePackagePolicy } from '../models';
+
+export interface GetPackagePoliciesRequest {
+  query: {
+    page: number;
+    perPage: number;
+    kuery?: string;
+  };
+}
+
+export interface GetPackagePoliciesResponse {
+  items: PackagePolicy[];
+  total: number;
+  page: number;
+  perPage: number;
+  success: boolean;
+}
+
+export interface GetOnePackagePolicyRequest {
+  params: {
+    packagePolicyId: string;
+  };
+}
+
+export interface GetOnePackagePolicyResponse {
+  item: PackagePolicy;
+  success: boolean;
+}
+
+export interface CreatePackagePolicyRequest {
+  body: NewPackagePolicy;
+}
+
+export interface CreatePackagePolicyResponse {
+  item: PackagePolicy;
+  success: boolean;
+}
+
+export type UpdatePackagePolicyRequest = GetOnePackagePolicyRequest & {
+  body: UpdatePackagePolicy;
+};
+
+export type UpdatePackagePolicyResponse = CreatePackagePolicyResponse;
+
+export interface DeletePackagePoliciesRequest {
+  body: {
+    packagePolicyIds: string[];
+  };
+}
+
+export type DeletePackagePoliciesResponse = Array<{
+  id: string;
+  success: boolean;
+}>;
diff --git a/x-pack/plugins/ingest_manager/dev_docs/actions_and_events.md b/x-pack/plugins/ingest_manager/dev_docs/actions_and_events.md
index b41cdc221c51a..f98a1c281e3ee 100644
--- a/x-pack/plugins/ingest_manager/dev_docs/actions_and_events.md
+++ b/x-pack/plugins/ingest_manager/dev_docs/actions_and_events.md
@@ -17,7 +17,7 @@ This action is send when a new policy is available, the policy is available unde
     "id": "action_id_1",
     "data": {
       "policy":  {
-        "id": "config_id",
+        "id": "policy_id",
         "outputs": {
           "default": {
             "api_key": "slfhsdlfhjjkshfkjh:sdfsdfsdfsdf",
diff --git a/x-pack/plugins/ingest_manager/dev_docs/api/agents_enroll.md b/x-pack/plugins/ingest_manager/dev_docs/api/agents_enroll.md
index 304ce733b7dcd..b32e6873c60e5 100644
--- a/x-pack/plugins/ingest_manager/dev_docs/api/agents_enroll.md
+++ b/x-pack/plugins/ingest_manager/dev_docs/api/agents_enroll.md
@@ -45,7 +45,7 @@ The API returns the following:
   "item": {
     "id": "a4937110-e53e-11e9-934f-47a8e38a522c",
     "active": true,
-    "config_id": "default",
+    "policy_id": "default",
     "type": "PERMANENT",
     "enrolled_at": "2019-10-02T18:01:22.337Z",
     "user_provided_metadata": {},
diff --git a/x-pack/plugins/ingest_manager/dev_docs/definitions.md b/x-pack/plugins/ingest_manager/dev_docs/definitions.md
index bd20780611055..be5aeb923e903 100644
--- a/x-pack/plugins/ingest_manager/dev_docs/definitions.md
+++ b/x-pack/plugins/ingest_manager/dev_docs/definitions.md
@@ -5,12 +5,12 @@ Overall documentation of Ingest Management is now maintained in the `elastic/sta
 
 This section is to define terms used across ingest management.
 
-## Package Config
+## Package policy
 
-A package config is a definition on how to collect data from a service, for example `nginx`. A package config contains
+A package policy is a definition on how to collect data from a service, for example `nginx`. A package policy contains
 definitions for one or multiple inputs and each input can contain one or multiple streams.
 
-With the example of the nginx Package Config, it contains two inputs: `logs` and `nginx/metrics`. Logs and metrics are collected
+With the example of the nginx Package policy, it contains two inputs: `logs` and `nginx/metrics`. Logs and metrics are collected
 differently. The `logs` input contains two streams, `access` and `error`, the `nginx/metrics` input contains the stubstatus stream.
 
 ## Data Stream
@@ -20,7 +20,7 @@ ingesting data and the setup of Elasticsearch.
 
 ## Elastic Agent
 
-A single, unified agent that users can deploy to hosts or containers. It controls which data is collected from the host or containers and where the data is sent. It will run Beats, Endpoint or other monitoring programs as needed. It can operate standalone or pull a configuration policy from Fleet.
+A single, unified agent that users can deploy to hosts or containers. It controls which data is collected from the host or containers and where the data is sent. It will run Beats, Endpoint or other monitoring programs as needed. It can operate standalone or pull an agent policy from Fleet.
 
 ## Elastic Package Registry
 
@@ -29,8 +29,7 @@ More details about the registry can be found [here](https://github.com/elastic/p
 
 ## Fleet
 
-Fleet is the part of the Ingest Manager UI in Kibana that handles the part of enrolling Elastic Agents,
-managing agents and sending configurations to the Elastic Agent.
+Fleet is the part of the Ingest Manager UI in Kibana that handles the part of enrolling Elastic Agents, managing agents and sending policies to the Elastic Agent.
 
 ## Indexing Strategy
 
@@ -40,15 +39,15 @@ the index strategy is sent to Data Streams.
 
 ## Input
 
-An input is the configuration unit in an Agent Config that defines the options on how to collect data from
+An input is the configuration unit in an Agent policy that defines the options on how to collect data from
 an endpoint. This could be username / password which are need to authenticate with a service or a host url
 as an example.
 
-An input is part of a Package Config and contains streams.
+An input is part of a Package policy and contains streams.
 
 ## Integration
 
-An integration is a package with the type integration. An integration package has at least 1 package config
+An integration is a package with the type integration. An integration package has at least 1 package policy
 and usually collects data from / about a service.
 
 ## Namespace
@@ -60,9 +59,9 @@ A user-specified string that will be used to part of the index name in Elasticse
 A package contains all the assets for the Elastic Stack. A more detailed definition of a
 package can be found under https://github.com/elastic/package-registry.
 
-Besides the assets, a package contains the package config definitions with its inputs and streams.
+Besides the assets, a package contains the package policy definitions with its inputs and streams.
 
 ## Stream
 
-A stream is a configuration unit in the Elastic Agent config. A stream is part of an input and defines how the data
+A stream is a configuration unit in the Elastic Agent policy. A stream is part of an input and defines how the data
 fetched by this input should be processed and which Data Stream to send it to.
diff --git a/x-pack/plugins/ingest_manager/dev_docs/epm.md b/x-pack/plugins/ingest_manager/dev_docs/epm.md
index abcab718f7ab9..20209d09e6cc2 100644
--- a/x-pack/plugins/ingest_manager/dev_docs/epm.md
+++ b/x-pack/plugins/ingest_manager/dev_docs/epm.md
@@ -5,26 +5,26 @@ Overall documentation of Ingest Management is now maintained in the `elastic/sta
 
 When upgrading a package between a bugfix or a minor version, no breaking changes should happen. Upgrading a package has the following effect:
 
-* Removal of existing dashboards
-* Installation of new dashboards
-* Write new ingest pipelines with the version
-* Write new Elasticsearch alias templates
-* Trigger a rollover for all the affected indices
+- Removal of existing dashboards
+- Installation of new dashboards
+- Write new ingest pipelines with the version
+- Write new Elasticsearch alias templates
+- Trigger a rollover for all the affected indices
 
-The new ingest pipeline is expected to still work with the data coming from older configurations. In most cases this means some of the fields can be missing. For this to work, each event must contain the version of config / package it is coming from to make such a decision.
+The new ingest pipeline is expected to still work with the data coming from older policies. In most cases this means some of the fields can be missing. For this to work, each event must contain the version of policy / package it is coming from to make such a decision.
 
 In case of a breaking change in the data structure, the new ingest pipeline is also expected to deal with this change. In case there are breaking changes which cannot be dealt with in an ingest pipeline, a new package has to be created.
 
-Each package lists its minimal required agent version. In case there are agents enrolled with an older version, the user is notified to upgrade these agents as otherwise the new configs cannot be rolled out.
+Each package lists its minimal required agent version. In case there are agents enrolled with an older version, the user is notified to upgrade these agents as otherwise the new policies cannot be rolled out.
 
 # Generated assets
 
-When a package is installed or upgraded, certain Kibana and Elasticsearch assets are generated from . These follow the naming conventions explained above (see "indexing strategy") and contain configuration for the elastic stack that makes ingesting and displaying data work with as little user interaction as possible.
+When a package is installed or upgraded, certain Kibana and Elasticsearch assets are generated from . These follow the naming conventions explained above (see "indexing strategy") and contain configuration for the Elastic stack that makes ingesting and displaying data work with as little user interaction as possible.
 
 ## Elasticsearch Index Templates
 
 ### Generation
 
-* Index templates are generated from `YAML` files contained in the package.
-* There is one index template per dataset.
-* For the generation of an index template, all `yml` files contained in the package subdirectory `dataset/DATASET_NAME/fields/` are used.
\ No newline at end of file
+- Index templates are generated from `YAML` files contained in the package.
+- There is one index template per dataset.
+- For the generation of an index template, all `yml` files contained in the package subdirectory `dataset/DATASET_NAME/fields/` are used.
diff --git a/x-pack/plugins/ingest_manager/dev_docs/fleet_agents_interactions_detailed.md b/x-pack/plugins/ingest_manager/dev_docs/fleet_agents_interactions_detailed.md
index d563712fdf0a6..52a1dde37cd07 100644
--- a/x-pack/plugins/ingest_manager/dev_docs/fleet_agents_interactions_detailed.md
+++ b/x-pack/plugins/ingest_manager/dev_docs/fleet_agents_interactions_detailed.md
@@ -5,7 +5,7 @@
 Fleet workflow:
 
 - an agent enroll to fleet using an enrollment token.
-- Every n seconds agent is polling the checkin API to send events and check for new configuration
+- Every n seconds agent is polling the checkin API to send events and check for new policy
 
 ### Agent enrollment
 
@@ -13,7 +13,7 @@ An agent must enroll using the REST Api provided by fleet.
 When an agent enroll Fleet:
 
 - verify the Enrollment token is a valid ES API key
-- retrieve the Saved Object (SO) associated to this api key id (this SO contains the configuration|policy id)
+- retrieve the Saved Object (SO) associated to this api key id (this SO contains the agent policy id)
 - create an ES ApiKey unique to the agent for accessing kibana during checkin
 - create an ES ApiKey per output to send logs and metrics to the output
 - Save the new agent in a SO with keys encrypted inside the agent SO object
@@ -22,15 +22,15 @@ When an agent enroll Fleet:
 
 ### Agent checkin
 
-Agent are going to poll the checkin API to send events and check for new configration. To checkin agent are going to use the REST Api provided by fleet.
+Agent are going to poll the checkin API to send events and check for new policy. To checkin agent are going to use the REST Api provided by fleet.
 
 When an agent checkin fleet:
 
 - verify the access token is a valid ES API key
 - retrieve the agent (SO associated to this api key id)
 - Insert events SO
-- If the Agent configuration has been updated since last checkin
-  - generate the agent config
+- If the Agent policy has been updated since last checkin
+  - generate the agent policy
   - Create the missing API key for agent -> ES communication
 - Save the new agent (with last checkin date) in a SavedObject with keys encrypted inside the agent
 
@@ -44,6 +44,6 @@ An agent can acknowledge one or multiple actions by calling `POST /api/ingest_ma
 
 ## Other interactions
 
-### Agent Configuration update
+### Agent policy update
 
-When a configuration is updated, every SO agent running this configuration is updated with a timestamp of the latest config.
+When a policy is updated, every SO agent running this policy is updated with a timestamp of the latest policy.
diff --git a/x-pack/plugins/ingest_manager/dev_docs/schema/agent_checkin.mml b/x-pack/plugins/ingest_manager/dev_docs/schema/agent_checkin.mml
index a5332c50ab947..377c6a30fa230 100644
--- a/x-pack/plugins/ingest_manager/dev_docs/schema/agent_checkin.mml
+++ b/x-pack/plugins/ingest_manager/dev_docs/schema/agent_checkin.mml
@@ -12,8 +12,8 @@ sequenceDiagram
   Note right of SavedObjects: encrypted SO here
   end
 
-  alt If configuration updated since last checkin
-    Fleet API->>SavedObjects: getAgentConfiguration(configId)
+  alt If policy updated since last checkin
+    Fleet API->>SavedObjects: getAgentPolicy(agentPolicyId)
 
     opt If there is not API Key for default output
       Fleet API->>Elasticsearch: createAgentESApiKey()
@@ -34,4 +34,4 @@ sequenceDiagram
   end
 
 
-  Fleet API->>Agent: actions|agent config
+  Fleet API->>Agent: actions|agent policy
diff --git a/x-pack/plugins/ingest_manager/dev_docs/schema/saved_objects.mml b/x-pack/plugins/ingest_manager/dev_docs/schema/saved_objects.mml
index d157bf32fa66b..9f73a15bed2eb 100644
--- a/x-pack/plugins/ingest_manager/dev_docs/schema/saved_objects.mml
+++ b/x-pack/plugins/ingest_manager/dev_docs/schema/saved_objects.mml
@@ -1,11 +1,11 @@
 classDiagram
-  agent_configs "1" -- "*"  package_configs
-  agent_configs "1" -- "*"  enrollment_api_keys
-  agent_configs "1" -- "*"  agents : is used
-  agent_configs "*" -- "*"  outputs
+  agent_policies "1" -- "*"  package_policies
+  agent_policies "1" -- "*"  enrollment_api_keys
+  agent_policies "1" -- "*"  agents : is used
+  agent_policies "*" -- "*"  outputs
   agents "1" -- "*"  agent_events
   agents "1" -- "*"  agent_events
-  package "1" -- "*"  package_configs
+  package "1" -- "*"  package_policies
 
   class package {
     installed
@@ -14,11 +14,11 @@ classDiagram
 	class agents {
 		status
     access_api_key_id
-    config_id
+    policy_id
     last_checkin
     local_metadata
     user_provided_metadata
-    actions // Encrypted  contains new agent config
+    actions // Encrypted  contains new agent policy
     default_api_key // Encrypted
 
 	}
@@ -28,7 +28,7 @@ classDiagram
     subtype
     agent_id
     action_id
-    config_id
+    policy_id
     stream_id
     timestamp
     message
@@ -36,18 +36,18 @@ classDiagram
     data
   }
 
-  class agent_configs {
-    package_configs // package_config ids
+  class agent_policies {
+    package_policies // package_policy ids
     name
     namespace
     description
     status
   }
 
-	class package_configs {
+	class package_policies {
     name
     namespace
-    config_id
+    policy_id
     enabled
     package
     output_id
@@ -64,7 +64,7 @@ classDiagram
 	}
 
   class enrollment_api_keys {
-    config_id
+    policy_id
     api_key_id
     api_key // Encrypted
   }
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/home_integration/tutorial_directory_notice.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/home_integration/tutorial_directory_notice.tsx
index 553623380dcc0..bc5435369f44a 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/home_integration/tutorial_directory_notice.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/home_integration/tutorial_directory_notice.tsx
@@ -82,7 +82,7 @@ export const TutorialDirectoryNotice: TutorialDirectoryNoticeComponent = memo(()
           <FormattedMessage
             id="xpack.ingestManager.homeIntegration.tutorialDirectory.noticeText"
             defaultMessage="The Elastic Agent provides a simple, unified way to add monitoring for logs, metrics, and other types of data to your hosts.
-                You no longer need to install multiple Beats and other agents, which makes it easier and faster to deploy configurations across your infrastructure.
+                You no longer need to install multiple Beats and other agents, which makes it easier and faster to deploy policies across your infrastructure.
                 For more information, read our {blogPostLink}."
             values={{
               blogPostLink: (
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/home_integration/tutorial_module_notice.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/home_integration/tutorial_module_notice.tsx
index a26691bdd64a0..f4c5f0d140d24 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/home_integration/tutorial_module_notice.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/home_integration/tutorial_module_notice.tsx
@@ -28,7 +28,7 @@ export const TutorialModuleNotice: TutorialModuleNoticeComponent = memo(({ modul
             <FormattedMessage
               id="xpack.ingestManager.homeIntegration.tutorialModule.noticeText"
               defaultMessage="{notePrefix} a newer version of this module is {availableAsIntegrationLink} in Ingest Manager Beta.
-              To learn more about agent configurations and the new Elastic Agent, read our {blogPostLink}."
+              To learn more about agent policies and the new Elastic Agent, read our {blogPostLink}."
               values={{
                 notePrefix: (
                   <strong>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/settings_flyout.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/settings_flyout.tsx
index e8081e097fd42..be1b3df8a0c3e 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/settings_flyout.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/settings_flyout.tsx
@@ -167,7 +167,7 @@ export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
               'xpack.ingestManager.settings.integrationUpgradeEnabledFieldLabel',
               {
                 defaultMessage:
-                  'Automatically update integrations to the latest version to receive the latest assets. Agent configurations may need to be updated in order to use new features.',
+                  'Automatically update integrations to the latest version to receive the latest assets. Agent policies may need to be updated in order to use new features.',
               }
             ),
           },
@@ -210,7 +210,7 @@ export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
       <EuiText color="subdued" size="s">
         <FormattedMessage
           id="xpack.ingestManager.settings.globalOutputDescription"
-          defaultMessage="The global output is applied to all agent configurations and specifies where data is sent."
+          defaultMessage="The global output is applied to all agent policies and specifies where data is sent."
         />
       </EuiText>
       <EuiSpacer size="m" />
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/constants/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/constants/index.ts
index d31d66d889c96..185e1fa5eb0ce 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/constants/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/constants/index.ts
@@ -7,11 +7,11 @@ export {
   PLUGIN_ID,
   EPM_API_ROUTES,
   AGENT_API_ROUTES,
-  AGENT_CONFIG_SAVED_OBJECT_TYPE,
+  AGENT_POLICY_SAVED_OBJECT_TYPE,
   AGENT_EVENT_SAVED_OBJECT_TYPE,
   AGENT_SAVED_OBJECT_TYPE,
   ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE,
-  PACKAGE_CONFIG_SAVED_OBJECT_TYPE,
+  PACKAGE_POLICY_SAVED_OBJECT_TYPE,
 } from '../../../../common';
 
 export * from './page_paths';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/constants/page_paths.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/constants/page_paths.ts
index 9f1088a94aa94..4a8dcfedc0936 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/constants/page_paths.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/constants/page_paths.ts
@@ -9,17 +9,17 @@ export type StaticPage =
   | 'integrations'
   | 'integrations_all'
   | 'integrations_installed'
-  | 'configurations'
-  | 'configurations_list'
+  | 'policies'
+  | 'policies_list'
   | 'fleet'
   | 'fleet_enrollment_tokens'
   | 'data_streams';
 
 export type DynamicPage =
   | 'integration_details'
-  | 'configuration_details'
-  | 'add_integration_from_configuration'
-  | 'add_integration_to_configuration'
+  | 'policy_details'
+  | 'add_integration_from_policy'
+  | 'add_integration_to_policy'
   | 'edit_integration'
   | 'fleet_agent_list'
   | 'fleet_agent_details';
@@ -40,13 +40,13 @@ export const PAGE_ROUTING_PATHS = {
   integrations_all: '/integrations',
   integrations_installed: '/integrations/installed',
   integration_details: '/integrations/detail/:pkgkey/:panel?',
-  configurations: '/configs',
-  configurations_list: '/configs',
-  configuration_details: '/configs/:configId/:tabId?',
-  configuration_details_settings: '/configs/:configId/settings',
-  add_integration_from_configuration: '/configs/:configId/add-integration',
-  add_integration_to_configuration: '/integrations/:pkgkey/add-integration',
-  edit_integration: '/configs/:configId/edit-integration/:packageConfigId',
+  policies: '/policies',
+  policies_list: '/policies',
+  policy_details: '/policies/:policyId/:tabId?',
+  policy_details_settings: '/policies/:policyId/settings',
+  add_integration_from_policy: '/policies/:policyId/add-integration',
+  add_integration_to_policy: '/integrations/:pkgkey/add-integration',
+  edit_integration: '/policies/:policyId/edit-integration/:packagePolicyId',
   fleet: '/fleet',
   fleet_agent_list: '/fleet/agents',
   fleet_agent_details: '/fleet/agents/:agentId/:tabId?',
@@ -68,13 +68,13 @@ export const pagePathGetters: {
   integrations_installed: () => '/integrations/installed',
   integration_details: ({ pkgkey, panel }) =>
     `/integrations/detail/${pkgkey}${panel ? `/${panel}` : ''}`,
-  configurations: () => '/configs',
-  configurations_list: () => '/configs',
-  configuration_details: ({ configId, tabId }) => `/configs/${configId}${tabId ? `/${tabId}` : ''}`,
-  add_integration_from_configuration: ({ configId }) => `/configs/${configId}/add-integration`,
-  add_integration_to_configuration: ({ pkgkey }) => `/integrations/${pkgkey}/add-integration`,
-  edit_integration: ({ configId, packageConfigId }) =>
-    `/configs/${configId}/edit-integration/${packageConfigId}`,
+  policies: () => '/policies',
+  policies_list: () => '/policies',
+  policy_details: ({ policyId, tabId }) => `/policies/${policyId}${tabId ? `/${tabId}` : ''}`,
+  add_integration_from_policy: ({ policyId }) => `/policies/${policyId}/add-integration`,
+  add_integration_to_policy: ({ pkgkey }) => `/integrations/${pkgkey}/add-integration`,
+  edit_integration: ({ policyId, packagePolicyId }) =>
+    `/policies/${policyId}/edit-integration/${packagePolicyId}`,
   fleet: () => '/fleet',
   fleet_agent_list: ({ kuery }) => `/fleet/agents${kuery ? `?kuery=${kuery}` : ''}`,
   fleet_agent_details: ({ agentId, tabId }) =>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_breadcrumbs.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_breadcrumbs.tsx
index 293638cff50bf..6ef1351dc5b60 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_breadcrumbs.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_breadcrumbs.tsx
@@ -72,51 +72,51 @@ const breadcrumbGetters: {
     },
     { text: pkgTitle },
   ],
-  configurations: () => [
+  policies: () => [
     BASE_BREADCRUMB,
     {
-      text: i18n.translate('xpack.ingestManager.breadcrumbs.configurationsPageTitle', {
-        defaultMessage: 'Configurations',
+      text: i18n.translate('xpack.ingestManager.breadcrumbs.policiesPageTitle', {
+        defaultMessage: 'Policies',
       }),
     },
   ],
-  configurations_list: () => [
+  policies_list: () => [
     BASE_BREADCRUMB,
     {
-      text: i18n.translate('xpack.ingestManager.breadcrumbs.configurationsPageTitle', {
-        defaultMessage: 'Configurations',
+      text: i18n.translate('xpack.ingestManager.breadcrumbs.policiesPageTitle', {
+        defaultMessage: 'Policies',
       }),
     },
   ],
-  configuration_details: ({ configName }) => [
+  policy_details: ({ policyName }) => [
     BASE_BREADCRUMB,
     {
-      href: pagePathGetters.configurations(),
-      text: i18n.translate('xpack.ingestManager.breadcrumbs.configurationsPageTitle', {
-        defaultMessage: 'Configurations',
+      href: pagePathGetters.policies(),
+      text: i18n.translate('xpack.ingestManager.breadcrumbs.policiesPageTitle', {
+        defaultMessage: 'Policies',
       }),
     },
-    { text: configName },
+    { text: policyName },
   ],
-  add_integration_from_configuration: ({ configName, configId }) => [
+  add_integration_from_policy: ({ policyName, policyId }) => [
     BASE_BREADCRUMB,
     {
-      href: pagePathGetters.configurations(),
-      text: i18n.translate('xpack.ingestManager.breadcrumbs.configurationsPageTitle', {
-        defaultMessage: 'Configurations',
+      href: pagePathGetters.policies(),
+      text: i18n.translate('xpack.ingestManager.breadcrumbs.policiesPageTitle', {
+        defaultMessage: 'Policies',
       }),
     },
     {
-      href: pagePathGetters.configuration_details({ configId }),
-      text: configName,
+      href: pagePathGetters.policy_details({ policyId }),
+      text: policyName,
     },
     {
-      text: i18n.translate('xpack.ingestManager.breadcrumbs.addPackageConfigPageTitle', {
+      text: i18n.translate('xpack.ingestManager.breadcrumbs.addPackagePolicyPageTitle', {
         defaultMessage: 'Add integration',
       }),
     },
   ],
-  add_integration_to_configuration: ({ pkgTitle, pkgkey }) => [
+  add_integration_to_policy: ({ pkgTitle, pkgkey }) => [
     BASE_BREADCRUMB,
     {
       href: pagePathGetters.integrations(),
@@ -129,25 +129,25 @@ const breadcrumbGetters: {
       text: pkgTitle,
     },
     {
-      text: i18n.translate('xpack.ingestManager.breadcrumbs.addPackageConfigPageTitle', {
+      text: i18n.translate('xpack.ingestManager.breadcrumbs.addPackagePolicyPageTitle', {
         defaultMessage: 'Add integration',
       }),
     },
   ],
-  edit_integration: ({ configName, configId }) => [
+  edit_integration: ({ policyName, policyId }) => [
     BASE_BREADCRUMB,
     {
-      href: pagePathGetters.configurations(),
-      text: i18n.translate('xpack.ingestManager.breadcrumbs.configurationsPageTitle', {
-        defaultMessage: 'Configurations',
+      href: pagePathGetters.policies(),
+      text: i18n.translate('xpack.ingestManager.breadcrumbs.policiesPageTitle', {
+        defaultMessage: 'Policies',
       }),
     },
     {
-      href: pagePathGetters.configuration_details({ configId }),
-      text: configName,
+      href: pagePathGetters.policy_details({ policyId }),
+      text: policyName,
     },
     {
-      text: i18n.translate('xpack.ingestManager.breadcrumbs.editPackageConfigPageTitle', {
+      text: i18n.translate('xpack.ingestManager.breadcrumbs.editPackagePolicyPageTitle', {
         defaultMessage: 'Edit integration',
       }),
     },
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/agent_config.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/agent_config.ts
deleted file mode 100644
index 0bb09c2731032..0000000000000
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/agent_config.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import {
-  useRequest,
-  sendRequest,
-  useConditionalRequest,
-  SendConditionalRequestConfig,
-} from './use_request';
-import { agentConfigRouteService } from '../../services';
-import {
-  GetAgentConfigsRequest,
-  GetAgentConfigsResponse,
-  GetOneAgentConfigResponse,
-  GetFullAgentConfigResponse,
-  CreateAgentConfigRequest,
-  CreateAgentConfigResponse,
-  UpdateAgentConfigRequest,
-  UpdateAgentConfigResponse,
-  CopyAgentConfigRequest,
-  CopyAgentConfigResponse,
-  DeleteAgentConfigRequest,
-  DeleteAgentConfigResponse,
-} from '../../types';
-
-export const useGetAgentConfigs = (query?: GetAgentConfigsRequest['query']) => {
-  return useRequest<GetAgentConfigsResponse>({
-    path: agentConfigRouteService.getListPath(),
-    method: 'get',
-    query,
-  });
-};
-
-export const useGetOneAgentConfig = (agentConfigId: string | undefined) => {
-  return useConditionalRequest<GetOneAgentConfigResponse>({
-    path: agentConfigId ? agentConfigRouteService.getInfoPath(agentConfigId) : undefined,
-    method: 'get',
-    shouldSendRequest: !!agentConfigId,
-  } as SendConditionalRequestConfig);
-};
-
-export const useGetOneAgentConfigFull = (agentConfigId: string) => {
-  return useRequest<GetFullAgentConfigResponse>({
-    path: agentConfigRouteService.getInfoFullPath(agentConfigId),
-    method: 'get',
-  });
-};
-
-export const sendGetOneAgentConfigFull = (
-  agentConfigId: string,
-  query: { standalone?: boolean } = {}
-) => {
-  return sendRequest<GetFullAgentConfigResponse>({
-    path: agentConfigRouteService.getInfoFullPath(agentConfigId),
-    method: 'get',
-    query,
-  });
-};
-
-export const sendGetOneAgentConfig = (agentConfigId: string) => {
-  return sendRequest<GetOneAgentConfigResponse>({
-    path: agentConfigRouteService.getInfoPath(agentConfigId),
-    method: 'get',
-  });
-};
-
-export const sendCreateAgentConfig = (
-  body: CreateAgentConfigRequest['body'],
-  { withSysMonitoring }: { withSysMonitoring: boolean } = { withSysMonitoring: false }
-) => {
-  return sendRequest<CreateAgentConfigResponse>({
-    path: agentConfigRouteService.getCreatePath(),
-    method: 'post',
-    body: JSON.stringify(body),
-    query: withSysMonitoring ? { sys_monitoring: true } : {},
-  });
-};
-
-export const sendUpdateAgentConfig = (
-  agentConfigId: string,
-  body: UpdateAgentConfigRequest['body']
-) => {
-  return sendRequest<UpdateAgentConfigResponse>({
-    path: agentConfigRouteService.getUpdatePath(agentConfigId),
-    method: 'put',
-    body: JSON.stringify(body),
-  });
-};
-
-export const sendCopyAgentConfig = (
-  agentConfigId: string,
-  body: CopyAgentConfigRequest['body']
-) => {
-  return sendRequest<CopyAgentConfigResponse>({
-    path: agentConfigRouteService.getCopyPath(agentConfigId),
-    method: 'post',
-    body: JSON.stringify(body),
-  });
-};
-
-export const sendDeleteAgentConfig = (body: DeleteAgentConfigRequest['body']) => {
-  return sendRequest<DeleteAgentConfigResponse>({
-    path: agentConfigRouteService.getDeletePath(),
-    method: 'post',
-    body: JSON.stringify(body),
-  });
-};
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/agent_policy.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/agent_policy.ts
new file mode 100644
index 0000000000000..8707dcab9e584
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/agent_policy.ts
@@ -0,0 +1,109 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import {
+  useRequest,
+  sendRequest,
+  useConditionalRequest,
+  SendConditionalRequestConfig,
+} from './use_request';
+import { agentPolicyRouteService } from '../../services';
+import {
+  GetAgentPoliciesRequest,
+  GetAgentPoliciesResponse,
+  GetOneAgentPolicyResponse,
+  GetFullAgentPolicyResponse,
+  CreateAgentPolicyRequest,
+  CreateAgentPolicyResponse,
+  UpdateAgentPolicyRequest,
+  UpdateAgentPolicyResponse,
+  CopyAgentPolicyRequest,
+  CopyAgentPolicyResponse,
+  DeleteAgentPolicyRequest,
+  DeleteAgentPolicyResponse,
+} from '../../types';
+
+export const useGetAgentPolicies = (query?: GetAgentPoliciesRequest['query']) => {
+  return useRequest<GetAgentPoliciesResponse>({
+    path: agentPolicyRouteService.getListPath(),
+    method: 'get',
+    query,
+  });
+};
+
+export const useGetOneAgentPolicy = (agentPolicyId: string | undefined) => {
+  return useConditionalRequest<GetOneAgentPolicyResponse>({
+    path: agentPolicyId ? agentPolicyRouteService.getInfoPath(agentPolicyId) : undefined,
+    method: 'get',
+    shouldSendRequest: !!agentPolicyId,
+  } as SendConditionalRequestConfig);
+};
+
+export const useGetOneAgentPolicyFull = (agentPolicyId: string) => {
+  return useRequest<GetFullAgentPolicyResponse>({
+    path: agentPolicyRouteService.getInfoFullPath(agentPolicyId),
+    method: 'get',
+  });
+};
+
+export const sendGetOneAgentPolicyFull = (
+  agentPolicyId: string,
+  query: { standalone?: boolean } = {}
+) => {
+  return sendRequest<GetFullAgentPolicyResponse>({
+    path: agentPolicyRouteService.getInfoFullPath(agentPolicyId),
+    method: 'get',
+    query,
+  });
+};
+
+export const sendGetOneAgentPolicy = (agentPolicyId: string) => {
+  return sendRequest<GetOneAgentPolicyResponse>({
+    path: agentPolicyRouteService.getInfoPath(agentPolicyId),
+    method: 'get',
+  });
+};
+
+export const sendCreateAgentPolicy = (
+  body: CreateAgentPolicyRequest['body'],
+  { withSysMonitoring }: { withSysMonitoring: boolean } = { withSysMonitoring: false }
+) => {
+  return sendRequest<CreateAgentPolicyResponse>({
+    path: agentPolicyRouteService.getCreatePath(),
+    method: 'post',
+    body: JSON.stringify(body),
+    query: withSysMonitoring ? { sys_monitoring: true } : {},
+  });
+};
+
+export const sendUpdateAgentPolicy = (
+  agentPolicyId: string,
+  body: UpdateAgentPolicyRequest['body']
+) => {
+  return sendRequest<UpdateAgentPolicyResponse>({
+    path: agentPolicyRouteService.getUpdatePath(agentPolicyId),
+    method: 'put',
+    body: JSON.stringify(body),
+  });
+};
+
+export const sendCopyAgentPolicy = (
+  agentPolicyId: string,
+  body: CopyAgentPolicyRequest['body']
+) => {
+  return sendRequest<CopyAgentPolicyResponse>({
+    path: agentPolicyRouteService.getCopyPath(agentPolicyId),
+    method: 'post',
+    body: JSON.stringify(body),
+  });
+};
+
+export const sendDeleteAgentPolicy = (body: DeleteAgentPolicyRequest['body']) => {
+  return sendRequest<DeleteAgentPolicyResponse>({
+    path: agentPolicyRouteService.getDeletePath(),
+    method: 'post',
+    body: JSON.stringify(body),
+  });
+};
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/index.ts
index 0d703925f2cf3..e33684b5a0926 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/index.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 export { setHttpClient, sendRequest, useRequest } from './use_request';
-export * from './agent_config';
-export * from './package_config';
+export * from './agent_policy';
+export * from './package_policy';
 export * from './data_stream';
 export * from './agents';
 export * from './enrollment_api_keys';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/package_config.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/package_config.ts
deleted file mode 100644
index aba950123ead3..0000000000000
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/package_config.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { sendRequest, useRequest } from './use_request';
-import { packageConfigRouteService } from '../../services';
-import {
-  CreatePackageConfigRequest,
-  CreatePackageConfigResponse,
-  UpdatePackageConfigRequest,
-  UpdatePackageConfigResponse,
-} from '../../types';
-import {
-  DeletePackageConfigsRequest,
-  DeletePackageConfigsResponse,
-  GetPackageConfigsRequest,
-  GetPackageConfigsResponse,
-  GetOnePackageConfigResponse,
-} from '../../../../../common/types/rest_spec';
-
-export const sendCreatePackageConfig = (body: CreatePackageConfigRequest['body']) => {
-  return sendRequest<CreatePackageConfigResponse>({
-    path: packageConfigRouteService.getCreatePath(),
-    method: 'post',
-    body: JSON.stringify(body),
-  });
-};
-
-export const sendUpdatePackageConfig = (
-  packageConfigId: string,
-  body: UpdatePackageConfigRequest['body']
-) => {
-  return sendRequest<UpdatePackageConfigResponse>({
-    path: packageConfigRouteService.getUpdatePath(packageConfigId),
-    method: 'put',
-    body: JSON.stringify(body),
-  });
-};
-
-export const sendDeletePackageConfig = (body: DeletePackageConfigsRequest['body']) => {
-  return sendRequest<DeletePackageConfigsResponse>({
-    path: packageConfigRouteService.getDeletePath(),
-    method: 'post',
-    body: JSON.stringify(body),
-  });
-};
-
-export function useGetPackageConfigs(query: GetPackageConfigsRequest['query']) {
-  return useRequest<GetPackageConfigsResponse>({
-    method: 'get',
-    path: packageConfigRouteService.getListPath(),
-    query,
-  });
-}
-
-export const sendGetOnePackageConfig = (packageConfigId: string) => {
-  return sendRequest<GetOnePackageConfigResponse>({
-    path: packageConfigRouteService.getInfoPath(packageConfigId),
-    method: 'get',
-  });
-};
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/package_policy.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/package_policy.ts
new file mode 100644
index 0000000000000..47a38ba3bfeae
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/package_policy.ts
@@ -0,0 +1,62 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { sendRequest, useRequest } from './use_request';
+import { packagePolicyRouteService } from '../../services';
+import {
+  CreatePackagePolicyRequest,
+  CreatePackagePolicyResponse,
+  UpdatePackagePolicyRequest,
+  UpdatePackagePolicyResponse,
+} from '../../types';
+import {
+  DeletePackagePoliciesRequest,
+  DeletePackagePoliciesResponse,
+  GetPackagePoliciesRequest,
+  GetPackagePoliciesResponse,
+  GetOnePackagePolicyResponse,
+} from '../../../../../common/types/rest_spec';
+
+export const sendCreatePackagePolicy = (body: CreatePackagePolicyRequest['body']) => {
+  return sendRequest<CreatePackagePolicyResponse>({
+    path: packagePolicyRouteService.getCreatePath(),
+    method: 'post',
+    body: JSON.stringify(body),
+  });
+};
+
+export const sendUpdatePackagePolicy = (
+  packagePolicyId: string,
+  body: UpdatePackagePolicyRequest['body']
+) => {
+  return sendRequest<UpdatePackagePolicyResponse>({
+    path: packagePolicyRouteService.getUpdatePath(packagePolicyId),
+    method: 'put',
+    body: JSON.stringify(body),
+  });
+};
+
+export const sendDeletePackagePolicy = (body: DeletePackagePoliciesRequest['body']) => {
+  return sendRequest<DeletePackagePoliciesResponse>({
+    path: packagePolicyRouteService.getDeletePath(),
+    method: 'post',
+    body: JSON.stringify(body),
+  });
+};
+
+export function useGetPackagePolicies(query: GetPackagePoliciesRequest['query']) {
+  return useRequest<GetPackagePoliciesResponse>({
+    method: 'get',
+    path: packagePolicyRouteService.getListPath(),
+    query,
+  });
+}
+
+export const sendGetOnePackagePolicy = (packagePolicyId: string) => {
+  return sendRequest<GetOnePackagePolicyResponse>({
+    path: packagePolicyRouteService.getInfoPath(packagePolicyId),
+    method: 'get',
+  });
+};
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/index.tsx
index 443708ec6384f..5520a50463db4 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/index.tsx
@@ -21,7 +21,7 @@ import {
 import { PAGE_ROUTING_PATHS } from './constants';
 import { DefaultLayout, WithoutHeaderLayout } from './layouts';
 import { Loading, Error } from './components';
-import { IngestManagerOverview, EPMApp, AgentConfigApp, FleetApp, DataStreamApp } from './sections';
+import { IngestManagerOverview, EPMApp, AgentPolicyApp, FleetApp, DataStreamApp } from './sections';
 import { DepsContext, ConfigContext, useConfig } from './hooks';
 import { PackageInstallProvider } from './sections/epm/hooks';
 import { useCore, sendSetup, sendGetPermissionsCheck } from './hooks';
@@ -190,9 +190,9 @@ const IngestManagerRoutes = memo<{ history: AppMountParameters['history']; basep
                       <EPMApp />
                     </DefaultLayout>
                   </Route>
-                  <Route path={PAGE_ROUTING_PATHS.configurations}>
-                    <DefaultLayout section="agent_config">
-                      <AgentConfigApp />
+                  <Route path={PAGE_ROUTING_PATHS.policies}>
+                    <DefaultLayout section="agent_policy">
+                      <AgentPolicyApp />
                     </DefaultLayout>
                   </Route>
                   <Route path={PAGE_ROUTING_PATHS.data_streams}>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx
index 09da96fac4462..3a68cb948eb2d 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx
@@ -77,13 +77,10 @@ export const DefaultLayout: React.FunctionComponent<Props> = ({
                       defaultMessage="Integrations"
                     />
                   </EuiTab>
-                  <EuiTab
-                    isSelected={section === 'agent_config'}
-                    href={getHref('configurations_list')}
-                  >
+                  <EuiTab isSelected={section === 'agent_policy'} href={getHref('policies_list')}>
                     <FormattedMessage
-                      id="xpack.ingestManager.appNavigation.configurationsLinkText"
-                      defaultMessage="Configurations"
+                      id="xpack.ingestManager.appNavigation.policiesLinkText"
+                      defaultMessage="Policies"
                     />
                   </EuiTab>
                   <EuiTab
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/index.ts
deleted file mode 100644
index 3794a1f1afd26..0000000000000
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-export { AgentConfigForm, agentConfigFormValidation } from './config_form';
-export { AgentConfigDeleteProvider } from './config_delete_provider';
-export { PackageConfigDeleteProvider } from './package_config_delete_provider';
-export { LinkedAgentCount } from './linked_agent_count';
-export { ConfirmDeployConfigModal } from './confirm_deploy_modal';
-export { DangerEuiContextMenuItem } from './danger_eui_context_menu_item';
-export { AgentConfigActionMenu } from './actions_menu';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/custom_package_config.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/custom_package_config.tsx
deleted file mode 100644
index 98ab507c1453d..0000000000000
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/custom_package_config.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import React from 'react';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { EuiEmptyPrompt, EuiText } from '@elastic/eui';
-import { NewPackageConfig } from '../../../../types';
-import { CreatePackageConfigFrom } from '../types';
-
-export interface CustomConfigurePackageConfigProps {
-  packageName: string;
-  from: CreatePackageConfigFrom;
-  packageConfig: NewPackageConfig;
-  packageConfigId?: string;
-}
-
-/**
- * Custom content type that external plugins can provide to Ingest's
- * package config UI.
- */
-export type CustomConfigurePackageConfigContent = React.FC<CustomConfigurePackageConfigProps>;
-
-type AllowedPackageKey = 'endpoint';
-const PackageConfigMapping: {
-  [key: string]: CustomConfigurePackageConfigContent;
-} = {};
-
-/**
- * Plugins can call this function from the start lifecycle to
- * register a custom component in the Ingest package config.
- */
-export function registerPackageConfigComponent(
-  key: AllowedPackageKey,
-  value: CustomConfigurePackageConfigContent
-) {
-  PackageConfigMapping[key] = value;
-}
-
-const EmptyPackageConfig: CustomConfigurePackageConfigContent = () => (
-  <EuiEmptyPrompt
-    iconType="checkInCircleFilled"
-    iconColor="secondary"
-    body={
-      <EuiText>
-        <p>
-          <FormattedMessage
-            id="xpack.ingestManager.createPackageConfig.stepConfigure.noConfigOptionsMessage"
-            defaultMessage="Nothing to configure"
-          />
-        </p>
-      </EuiText>
-    }
-  />
-);
-
-export const CustomPackageConfig = (props: CustomConfigurePackageConfigProps) => {
-  const CustomPackageConfigContent = PackageConfigMapping[props.packageName] || EmptyPackageConfig;
-  return <CustomPackageConfigContent {...props} />;
-};
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/index.ts
deleted file mode 100644
index e53206c68c443..0000000000000
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-export { PackageConfigsTable } from './package_configs/package_configs_table';
-export { ConfigPackageConfigsView } from './package_configs';
-export { ConfigSettingsView } from './settings';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/index.tsx
deleted file mode 100644
index 3aef297e8d22e..0000000000000
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/index.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { memo } from 'react';
-import { AgentConfig, PackageConfig } from '../../../../../types';
-import { NoPackageConfigs } from './no_package_configs';
-import { PackageConfigsTable } from './package_configs_table';
-
-export const ConfigPackageConfigsView = memo<{ config: AgentConfig }>(({ config }) => {
-  if (config.package_configs.length === 0) {
-    return <NoPackageConfigs configId={config.id} />;
-  }
-
-  return (
-    <PackageConfigsTable
-      config={config}
-      packageConfigs={(config.package_configs || []) as PackageConfig[]}
-    />
-  );
-});
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/index.tsx
deleted file mode 100644
index 727ef23347251..0000000000000
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/index.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import React from 'react';
-import { HashRouter as Router, Switch, Route } from 'react-router-dom';
-import { PAGE_ROUTING_PATHS } from '../../constants';
-import { useBreadcrumbs } from '../../hooks';
-import { AgentConfigListPage } from './list_page';
-import { AgentConfigDetailsPage } from './details_page';
-import { CreatePackageConfigPage } from './create_package_config_page';
-import { EditPackageConfigPage } from './edit_package_config_page';
-
-export const AgentConfigApp: React.FunctionComponent = () => {
-  useBreadcrumbs('configurations');
-
-  return (
-    <Router>
-      <Switch>
-        <Route path={PAGE_ROUTING_PATHS.edit_integration}>
-          <EditPackageConfigPage />
-        </Route>
-        <Route path={PAGE_ROUTING_PATHS.add_integration_from_configuration}>
-          <CreatePackageConfigPage />
-        </Route>
-        <Route path={PAGE_ROUTING_PATHS.configuration_details}>
-          <AgentConfigDetailsPage />
-        </Route>
-        <Route path={PAGE_ROUTING_PATHS.configurations_list}>
-          <AgentConfigListPage />
-        </Route>
-      </Switch>
-    </Router>
-  );
-};
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/actions_menu.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/actions_menu.tsx
similarity index 74%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/actions_menu.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/actions_menu.tsx
index a71de4b60c08c..691de5f259134 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/actions_menu.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/actions_menu.tsx
@@ -6,22 +6,22 @@
 import React, { memo, useState, useMemo } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiContextMenuItem, EuiPortal } from '@elastic/eui';
-import { AgentConfig } from '../../../types';
+import { AgentPolicy } from '../../../types';
 import { useCapabilities } from '../../../hooks';
 import { ContextMenuActions } from '../../../components';
 import { AgentEnrollmentFlyout } from '../../fleet/components';
-import { ConfigYamlFlyout } from './config_yaml_flyout';
-import { AgentConfigCopyProvider } from './config_copy_provider';
+import { AgentPolicyYamlFlyout } from './agent_policy_yaml_flyout';
+import { AgentPolicyCopyProvider } from './agent_policy_copy_provider';
 
-export const AgentConfigActionMenu = memo<{
-  config: AgentConfig;
-  onCopySuccess?: (newAgentConfig: AgentConfig) => void;
+export const AgentPolicyActionMenu = memo<{
+  agentPolicy: AgentPolicy;
+  onCopySuccess?: (newAgentPolicy: AgentPolicy) => void;
   fullButton?: boolean;
   enrollmentFlyoutOpenByDefault?: boolean;
   onCancelEnrollment?: () => void;
 }>(
   ({
-    config,
+    agentPolicy,
     onCopySuccess,
     fullButton = false,
     enrollmentFlyoutOpenByDefault = false,
@@ -42,21 +42,21 @@ export const AgentConfigActionMenu = memo<{
     }, [onCancelEnrollment, setIsEnrollmentFlyoutOpen]);
 
     return (
-      <AgentConfigCopyProvider>
-        {(copyAgentConfigPrompt) => {
+      <AgentPolicyCopyProvider>
+        {(copyAgentPolicyPrompt) => {
           return (
             <>
               {isYamlFlyoutOpen ? (
                 <EuiPortal>
-                  <ConfigYamlFlyout
-                    configId={config.id}
+                  <AgentPolicyYamlFlyout
+                    policyId={agentPolicy.id}
                     onClose={() => setIsYamlFlyoutOpen(false)}
                   />
                 </EuiPortal>
               ) : null}
               {isEnrollmentFlyoutOpen && (
                 <EuiPortal>
-                  <AgentEnrollmentFlyout agentConfigs={[config]} onClose={onClose} />
+                  <AgentEnrollmentFlyout agentPolicies={[agentPolicy]} onClose={onClose} />
                 </EuiPortal>
               )}
               <ContextMenuActions
@@ -69,7 +69,7 @@ export const AgentConfigActionMenu = memo<{
                         },
                         children: (
                           <FormattedMessage
-                            id="xpack.ingestManager.agentConfigActionMenu.buttonText"
+                            id="xpack.ingestManager.agentPolicyActionMenu.buttonText"
                             defaultMessage="Actions"
                           />
                         ),
@@ -84,31 +84,31 @@ export const AgentConfigActionMenu = memo<{
                     key="enrollAgents"
                   >
                     <FormattedMessage
-                      id="xpack.ingestManager.agentConfigActionMenu.enrollAgentActionText"
+                      id="xpack.ingestManager.agentPolicyActionMenu.enrollAgentActionText"
                       defaultMessage="Add agent"
                     />
                   </EuiContextMenuItem>,
                   <EuiContextMenuItem
                     icon="inspect"
                     onClick={() => setIsYamlFlyoutOpen(!isYamlFlyoutOpen)}
-                    key="viewConfig"
+                    key="viewPolicy"
                   >
                     <FormattedMessage
-                      id="xpack.ingestManager.agentConfigActionMenu.viewConfigText"
-                      defaultMessage="View config"
+                      id="xpack.ingestManager.agentPolicyActionMenu.viewPolicyText"
+                      defaultMessage="View policy"
                     />
                   </EuiContextMenuItem>,
                   <EuiContextMenuItem
                     disabled={!hasWriteCapabilities}
                     icon="copy"
                     onClick={() => {
-                      copyAgentConfigPrompt(config, onCopySuccess);
+                      copyAgentPolicyPrompt(agentPolicy, onCopySuccess);
                     }}
-                    key="copyConfig"
+                    key="copyPolicy"
                   >
                     <FormattedMessage
-                      id="xpack.ingestManager.agentConfigActionMenu.copyConfigActionText"
-                      defaultMessage="Copy config"
+                      id="xpack.ingestManager.agentPolicyActionMenu.copyPolicyActionText"
+                      defaultMessage="Copy policy"
                     />
                   </EuiContextMenuItem>,
                 ]}
@@ -116,7 +116,7 @@ export const AgentConfigActionMenu = memo<{
             </>
           );
         }}
-      </AgentConfigCopyProvider>
+      </AgentPolicyCopyProvider>
     );
   }
 );
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_copy_provider.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_copy_provider.tsx
similarity index 54%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_copy_provider.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_copy_provider.tsx
index c1bd0846b887e..8a91cabe78d00 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_copy_provider.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_copy_provider.tsx
@@ -8,63 +8,63 @@ import React, { Fragment, useRef, useState } from 'react';
 import { EuiConfirmModal, EuiOverlayMask, EuiFormRow, EuiFieldText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { AgentConfig } from '../../../types';
-import { sendCopyAgentConfig, useCore } from '../../../hooks';
+import { AgentPolicy } from '../../../types';
+import { sendCopyAgentPolicy, useCore } from '../../../hooks';
 
 interface Props {
-  children: (copyAgentConfig: CopyAgentConfig) => React.ReactElement;
+  children: (copyAgentPolicy: CopyAgentPolicy) => React.ReactElement;
 }
 
-export type CopyAgentConfig = (agentConfig: AgentConfig, onSuccess?: OnSuccessCallback) => void;
+export type CopyAgentPolicy = (agentPolicy: AgentPolicy, onSuccess?: OnSuccessCallback) => void;
 
-type OnSuccessCallback = (newAgentConfig: AgentConfig) => void;
+type OnSuccessCallback = (newAgentPolicy: AgentPolicy) => void;
 
-export const AgentConfigCopyProvider: React.FunctionComponent<Props> = ({ children }) => {
+export const AgentPolicyCopyProvider: React.FunctionComponent<Props> = ({ children }) => {
   const { notifications } = useCore();
-  const [agentConfig, setAgentConfig] = useState<AgentConfig>();
-  const [newAgentConfig, setNewAgentConfig] = useState<Pick<AgentConfig, 'name' | 'description'>>();
+  const [agentPolicy, setAgentPolicy] = useState<AgentPolicy>();
+  const [newAgentPolicy, setNewAgentPolicy] = useState<Pick<AgentPolicy, 'name' | 'description'>>();
   const [isModalOpen, setIsModalOpen] = useState<boolean>(false);
   const [isLoading, setIsLoading] = useState<boolean>(false);
   const onSuccessCallback = useRef<OnSuccessCallback | null>(null);
 
-  const copyAgentConfigPrompt: CopyAgentConfig = (
-    agentConfigToCopy,
+  const copyAgentPolicyPrompt: CopyAgentPolicy = (
+    agentPolicyToCopy,
     onSuccess = () => undefined
   ) => {
-    if (!agentConfigToCopy) {
-      throw new Error('No agent config specified to copy');
+    if (!agentPolicyToCopy) {
+      throw new Error('No agent policy specified to copy');
     }
     setIsModalOpen(true);
-    setAgentConfig(agentConfigToCopy);
-    setNewAgentConfig({
+    setAgentPolicy(agentPolicyToCopy);
+    setNewAgentPolicy({
       name: i18n.translate(
-        'xpack.ingestManager.copyAgentConfig.confirmModal.defaultNewConfigName',
+        'xpack.ingestManager.copyAgentPolicy.confirmModal.defaultNewPolicyName',
         {
           defaultMessage: '{name} (copy)',
-          values: { name: agentConfigToCopy.name },
+          values: { name: agentPolicyToCopy.name },
         }
       ),
-      description: agentConfigToCopy.description,
+      description: agentPolicyToCopy.description,
     });
     onSuccessCallback.current = onSuccess;
   };
 
   const closeModal = () => {
-    setAgentConfig(undefined);
-    setNewAgentConfig(undefined);
+    setAgentPolicy(undefined);
+    setNewAgentPolicy(undefined);
     setIsLoading(false);
     setIsModalOpen(false);
   };
 
-  const copyAgentConfig = async () => {
+  const copyAgentPolicy = async () => {
     setIsLoading(true);
     try {
-      const { data } = await sendCopyAgentConfig(agentConfig!.id, newAgentConfig!);
+      const { data } = await sendCopyAgentPolicy(agentPolicy!.id, newAgentPolicy!);
 
       if (data?.success) {
         notifications.toasts.addSuccess(
-          i18n.translate('xpack.ingestManager.copyAgentConfig.successNotificationTitle', {
-            defaultMessage: 'Agent config copied',
+          i18n.translate('xpack.ingestManager.copyAgentPolicy.successNotificationTitle', {
+            defaultMessage: 'Agent policy copied',
           })
         );
         if (onSuccessCallback.current) {
@@ -74,16 +74,16 @@ export const AgentConfigCopyProvider: React.FunctionComponent<Props> = ({ childr
 
       if (!data?.success) {
         notifications.toasts.addDanger(
-          i18n.translate('xpack.ingestManager.copyAgentConfig.failureNotificationTitle', {
-            defaultMessage: "Error copying agent config '{id}'",
-            values: { id: agentConfig!.id },
+          i18n.translate('xpack.ingestManager.copyAgentPolicy.failureNotificationTitle', {
+            defaultMessage: "Error copying agent policy '{id}'",
+            values: { id: agentPolicy!.id },
           })
         );
       }
     } catch (e) {
       notifications.toasts.addDanger(
-        i18n.translate('xpack.ingestManager.copyAgentConfig.fatalErrorNotificationTitle', {
-          defaultMessage: 'Error copying agent config',
+        i18n.translate('xpack.ingestManager.copyAgentPolicy.fatalErrorNotificationTitle', {
+          defaultMessage: 'Error copying agent policy',
         })
       );
     }
@@ -91,7 +91,7 @@ export const AgentConfigCopyProvider: React.FunctionComponent<Props> = ({ childr
   };
 
   const renderModal = () => {
-    if (!isModalOpen || !agentConfig || !newAgentConfig) {
+    if (!isModalOpen || !agentPolicy || !newAgentPolicy) {
       return null;
     }
 
@@ -101,55 +101,55 @@ export const AgentConfigCopyProvider: React.FunctionComponent<Props> = ({ childr
           title={
             <span className="eui-textBreakWord">
               <FormattedMessage
-                id="xpack.ingestManager.copyAgentConfig.confirmModal.copyConfigTitle"
-                defaultMessage="Copy '{name}' agent configuration"
+                id="xpack.ingestManager.copyAgentPolicy.confirmModal.copyPolicyTitle"
+                defaultMessage="Copy '{name}' agent policy"
                 values={{
-                  name: agentConfig.name,
+                  name: agentPolicy.name,
                 }}
               />
             </span>
           }
           onCancel={closeModal}
-          onConfirm={copyAgentConfig}
+          onConfirm={copyAgentPolicy}
           cancelButtonText={
             <FormattedMessage
-              id="xpack.ingestManager.copyAgentConfig.confirmModal.cancelButtonLabel"
+              id="xpack.ingestManager.copyAgentPolicy.confirmModal.cancelButtonLabel"
               defaultMessage="Cancel"
             />
           }
           confirmButtonText={
             <FormattedMessage
-              id="xpack.ingestManager.copyAgentConfig.confirmModal.confirmButtonLabel"
-              defaultMessage="Copy configuration"
+              id="xpack.ingestManager.copyAgentPolicy.confirmModal.confirmButtonLabel"
+              defaultMessage="Copy policy"
             />
           }
-          confirmButtonDisabled={isLoading || !newAgentConfig.name.trim()}
+          confirmButtonDisabled={isLoading || !newAgentPolicy.name.trim()}
         >
           <p>
             <FormattedMessage
-              id="xpack.ingestManager.copyAgentConfig.confirmModal.copyConfigPrompt"
-              defaultMessage="Choose a name and description for your new agent configuration."
+              id="xpack.ingestManager.copyAgentPolicy.confirmModal.copyPolicyPrompt"
+              defaultMessage="Choose a name and description for your new agent policy."
             />
           </p>
           <EuiFormRow
             label={
               <FormattedMessage
-                id="xpack.ingestManager.copyAgentConfig.confirmModal.newNameLabel"
-                defaultMessage="New configuration name"
+                id="xpack.ingestManager.copyAgentPolicy.confirmModal.newNameLabel"
+                defaultMessage="New policy name"
               />
             }
             fullWidth
           >
             <EuiFieldText
               fullWidth
-              value={newAgentConfig.name}
-              onChange={(e) => setNewAgentConfig({ ...newAgentConfig, name: e.target.value })}
+              value={newAgentPolicy.name}
+              onChange={(e) => setNewAgentPolicy({ ...newAgentPolicy, name: e.target.value })}
             />
           </EuiFormRow>
           <EuiFormRow
             label={
               <FormattedMessage
-                id="xpack.ingestManager.copyAgentConfig.confirmModal.newDescriptionLabel"
+                id="xpack.ingestManager.copyAgentPolicy.confirmModal.newDescriptionLabel"
                 defaultMessage="Description"
               />
             }
@@ -157,9 +157,9 @@ export const AgentConfigCopyProvider: React.FunctionComponent<Props> = ({ childr
           >
             <EuiFieldText
               fullWidth
-              value={newAgentConfig.description}
+              value={newAgentPolicy.description}
               onChange={(e) =>
-                setNewAgentConfig({ ...newAgentConfig, description: e.target.value })
+                setNewAgentPolicy({ ...newAgentPolicy, description: e.target.value })
               }
             />
           </EuiFormRow>
@@ -170,7 +170,7 @@ export const AgentConfigCopyProvider: React.FunctionComponent<Props> = ({ childr
 
   return (
     <Fragment>
-      {children(copyAgentConfigPrompt)}
+      {children(copyAgentPolicyPrompt)}
       {renderModal()}
     </Fragment>
   );
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_delete_provider.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_delete_provider.tsx
similarity index 62%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_delete_provider.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_delete_provider.tsx
index d517dde45d5e3..08367bf2a97bf 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_delete_provider.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_delete_provider.tsx
@@ -9,87 +9,87 @@ import { EuiConfirmModal, EuiOverlayMask, EuiCallOut } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { AGENT_SAVED_OBJECT_TYPE } from '../../../constants';
-import { sendDeleteAgentConfig, useCore, useConfig, sendRequest } from '../../../hooks';
+import { sendDeleteAgentPolicy, useCore, useConfig, sendRequest } from '../../../hooks';
 
 interface Props {
-  children: (deleteAgentConfig: DeleteAgentConfig) => React.ReactElement;
+  children: (deleteAgentPolicy: DeleteAgentPolicy) => React.ReactElement;
 }
 
-export type DeleteAgentConfig = (agentConfig: string, onSuccess?: OnSuccessCallback) => void;
+export type DeleteAgentPolicy = (agentPolicy: string, onSuccess?: OnSuccessCallback) => void;
 
-type OnSuccessCallback = (agentConfigDeleted: string) => void;
+type OnSuccessCallback = (agentPolicyDeleted: string) => void;
 
-export const AgentConfigDeleteProvider: React.FunctionComponent<Props> = ({ children }) => {
+export const AgentPolicyDeleteProvider: React.FunctionComponent<Props> = ({ children }) => {
   const { notifications } = useCore();
   const {
     fleet: { enabled: isFleetEnabled },
   } = useConfig();
-  const [agentConfig, setAgentConfig] = useState<string>();
+  const [agentPolicy, setAgentPolicy] = useState<string>();
   const [isModalOpen, setIsModalOpen] = useState<boolean>(false);
   const [isLoadingAgentsCount, setIsLoadingAgentsCount] = useState<boolean>(false);
   const [agentsCount, setAgentsCount] = useState<number>(0);
   const [isLoading, setIsLoading] = useState<boolean>(false);
   const onSuccessCallback = useRef<OnSuccessCallback | null>(null);
 
-  const deleteAgentConfigPrompt: DeleteAgentConfig = (
-    agentConfigToDelete,
+  const deleteAgentPolicyPrompt: DeleteAgentPolicy = (
+    agentPolicyToDelete,
     onSuccess = () => undefined
   ) => {
-    if (!agentConfigToDelete) {
-      throw new Error('No agent config specified for deletion');
+    if (!agentPolicyToDelete) {
+      throw new Error('No agent policy specified for deletion');
     }
     setIsModalOpen(true);
-    setAgentConfig(agentConfigToDelete);
-    fetchAgentsCount(agentConfigToDelete);
+    setAgentPolicy(agentPolicyToDelete);
+    fetchAgentsCount(agentPolicyToDelete);
     onSuccessCallback.current = onSuccess;
   };
 
   const closeModal = () => {
-    setAgentConfig(undefined);
+    setAgentPolicy(undefined);
     setIsLoading(false);
     setIsLoadingAgentsCount(false);
     setIsModalOpen(false);
   };
 
-  const deleteAgentConfig = async () => {
+  const deleteAgentPolicy = async () => {
     setIsLoading(true);
 
     try {
-      const { data } = await sendDeleteAgentConfig({
-        agentConfigId: agentConfig!,
+      const { data } = await sendDeleteAgentPolicy({
+        agentPolicyId: agentPolicy!,
       });
 
       if (data?.success) {
         notifications.toasts.addSuccess(
-          i18n.translate('xpack.ingestManager.deleteAgentConfig.successSingleNotificationTitle', {
-            defaultMessage: "Deleted agent config '{id}'",
-            values: { id: agentConfig },
+          i18n.translate('xpack.ingestManager.deleteAgentPolicy.successSingleNotificationTitle', {
+            defaultMessage: "Deleted agent policy '{id}'",
+            values: { id: agentPolicy },
           })
         );
         if (onSuccessCallback.current) {
-          onSuccessCallback.current(agentConfig!);
+          onSuccessCallback.current(agentPolicy!);
         }
       }
 
       if (!data?.success) {
         notifications.toasts.addDanger(
-          i18n.translate('xpack.ingestManager.deleteAgentConfig.failureSingleNotificationTitle', {
-            defaultMessage: "Error deleting agent config '{id}'",
-            values: { id: agentConfig },
+          i18n.translate('xpack.ingestManager.deleteAgentPolicy.failureSingleNotificationTitle', {
+            defaultMessage: "Error deleting agent policy '{id}'",
+            values: { id: agentPolicy },
           })
         );
       }
     } catch (e) {
       notifications.toasts.addDanger(
-        i18n.translate('xpack.ingestManager.deleteAgentConfig.fatalErrorNotificationTitle', {
-          defaultMessage: 'Error deleting agent config',
+        i18n.translate('xpack.ingestManager.deleteAgentPolicy.fatalErrorNotificationTitle', {
+          defaultMessage: 'Error deleting agent policy',
         })
       );
     }
     closeModal();
   };
 
-  const fetchAgentsCount = async (agentConfigToCheck: string) => {
+  const fetchAgentsCount = async (agentPolicyToCheck: string) => {
     if (!isFleetEnabled || isLoadingAgentsCount) {
       return;
     }
@@ -98,7 +98,7 @@ export const AgentConfigDeleteProvider: React.FunctionComponent<Props> = ({ chil
       path: `/api/ingest_manager/fleet/agents`,
       method: 'get',
       query: {
-        kuery: `${AGENT_SAVED_OBJECT_TYPE}.config_id : ${agentConfigToCheck}`,
+        kuery: `${AGENT_SAVED_OBJECT_TYPE}.policy_id : ${agentPolicyToCheck}`,
       },
     });
     setAgentsCount(data?.total || 0);
@@ -115,28 +115,28 @@ export const AgentConfigDeleteProvider: React.FunctionComponent<Props> = ({ chil
         <EuiConfirmModal
           title={
             <FormattedMessage
-              id="xpack.ingestManager.deleteAgentConfig.confirmModal.deleteConfigTitle"
-              defaultMessage="Delete this agent configuration?"
+              id="xpack.ingestManager.deleteAgentPolicy.confirmModal.deletePolicyTitle"
+              defaultMessage="Delete this agent policy?"
             />
           }
           onCancel={closeModal}
-          onConfirm={deleteAgentConfig}
+          onConfirm={deleteAgentPolicy}
           cancelButtonText={
             <FormattedMessage
-              id="xpack.ingestManager.deleteAgentConfig.confirmModal.cancelButtonLabel"
+              id="xpack.ingestManager.deleteAgentPolicy.confirmModal.cancelButtonLabel"
               defaultMessage="Cancel"
             />
           }
           confirmButtonText={
             isLoading || isLoadingAgentsCount ? (
               <FormattedMessage
-                id="xpack.ingestManager.deleteAgentConfig.confirmModal.loadingButtonLabel"
+                id="xpack.ingestManager.deleteAgentPolicy.confirmModal.loadingButtonLabel"
                 defaultMessage="Loading…"
               />
             ) : (
               <FormattedMessage
-                id="xpack.ingestManager.deleteAgentConfig.confirmModal.confirmButtonLabel"
-                defaultMessage="Delete configuration"
+                id="xpack.ingestManager.deleteAgentPolicy.confirmModal.confirmButtonLabel"
+                defaultMessage="Delete policy"
               />
             )
           }
@@ -145,22 +145,22 @@ export const AgentConfigDeleteProvider: React.FunctionComponent<Props> = ({ chil
         >
           {isLoadingAgentsCount ? (
             <FormattedMessage
-              id="xpack.ingestManager.deleteAgentConfig.confirmModal.loadingAgentsCountMessage"
+              id="xpack.ingestManager.deleteAgentPolicy.confirmModal.loadingAgentsCountMessage"
               defaultMessage="Checking amount of affected agents…"
             />
           ) : agentsCount ? (
             <EuiCallOut
               color="danger"
               title={i18n.translate(
-                'xpack.ingestManager.deleteAgentConfig.confirmModal.affectedAgentsTitle',
+                'xpack.ingestManager.deleteAgentPolicy.confirmModal.affectedAgentsTitle',
                 {
-                  defaultMessage: 'Configuration in use',
+                  defaultMessage: 'Policy in use',
                 }
               )}
             >
               <FormattedMessage
-                id="xpack.ingestManager.deleteAgentConfig.confirmModal.affectedAgentsMessage"
-                defaultMessage="{agentsCount, plural, one {# agent is} other {# agents are}} assigned to this agent configuration. Unassign these agents before deleting this configuration."
+                id="xpack.ingestManager.deleteAgentPolicy.confirmModal.affectedAgentsMessage"
+                defaultMessage="{agentsCount, plural, one {# agent is} other {# agents are}} assigned to this agent policy. Unassign these agents before deleting this policy."
                 values={{
                   agentsCount,
                 }}
@@ -168,7 +168,7 @@ export const AgentConfigDeleteProvider: React.FunctionComponent<Props> = ({ chil
             </EuiCallOut>
           ) : (
             <FormattedMessage
-              id="xpack.ingestManager.deleteAgentConfig.confirmModal.irreversibleMessage"
+              id="xpack.ingestManager.deleteAgentPolicy.confirmModal.irreversibleMessage"
               defaultMessage="This action cannot be undone."
             />
           )}
@@ -179,7 +179,7 @@ export const AgentConfigDeleteProvider: React.FunctionComponent<Props> = ({ chil
 
   return (
     <Fragment>
-      {children(deleteAgentConfigPrompt)}
+      {children(deleteAgentPolicyPrompt)}
       {renderModal()}
     </Fragment>
   );
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_form.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_form.tsx
similarity index 70%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_form.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_form.tsx
index b60c36b282a0d..a858a53c485b7 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_form.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_form.tsx
@@ -23,8 +23,8 @@ import {
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 import styled from 'styled-components';
-import { NewAgentConfig, AgentConfig } from '../../../types';
-import { AgentConfigDeleteProvider } from './config_delete_provider';
+import { NewAgentPolicy, AgentPolicy } from '../../../types';
+import { AgentPolicyDeleteProvider } from './agent_policy_delete_provider';
 
 interface ValidationResults {
   [key: string]: JSX.Element[];
@@ -36,24 +36,24 @@ const StyledEuiAccordion = styled(EuiAccordion)`
   }
 `;
 
-export const agentConfigFormValidation = (
-  agentConfig: Partial<NewAgentConfig | AgentConfig>
+export const agentPolicyFormValidation = (
+  agentPolicy: Partial<NewAgentPolicy | AgentPolicy>
 ): ValidationResults => {
   const errors: ValidationResults = {};
 
-  if (!agentConfig.name?.trim()) {
+  if (!agentPolicy.name?.trim()) {
     errors.name = [
       <FormattedMessage
-        id="xpack.ingestManager.agentConfigForm.nameRequiredErrorMessage"
-        defaultMessage="Agent config name is required"
+        id="xpack.ingestManager.agentPolicyForm.nameRequiredErrorMessage"
+        defaultMessage="Agent policy name is required"
       />,
     ];
   }
 
-  if (!agentConfig.namespace?.trim()) {
+  if (!agentPolicy.namespace?.trim()) {
     errors.namespace = [
       <FormattedMessage
-        id="xpack.ingestManager.agentConfigForm.namespaceRequiredErrorMessage"
+        id="xpack.ingestManager.agentPolicyForm.namespaceRequiredErrorMessage"
         defaultMessage="A namespace is required"
       />,
     ];
@@ -63,8 +63,8 @@ export const agentConfigFormValidation = (
 };
 
 interface Props {
-  agentConfig: Partial<NewAgentConfig | AgentConfig>;
-  updateAgentConfig: (u: Partial<NewAgentConfig | AgentConfig>) => void;
+  agentPolicy: Partial<NewAgentPolicy | AgentPolicy>;
+  updateAgentPolicy: (u: Partial<NewAgentPolicy | AgentPolicy>) => void;
   withSysMonitoring: boolean;
   updateSysMonitoring: (newValue: boolean) => void;
   validation: ValidationResults;
@@ -72,9 +72,9 @@ interface Props {
   onDelete?: () => void;
 }
 
-export const AgentConfigForm: React.FunctionComponent<Props> = ({
-  agentConfig,
-  updateAgentConfig,
+export const AgentPolicyForm: React.FunctionComponent<Props> = ({
+  agentPolicy,
+  updateAgentPolicy,
   withSysMonitoring,
   updateSysMonitoring,
   validation,
@@ -92,11 +92,11 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
         name: 'name',
         label: (
           <FormattedMessage
-            id="xpack.ingestManager.agentConfigForm.nameFieldLabel"
+            id="xpack.ingestManager.agentPolicyForm.nameFieldLabel"
             defaultMessage="Name"
           />
         ),
-        placeholder: i18n.translate('xpack.ingestManager.agentConfigForm.nameFieldPlaceholder', {
+        placeholder: i18n.translate('xpack.ingestManager.agentPolicyForm.nameFieldPlaceholder', {
           defaultMessage: 'Choose a name',
         }),
       },
@@ -104,14 +104,14 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
         name: 'description',
         label: (
           <FormattedMessage
-            id="xpack.ingestManager.agentConfigForm.descriptionFieldLabel"
+            id="xpack.ingestManager.agentPolicyForm.descriptionFieldLabel"
             defaultMessage="Description"
           />
         ),
         placeholder: i18n.translate(
-          'xpack.ingestManager.agentConfigForm.descriptionFieldPlaceholder',
+          'xpack.ingestManager.agentPolicyForm.descriptionFieldPlaceholder',
           {
-            defaultMessage: 'How will this configuration be used?',
+            defaultMessage: 'How will this policy be used?',
           }
         ),
       },
@@ -123,15 +123,15 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
       title={
         <h4>
           <FormattedMessage
-            id="xpack.ingestManager.configForm.generalSettingsGroupTitle"
+            id="xpack.ingestManager.policyForm.generalSettingsGroupTitle"
             defaultMessage="General settings"
           />
         </h4>
       }
       description={
         <FormattedMessage
-          id="xpack.ingestManager.configForm.generalSettingsGroupDescription"
-          defaultMessage="Choose a name and description for your agent configuration."
+          id="xpack.ingestManager.policyForm.generalSettingsGroupDescription"
+          defaultMessage="Choose a name and description for your agent policy."
         />
       }
     >
@@ -150,8 +150,8 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
       >
         <EuiFieldText
           fullWidth
-          value={agentConfig[name]}
-          onChange={(e) => updateAgentConfig({ [name]: e.target.value })}
+          value={agentPolicy[name]}
+          onChange={(e) => updateAgentPolicy({ [name]: e.target.value })}
           isInvalid={Boolean(touchedFields[name] && validation[name])}
           onBlur={() => setTouchedFields({ ...touchedFields, [name]: true })}
           placeholder={placeholder}
@@ -166,15 +166,15 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
         title={
           <h4>
             <FormattedMessage
-              id="xpack.ingestManager.agentConfigForm.namespaceFieldLabel"
+              id="xpack.ingestManager.agentPolicyForm.namespaceFieldLabel"
               defaultMessage="Default namespace"
             />
           </h4>
         }
         description={
           <FormattedMessage
-            id="xpack.ingestManager.agentConfigForm.namespaceFieldDescription"
-            defaultMessage="Apply a default namespace to integrations that use this configuration. Integrations can specify their own namespaces."
+            id="xpack.ingestManager.agentPolicyForm.namespaceFieldDescription"
+            defaultMessage="Apply a default namespace to integrations that use this policy. Integrations can specify their own namespaces."
           />
         }
       >
@@ -187,12 +187,12 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
             fullWidth
             singleSelection
             noSuggestions
-            selectedOptions={agentConfig.namespace ? [{ label: agentConfig.namespace }] : []}
+            selectedOptions={agentPolicy.namespace ? [{ label: agentPolicy.namespace }] : []}
             onCreateOption={(value: string) => {
-              updateAgentConfig({ namespace: value });
+              updateAgentPolicy({ namespace: value });
             }}
             onChange={(selectedOptions) => {
-              updateAgentConfig({
+              updateAgentPolicy({
                 namespace: (selectedOptions.length ? selectedOptions[0] : '') as string,
               });
             }}
@@ -205,14 +205,14 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
         title={
           <h4>
             <FormattedMessage
-              id="xpack.ingestManager.agentConfigForm.monitoringLabel"
+              id="xpack.ingestManager.agentPolicyForm.monitoringLabel"
               defaultMessage="Agent monitoring"
             />
           </h4>
         }
         description={
           <FormattedMessage
-            id="xpack.ingestManager.agentConfigForm.monitoringDescription"
+            id="xpack.ingestManager.agentPolicyForm.monitoringDescription"
             defaultMessage="Collect data about your agents for debugging and tracking performance."
           />
         }
@@ -224,15 +224,14 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
               label: (
                 <>
                   <FormattedMessage
-                    id="xpack.ingestManager.agentConfigForm.monitoringLogsFieldLabel"
+                    id="xpack.ingestManager.agentPolicyForm.monitoringLogsFieldLabel"
                     defaultMessage="Collect agent logs"
                   />{' '}
                   <EuiIconTip
                     content={i18n.translate(
-                      'xpack.ingestManager.agentConfigForm.monitoringLogsTooltipText',
+                      'xpack.ingestManager.agentPolicyForm.monitoringLogsTooltipText',
                       {
-                        defaultMessage:
-                          'Collect logs from Elastic Agents that use this configuration.',
+                        defaultMessage: 'Collect logs from Elastic Agents that use this policy.',
                       }
                     )}
                     position="right"
@@ -247,15 +246,14 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
               label: (
                 <>
                   <FormattedMessage
-                    id="xpack.ingestManager.agentConfigForm.monitoringMetricsFieldLabel"
+                    id="xpack.ingestManager.agentPolicyForm.monitoringMetricsFieldLabel"
                     defaultMessage="Collect agent metrics"
                   />{' '}
                   <EuiIconTip
                     content={i18n.translate(
-                      'xpack.ingestManager.agentConfigForm.monitoringMetricsTooltipText',
+                      'xpack.ingestManager.agentPolicyForm.monitoringMetricsTooltipText',
                       {
-                        defaultMessage:
-                          'Collect metrics from Elastic Agents that use this configuration.',
+                        defaultMessage: 'Collect metrics from Elastic Agents that use this policy.',
                       }
                     )}
                     position="right"
@@ -266,7 +264,7 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
               ),
             },
           ]}
-          idToSelectedMap={(agentConfig.monitoring_enabled || []).reduce(
+          idToSelectedMap={(agentPolicy.monitoring_enabled || []).reduce(
             (acc: { logs: boolean; metrics: boolean }, key) => {
               acc[key] = true;
               return acc;
@@ -279,10 +277,10 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
             }
 
             const hasLogs =
-              agentConfig.monitoring_enabled && agentConfig.monitoring_enabled.indexOf(id) >= 0;
+              agentPolicy.monitoring_enabled && agentPolicy.monitoring_enabled.indexOf(id) >= 0;
 
-            const previousValues = agentConfig.monitoring_enabled || [];
-            updateAgentConfig({
+            const previousValues = agentPolicy.monitoring_enabled || [];
+            updateAgentPolicy({
               monitoring_enabled: hasLogs
                 ? previousValues.filter((type) => type !== id)
                 : [...previousValues, id],
@@ -290,46 +288,46 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
           }}
         />
       </EuiDescribedFormGroup>
-      {isEditing && 'id' in agentConfig ? (
+      {isEditing && 'id' in agentPolicy ? (
         <EuiDescribedFormGroup
           title={
             <h4>
               <FormattedMessage
-                id="xpack.ingestManager.configForm.deleteConfigGroupTitle"
-                defaultMessage="Delete configuration"
+                id="xpack.ingestManager.policyForm.deletePolicyGroupTitle"
+                defaultMessage="Delete policy"
               />
             </h4>
           }
           description={
             <>
               <FormattedMessage
-                id="xpack.ingestManager.configForm.deleteConfigGroupDescription"
+                id="xpack.ingestManager.policyForm.deletePolicyGroupDescription"
                 defaultMessage="Existing data will not be deleted."
               />
               <EuiSpacer size="s" />
-              <AgentConfigDeleteProvider>
-                {(deleteAgentConfigPrompt) => {
+              <AgentPolicyDeleteProvider>
+                {(deleteAgentPolicyPrompt) => {
                   return (
                     <EuiButton
                       color="danger"
-                      disabled={Boolean(agentConfig.is_default)}
-                      onClick={() => deleteAgentConfigPrompt(agentConfig.id!, onDelete)}
+                      disabled={Boolean(agentPolicy.is_default)}
+                      onClick={() => deleteAgentPolicyPrompt(agentPolicy.id!, onDelete)}
                     >
                       <FormattedMessage
-                        id="xpack.ingestManager.configForm.deleteConfigActionText"
-                        defaultMessage="Delete configuration"
+                        id="xpack.ingestManager.policyForm.deletePolicyActionText"
+                        defaultMessage="Delete policy"
                       />
                     </EuiButton>
                   );
                 }}
-              </AgentConfigDeleteProvider>
-              {agentConfig.is_default ? (
+              </AgentPolicyDeleteProvider>
+              {agentPolicy.is_default ? (
                 <>
                   <EuiSpacer size="xs" />
                   <EuiText color="subdued" size="xs">
                     <FormattedMessage
-                      id="xpack.ingestManager.configForm.unableToDeleteDefaultConfigText"
-                      defaultMessage="Default configuration cannot be deleted"
+                      id="xpack.ingestManager.policyForm.unableToDeleteDefaultPolicyText"
+                      defaultMessage="Default policy cannot be deleted"
                     />
                   </EuiText>
                 </>
@@ -348,25 +346,25 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
         <EuiFormRow
           label={
             <FormattedMessage
-              id="xpack.ingestManager.agentConfigForm.systemMonitoringFieldLabel"
+              id="xpack.ingestManager.agentPolicyForm.systemMonitoringFieldLabel"
               defaultMessage="System monitoring"
             />
           }
         >
           <EuiCheckbox
-            id="agentConfigFormSystemMonitoringCheckbox"
+            id="agentPolicyFormSystemMonitoringCheckbox"
             label={
               <>
                 <FormattedMessage
-                  id="xpack.ingestManager.agentConfigForm.systemMonitoringText"
+                  id="xpack.ingestManager.agentPolicyForm.systemMonitoringText"
                   defaultMessage="Collect system metrics"
                 />{' '}
                 <EuiIconTip
                   content={i18n.translate(
-                    'xpack.ingestManager.agentConfigForm.systemMonitoringTooltipText',
+                    'xpack.ingestManager.agentPolicyForm.systemMonitoringTooltipText',
                     {
                       defaultMessage:
-                        'Enable this option to bootstrap your configuration with an integration that collects system metrics and information.',
+                        'Enable this option to bootstrap your policy with an integration that collects system metrics and information.',
                     }
                   )}
                   position="right"
@@ -390,7 +388,7 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
             id="advancedOptions"
             buttonContent={
               <FormattedMessage
-                id="xpack.ingestManager.agentConfigForm.advancedOptionsToggleLabel"
+                id="xpack.ingestManager.agentPolicyForm.advancedOptionsToggleLabel"
                 defaultMessage="Advanced options"
               />
             }
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_yaml_flyout.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_yaml_flyout.tsx
similarity index 68%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_yaml_flyout.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_yaml_flyout.tsx
index 9c2d09b02665f..919bb49f69aae 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_yaml_flyout.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_yaml_flyout.tsx
@@ -19,9 +19,9 @@ import {
   EuiButtonEmpty,
   EuiButton,
 } from '@elastic/eui';
-import { useGetOneAgentConfigFull, useGetOneAgentConfig, useCore } from '../../../hooks';
+import { useGetOneAgentPolicyFull, useGetOneAgentPolicy, useCore } from '../../../hooks';
 import { Loading } from '../../../components';
-import { configToYaml, agentConfigRouteService } from '../../../services';
+import { fullAgentPolicyToYaml, agentPolicyRouteService } from '../../../services';
 
 const FlyoutBody = styled(EuiFlyoutBody)`
   .euiFlyoutBody__overflowContent {
@@ -29,40 +29,40 @@ const FlyoutBody = styled(EuiFlyoutBody)`
   }
 `;
 
-export const ConfigYamlFlyout = memo<{ configId: string; onClose: () => void }>(
-  ({ configId, onClose }) => {
+export const AgentPolicyYamlFlyout = memo<{ policyId: string; onClose: () => void }>(
+  ({ policyId, onClose }) => {
     const core = useCore();
-    const { isLoading: isLoadingYaml, data: yamlData } = useGetOneAgentConfigFull(configId);
-    const { data: configData } = useGetOneAgentConfig(configId);
+    const { isLoading: isLoadingYaml, data: yamlData } = useGetOneAgentPolicyFull(policyId);
+    const { data: agentPolicyData } = useGetOneAgentPolicy(policyId);
 
     const body =
       isLoadingYaml && !yamlData ? (
         <Loading />
       ) : (
         <EuiCodeBlock language="yaml" isCopyable fontSize="m">
-          {configToYaml(yamlData!.item)}
+          {fullAgentPolicyToYaml(yamlData!.item)}
         </EuiCodeBlock>
       );
 
     const downloadLink = core.http.basePath.prepend(
-      agentConfigRouteService.getInfoFullDownloadPath(configId)
+      agentPolicyRouteService.getInfoFullDownloadPath(policyId)
     );
 
     return (
       <EuiFlyout onClose={onClose} size="l" maxWidth={640}>
-        <EuiFlyoutHeader hasBorder aria-labelledby="IngestManagerConfigYamlFlyoutTitle">
+        <EuiFlyoutHeader hasBorder aria-labelledby="IngestManagerAgentPolicyYamlFlyoutTitle">
           <EuiTitle size="m">
-            <h2 id="IngestManagerConfigYamlFlyoutTitle">
-              {configData?.item ? (
+            <h2 id="IngestManagerAgentPolicyYamlFlyoutTitle">
+              {agentPolicyData?.item ? (
                 <FormattedMessage
-                  id="xpack.ingestManager.configDetails.yamlflyoutTitleWithName"
-                  defaultMessage="'{name}' agent configuration"
-                  values={{ name: configData.item.name }}
+                  id="xpack.ingestManager.policyDetails.yamlflyoutTitleWithName"
+                  defaultMessage="'{name}' agent policy"
+                  values={{ name: agentPolicyData.item.name }}
                 />
               ) : (
                 <FormattedMessage
-                  id="xpack.ingestManager.configDetails.yamlflyoutTitleWithoutName"
-                  defaultMessage="Agent configuration"
+                  id="xpack.ingestManager.policyDetails.yamlflyoutTitleWithoutName"
+                  defaultMessage="Agent policy"
                 />
               )}
             </h2>
@@ -74,7 +74,7 @@ export const ConfigYamlFlyout = memo<{ configId: string; onClose: () => void }>(
             <EuiFlexItem grow={false}>
               <EuiButtonEmpty onClick={onClose} flush="left">
                 <FormattedMessage
-                  id="xpack.ingestManager.configDetails.yamlFlyoutCloseButtonLabel"
+                  id="xpack.ingestManager.policyDetails.yamlFlyoutCloseButtonLabel"
                   defaultMessage="Close"
                 />
               </EuiButtonEmpty>
@@ -86,8 +86,8 @@ export const ConfigYamlFlyout = memo<{ configId: string; onClose: () => void }>(
                 isDisabled={Boolean(isLoadingYaml && !yamlData)}
               >
                 <FormattedMessage
-                  id="xpack.ingestManager.configDetails.yamlDownloadButtonLabel"
-                  defaultMessage="Download configuration"
+                  id="xpack.ingestManager.policyDetails.yamlDownloadButtonLabel"
+                  defaultMessage="Download policy"
                 />
               </EuiButton>
             </EuiFlexItem>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/confirm_deploy_modal.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/confirm_deploy_modal.tsx
similarity index 72%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/confirm_deploy_modal.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/confirm_deploy_modal.tsx
index 51f37f72a7514..d1a9b4812bfe0 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/confirm_deploy_modal.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/confirm_deploy_modal.tsx
@@ -8,20 +8,20 @@ import React from 'react';
 import { EuiCallOut, EuiOverlayMask, EuiConfirmModal, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import { AgentConfig } from '../../../types';
+import { AgentPolicy } from '../../../types';
 
-export const ConfirmDeployConfigModal: React.FunctionComponent<{
+export const ConfirmDeployAgentPolicyModal: React.FunctionComponent<{
   onConfirm: () => void;
   onCancel: () => void;
   agentCount: number;
-  agentConfig: AgentConfig;
-}> = ({ onConfirm, onCancel, agentCount, agentConfig }) => {
+  agentPolicy: AgentPolicy;
+}> = ({ onConfirm, onCancel, agentCount, agentPolicy }) => {
   return (
     <EuiOverlayMask>
       <EuiConfirmModal
         title={
           <FormattedMessage
-            id="xpack.ingestManager.agentConfig.confirmModalTitle"
+            id="xpack.ingestManager.agentPolicy.confirmModalTitle"
             defaultMessage="Save and deploy changes"
           />
         }
@@ -29,13 +29,13 @@ export const ConfirmDeployConfigModal: React.FunctionComponent<{
         onConfirm={onConfirm}
         cancelButtonText={
           <FormattedMessage
-            id="xpack.ingestManager.agentConfig.confirmModalCancelButtonLabel"
+            id="xpack.ingestManager.agentPolicy.confirmModalCancelButtonLabel"
             defaultMessage="Cancel"
           />
         }
         confirmButtonText={
           <FormattedMessage
-            id="xpack.ingestManager.agentConfig.confirmModalConfirmButtonLabel"
+            id="xpack.ingestManager.agentPolicy.confirmModalConfirmButtonLabel"
             defaultMessage="Save and deploy changes"
           />
         }
@@ -43,7 +43,7 @@ export const ConfirmDeployConfigModal: React.FunctionComponent<{
       >
         <EuiCallOut
           iconType="iInCircle"
-          title={i18n.translate('xpack.ingestManager.agentConfig.confirmModalCalloutTitle', {
+          title={i18n.translate('xpack.ingestManager.agentPolicy.confirmModalCalloutTitle', {
             defaultMessage:
               'This action will update {agentCount, plural, one {# agent} other {# agents}}',
             values: {
@@ -53,19 +53,19 @@ export const ConfirmDeployConfigModal: React.FunctionComponent<{
         >
           <div className="eui-textBreakWord">
             <FormattedMessage
-              id="xpack.ingestManager.agentConfig.confirmModalCalloutDescription"
-              defaultMessage="Fleet has detected that the selected agent configuration, {configName}, is already in use by
+              id="xpack.ingestManager.agentPolicy.confirmModalCalloutDescription"
+              defaultMessage="Fleet has detected that the selected agent policy, {policyName}, is already in use by
             some of your agents. As a result of this action, Fleet will deploy updates to all agents
-            that use this configuration."
+            that use this policy."
               values={{
-                configName: <b>{agentConfig.name}</b>,
+                policyName: <b>{agentPolicy.name}</b>,
               }}
             />
           </div>
         </EuiCallOut>
         <EuiSpacer size="l" />
         <FormattedMessage
-          id="xpack.ingestManager.agentConfig.confirmModalDescription"
+          id="xpack.ingestManager.agentPolicy.confirmModalDescription"
           defaultMessage="This action can not be undone. Are you sure you wish to continue?"
         />
       </EuiConfirmModal>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/danger_eui_context_menu_item.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/danger_eui_context_menu_item.tsx
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/danger_eui_context_menu_item.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/danger_eui_context_menu_item.tsx
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/index.ts
new file mode 100644
index 0000000000000..1ec43f4df8c8e
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/index.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+export { AgentPolicyForm, agentPolicyFormValidation } from './agent_policy_form';
+export { AgentPolicyCopyProvider } from './agent_policy_copy_provider';
+export { AgentPolicyDeleteProvider } from './agent_policy_delete_provider';
+export { PackagePolicyDeleteProvider } from './package_policy_delete_provider';
+export { AgentPolicyYamlFlyout } from './agent_policy_yaml_flyout';
+export { LinkedAgentCount } from './linked_agent_count';
+export { ConfirmDeployAgentPolicyModal } from './confirm_deploy_modal';
+export { DangerEuiContextMenuItem } from './danger_eui_context_menu_item';
+export { AgentPolicyActionMenu } from './actions_menu';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/linked_agent_count.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/linked_agent_count.tsx
similarity index 77%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/linked_agent_count.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/linked_agent_count.tsx
index 8294597e43c50..72e60ae678739 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/linked_agent_count.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/linked_agent_count.tsx
@@ -10,12 +10,12 @@ import { EuiLink } from '@elastic/eui';
 import { useLink } from '../../../hooks';
 import { AGENT_SAVED_OBJECT_TYPE } from '../../../constants';
 
-export const LinkedAgentCount = memo<{ count: number; agentConfigId: string }>(
-  ({ count, agentConfigId }) => {
+export const LinkedAgentCount = memo<{ count: number; agentPolicyId: string }>(
+  ({ count, agentPolicyId }) => {
     const { getHref } = useLink();
     const displayValue = (
       <FormattedMessage
-        id="xpack.ingestManager.agentConfig.linkedAgentCountText"
+        id="xpack.ingestManager.agentPolicy.linkedAgentCountText"
         defaultMessage="{count, plural, one {# agent} other {# agents}}"
         values={{ count }}
       />
@@ -23,7 +23,7 @@ export const LinkedAgentCount = memo<{ count: number; agentConfigId: string }>(
     return count > 0 ? (
       <EuiLink
         href={getHref('fleet_agent_list', {
-          kuery: `${AGENT_SAVED_OBJECT_TYPE}.config_id : ${agentConfigId}`,
+          kuery: `${AGENT_SAVED_OBJECT_TYPE}.policy_id : ${agentPolicyId}`,
         })}
       >
         {displayValue}
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/package_config_delete_provider.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/package_policy_delete_provider.tsx
similarity index 70%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/package_config_delete_provider.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/package_policy_delete_provider.tsx
index 3421b70715c35..3a6852de873f8 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/package_config_delete_provider.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/package_policy_delete_provider.tsx
@@ -8,31 +8,31 @@ import React, { Fragment, useMemo, useRef, useState } from 'react';
 import { EuiCallOut, EuiConfirmModal, EuiOverlayMask, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { useCore, sendRequest, sendDeletePackageConfig, useConfig } from '../../../hooks';
+import { useCore, sendRequest, sendDeletePackagePolicy, useConfig } from '../../../hooks';
 import { AGENT_API_ROUTES, AGENT_SAVED_OBJECT_TYPE } from '../../../constants';
-import { AgentConfig } from '../../../types';
+import { AgentPolicy } from '../../../types';
 
 interface Props {
-  agentConfig: AgentConfig;
-  children: (deletePackageConfigsPrompt: DeletePackageConfigsPrompt) => React.ReactElement;
+  agentPolicy: AgentPolicy;
+  children: (deletePackagePoliciesPrompt: DeletePackagePoliciesPrompt) => React.ReactElement;
 }
 
-export type DeletePackageConfigsPrompt = (
-  packageConfigsToDelete: string[],
+export type DeletePackagePoliciesPrompt = (
+  packagePoliciesToDelete: string[],
   onSuccess?: OnSuccessCallback
 ) => void;
 
-type OnSuccessCallback = (packageConfigsDeleted: string[]) => void;
+type OnSuccessCallback = (packagePoliciesDeleted: string[]) => void;
 
-export const PackageConfigDeleteProvider: React.FunctionComponent<Props> = ({
-  agentConfig,
+export const PackagePolicyDeleteProvider: React.FunctionComponent<Props> = ({
+  agentPolicy,
   children,
 }) => {
   const { notifications } = useCore();
   const {
     fleet: { enabled: isFleetEnabled },
   } = useConfig();
-  const [packageConfigs, setPackageConfigs] = useState<string[]>([]);
+  const [packagePolicies, setPackagePolicies] = useState<string[]>([]);
   const [isModalOpen, setIsModalOpen] = useState<boolean>(false);
   const [isLoadingAgentsCount, setIsLoadingAgentsCount] = useState<boolean>(false);
   const [agentsCount, setAgentsCount] = useState<number>(0);
@@ -51,22 +51,22 @@ export const PackageConfigDeleteProvider: React.FunctionComponent<Props> = ({
         query: {
           page: 1,
           perPage: 1,
-          kuery: `${AGENT_SAVED_OBJECT_TYPE}.config_id : ${agentConfig.id}`,
+          kuery: `${AGENT_SAVED_OBJECT_TYPE}.policy_id : ${agentPolicy.id}`,
         },
       });
       setAgentsCount(data?.total || 0);
       setIsLoadingAgentsCount(false);
     },
-    [agentConfig.id, isFleetEnabled, isLoadingAgentsCount]
+    [agentPolicy.id, isFleetEnabled, isLoadingAgentsCount]
   );
 
-  const deletePackageConfigsPrompt = useMemo(
-    (): DeletePackageConfigsPrompt => (packageConfigsToDelete, onSuccess = () => undefined) => {
-      if (!Array.isArray(packageConfigsToDelete) || packageConfigsToDelete.length === 0) {
-        throw new Error('No package configs specified for deletion');
+  const deletePackagePoliciesPrompt = useMemo(
+    (): DeletePackagePoliciesPrompt => (packagePoliciesToDelete, onSuccess = () => undefined) => {
+      if (!Array.isArray(packagePoliciesToDelete) || packagePoliciesToDelete.length === 0) {
+        throw new Error('No package policies specified for deletion');
       }
       setIsModalOpen(true);
-      setPackageConfigs(packageConfigsToDelete);
+      setPackagePolicies(packagePoliciesToDelete);
       fetchAgentsCount();
       onSuccessCallback.current = onSuccess;
     },
@@ -75,7 +75,7 @@ export const PackageConfigDeleteProvider: React.FunctionComponent<Props> = ({
 
   const closeModal = useMemo(
     () => () => {
-      setPackageConfigs([]);
+      setPackagePolicies([]);
       setIsLoading(false);
       setIsLoadingAgentsCount(false);
       setIsModalOpen(false);
@@ -83,12 +83,12 @@ export const PackageConfigDeleteProvider: React.FunctionComponent<Props> = ({
     []
   );
 
-  const deletePackageConfigs = useMemo(
+  const deletePackagePolicies = useMemo(
     () => async () => {
       setIsLoading(true);
 
       try {
-        const { data } = await sendDeletePackageConfig({ packageConfigIds: packageConfigs });
+        const { data } = await sendDeletePackagePolicy({ packagePolicyIds: packagePolicies });
         const successfulResults = data?.filter((result) => result.success) || [];
         const failedResults = data?.filter((result) => !result.success) || [];
 
@@ -96,14 +96,14 @@ export const PackageConfigDeleteProvider: React.FunctionComponent<Props> = ({
           const hasMultipleSuccesses = successfulResults.length > 1;
           const successMessage = hasMultipleSuccesses
             ? i18n.translate(
-                'xpack.ingestManager.deletePackageConfig.successMultipleNotificationTitle',
+                'xpack.ingestManager.deletePackagePolicy.successMultipleNotificationTitle',
                 {
                   defaultMessage: 'Deleted {count} integrations',
                   values: { count: successfulResults.length },
                 }
               )
             : i18n.translate(
-                'xpack.ingestManager.deletePackageConfig.successSingleNotificationTitle',
+                'xpack.ingestManager.deletePackagePolicy.successSingleNotificationTitle',
                 {
                   defaultMessage: "Deleted integration '{id}'",
                   values: { id: successfulResults[0].id },
@@ -116,14 +116,14 @@ export const PackageConfigDeleteProvider: React.FunctionComponent<Props> = ({
           const hasMultipleFailures = failedResults.length > 1;
           const failureMessage = hasMultipleFailures
             ? i18n.translate(
-                'xpack.ingestManager.deletePackageConfig.failureMultipleNotificationTitle',
+                'xpack.ingestManager.deletePackagePolicy.failureMultipleNotificationTitle',
                 {
                   defaultMessage: 'Error deleting {count} integrations',
                   values: { count: failedResults.length },
                 }
               )
             : i18n.translate(
-                'xpack.ingestManager.deletePackageConfig.failureSingleNotificationTitle',
+                'xpack.ingestManager.deletePackagePolicy.failureSingleNotificationTitle',
                 {
                   defaultMessage: "Error deleting integration '{id}'",
                   values: { id: failedResults[0].id },
@@ -137,14 +137,14 @@ export const PackageConfigDeleteProvider: React.FunctionComponent<Props> = ({
         }
       } catch (e) {
         notifications.toasts.addDanger(
-          i18n.translate('xpack.ingestManager.deletePackageConfig.fatalErrorNotificationTitle', {
+          i18n.translate('xpack.ingestManager.deletePackagePolicy.fatalErrorNotificationTitle', {
             defaultMessage: 'Error deleting integration',
           })
         );
       }
       closeModal();
     },
-    [closeModal, packageConfigs, notifications.toasts]
+    [closeModal, packagePolicies, notifications.toasts]
   );
 
   const renderModal = () => {
@@ -157,31 +157,31 @@ export const PackageConfigDeleteProvider: React.FunctionComponent<Props> = ({
         <EuiConfirmModal
           title={
             <FormattedMessage
-              id="xpack.ingestManager.deletePackageConfig.confirmModal.deleteMultipleTitle"
+              id="xpack.ingestManager.deletePackagePolicy.confirmModal.deleteMultipleTitle"
               defaultMessage="Delete {count, plural, one {integration} other {# integrations}}?"
-              values={{ count: packageConfigs.length }}
+              values={{ count: packagePolicies.length }}
             />
           }
           onCancel={closeModal}
-          onConfirm={deletePackageConfigs}
+          onConfirm={deletePackagePolicies}
           cancelButtonText={
             <FormattedMessage
-              id="xpack.ingestManager.deletePackageConfig.confirmModal.cancelButtonLabel"
+              id="xpack.ingestManager.deletePackagePolicy.confirmModal.cancelButtonLabel"
               defaultMessage="Cancel"
             />
           }
           confirmButtonText={
             isLoading || isLoadingAgentsCount ? (
               <FormattedMessage
-                id="xpack.ingestManager.deletePackageConfig.confirmModal.loadingButtonLabel"
+                id="xpack.ingestManager.deletePackagePolicy.confirmModal.loadingButtonLabel"
                 defaultMessage="Loading…"
               />
             ) : (
               <FormattedMessage
-                id="xpack.ingestManager.deletePackageConfig.confirmModal.confirmButtonLabel"
-                defaultMessage="Delete {agentConfigsCount, plural, one {integration} other {integrations}}"
+                id="xpack.ingestManager.deletePackagePolicy.confirmModal.confirmButtonLabel"
+                defaultMessage="Delete {agentPoliciesCount, plural, one {integration} other {integrations}}"
                 values={{
-                  agentConfigsCount: packageConfigs.length,
+                  agentPoliciesCount: packagePolicies.length,
                 }}
               />
             )
@@ -191,7 +191,7 @@ export const PackageConfigDeleteProvider: React.FunctionComponent<Props> = ({
         >
           {isLoadingAgentsCount ? (
             <FormattedMessage
-              id="xpack.ingestManager.deletePackageConfig.confirmModal.loadingAgentsCountMessage"
+              id="xpack.ingestManager.deletePackagePolicy.confirmModal.loadingAgentsCountMessage"
               defaultMessage="Checking affected agents…"
             />
           ) : agentsCount ? (
@@ -200,17 +200,17 @@ export const PackageConfigDeleteProvider: React.FunctionComponent<Props> = ({
                 color="danger"
                 title={
                   <FormattedMessage
-                    id="xpack.ingestManager.deletePackageConfig.confirmModal.affectedAgentsTitle"
+                    id="xpack.ingestManager.deletePackagePolicy.confirmModal.affectedAgentsTitle"
                     defaultMessage="This action will affect {agentsCount} {agentsCount, plural, one {agent} other {agents}}."
                     values={{ agentsCount }}
                   />
                 }
               >
                 <FormattedMessage
-                  id="xpack.ingestManager.deletePackageConfig.confirmModal.affectedAgentsMessage"
-                  defaultMessage="Fleet has detected that {agentConfigName} is already in use by some of your agents."
+                  id="xpack.ingestManager.deletePackagePolicy.confirmModal.affectedAgentsMessage"
+                  defaultMessage="Fleet has detected that {agentPolicyName} is already in use by some of your agents."
                   values={{
-                    agentConfigName: <strong>{agentConfig.name}</strong>,
+                    agentPolicyName: <strong>{agentPolicy.name}</strong>,
                   }}
                 />
               </EuiCallOut>
@@ -219,7 +219,7 @@ export const PackageConfigDeleteProvider: React.FunctionComponent<Props> = ({
           ) : null}
           {!isLoadingAgentsCount && (
             <FormattedMessage
-              id="xpack.ingestManager.deletePackageConfig.confirmModal.generalMessage"
+              id="xpack.ingestManager.deletePackagePolicy.confirmModal.generalMessage"
               defaultMessage="This action can not be undone. Are you sure you wish to continue?"
             />
           )}
@@ -230,7 +230,7 @@ export const PackageConfigDeleteProvider: React.FunctionComponent<Props> = ({
 
   return (
     <Fragment>
-      {children(deletePackageConfigsPrompt)}
+      {children(deletePackagePoliciesPrompt)}
       {renderModal()}
     </Fragment>
   );
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/custom_package_policy.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/custom_package_policy.tsx
new file mode 100644
index 0000000000000..47c14ce0a3e81
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/custom_package_policy.tsx
@@ -0,0 +1,61 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiEmptyPrompt, EuiText } from '@elastic/eui';
+import { NewPackagePolicy } from '../../../../types';
+import { CreatePackagePolicyFrom } from '../types';
+
+export interface CustomConfigurePackagePolicyProps {
+  packageName: string;
+  from: CreatePackagePolicyFrom;
+  packagePolicy: NewPackagePolicy;
+  packagePolicyId?: string;
+}
+
+/**
+ * Custom content type that external plugins can provide to Ingest's
+ * package policy UI.
+ */
+export type CustomConfigurePackagePolicyContent = React.FC<CustomConfigurePackagePolicyProps>;
+
+type AllowedPackageKey = 'endpoint';
+const PackagePolicyMapping: {
+  [key: string]: CustomConfigurePackagePolicyContent;
+} = {};
+
+/**
+ * Plugins can call this function from the start lifecycle to
+ * register a custom component in the Ingest package policy.
+ */
+export function registerPackagePolicyComponent(
+  key: AllowedPackageKey,
+  value: CustomConfigurePackagePolicyContent
+) {
+  PackagePolicyMapping[key] = value;
+}
+
+const EmptyPackagePolicy: CustomConfigurePackagePolicyContent = () => (
+  <EuiEmptyPrompt
+    iconType="checkInCircleFilled"
+    iconColor="secondary"
+    body={
+      <EuiText>
+        <p>
+          <FormattedMessage
+            id="xpack.ingestManager.createPackagePolicy.stepConfigure.noPolicyOptionsMessage"
+            defaultMessage="Nothing to configure"
+          />
+        </p>
+      </EuiText>
+    }
+  />
+);
+
+export const CustomPackagePolicy = (props: CustomConfigurePackagePolicyProps) => {
+  const CustomPackagePolicyContent = PackagePolicyMapping[props.packageName] || EmptyPackagePolicy;
+  return <CustomPackagePolicyContent {...props} />;
+};
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/index.ts
similarity index 51%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/index.ts
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/index.ts
index e8d2ef329b25e..893ed00cca9ac 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/index.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-export { CreatePackageConfigPageLayout } from './layout';
-export { PackageConfigInputPanel } from './package_config_input_panel';
-export { PackageConfigInputVarField } from './package_config_input_var_field';
-export { CustomPackageConfig } from './custom_package_config';
+export { CreatePackagePolicyPageLayout } from './layout';
+export { PackagePolicyInputPanel } from './package_policy_input_panel';
+export { PackagePolicyInputVarField } from './package_policy_input_var_field';
+export { CustomPackagePolicy } from './custom_package_policy';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/layout.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/layout.tsx
similarity index 79%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/layout.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/layout.tsx
index 8316e2500453a..3bcf0aab9a5c8 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/layout.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/layout.tsx
@@ -16,15 +16,15 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 import { WithHeaderLayout } from '../../../../layouts';
-import { AgentConfig, PackageInfo } from '../../../../types';
+import { AgentPolicy, PackageInfo } from '../../../../types';
 import { PackageIcon } from '../../../../components/package_icon';
-import { CreatePackageConfigFrom } from '../types';
+import { CreatePackagePolicyFrom } from '../types';
 
-export const CreatePackageConfigPageLayout: React.FunctionComponent<{
-  from: CreatePackageConfigFrom;
+export const CreatePackagePolicyPageLayout: React.FunctionComponent<{
+  from: CreatePackagePolicyFrom;
   cancelUrl: string;
   onCancel?: React.ReactEventHandler;
-  agentConfig?: AgentConfig;
+  agentPolicy?: AgentPolicy;
   packageInfo?: PackageInfo;
   'data-test-subj'?: string;
 }> = memo(
@@ -32,7 +32,7 @@ export const CreatePackageConfigPageLayout: React.FunctionComponent<{
     from,
     cancelUrl,
     onCancel,
-    agentConfig,
+    agentPolicy,
     packageInfo,
     children,
     'data-test-subj': dataTestSubj,
@@ -54,7 +54,7 @@ export const CreatePackageConfigPageLayout: React.FunctionComponent<{
                 <h1>
                   {from === 'edit' ? (
                     <FormattedMessage
-                      id="xpack.ingestManager.editPackageConfig.pageTitleWithPackageName"
+                      id="xpack.ingestManager.editPackagePolicy.pageTitleWithPackageName"
                       defaultMessage="Edit {packageName} integration"
                       values={{
                         packageName: packageInfo.title,
@@ -62,7 +62,7 @@ export const CreatePackageConfigPageLayout: React.FunctionComponent<{
                     />
                   ) : (
                     <FormattedMessage
-                      id="xpack.ingestManager.createPackageConfig.pageTitleWithPackageName"
+                      id="xpack.ingestManager.createPackagePolicy.pageTitleWithPackageName"
                       defaultMessage="Add {packageName} integration"
                       values={{
                         packageName: packageInfo.title,
@@ -80,7 +80,7 @@ export const CreatePackageConfigPageLayout: React.FunctionComponent<{
         <EuiText>
           <h1>
             <FormattedMessage
-              id="xpack.ingestManager.editPackageConfig.pageTitle"
+              id="xpack.ingestManager.editPackagePolicy.pageTitle"
               defaultMessage="Edit integration"
             />
           </h1>
@@ -89,7 +89,7 @@ export const CreatePackageConfigPageLayout: React.FunctionComponent<{
         <EuiText>
           <h1>
             <FormattedMessage
-              id="xpack.ingestManager.createPackageConfig.pageTitle"
+              id="xpack.ingestManager.createPackagePolicy.pageTitle"
               defaultMessage="Add integration"
             />
           </h1>
@@ -100,18 +100,18 @@ export const CreatePackageConfigPageLayout: React.FunctionComponent<{
     const pageDescription = useMemo(() => {
       return from === 'edit' ? (
         <FormattedMessage
-          id="xpack.ingestManager.editPackageConfig.pageDescription"
-          defaultMessage="Modify integration settings and deploy changes to the selected agent configuration."
+          id="xpack.ingestManager.editPackagePolicy.pageDescription"
+          defaultMessage="Modify integration settings and deploy changes to the selected agent policy."
         />
-      ) : from === 'config' ? (
+      ) : from === 'policy' ? (
         <FormattedMessage
-          id="xpack.ingestManager.createPackageConfig.pageDescriptionfromConfig"
-          defaultMessage="Configure an integration for the selected agent configuration."
+          id="xpack.ingestManager.createPackagePolicy.pageDescriptionfromPolicy"
+          defaultMessage="Configure an integration for the selected agent policy."
         />
       ) : (
         <FormattedMessage
-          id="xpack.ingestManager.createPackageConfig.pageDescriptionfromPackage"
-          defaultMessage="Follow the instructions below to add this integration to an agent configuraiton."
+          id="xpack.ingestManager.createPackagePolicy.pageDescriptionfromPackage"
+          defaultMessage="Follow the instructions below to add this integration to an agent policy."
         />
       );
     }, [from]);
@@ -129,7 +129,7 @@ export const CreatePackageConfigPageLayout: React.FunctionComponent<{
             data-test-subj={`${dataTestSubj}_cancelBackLink`}
           >
             <FormattedMessage
-              id="xpack.ingestManager.createPackageConfig.cancelLinkText"
+              id="xpack.ingestManager.createPackagePolicy.cancelLinkText"
               defaultMessage="Cancel"
             />
           </EuiButtonEmpty>
@@ -145,16 +145,16 @@ export const CreatePackageConfigPageLayout: React.FunctionComponent<{
     );
 
     const rightColumn =
-      agentConfig && (from === 'config' || from === 'edit') ? (
+      agentPolicy && (from === 'policy' || from === 'edit') ? (
         <EuiDescriptionList className="eui-textRight" textStyle="reverse">
           <EuiDescriptionListTitle>
             <FormattedMessage
-              id="xpack.ingestManager.createPackageConfig.agentConfigurationNameLabel"
-              defaultMessage="Agent configuration"
+              id="xpack.ingestManager.createPackagePolicy.agentPolicyNameLabel"
+              defaultMessage="Agent policy"
             />
           </EuiDescriptionListTitle>
           <EuiDescriptionListDescription className="eui-textBreakWord">
-            {agentConfig?.name || '-'}
+            {agentPolicy?.name || '-'}
           </EuiDescriptionListDescription>
         </EuiDescriptionList>
       ) : undefined;
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_config.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/package_policy_input_config.tsx
similarity index 83%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_config.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/package_policy_input_config.tsx
index fd3a64bc760a0..e966ca30c4c97 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_config.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/package_policy_input_config.tsx
@@ -14,29 +14,29 @@ import {
   EuiSpacer,
   EuiButtonEmpty,
 } from '@elastic/eui';
-import { PackageConfigInput, RegistryVarsEntry } from '../../../../types';
+import { PackagePolicyInput, RegistryVarsEntry } from '../../../../types';
 import {
   isAdvancedVar,
-  PackageConfigConfigValidationResults,
+  PackagePolicyConfigValidationResults,
   validationHasErrors,
 } from '../services';
-import { PackageConfigInputVarField } from './package_config_input_var_field';
+import { PackagePolicyInputVarField } from './package_policy_input_var_field';
 
 const FlexItemWithMaxWidth = styled(EuiFlexItem)`
   max-width: calc(50% - ${(props) => props.theme.eui.euiSizeL});
 `;
 
-export const PackageConfigInputConfig: React.FunctionComponent<{
+export const PackagePolicyInputConfig: React.FunctionComponent<{
   packageInputVars?: RegistryVarsEntry[];
-  packageConfigInput: PackageConfigInput;
-  updatePackageConfigInput: (updatedInput: Partial<PackageConfigInput>) => void;
-  inputVarsValidationResults: PackageConfigConfigValidationResults;
+  packagePolicyInput: PackagePolicyInput;
+  updatePackagePolicyInput: (updatedInput: Partial<PackagePolicyInput>) => void;
+  inputVarsValidationResults: PackagePolicyConfigValidationResults;
   forceShowErrors?: boolean;
 }> = memo(
   ({
     packageInputVars,
-    packageConfigInput,
-    updatePackageConfigInput,
+    packagePolicyInput,
+    updatePackagePolicyInput,
     inputVarsValidationResults,
     forceShowErrors,
   }) => {
@@ -76,7 +76,7 @@ export const PackageConfigInputConfig: React.FunctionComponent<{
               <EuiText>
                 <h4>
                   <FormattedMessage
-                    id="xpack.ingestManager.createPackageConfig.stepConfigure.inputSettingsTitle"
+                    id="xpack.ingestManager.createPackagePolicy.stepConfigure.inputSettingsTitle"
                     defaultMessage="Settings"
                   />
                 </h4>
@@ -85,7 +85,7 @@ export const PackageConfigInputConfig: React.FunctionComponent<{
               <EuiText color="subdued" size="s">
                 <p>
                   <FormattedMessage
-                    id="xpack.ingestManager.createPackageConfig.stepConfigure.inputSettingsDescription"
+                    id="xpack.ingestManager.createPackagePolicy.stepConfigure.inputSettingsDescription"
                     defaultMessage="The following settings are applicable to all inputs below."
                   />
                 </p>
@@ -97,16 +97,16 @@ export const PackageConfigInputConfig: React.FunctionComponent<{
           <EuiFlexGroup direction="column" gutterSize="m">
             {requiredVars.map((varDef) => {
               const { name: varName, type: varType } = varDef;
-              const value = packageConfigInput.vars![varName].value;
+              const value = packagePolicyInput.vars![varName].value;
               return (
                 <EuiFlexItem key={varName}>
-                  <PackageConfigInputVarField
+                  <PackagePolicyInputVarField
                     varDef={varDef}
                     value={value}
                     onChange={(newValue: any) => {
-                      updatePackageConfigInput({
+                      updatePackagePolicyInput({
                         vars: {
-                          ...packageConfigInput.vars,
+                          ...packagePolicyInput.vars,
                           [varName]: {
                             type: varType,
                             value: newValue,
@@ -133,7 +133,7 @@ export const PackageConfigInputConfig: React.FunctionComponent<{
                         flush="left"
                       >
                         <FormattedMessage
-                          id="xpack.ingestManager.createPackageConfig.stepConfigure.toggleAdvancedOptionsButtonText"
+                          id="xpack.ingestManager.createPackagePolicy.stepConfigure.toggleAdvancedOptionsButtonText"
                           defaultMessage="Advanced options"
                         />
                       </EuiButtonEmpty>
@@ -142,7 +142,7 @@ export const PackageConfigInputConfig: React.FunctionComponent<{
                       <EuiFlexItem grow={false}>
                         <EuiText color="danger" size="s">
                           <FormattedMessage
-                            id="xpack.ingestManager.createPackageConfig.stepConfigure.errorCountText"
+                            id="xpack.ingestManager.createPackagePolicy.stepConfigure.errorCountText"
                             defaultMessage="{count, plural, one {# error} other {# errors}}"
                             values={{ count: advancedVarsWithErrorsCount }}
                           />
@@ -154,16 +154,16 @@ export const PackageConfigInputConfig: React.FunctionComponent<{
                 {isShowingAdvanced
                   ? advancedVars.map((varDef) => {
                       const { name: varName, type: varType } = varDef;
-                      const value = packageConfigInput.vars![varName].value;
+                      const value = packagePolicyInput.vars![varName].value;
                       return (
                         <EuiFlexItem key={varName}>
-                          <PackageConfigInputVarField
+                          <PackagePolicyInputVarField
                             varDef={varDef}
                             value={value}
                             onChange={(newValue: any) => {
-                              updatePackageConfigInput({
+                              updatePackagePolicyInput({
                                 vars: {
-                                  ...packageConfigInput.vars,
+                                  ...packagePolicyInput.vars,
                                   [varName]: {
                                     type: varType,
                                     value: newValue,
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_panel.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/package_policy_input_panel.tsx
similarity index 74%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_panel.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/package_policy_input_panel.tsx
index 438a17b7ccf35..13504a1ed355a 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_panel.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/package_policy_input_panel.tsx
@@ -17,18 +17,18 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 import {
-  PackageConfigInput,
-  PackageConfigInputStream,
+  PackagePolicyInput,
+  PackagePolicyInputStream,
   RegistryInput,
   RegistryStream,
 } from '../../../../types';
 import {
-  PackageConfigInputValidationResults,
+  PackagePolicyInputValidationResults,
   hasInvalidButRequiredVar,
   countValidationErrors,
 } from '../services';
-import { PackageConfigInputConfig } from './package_config_input_config';
-import { PackageConfigInputStreamConfig } from './package_config_input_stream';
+import { PackagePolicyInputConfig } from './package_policy_input_config';
+import { PackagePolicyInputStreamConfig } from './package_policy_input_stream';
 
 const ShortenedHorizontalRule = styled(EuiHorizontalRule)`
   &&& {
@@ -40,18 +40,18 @@ const ShortenedHorizontalRule = styled(EuiHorizontalRule)`
 const shouldShowStreamsByDefault = (
   packageInput: RegistryInput,
   packageInputStreams: Array<RegistryStream & { data_stream: { dataset: string } }>,
-  packageConfigInput: PackageConfigInput
+  packagePolicyInput: PackagePolicyInput
 ): boolean => {
   return (
-    packageConfigInput.enabled &&
-    (hasInvalidButRequiredVar(packageInput.vars, packageConfigInput.vars) ||
+    packagePolicyInput.enabled &&
+    (hasInvalidButRequiredVar(packageInput.vars, packagePolicyInput.vars) ||
       Boolean(
         packageInputStreams.find(
           (stream) =>
             stream.enabled &&
             hasInvalidButRequiredVar(
               stream.vars,
-              packageConfigInput.streams.find(
+              packagePolicyInput.streams.find(
                 (pkgStream) => stream.data_stream.dataset === pkgStream.data_stream.dataset
               )?.vars
             )
@@ -60,25 +60,25 @@ const shouldShowStreamsByDefault = (
   );
 };
 
-export const PackageConfigInputPanel: React.FunctionComponent<{
+export const PackagePolicyInputPanel: React.FunctionComponent<{
   packageInput: RegistryInput;
   packageInputStreams: Array<RegistryStream & { data_stream: { dataset: string } }>;
-  packageConfigInput: PackageConfigInput;
-  updatePackageConfigInput: (updatedInput: Partial<PackageConfigInput>) => void;
-  inputValidationResults: PackageConfigInputValidationResults;
+  packagePolicyInput: PackagePolicyInput;
+  updatePackagePolicyInput: (updatedInput: Partial<PackagePolicyInput>) => void;
+  inputValidationResults: PackagePolicyInputValidationResults;
   forceShowErrors?: boolean;
 }> = memo(
   ({
     packageInput,
     packageInputStreams,
-    packageConfigInput,
-    updatePackageConfigInput,
+    packagePolicyInput,
+    updatePackagePolicyInput,
     inputValidationResults,
     forceShowErrors,
   }) => {
     // Showing streams toggle state
     const [isShowingStreams, setIsShowingStreams] = useState<boolean>(
-      shouldShowStreamsByDefault(packageInput, packageInputStreams, packageConfigInput)
+      shouldShowStreamsByDefault(packageInput, packageInputStreams, packagePolicyInput)
     );
 
     // Errors state
@@ -89,12 +89,12 @@ export const PackageConfigInputPanel: React.FunctionComponent<{
       .map((packageInputStream) => {
         return {
           packageInputStream,
-          packageConfigInputStream: packageConfigInput.streams.find(
+          packagePolicyInputStream: packagePolicyInput.streams.find(
             (stream) => stream.data_stream.dataset === packageInputStream.data_stream.dataset
           ),
         };
       })
-      .filter((stream) => Boolean(stream.packageConfigInputStream));
+      .filter((stream) => Boolean(stream.packagePolicyInputStream));
 
     return (
       <>
@@ -111,12 +111,12 @@ export const PackageConfigInputPanel: React.FunctionComponent<{
                   </EuiFlexItem>
                 </EuiFlexGroup>
               }
-              checked={packageConfigInput.enabled}
+              checked={packagePolicyInput.enabled}
               onChange={(e) => {
                 const enabled = e.target.checked;
-                updatePackageConfigInput({
+                updatePackagePolicyInput({
                   enabled,
-                  streams: packageConfigInput.streams.map((stream) => ({
+                  streams: packagePolicyInput.streams.map((stream) => ({
                     ...stream,
                     enabled,
                   })),
@@ -133,7 +133,7 @@ export const PackageConfigInputPanel: React.FunctionComponent<{
                 <EuiFlexItem grow={false}>
                   <EuiText color="danger" size="s">
                     <FormattedMessage
-                      id="xpack.ingestManager.createPackageConfig.stepConfigure.errorCountText"
+                      id="xpack.ingestManager.createPackagePolicy.stepConfigure.errorCountText"
                       defaultMessage="{count, plural, one {# error} other {# errors}}"
                       values={{ count: errorCount }}
                     />
@@ -148,7 +148,7 @@ export const PackageConfigInputPanel: React.FunctionComponent<{
                   aria-label={
                     isShowingStreams
                       ? i18n.translate(
-                          'xpack.ingestManager.createPackageConfig.stepConfigure.hideStreamsAriaLabel',
+                          'xpack.ingestManager.createPackagePolicy.stepConfigure.hideStreamsAriaLabel',
                           {
                             defaultMessage: 'Hide {type} inputs',
                             values: {
@@ -157,7 +157,7 @@ export const PackageConfigInputPanel: React.FunctionComponent<{
                           }
                         )
                       : i18n.translate(
-                          'xpack.ingestManager.createPackageConfig.stepConfigure.showStreamsAriaLabel',
+                          'xpack.ingestManager.createPackagePolicy.stepConfigure.showStreamsAriaLabel',
                           {
                             defaultMessage: 'Show {type} inputs',
                             values: {
@@ -175,13 +175,13 @@ export const PackageConfigInputPanel: React.FunctionComponent<{
         {/* Header rule break */}
         {isShowingStreams ? <EuiSpacer size="l" /> : null}
 
-        {/* Input level configuration */}
+        {/* Input level policy */}
         {isShowingStreams && packageInput.vars && packageInput.vars.length ? (
           <Fragment>
-            <PackageConfigInputConfig
+            <PackagePolicyInputConfig
               packageInputVars={packageInput.vars}
-              packageConfigInput={packageConfigInput}
-              updatePackageConfigInput={updatePackageConfigInput}
+              packagePolicyInput={packagePolicyInput}
+              updatePackagePolicyInput={updatePackagePolicyInput}
               inputVarsValidationResults={{ vars: inputValidationResults.vars }}
               forceShowErrors={forceShowErrors}
             />
@@ -189,45 +189,45 @@ export const PackageConfigInputPanel: React.FunctionComponent<{
           </Fragment>
         ) : null}
 
-        {/* Per-stream configuration */}
+        {/* Per-stream policy */}
         {isShowingStreams ? (
           <EuiFlexGroup direction="column">
-            {inputStreams.map(({ packageInputStream, packageConfigInputStream }, index) => (
+            {inputStreams.map(({ packageInputStream, packagePolicyInputStream }, index) => (
               <EuiFlexItem key={index}>
-                <PackageConfigInputStreamConfig
+                <PackagePolicyInputStreamConfig
                   packageInputStream={packageInputStream}
-                  packageConfigInputStream={packageConfigInputStream!}
-                  updatePackageConfigInputStream={(
-                    updatedStream: Partial<PackageConfigInputStream>
+                  packagePolicyInputStream={packagePolicyInputStream!}
+                  updatePackagePolicyInputStream={(
+                    updatedStream: Partial<PackagePolicyInputStream>
                   ) => {
-                    const indexOfUpdatedStream = packageConfigInput.streams.findIndex(
+                    const indexOfUpdatedStream = packagePolicyInput.streams.findIndex(
                       (stream) =>
                         stream.data_stream.dataset === packageInputStream.data_stream.dataset
                     );
-                    const newStreams = [...packageConfigInput.streams];
+                    const newStreams = [...packagePolicyInput.streams];
                     newStreams[indexOfUpdatedStream] = {
                       ...newStreams[indexOfUpdatedStream],
                       ...updatedStream,
                     };
 
-                    const updatedInput: Partial<PackageConfigInput> = {
+                    const updatedInput: Partial<PackagePolicyInput> = {
                       streams: newStreams,
                     };
 
                     // Update input enabled state if needed
-                    if (!packageConfigInput.enabled && updatedStream.enabled) {
+                    if (!packagePolicyInput.enabled && updatedStream.enabled) {
                       updatedInput.enabled = true;
                     } else if (
-                      packageConfigInput.enabled &&
+                      packagePolicyInput.enabled &&
                       !newStreams.find((stream) => stream.enabled)
                     ) {
                       updatedInput.enabled = false;
                     }
 
-                    updatePackageConfigInput(updatedInput);
+                    updatePackagePolicyInput(updatedInput);
                   }}
                   inputStreamValidationResults={
-                    inputValidationResults.streams![packageConfigInputStream!.id]
+                    inputValidationResults.streams![packagePolicyInputStream!.id]
                   }
                   forceShowErrors={forceShowErrors}
                 />
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_stream.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/package_policy_input_stream.tsx
similarity index 83%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_stream.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/package_policy_input_stream.tsx
index 04a0f4e6dbb74..cbc23f4079d9b 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_stream.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/package_policy_input_stream.tsx
@@ -16,29 +16,29 @@ import {
   EuiSpacer,
   EuiButtonEmpty,
 } from '@elastic/eui';
-import { PackageConfigInputStream, RegistryStream, RegistryVarsEntry } from '../../../../types';
+import { PackagePolicyInputStream, RegistryStream, RegistryVarsEntry } from '../../../../types';
 import {
   isAdvancedVar,
-  PackageConfigConfigValidationResults,
+  PackagePolicyConfigValidationResults,
   validationHasErrors,
 } from '../services';
-import { PackageConfigInputVarField } from './package_config_input_var_field';
+import { PackagePolicyInputVarField } from './package_policy_input_var_field';
 
 const FlexItemWithMaxWidth = styled(EuiFlexItem)`
   max-width: calc(50% - ${(props) => props.theme.eui.euiSizeL});
 `;
 
-export const PackageConfigInputStreamConfig: React.FunctionComponent<{
+export const PackagePolicyInputStreamConfig: React.FunctionComponent<{
   packageInputStream: RegistryStream;
-  packageConfigInputStream: PackageConfigInputStream;
-  updatePackageConfigInputStream: (updatedStream: Partial<PackageConfigInputStream>) => void;
-  inputStreamValidationResults: PackageConfigConfigValidationResults;
+  packagePolicyInputStream: PackagePolicyInputStream;
+  updatePackagePolicyInputStream: (updatedStream: Partial<PackagePolicyInputStream>) => void;
+  inputStreamValidationResults: PackagePolicyConfigValidationResults;
   forceShowErrors?: boolean;
 }> = memo(
   ({
     packageInputStream,
-    packageConfigInputStream,
-    updatePackageConfigInputStream,
+    packagePolicyInputStream,
+    updatePackagePolicyInputStream,
     inputStreamValidationResults,
     forceShowErrors,
   }) => {
@@ -77,10 +77,10 @@ export const PackageConfigInputStreamConfig: React.FunctionComponent<{
             <EuiFlexItem grow={5}>
               <EuiSwitch
                 label={packageInputStream.title}
-                checked={packageConfigInputStream.enabled}
+                checked={packagePolicyInputStream.enabled}
                 onChange={(e) => {
                   const enabled = e.target.checked;
-                  updatePackageConfigInputStream({
+                  updatePackagePolicyInputStream({
                     enabled,
                   });
                 }}
@@ -100,16 +100,16 @@ export const PackageConfigInputStreamConfig: React.FunctionComponent<{
           <EuiFlexGroup direction="column" gutterSize="m">
             {requiredVars.map((varDef) => {
               const { name: varName, type: varType } = varDef;
-              const value = packageConfigInputStream.vars![varName].value;
+              const value = packagePolicyInputStream.vars![varName].value;
               return (
                 <EuiFlexItem key={varName}>
-                  <PackageConfigInputVarField
+                  <PackagePolicyInputVarField
                     varDef={varDef}
                     value={value}
                     onChange={(newValue: any) => {
-                      updatePackageConfigInputStream({
+                      updatePackagePolicyInputStream({
                         vars: {
-                          ...packageConfigInputStream.vars,
+                          ...packagePolicyInputStream.vars,
                           [varName]: {
                             type: varType,
                             value: newValue,
@@ -135,7 +135,7 @@ export const PackageConfigInputStreamConfig: React.FunctionComponent<{
                         flush="left"
                       >
                         <FormattedMessage
-                          id="xpack.ingestManager.createPackageConfig.stepConfigure.toggleAdvancedOptionsButtonText"
+                          id="xpack.ingestManager.createPackagePolicy.stepConfigure.toggleAdvancedOptionsButtonText"
                           defaultMessage="Advanced options"
                         />
                       </EuiButtonEmpty>
@@ -144,7 +144,7 @@ export const PackageConfigInputStreamConfig: React.FunctionComponent<{
                       <EuiFlexItem grow={false}>
                         <EuiText color="danger" size="s">
                           <FormattedMessage
-                            id="xpack.ingestManager.createPackageConfig.stepConfigure.errorCountText"
+                            id="xpack.ingestManager.createPackagePolicy.stepConfigure.errorCountText"
                             defaultMessage="{count, plural, one {# error} other {# errors}}"
                             values={{ count: advancedVarsWithErrorsCount }}
                           />
@@ -156,16 +156,16 @@ export const PackageConfigInputStreamConfig: React.FunctionComponent<{
                 {isShowingAdvanced
                   ? advancedVars.map((varDef) => {
                       const { name: varName, type: varType } = varDef;
-                      const value = packageConfigInputStream.vars![varName].value;
+                      const value = packagePolicyInputStream.vars![varName].value;
                       return (
                         <EuiFlexItem key={varName}>
-                          <PackageConfigInputVarField
+                          <PackagePolicyInputVarField
                             varDef={varDef}
                             value={value}
                             onChange={(newValue: any) => {
-                              updatePackageConfigInputStream({
+                              updatePackagePolicyInputStream({
                                 vars: {
-                                  ...packageConfigInputStream.vars,
+                                  ...packagePolicyInputStream.vars,
                                   [varName]: {
                                     type: varType,
                                     value: newValue,
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_var_field.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/package_policy_input_var_field.tsx
similarity index 95%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_var_field.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/package_policy_input_var_field.tsx
index eb681096a080e..3620b11948b54 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_var_field.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/package_policy_input_var_field.tsx
@@ -12,7 +12,7 @@ import { RegistryVarsEntry } from '../../../../types';
 import 'brace/mode/yaml';
 import 'brace/theme/textmate';
 
-export const PackageConfigInputVarField: React.FunctionComponent<{
+export const PackagePolicyInputVarField: React.FunctionComponent<{
   varDef: RegistryVarsEntry;
   value: any;
   onChange: (newValue: any) => void;
@@ -78,7 +78,7 @@ export const PackageConfigInputVarField: React.FunctionComponent<{
         !required ? (
           <EuiText size="xs" color="subdued">
             <FormattedMessage
-              id="xpack.ingestManager.createPackageConfig.stepConfigure.inputVarFieldOptionalLabel"
+              id="xpack.ingestManager.createPackagePolicy.stepConfigure.inputVarFieldOptionalLabel"
               defaultMessage="Optional"
             />
           </EuiText>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/index.tsx
similarity index 60%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/index.tsx
index 74cbcdca512db..bdd43b8385ae8 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/index.tsx
@@ -19,32 +19,32 @@ import {
 } from '@elastic/eui';
 import { EuiStepProps } from '@elastic/eui/src/components/steps/step';
 import {
-  AgentConfig,
+  AgentPolicy,
   PackageInfo,
-  NewPackageConfig,
-  CreatePackageConfigRouteState,
+  NewPackagePolicy,
+  CreatePackagePolicyRouteState,
 } from '../../../types';
 import {
   useLink,
   useBreadcrumbs,
-  sendCreatePackageConfig,
+  sendCreatePackagePolicy,
   useCore,
   useConfig,
   sendGetAgentStatus,
 } from '../../../hooks';
 import { Loading } from '../../../components';
-import { ConfirmDeployConfigModal } from '../components';
-import { CreatePackageConfigPageLayout } from './components';
-import { CreatePackageConfigFrom, PackageConfigFormState } from './types';
+import { ConfirmDeployAgentPolicyModal } from '../components';
+import { CreatePackagePolicyPageLayout } from './components';
+import { CreatePackagePolicyFrom, PackagePolicyFormState } from './types';
 import {
-  PackageConfigValidationResults,
-  validatePackageConfig,
+  PackagePolicyValidationResults,
+  validatePackagePolicy,
   validationHasErrors,
 } from './services';
 import { StepSelectPackage } from './step_select_package';
-import { StepSelectConfig } from './step_select_config';
-import { StepConfigurePackage } from './step_configure_package';
-import { StepDefinePackageConfig } from './step_define_package_config';
+import { StepSelectAgentPolicy } from './step_select_agent_policy';
+import { StepConfigurePackagePolicy } from './step_configure_package';
+import { StepDefinePackagePolicy } from './step_define_package_policy';
 import { useIntraAppState } from '../../../hooks/use_intra_app_state';
 
 const StepsWithLessPadding = styled(EuiSteps)`
@@ -53,7 +53,7 @@ const StepsWithLessPadding = styled(EuiSteps)`
   }
 `;
 
-export const CreatePackageConfigPage: React.FunctionComponent = () => {
+export const CreatePackagePolicyPage: React.FunctionComponent = () => {
   const {
     notifications,
     chrome: { getIsNavDrawerLocked$ },
@@ -64,12 +64,12 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
     fleet: { enabled: isFleetEnabled },
   } = useConfig();
   const {
-    params: { configId, pkgkey },
+    params: { policyId, pkgkey },
   } = useRouteMatch();
   const { getHref, getPath } = useLink();
   const history = useHistory();
-  const routeState = useIntraAppState<CreatePackageConfigRouteState>();
-  const from: CreatePackageConfigFrom = configId ? 'config' : 'package';
+  const routeState = useIntraAppState<CreatePackagePolicyRouteState>();
+  const from: CreatePackagePolicyFrom = policyId ? 'policy' : 'package';
   const [isNavDrawerLocked, setIsNavDrawerLocked] = useState(false);
 
   useEffect(() => {
@@ -80,52 +80,52 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
     return () => subscription.unsubscribe();
   });
 
-  // Agent config and package info states
-  const [agentConfig, setAgentConfig] = useState<AgentConfig>();
+  // Agent policy and package info states
+  const [agentPolicy, setAgentPolicy] = useState<AgentPolicy>();
   const [packageInfo, setPackageInfo] = useState<PackageInfo>();
   const [isLoadingSecondStep, setIsLoadingSecondStep] = useState<boolean>(false);
 
-  const agentConfigId = agentConfig?.id;
+  const agentPolicyId = agentPolicy?.id;
   // Retrieve agent count
   useEffect(() => {
     const getAgentCount = async () => {
-      if (agentConfigId) {
-        const { data } = await sendGetAgentStatus({ configId: agentConfigId });
+      if (agentPolicyId) {
+        const { data } = await sendGetAgentStatus({ policyId: agentPolicyId });
         if (data?.results.total) {
           setAgentCount(data.results.total);
         }
       }
     };
 
-    if (isFleetEnabled && agentConfigId) {
+    if (isFleetEnabled && agentPolicyId) {
       getAgentCount();
     }
-  }, [agentConfigId, isFleetEnabled]);
+  }, [agentPolicyId, isFleetEnabled]);
   const [agentCount, setAgentCount] = useState<number>(0);
 
-  // New package config state
-  const [packageConfig, setPackageConfig] = useState<NewPackageConfig>({
+  // New package policy state
+  const [packagePolicy, setPackagePolicy] = useState<NewPackagePolicy>({
     name: '',
     description: '',
     namespace: '',
-    config_id: '',
+    policy_id: '',
     enabled: true,
     output_id: '', // TODO: Blank for now as we only support default output
     inputs: [],
   });
 
-  // Package config validation state
-  const [validationResults, setValidationResults] = useState<PackageConfigValidationResults>();
+  // Package policy validation state
+  const [validationResults, setValidationResults] = useState<PackagePolicyValidationResults>();
 
   // Form state
-  const [formState, setFormState] = useState<PackageConfigFormState>('INVALID');
+  const [formState, setFormState] = useState<PackagePolicyFormState>('INVALID');
 
   // Update package info method
   const updatePackageInfo = useCallback(
     (updatedPackageInfo: PackageInfo | undefined) => {
       if (updatedPackageInfo) {
         setPackageInfo(updatedPackageInfo);
-        if (agentConfig) {
+        if (agentPolicy) {
           setFormState('VALID');
         }
       } else {
@@ -136,70 +136,70 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
       // eslint-disable-next-line no-console
       console.debug('Package info updated', updatedPackageInfo);
     },
-    [agentConfig, setPackageInfo, setFormState]
+    [agentPolicy, setPackageInfo, setFormState]
   );
 
-  // Update agent config method
-  const updateAgentConfig = useCallback(
-    (updatedAgentConfig: AgentConfig | undefined) => {
-      if (updatedAgentConfig) {
-        setAgentConfig(updatedAgentConfig);
+  // Update agent policy method
+  const updateAgentPolicy = useCallback(
+    (updatedAgentPolicy: AgentPolicy | undefined) => {
+      if (updatedAgentPolicy) {
+        setAgentPolicy(updatedAgentPolicy);
         if (packageInfo) {
           setFormState('VALID');
         }
       } else {
         setFormState('INVALID');
-        setAgentConfig(undefined);
+        setAgentPolicy(undefined);
       }
 
       // eslint-disable-next-line no-console
-      console.debug('Agent config updated', updatedAgentConfig);
+      console.debug('Agent policy updated', updatedAgentPolicy);
     },
-    [packageInfo, setAgentConfig, setFormState]
+    [packageInfo, setAgentPolicy, setFormState]
   );
 
   const hasErrors = validationResults ? validationHasErrors(validationResults) : false;
 
-  // Update package config validation
-  const updatePackageConfigValidation = useCallback(
-    (newPackageConfig?: NewPackageConfig) => {
+  // Update package policy validation
+  const updatePackagePolicyValidation = useCallback(
+    (newPackagePolicy?: NewPackagePolicy) => {
       if (packageInfo) {
-        const newValidationResult = validatePackageConfig(
-          newPackageConfig || packageConfig,
+        const newValidationResult = validatePackagePolicy(
+          newPackagePolicy || packagePolicy,
           packageInfo
         );
         setValidationResults(newValidationResult);
         // eslint-disable-next-line no-console
-        console.debug('Package config validation results', newValidationResult);
+        console.debug('Package policy validation results', newValidationResult);
 
         return newValidationResult;
       }
     },
-    [packageConfig, packageInfo]
+    [packagePolicy, packageInfo]
   );
 
-  // Update package config method
-  const updatePackageConfig = useCallback(
-    (updatedFields: Partial<NewPackageConfig>) => {
-      const newPackageConfig = {
-        ...packageConfig,
+  // Update package policy method
+  const updatePackagePolicy = useCallback(
+    (updatedFields: Partial<NewPackagePolicy>) => {
+      const newPackagePolicy = {
+        ...packagePolicy,
         ...updatedFields,
       };
-      setPackageConfig(newPackageConfig);
+      setPackagePolicy(newPackagePolicy);
 
       // eslint-disable-next-line no-console
-      console.debug('Package config updated', newPackageConfig);
-      const newValidationResults = updatePackageConfigValidation(newPackageConfig);
-      const hasPackage = newPackageConfig.package;
+      console.debug('Package policy updated', newPackagePolicy);
+      const newValidationResults = updatePackagePolicyValidation(newPackagePolicy);
+      const hasPackage = newPackagePolicy.package;
       const hasValidationErrors = newValidationResults
         ? validationHasErrors(newValidationResults)
         : false;
-      const hasAgentConfig = newPackageConfig.config_id && newPackageConfig.config_id !== '';
-      if (hasPackage && hasAgentConfig && !hasValidationErrors) {
+      const hasAgentPolicy = newPackagePolicy.policy_id && newPackagePolicy.policy_id !== '';
+      if (hasPackage && hasAgentPolicy && !hasValidationErrors) {
         setFormState('VALID');
       }
     },
-    [packageConfig, updatePackageConfigValidation]
+    [packagePolicy, updatePackagePolicyValidation]
   );
 
   // Cancel path
@@ -207,10 +207,10 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
     if (routeState && routeState.onCancelUrl) {
       return routeState.onCancelUrl;
     }
-    return from === 'config'
-      ? getHref('configuration_details', { configId: agentConfigId || configId })
+    return from === 'policy'
+      ? getHref('policy_details', { policyId: agentPolicyId || policyId })
       : getHref('integration_details', { pkgkey });
-  }, [agentConfigId, configId, from, getHref, pkgkey, routeState]);
+  }, [agentPolicyId, policyId, from, getHref, pkgkey, routeState]);
 
   const cancelClickHandler: ReactEventHandler = useCallback(
     (ev) => {
@@ -222,10 +222,10 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
     [routeState, navigateToApp]
   );
 
-  // Save package config
-  const savePackageConfig = async () => {
+  // Save package policy
+  const savePackagePolicy = async () => {
     setFormState('LOADING');
-    const result = await sendCreatePackageConfig(packageConfig);
+    const result = await sendCreatePackagePolicy(packagePolicy);
     setFormState('SUBMITTED');
     return result;
   };
@@ -239,7 +239,7 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
       setFormState('CONFIRM');
       return;
     }
-    const { error, data } = await savePackageConfig();
+    const { error, data } = await savePackagePolicy();
     if (!error) {
       if (routeState && routeState.onSaveNavigateTo) {
         navigateToApp(
@@ -248,26 +248,26 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
             : routeState.onSaveNavigateTo)
         );
       } else {
-        history.push(getPath('configuration_details', { configId: agentConfig?.id || configId }));
+        history.push(getPath('policy_details', { policyId: agentPolicy?.id || policyId }));
       }
 
       notifications.toasts.addSuccess({
-        title: i18n.translate('xpack.ingestManager.createPackageConfig.addedNotificationTitle', {
-          defaultMessage: `Successfully added '{packageConfigName}'`,
+        title: i18n.translate('xpack.ingestManager.createPackagePolicy.addedNotificationTitle', {
+          defaultMessage: `Successfully added '{packagePolicyName}'`,
           values: {
-            packageConfigName: packageConfig.name,
+            packagePolicyName: packagePolicy.name,
           },
         }),
         text:
-          agentCount && agentConfig
-            ? i18n.translate('xpack.ingestManager.createPackageConfig.addedNotificationMessage', {
-                defaultMessage: `Fleet will deploy updates to all agents that use the '{agentConfigName}' configuration`,
+          agentCount && agentPolicy
+            ? i18n.translate('xpack.ingestManager.createPackagePolicy.addedNotificationMessage', {
+                defaultMessage: `Fleet will deploy updates to all agents that use the '{agentPolicyName}' policy`,
                 values: {
-                  agentConfigName: agentConfig.name,
+                  agentPolicyName: agentPolicy.name,
                 },
               })
             : undefined,
-        'data-test-subj': 'packageConfigCreateSuccessToast',
+        'data-test-subj': 'packagePolicyCreateSuccessToast',
       });
     } else {
       notifications.toasts.addError(error, {
@@ -281,53 +281,53 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
     from,
     cancelUrl,
     onCancel: cancelClickHandler,
-    agentConfig,
+    agentPolicy,
     packageInfo,
   };
 
-  const stepSelectConfig = useMemo(
+  const stepSelectAgentPolicy = useMemo(
     () => (
-      <StepSelectConfig
+      <StepSelectAgentPolicy
         pkgkey={pkgkey}
         updatePackageInfo={updatePackageInfo}
-        agentConfig={agentConfig}
-        updateAgentConfig={updateAgentConfig}
+        agentPolicy={agentPolicy}
+        updateAgentPolicy={updateAgentPolicy}
         setIsLoadingSecondStep={setIsLoadingSecondStep}
       />
     ),
-    [pkgkey, updatePackageInfo, agentConfig, updateAgentConfig]
+    [pkgkey, updatePackageInfo, agentPolicy, updateAgentPolicy]
   );
 
   const stepSelectPackage = useMemo(
     () => (
       <StepSelectPackage
-        agentConfigId={configId}
-        updateAgentConfig={updateAgentConfig}
+        agentPolicyId={policyId}
+        updateAgentPolicy={updateAgentPolicy}
         packageInfo={packageInfo}
         updatePackageInfo={updatePackageInfo}
         setIsLoadingSecondStep={setIsLoadingSecondStep}
       />
     ),
-    [configId, updateAgentConfig, packageInfo, updatePackageInfo]
+    [policyId, updateAgentPolicy, packageInfo, updatePackageInfo]
   );
 
-  const stepConfigurePackage = useMemo(
+  const stepConfigurePackagePolicy = useMemo(
     () =>
       isLoadingSecondStep ? (
         <Loading />
-      ) : agentConfig && packageInfo ? (
+      ) : agentPolicy && packageInfo ? (
         <>
-          <StepDefinePackageConfig
-            agentConfig={agentConfig}
+          <StepDefinePackagePolicy
+            agentPolicy={agentPolicy}
             packageInfo={packageInfo}
-            packageConfig={packageConfig}
-            updatePackageConfig={updatePackageConfig}
+            packagePolicy={packagePolicy}
+            updatePackagePolicy={updatePackagePolicy}
             validationResults={validationResults!}
           />
-          <StepConfigurePackage
+          <StepConfigurePackagePolicy
             packageInfo={packageInfo}
-            packageConfig={packageConfig}
-            updatePackageConfig={updatePackageConfig}
+            packagePolicy={packagePolicy}
+            updatePackagePolicy={updatePackagePolicy}
             validationResults={validationResults!}
             submitAttempted={formState === 'INVALID'}
           />
@@ -336,12 +336,12 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
         <div />
       ),
     [
-      agentConfig,
+      agentPolicy,
       formState,
       isLoadingSecondStep,
-      packageConfig,
+      packagePolicy,
       packageInfo,
-      updatePackageConfig,
+      updatePackagePolicy,
       validationResults,
     ]
   );
@@ -350,38 +350,38 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
     from === 'package'
       ? {
           title: i18n.translate(
-            'xpack.ingestManager.createPackageConfig.stepSelectAgentConfigTitle',
+            'xpack.ingestManager.createPackagePolicy.stepSelectAgentPolicyTitle',
             {
-              defaultMessage: 'Select an agent configuration',
+              defaultMessage: 'Select an agent policy',
             }
           ),
-          children: stepSelectConfig,
+          children: stepSelectAgentPolicy,
         }
       : {
-          title: i18n.translate('xpack.ingestManager.createPackageConfig.stepSelectPackageTitle', {
+          title: i18n.translate('xpack.ingestManager.createPackagePolicy.stepSelectPackageTitle', {
             defaultMessage: 'Select an integration',
           }),
           children: stepSelectPackage,
         },
     {
       title: i18n.translate(
-        'xpack.ingestManager.createPackageConfig.stepConfigurePackageConfigTitle',
+        'xpack.ingestManager.createPackagePolicy.stepConfigurePackagePolicyTitle',
         {
           defaultMessage: 'Configure integration',
         }
       ),
-      status: !packageInfo || !agentConfig || isLoadingSecondStep ? 'disabled' : undefined,
+      status: !packageInfo || !agentPolicy || isLoadingSecondStep ? 'disabled' : undefined,
       'data-test-subj': 'dataCollectionSetupStep',
-      children: stepConfigurePackage,
+      children: stepConfigurePackagePolicy,
     },
   ];
 
   return (
-    <CreatePackageConfigPageLayout {...layoutProps} data-test-subj="createPackageConfig">
-      {formState === 'CONFIRM' && agentConfig && (
-        <ConfirmDeployConfigModal
+    <CreatePackagePolicyPageLayout {...layoutProps} data-test-subj="createPackagePolicy">
+      {formState === 'CONFIRM' && agentPolicy && (
+        <ConfirmDeployAgentPolicyModal
           agentCount={agentCount}
-          agentConfig={agentConfig}
+          agentPolicy={agentPolicy}
           onConfirm={onSubmit}
           onCancel={() => setFormState('VALID')}
         />
@@ -393,8 +393,8 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
               pkgkey={`${packageInfo.name}-${packageInfo.version}`}
             />
           )
-        : agentConfig && (
-            <ConfigurationBreadcrumb configName={agentConfig.name} configId={agentConfig.id} />
+        : agentPolicy && (
+            <PolicyBreadcrumb policyName={agentPolicy.name} policyId={agentPolicy.id} />
           )}
       <StepsWithLessPadding steps={steps} />
       <EuiSpacer size="l" />
@@ -410,10 +410,10 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
       >
         <EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
           <EuiFlexItem grow={false}>
-            {!isLoadingSecondStep && agentConfig && packageInfo && formState === 'INVALID' ? (
+            {!isLoadingSecondStep && agentPolicy && packageInfo && formState === 'INVALID' ? (
               <FormattedMessage
-                id="xpack.ingestManager.createPackageConfig.errorOnSaveText"
-                defaultMessage="Your integration configuration has errors. Please fix them before saving."
+                id="xpack.ingestManager.createPackagePolicy.errorOnSaveText"
+                defaultMessage="Your integration policy has errors. Please fix them before saving."
               />
             ) : null}
           </EuiFlexItem>
@@ -425,10 +425,10 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
                   color="ghost"
                   href={cancelUrl}
                   onClick={cancelClickHandler}
-                  data-test-subj="createPackageConfigCancelButton"
+                  data-test-subj="createPackagePolicyCancelButton"
                 >
                   <FormattedMessage
-                    id="xpack.ingestManager.createPackageConfig.cancelButton"
+                    id="xpack.ingestManager.createPackagePolicy.cancelButton"
                     defaultMessage="Cancel"
                   />
                 </EuiButtonEmpty>
@@ -441,10 +441,10 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
                   iconType="save"
                   color="primary"
                   fill
-                  data-test-subj="createPackageConfigSaveButton"
+                  data-test-subj="createPackagePolicySaveButton"
                 >
                   <FormattedMessage
-                    id="xpack.ingestManager.createPackageConfig.saveButton"
+                    id="xpack.ingestManager.createPackagePolicy.saveButton"
                     defaultMessage="Save integration"
                   />
                 </EuiButton>
@@ -453,15 +453,15 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
           </EuiFlexItem>
         </EuiFlexGroup>
       </EuiBottomBar>
-    </CreatePackageConfigPageLayout>
+    </CreatePackagePolicyPageLayout>
   );
 };
 
-const ConfigurationBreadcrumb: React.FunctionComponent<{
-  configName: string;
-  configId: string;
-}> = ({ configName, configId }) => {
-  useBreadcrumbs('add_integration_from_configuration', { configName, configId });
+const PolicyBreadcrumb: React.FunctionComponent<{
+  policyName: string;
+  policyId: string;
+}> = ({ policyName, policyId }) => {
+  useBreadcrumbs('add_integration_from_policy', { policyName, policyId });
   return null;
 };
 
@@ -469,6 +469,6 @@ const IntegrationBreadcrumb: React.FunctionComponent<{
   pkgTitle: string;
   pkgkey: string;
 }> = ({ pkgTitle, pkgkey }) => {
-  useBreadcrumbs('add_integration_to_configuration', { pkgTitle, pkgkey });
+  useBreadcrumbs('add_integration_to_policy', { pkgTitle, pkgkey });
   return null;
 };
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/has_invalid_but_required_var.test.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/has_invalid_but_required_var.test.ts
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/has_invalid_but_required_var.test.ts
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/has_invalid_but_required_var.test.ts
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/has_invalid_but_required_var.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/has_invalid_but_required_var.ts
similarity index 60%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/has_invalid_but_required_var.ts
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/has_invalid_but_required_var.ts
index f632d40a05621..142625f3eb2a9 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/has_invalid_but_required_var.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/has_invalid_but_required_var.ts
@@ -3,23 +3,23 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { PackageConfigConfigRecord, RegistryVarsEntry } from '../../../../types';
-import { validatePackageConfigConfig } from './';
+import { PackagePolicyConfigRecord, RegistryVarsEntry } from '../../../../types';
+import { validatePackagePolicyConfig } from './';
 
 export const hasInvalidButRequiredVar = (
   registryVars?: RegistryVarsEntry[],
-  packageConfigVars?: PackageConfigConfigRecord
+  packagePolicyVars?: PackagePolicyConfigRecord
 ): boolean => {
   return (
-    (registryVars && !packageConfigVars) ||
+    (registryVars && !packagePolicyVars) ||
     Boolean(
       registryVars &&
         registryVars.find(
           (registryVar) =>
             registryVar.required &&
-            (!packageConfigVars ||
-              !packageConfigVars[registryVar.name] ||
-              validatePackageConfigConfig(packageConfigVars[registryVar.name], registryVar)?.length)
+            (!packagePolicyVars ||
+              !packagePolicyVars[registryVar.name] ||
+              validatePackagePolicyConfig(packagePolicyVars[registryVar.name], registryVar)?.length)
         )
     )
   );
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/index.ts
similarity index 67%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/index.ts
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/index.ts
index 0d33a4e113f03..6d8fd4c35c0fa 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/index.ts
@@ -6,11 +6,11 @@
 export { isAdvancedVar } from './is_advanced_var';
 export { hasInvalidButRequiredVar } from './has_invalid_but_required_var';
 export {
-  PackageConfigValidationResults,
-  PackageConfigConfigValidationResults,
-  PackageConfigInputValidationResults,
-  validatePackageConfig,
-  validatePackageConfigConfig,
+  PackagePolicyValidationResults,
+  PackagePolicyConfigValidationResults,
+  PackagePolicyInputValidationResults,
+  validatePackagePolicy,
+  validatePackagePolicyConfig,
   validationHasErrors,
   countValidationErrors,
-} from './validate_package_config';
+} from './validate_package_policy';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/is_advanced_var.test.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/is_advanced_var.test.ts
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/is_advanced_var.test.ts
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/is_advanced_var.test.ts
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/is_advanced_var.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/is_advanced_var.ts
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/is_advanced_var.ts
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/is_advanced_var.ts
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts.test.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/validate_package_policy.test..ts
similarity index 91%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts.test.ts
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/validate_package_policy.test..ts
index 47874525b8a5a..aae750cb67499 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts.test.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/validate_package_policy.test..ts
@@ -6,12 +6,12 @@
 import {
   PackageInfo,
   InstallationStatus,
-  NewPackageConfig,
+  NewPackagePolicy,
   RegistryConfigTemplate,
 } from '../../../../types';
-import { validatePackageConfig, validationHasErrors } from './validate_package_config';
+import { validatePackagePolicy, validationHasErrors } from './validate_package_policy';
 
-describe('Ingest Manager - validatePackageConfig()', () => {
+describe('Ingest Manager - validatePackagePolicy()', () => {
   const mockPackage = ({
     name: 'mock-package',
     title: 'Mock package',
@@ -92,9 +92,9 @@ describe('Ingest Manager - validatePackageConfig()', () => {
     ],
     config_templates: [
       {
-        name: 'pkgConfig1',
-        title: 'Package config 1',
-        description: 'test package config',
+        name: 'pkgPolicy1',
+        title: 'Package policy 1',
+        description: 'test package policy',
         inputs: [
           {
             type: 'foo',
@@ -141,10 +141,10 @@ describe('Ingest Manager - validatePackageConfig()', () => {
     ],
   } as unknown) as PackageInfo;
 
-  const validPackageConfig: NewPackageConfig = {
-    name: 'pkgConfig1-1',
+  const validPackagePolicy: NewPackagePolicy = {
+    name: 'pkgPolicy1-1',
     namespace: 'default',
-    config_id: 'test-config',
+    policy_id: 'test-policy',
     enabled: true,
     output_id: 'test-output',
     inputs: [
@@ -226,8 +226,8 @@ describe('Ingest Manager - validatePackageConfig()', () => {
     ],
   };
 
-  const invalidPackageConfig: NewPackageConfig = {
-    ...validPackageConfig,
+  const invalidPackagePolicy: NewPackagePolicy = {
+    ...validPackagePolicy,
     name: '',
     inputs: [
       {
@@ -350,14 +350,14 @@ describe('Ingest Manager - validatePackageConfig()', () => {
     },
   };
 
-  it('returns no errors for valid package config', () => {
-    expect(validatePackageConfig(validPackageConfig, mockPackage)).toEqual(
+  it('returns no errors for valid package policy', () => {
+    expect(validatePackagePolicy(validPackagePolicy, mockPackage)).toEqual(
       noErrorsValidationResults
     );
   });
 
-  it('returns errors for invalid package config', () => {
-    expect(validatePackageConfig(invalidPackageConfig, mockPackage)).toEqual({
+  it('returns errors for invalid package policy', () => {
+    expect(validatePackagePolicy(invalidPackagePolicy, mockPackage)).toEqual({
       name: ['Name is required'],
       description: null,
       namespace: null,
@@ -397,17 +397,17 @@ describe('Ingest Manager - validatePackageConfig()', () => {
   });
 
   it('returns no errors for disabled inputs', () => {
-    const disabledInputs = invalidPackageConfig.inputs.map((input) => ({
+    const disabledInputs = invalidPackagePolicy.inputs.map((input) => ({
       ...input,
       enabled: false,
     }));
     expect(
-      validatePackageConfig({ ...validPackageConfig, inputs: disabledInputs }, mockPackage)
+      validatePackagePolicy({ ...validPackagePolicy, inputs: disabledInputs }, mockPackage)
     ).toEqual(noErrorsValidationResults);
   });
 
-  it('returns only package config and input-level errors for disabled streams', () => {
-    const inputsWithDisabledStreams = invalidPackageConfig.inputs.map((input) =>
+  it('returns only package policy and input-level errors for disabled streams', () => {
+    const inputsWithDisabledStreams = invalidPackagePolicy.inputs.map((input) =>
       input.streams
         ? {
             ...input,
@@ -416,8 +416,8 @@ describe('Ingest Manager - validatePackageConfig()', () => {
         : input
     );
     expect(
-      validatePackageConfig(
-        { ...invalidPackageConfig, inputs: inputsWithDisabledStreams },
+      validatePackagePolicy(
+        { ...invalidPackagePolicy, inputs: inputsWithDisabledStreams },
         mockPackage
       )
     ).toEqual({
@@ -461,9 +461,9 @@ describe('Ingest Manager - validatePackageConfig()', () => {
     });
   });
 
-  it('returns no errors for packages with no package configs', () => {
+  it('returns no errors for packages with no package policies', () => {
     expect(
-      validatePackageConfig(validPackageConfig, {
+      validatePackagePolicy(validPackagePolicy, {
         ...mockPackage,
         config_templates: undefined,
       })
@@ -474,7 +474,7 @@ describe('Ingest Manager - validatePackageConfig()', () => {
       inputs: null,
     });
     expect(
-      validatePackageConfig(validPackageConfig, {
+      validatePackagePolicy(validPackagePolicy, {
         ...mockPackage,
         config_templates: [],
       })
@@ -488,7 +488,7 @@ describe('Ingest Manager - validatePackageConfig()', () => {
 
   it('returns no errors for packages with no inputs', () => {
     expect(
-      validatePackageConfig(validPackageConfig, {
+      validatePackagePolicy(validPackagePolicy, {
         ...mockPackage,
         config_templates: [{} as RegistryConfigTemplate],
       })
@@ -499,7 +499,7 @@ describe('Ingest Manager - validatePackageConfig()', () => {
       inputs: null,
     });
     expect(
-      validatePackageConfig(validPackageConfig, {
+      validatePackagePolicy(validPackagePolicy, {
         ...mockPackage,
         config_templates: [({ inputs: [] } as unknown) as RegistryConfigTemplate],
       })
@@ -553,7 +553,7 @@ describe('Ingest Manager - validationHasErrors()', () => {
     ).toBe(false);
   });
 
-  it('returns true for package config validation results with errors', () => {
+  it('returns true for package policy validation results with errors', () => {
     expect(
       validationHasErrors({
         name: ['name error'],
@@ -595,7 +595,7 @@ describe('Ingest Manager - validationHasErrors()', () => {
     ).toBe(true);
   });
 
-  it('returns false for package config validation results with no errors', () => {
+  it('returns false for package policy validation results with no errors', () => {
     expect(
       validationHasErrors({
         name: null,
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/validate_package_policy.ts
similarity index 76%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/validate_package_policy.ts
index 0514ad574a8cd..f375352c5a055 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/validate_package_policy.ts
@@ -7,10 +7,10 @@ import { i18n } from '@kbn/i18n';
 import { safeLoad } from 'js-yaml';
 import { getFlattenedObject } from '../../../../services';
 import {
-  NewPackageConfig,
-  PackageConfigInput,
-  PackageConfigInputStream,
-  PackageConfigConfigRecordEntry,
+  NewPackagePolicy,
+  PackagePolicyInput,
+  PackagePolicyInputStream,
+  PackagePolicyConfigRecordEntry,
   PackageInfo,
   RegistryInput,
   RegistryStream,
@@ -21,47 +21,47 @@ type Errors = string[] | null;
 
 type ValidationEntry = Record<string, Errors>;
 
-export interface PackageConfigConfigValidationResults {
+export interface PackagePolicyConfigValidationResults {
   vars?: ValidationEntry;
 }
 
-export type PackageConfigInputValidationResults = PackageConfigConfigValidationResults & {
-  streams?: Record<PackageConfigInputStream['id'], PackageConfigConfigValidationResults>;
+export type PackagePolicyInputValidationResults = PackagePolicyConfigValidationResults & {
+  streams?: Record<PackagePolicyInputStream['id'], PackagePolicyConfigValidationResults>;
 };
 
-export interface PackageConfigValidationResults {
+export interface PackagePolicyValidationResults {
   name: Errors;
   description: Errors;
   namespace: Errors;
-  inputs: Record<PackageConfigInput['type'], PackageConfigInputValidationResults> | null;
+  inputs: Record<PackagePolicyInput['type'], PackagePolicyInputValidationResults> | null;
 }
 
 /*
- * Returns validation information for a given package config and package info
- * Note: this method assumes that `packageConfig` is correctly structured for the given package
+ * Returns validation information for a given package policy and package info
+ * Note: this method assumes that `packagePolicy` is correctly structured for the given package
  */
-export const validatePackageConfig = (
-  packageConfig: NewPackageConfig,
+export const validatePackagePolicy = (
+  packagePolicy: NewPackagePolicy,
   packageInfo: PackageInfo
-): PackageConfigValidationResults => {
-  const validationResults: PackageConfigValidationResults = {
+): PackagePolicyValidationResults => {
+  const validationResults: PackagePolicyValidationResults = {
     name: null,
     description: null,
     namespace: null,
     inputs: {},
   };
 
-  if (!packageConfig.name.trim()) {
+  if (!packagePolicy.name.trim()) {
     validationResults.name = [
-      i18n.translate('xpack.ingestManager.packageConfigValidation.nameRequiredErrorMessage', {
+      i18n.translate('xpack.ingestManager.packagePolicyValidation.nameRequiredErrorMessage', {
         defaultMessage: 'Name is required',
       }),
     ];
   }
 
-  if (!packageConfig.namespace.trim()) {
+  if (!packagePolicy.namespace.trim()) {
     validationResults.namespace = [
-      i18n.translate('xpack.ingestManager.packageConfigValidation.namespaceRequiredErrorMessage', {
+      i18n.translate('xpack.ingestManager.packagePolicyValidation.namespaceRequiredErrorMessage', {
         defaultMessage: 'Namespace is required',
       }),
     ];
@@ -93,13 +93,13 @@ export const validatePackageConfig = (
     return datasets;
   }, {} as Record<string, RegistryStream[]>);
 
-  // Validate each package config input with either its own config fields or streams
-  packageConfig.inputs.forEach((input) => {
+  // Validate each package policy input with either its own config fields or streams
+  packagePolicy.inputs.forEach((input) => {
     if (!input.vars && !input.streams) {
       return;
     }
 
-    const inputValidationResults: PackageConfigInputValidationResults = {
+    const inputValidationResults: PackagePolicyInputValidationResults = {
       vars: undefined,
       streams: {},
     };
@@ -117,7 +117,7 @@ export const validatePackageConfig = (
     if (inputConfigs.length) {
       inputValidationResults.vars = inputConfigs.reduce((results, [name, configEntry]) => {
         results[name] = input.enabled
-          ? validatePackageConfigConfig(configEntry, inputVarsByName[name])
+          ? validatePackagePolicyConfig(configEntry, inputVarsByName[name])
           : null;
         return results;
       }, {} as ValidationEntry);
@@ -128,7 +128,7 @@ export const validatePackageConfig = (
     // Validate each input stream with config fields
     if (input.streams.length) {
       input.streams.forEach((stream) => {
-        const streamValidationResults: PackageConfigConfigValidationResults = {};
+        const streamValidationResults: PackagePolicyConfigValidationResults = {};
 
         // Validate stream-level config fields
         if (stream.vars) {
@@ -146,7 +146,7 @@ export const validatePackageConfig = (
             (results, [name, configEntry]) => {
               results[name] =
                 input.enabled && stream.enabled
-                  ? validatePackageConfigConfig(configEntry, streamVarsByName[name])
+                  ? validatePackagePolicyConfig(configEntry, streamVarsByName[name])
                   : null;
               return results;
             },
@@ -171,8 +171,8 @@ export const validatePackageConfig = (
   return validationResults;
 };
 
-export const validatePackageConfigConfig = (
-  configEntry: PackageConfigConfigRecordEntry,
+export const validatePackagePolicyConfig = (
+  configEntry: PackagePolicyConfigRecordEntry,
   varDef: RegistryVarsEntry
 ): string[] | null => {
   const errors = [];
@@ -186,7 +186,7 @@ export const validatePackageConfigConfig = (
   if (varDef.required) {
     if (parsedValue === undefined || (typeof parsedValue === 'string' && !parsedValue)) {
       errors.push(
-        i18n.translate('xpack.ingestManager.packageConfigValidation.requiredErrorMessage', {
+        i18n.translate('xpack.ingestManager.packagePolicyValidation.requiredErrorMessage', {
           defaultMessage: '{fieldName} is required',
           values: {
             fieldName: varDef.title || varDef.name,
@@ -202,7 +202,7 @@ export const validatePackageConfigConfig = (
     } catch (e) {
       errors.push(
         i18n.translate(
-          'xpack.ingestManager.packageConfigValidation.invalidYamlFormatErrorMessage',
+          'xpack.ingestManager.packagePolicyValidation.invalidYamlFormatErrorMessage',
           {
             defaultMessage: 'Invalid YAML format',
           }
@@ -214,7 +214,7 @@ export const validatePackageConfigConfig = (
   if (varDef.multi) {
     if (parsedValue && !Array.isArray(parsedValue)) {
       errors.push(
-        i18n.translate('xpack.ingestManager.packageConfigValidation.invalidArrayErrorMessage', {
+        i18n.translate('xpack.ingestManager.packagePolicyValidation.invalidArrayErrorMessage', {
           defaultMessage: 'Invalid format',
         })
       );
@@ -224,7 +224,7 @@ export const validatePackageConfigConfig = (
       (!parsedValue || (Array.isArray(parsedValue) && parsedValue.length === 0))
     ) {
       errors.push(
-        i18n.translate('xpack.ingestManager.packageConfigValidation.requiredErrorMessage', {
+        i18n.translate('xpack.ingestManager.packagePolicyValidation.requiredErrorMessage', {
           defaultMessage: '{fieldName} is required',
           values: {
             fieldName: varDef.title || varDef.name,
@@ -239,9 +239,9 @@ export const validatePackageConfigConfig = (
 
 export const countValidationErrors = (
   validationResults:
-    | PackageConfigValidationResults
-    | PackageConfigInputValidationResults
-    | PackageConfigConfigValidationResults
+    | PackagePolicyValidationResults
+    | PackagePolicyInputValidationResults
+    | PackagePolicyConfigValidationResults
 ): number => {
   const flattenedValidation = getFlattenedObject(validationResults);
   const errors = Object.values(flattenedValidation).filter((value) => Boolean(value)) || [];
@@ -250,9 +250,9 @@ export const countValidationErrors = (
 
 export const validationHasErrors = (
   validationResults:
-    | PackageConfigValidationResults
-    | PackageConfigInputValidationResults
-    | PackageConfigConfigValidationResults
+    | PackagePolicyValidationResults
+    | PackagePolicyInputValidationResults
+    | PackagePolicyConfigValidationResults
 ): boolean => {
   return countValidationErrors(validationResults) > 0;
 };
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_configure_package.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/step_configure_package.tsx
similarity index 68%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_configure_package.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/step_configure_package.tsx
index a41d4d72db34c..b77153daee2fc 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_configure_package.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/step_configure_package.tsx
@@ -5,11 +5,11 @@
  */
 import React from 'react';
 import { EuiHorizontalRule, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import { PackageInfo, RegistryStream, NewPackageConfig, PackageConfigInput } from '../../../types';
+import { PackageInfo, RegistryStream, NewPackagePolicy, PackagePolicyInput } from '../../../types';
 import { Loading } from '../../../components';
-import { PackageConfigValidationResults } from './services';
-import { PackageConfigInputPanel, CustomPackageConfig } from './components';
-import { CreatePackageConfigFrom } from './types';
+import { PackagePolicyValidationResults } from './services';
+import { PackagePolicyInputPanel, CustomPackagePolicy } from './components';
+import { CreatePackagePolicyFrom } from './types';
 
 const findStreamsForInputType = (
   inputType: string,
@@ -33,20 +33,20 @@ const findStreamsForInputType = (
   return streams;
 };
 
-export const StepConfigurePackage: React.FunctionComponent<{
-  from?: CreatePackageConfigFrom;
+export const StepConfigurePackagePolicy: React.FunctionComponent<{
+  from?: CreatePackagePolicyFrom;
   packageInfo: PackageInfo;
-  packageConfig: NewPackageConfig;
-  packageConfigId?: string;
-  updatePackageConfig: (fields: Partial<NewPackageConfig>) => void;
-  validationResults: PackageConfigValidationResults;
+  packagePolicy: NewPackagePolicy;
+  packagePolicyId?: string;
+  updatePackagePolicy: (fields: Partial<NewPackagePolicy>) => void;
+  validationResults: PackagePolicyValidationResults;
   submitAttempted: boolean;
 }> = ({
-  from = 'config',
+  from = 'policy',
   packageInfo,
-  packageConfig,
-  packageConfigId,
-  updatePackageConfig,
+  packagePolicy,
+  packagePolicyId,
+  updatePackagePolicy,
   validationResults,
   submitAttempted,
 }) => {
@@ -61,30 +61,30 @@ export const StepConfigurePackage: React.FunctionComponent<{
         <EuiHorizontalRule margin="m" />
         <EuiFlexGroup direction="column" gutterSize="none">
           {packageInfo.config_templates[0].inputs.map((packageInput) => {
-            const packageConfigInput = packageConfig.inputs.find(
+            const packagePolicyInput = packagePolicy.inputs.find(
               (input) => input.type === packageInput.type
             );
             const packageInputStreams = findStreamsForInputType(packageInput.type, packageInfo);
-            return packageConfigInput ? (
+            return packagePolicyInput ? (
               <EuiFlexItem key={packageInput.type}>
-                <PackageConfigInputPanel
+                <PackagePolicyInputPanel
                   packageInput={packageInput}
                   packageInputStreams={packageInputStreams}
-                  packageConfigInput={packageConfigInput}
-                  updatePackageConfigInput={(updatedInput: Partial<PackageConfigInput>) => {
-                    const indexOfUpdatedInput = packageConfig.inputs.findIndex(
+                  packagePolicyInput={packagePolicyInput}
+                  updatePackagePolicyInput={(updatedInput: Partial<PackagePolicyInput>) => {
+                    const indexOfUpdatedInput = packagePolicy.inputs.findIndex(
                       (input) => input.type === packageInput.type
                     );
-                    const newInputs = [...packageConfig.inputs];
+                    const newInputs = [...packagePolicy.inputs];
                     newInputs[indexOfUpdatedInput] = {
                       ...newInputs[indexOfUpdatedInput],
                       ...updatedInput,
                     };
-                    updatePackageConfig({
+                    updatePackagePolicy({
                       inputs: newInputs,
                     });
                   }}
-                  inputValidationResults={validationResults!.inputs![packageConfigInput.type]}
+                  inputValidationResults={validationResults!.inputs![packagePolicyInput.type]}
                   forceShowErrors={submitAttempted}
                 />
                 <EuiHorizontalRule margin="m" />
@@ -94,11 +94,11 @@ export const StepConfigurePackage: React.FunctionComponent<{
         </EuiFlexGroup>
       </>
     ) : (
-      <CustomPackageConfig
+      <CustomPackagePolicy
         from={from}
         packageName={packageInfo.name}
-        packageConfig={packageConfig}
-        packageConfigId={packageConfigId}
+        packagePolicy={packagePolicy}
+        packagePolicyId={packagePolicyId}
       />
     );
 
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_define_package_config.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/step_define_package_policy.tsx
similarity index 64%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_define_package_config.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/step_define_package_policy.tsx
index f487b4e5235e7..86f69208e0638 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_define_package_config.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/step_define_package_policy.tsx
@@ -16,45 +16,45 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
 } from '@elastic/eui';
-import { AgentConfig, PackageInfo, PackageConfig, NewPackageConfig } from '../../../types';
-import { packageToPackageConfigInputs } from '../../../services';
+import { AgentPolicy, PackageInfo, PackagePolicy, NewPackagePolicy } from '../../../types';
+import { packageToPackagePolicyInputs } from '../../../services';
 import { Loading } from '../../../components';
-import { PackageConfigValidationResults } from './services';
+import { PackagePolicyValidationResults } from './services';
 
-export const StepDefinePackageConfig: React.FunctionComponent<{
-  agentConfig: AgentConfig;
+export const StepDefinePackagePolicy: React.FunctionComponent<{
+  agentPolicy: AgentPolicy;
   packageInfo: PackageInfo;
-  packageConfig: NewPackageConfig;
-  updatePackageConfig: (fields: Partial<NewPackageConfig>) => void;
-  validationResults: PackageConfigValidationResults;
-}> = ({ agentConfig, packageInfo, packageConfig, updatePackageConfig, validationResults }) => {
+  packagePolicy: NewPackagePolicy;
+  updatePackagePolicy: (fields: Partial<NewPackagePolicy>) => void;
+  validationResults: PackagePolicyValidationResults;
+}> = ({ agentPolicy, packageInfo, packagePolicy, updatePackagePolicy, validationResults }) => {
   // Form show/hide states
   const [isShowingAdvanced, setIsShowingAdvanced] = useState<boolean>(false);
 
-  // Update package config's package and config info
+  // Update package policy's package and agent policy info
   useEffect(() => {
-    const pkg = packageConfig.package;
+    const pkg = packagePolicy.package;
     const currentPkgKey = pkg ? `${pkg.name}-${pkg.version}` : '';
     const pkgKey = `${packageInfo.name}-${packageInfo.version}`;
 
-    // If package has changed, create shell package config with input&stream values based on package info
+    // If package has changed, create shell package policy with input&stream values based on package info
     if (currentPkgKey !== pkgKey) {
-      // Existing package configs on the agent config using the package name, retrieve highest number appended to package config name
-      const dsPackageNamePattern = new RegExp(`${packageInfo.name}-(\\d+)`);
-      const dsWithMatchingNames = (agentConfig.package_configs as PackageConfig[])
-        .filter((ds) => Boolean(ds.name.match(dsPackageNamePattern)))
-        .map((ds) => parseInt(ds.name.match(dsPackageNamePattern)![1], 10))
+      // Existing package policies on the agent policy using the package name, retrieve highest number appended to package policy name
+      const pkgPoliciesNamePattern = new RegExp(`${packageInfo.name}-(\\d+)`);
+      const pkgPoliciesWithMatchingNames = (agentPolicy.package_policies as PackagePolicy[])
+        .filter((ds) => Boolean(ds.name.match(pkgPoliciesNamePattern)))
+        .map((ds) => parseInt(ds.name.match(pkgPoliciesNamePattern)![1], 10))
         .sort();
 
-      updatePackageConfig({
+      updatePackagePolicy({
         name:
           // For Endpoint packages, the user must fill in the name, thus we don't attempt to generate
           // a default one here.
-          // FIXME: Improve package configs name uniqueness - https://github.com/elastic/kibana/issues/72948
+          // FIXME: Improve package policies name uniqueness - https://github.com/elastic/kibana/issues/72948
           packageInfo.name !== 'endpoint'
             ? `${packageInfo.name}-${
-                dsWithMatchingNames.length
-                  ? dsWithMatchingNames[dsWithMatchingNames.length - 1] + 1
+                pkgPoliciesWithMatchingNames.length
+                  ? pkgPoliciesWithMatchingNames[pkgPoliciesWithMatchingNames.length - 1] + 1
                   : 1
               }`
             : '',
@@ -63,23 +63,23 @@ export const StepDefinePackageConfig: React.FunctionComponent<{
           title: packageInfo.title,
           version: packageInfo.version,
         },
-        inputs: packageToPackageConfigInputs(packageInfo),
+        inputs: packageToPackagePolicyInputs(packageInfo),
       });
     }
 
-    // If agent config has changed, update package config's config ID and namespace
-    if (packageConfig.config_id !== agentConfig.id) {
-      updatePackageConfig({
-        config_id: agentConfig.id,
-        namespace: agentConfig.namespace,
+    // If agent policy has changed, update package policy's agent policy ID and namespace
+    if (packagePolicy.policy_id !== agentPolicy.id) {
+      updatePackagePolicy({
+        policy_id: agentPolicy.id,
+        namespace: agentPolicy.namespace,
       });
     }
   }, [
-    packageConfig.package,
-    packageConfig.config_id,
-    agentConfig,
+    packagePolicy.package,
+    packagePolicy.policy_id,
+    agentPolicy,
     packageInfo,
-    updatePackageConfig,
+    updatePackagePolicy,
   ]);
 
   return validationResults ? (
@@ -87,14 +87,14 @@ export const StepDefinePackageConfig: React.FunctionComponent<{
       title={
         <h4>
           <FormattedMessage
-            id="xpack.ingestManager.createPackageConfig.stepConfigure.integrationSettingsSectionTitle"
+            id="xpack.ingestManager.createPackagePolicy.stepConfigure.integrationSettingsSectionTitle"
             defaultMessage="Integration settings"
           />
         </h4>
       }
       description={
         <FormattedMessage
-          id="xpack.ingestManager.createPackageConfig.stepConfigure.integrationSettingsSectionDescription"
+          id="xpack.ingestManager.createPackagePolicy.stepConfigure.integrationSettingsSectionDescription"
           defaultMessage="Choose a name and description to help identify how this integration will be used."
         />
       }
@@ -106,19 +106,19 @@ export const StepDefinePackageConfig: React.FunctionComponent<{
           error={validationResults.name}
           label={
             <FormattedMessage
-              id="xpack.ingestManager.createPackageConfig.stepConfigure.packageConfigNameInputLabel"
+              id="xpack.ingestManager.createPackagePolicy.stepConfigure.packagePolicyNameInputLabel"
               defaultMessage="Integration name"
             />
           }
         >
           <EuiFieldText
-            value={packageConfig.name}
+            value={packagePolicy.name}
             onChange={(e) =>
-              updatePackageConfig({
+              updatePackagePolicy({
                 name: e.target.value,
               })
             }
-            data-test-subj="packageConfigNameInput"
+            data-test-subj="packagePolicyNameInput"
           />
         </EuiFormRow>
 
@@ -126,14 +126,14 @@ export const StepDefinePackageConfig: React.FunctionComponent<{
         <EuiFormRow
           label={
             <FormattedMessage
-              id="xpack.ingestManager.createPackageConfig.stepConfigure.packageConfigDescriptionInputLabel"
+              id="xpack.ingestManager.createPackagePolicy.stepConfigure.packagePolicyDescriptionInputLabel"
               defaultMessage="Description"
             />
           }
           labelAppend={
             <EuiText size="xs" color="subdued">
               <FormattedMessage
-                id="xpack.ingestManager.createPackageConfig.stepConfigure.inputVarFieldOptionalLabel"
+                id="xpack.ingestManager.createPackagePolicy.stepConfigure.inputVarFieldOptionalLabel"
                 defaultMessage="Optional"
               />
             </EuiText>
@@ -142,9 +142,9 @@ export const StepDefinePackageConfig: React.FunctionComponent<{
           error={validationResults.description}
         >
           <EuiFieldText
-            value={packageConfig.description}
+            value={packagePolicy.description}
             onChange={(e) =>
-              updatePackageConfig({
+              updatePackagePolicy({
                 description: e.target.value,
               })
             }
@@ -162,7 +162,7 @@ export const StepDefinePackageConfig: React.FunctionComponent<{
               flush="left"
             >
               <FormattedMessage
-                id="xpack.ingestManager.createPackageConfig.stepConfigure.advancedOptionsToggleLinkText"
+                id="xpack.ingestManager.createPackagePolicy.stepConfigure.advancedOptionsToggleLinkText"
                 defaultMessage="Advanced options"
               />
             </EuiButtonEmpty>
@@ -171,7 +171,7 @@ export const StepDefinePackageConfig: React.FunctionComponent<{
             <EuiFlexItem grow={false}>
               <EuiText color="danger" size="s">
                 <FormattedMessage
-                  id="xpack.ingestManager.createPackageConfig.stepConfigure.errorCountText"
+                  id="xpack.ingestManager.createPackagePolicy.stepConfigure.errorCountText"
                   defaultMessage="{count, plural, one {# error} other {# errors}}"
                   values={{ count: 1 }}
                 />
@@ -190,7 +190,7 @@ export const StepDefinePackageConfig: React.FunctionComponent<{
               error={validationResults.namespace}
               label={
                 <FormattedMessage
-                  id="xpack.ingestManager.createPackageConfig.stepConfigure.packageConfigNamespaceInputLabel"
+                  id="xpack.ingestManager.createPackagePolicy.stepConfigure.packagePolicyNamespaceInputLabel"
                   defaultMessage="Namespace"
                 />
               }
@@ -199,15 +199,15 @@ export const StepDefinePackageConfig: React.FunctionComponent<{
                 noSuggestions
                 singleSelection={true}
                 selectedOptions={
-                  packageConfig.namespace ? [{ label: packageConfig.namespace }] : []
+                  packagePolicy.namespace ? [{ label: packagePolicy.namespace }] : []
                 }
                 onCreateOption={(newNamespace: string) => {
-                  updatePackageConfig({
+                  updatePackagePolicy({
                     namespace: newNamespace,
                   });
                 }}
                 onChange={(newNamespaces: Array<{ label: string }>) => {
-                  updatePackageConfig({
+                  updatePackagePolicy({
                     namespace: newNamespaces.length ? newNamespaces[0].label : '',
                   });
                 }}
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_config.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/step_select_agent_policy.tsx
similarity index 51%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_config.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/step_select_agent_policy.tsx
index 6f06530100d71..9f48be54f866d 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_config.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/step_select_agent_policy.tsx
@@ -18,55 +18,55 @@ import {
   EuiLink,
 } from '@elastic/eui';
 import { Error } from '../../../components';
-import { AgentConfig, PackageInfo, GetAgentConfigsResponseItem } from '../../../types';
-import { isPackageLimited, doesAgentConfigAlreadyIncludePackage } from '../../../services';
+import { AgentPolicy, PackageInfo, GetAgentPoliciesResponseItem } from '../../../types';
+import { isPackageLimited, doesAgentPolicyAlreadyIncludePackage } from '../../../services';
 import {
   useGetPackageInfoByKey,
-  useGetAgentConfigs,
-  sendGetOneAgentConfig,
+  useGetAgentPolicies,
+  sendGetOneAgentPolicy,
   useCapabilities,
   useFleetStatus,
 } from '../../../hooks';
-import { CreateAgentConfigFlyout } from '../list_page/components';
+import { CreateAgentPolicyFlyout } from '../list_page/components';
 
-const AgentConfigWrapper = styled(EuiFormRow)`
+const AgentPolicyWrapper = styled(EuiFormRow)`
   .euiFormRow__label {
     width: 100%;
   }
 `;
 
 // Custom styling for drop down list items due to:
-//  1) the max-width and overflow properties is added to prevent long config
+//  1) the max-width and overflow properties is added to prevent long agent policy
 //     names/descriptions from overflowing the flex items
 //  2) max-width is built from the grow property on the flex items because the value
 //     changes based on if Fleet is enabled/setup or not
-const AgentConfigNameColumn = styled(EuiFlexItem)`
+const AgentPolicyNameColumn = styled(EuiFlexItem)`
   max-width: ${(props) => `${((props.grow as number) / 9) * 100}%`};
   overflow: hidden;
 `;
-const AgentConfigDescriptionColumn = styled(EuiFlexItem)`
+const AgentPolicyDescriptionColumn = styled(EuiFlexItem)`
   max-width: ${(props) => `${((props.grow as number) / 9) * 100}%`};
   overflow: hidden;
 `;
 
-export const StepSelectConfig: React.FunctionComponent<{
+export const StepSelectAgentPolicy: React.FunctionComponent<{
   pkgkey: string;
   updatePackageInfo: (packageInfo: PackageInfo | undefined) => void;
-  agentConfig: AgentConfig | undefined;
-  updateAgentConfig: (config: AgentConfig | undefined) => void;
+  agentPolicy: AgentPolicy | undefined;
+  updateAgentPolicy: (agentPolicy: AgentPolicy | undefined) => void;
   setIsLoadingSecondStep: (isLoading: boolean) => void;
-}> = ({ pkgkey, updatePackageInfo, agentConfig, updateAgentConfig, setIsLoadingSecondStep }) => {
+}> = ({ pkgkey, updatePackageInfo, agentPolicy, updateAgentPolicy, setIsLoadingSecondStep }) => {
   const { isReady: isFleetReady } = useFleetStatus();
 
-  // Selected config state
-  const [selectedConfigId, setSelectedConfigId] = useState<string | undefined>(
-    agentConfig ? agentConfig.id : undefined
+  // Selected agent policy state
+  const [selectedPolicyId, setSelectedPolicyId] = useState<string | undefined>(
+    agentPolicy ? agentPolicy.id : undefined
   );
-  const [selectedConfigError, setSelectedConfigError] = useState<Error>();
+  const [selectedAgentPolicyError, setSelectedAgentPolicyError] = useState<Error>();
 
-  // Create new config flyout state
+  // Create new agent policy flyout state
   const hasWriteCapabilites = useCapabilities().write;
-  const [isCreateAgentConfigFlyoutOpen, setIsCreateAgentConfigFlyoutOpen] = useState<boolean>(
+  const [isCreateAgentPolicyFlyoutOpen, setIsCreateAgentPolicyFlyoutOpen] = useState<boolean>(
     false
   );
 
@@ -78,23 +78,23 @@ export const StepSelectConfig: React.FunctionComponent<{
   } = useGetPackageInfoByKey(pkgkey);
   const isLimitedPackage = (packageInfoData && isPackageLimited(packageInfoData.response)) || false;
 
-  // Fetch agent configs info
+  // Fetch agent policies info
   const {
-    data: agentConfigsData,
-    error: agentConfigsError,
-    isLoading: isAgentConfigsLoading,
-    sendRequest: refreshAgentConfigs,
-  } = useGetAgentConfigs({
+    data: agentPoliciesData,
+    error: agentPoliciesError,
+    isLoading: isAgentPoliciesLoading,
+    sendRequest: refreshAgentPolicies,
+  } = useGetAgentPolicies({
     page: 1,
     perPage: 1000,
     sortField: 'name',
     sortOrder: 'asc',
     full: true,
   });
-  const agentConfigs = agentConfigsData?.items || [];
-  const agentConfigsById = agentConfigs.reduce(
-    (acc: { [key: string]: GetAgentConfigsResponseItem }, config) => {
-      acc[config.id] = config;
+  const agentPolicies = agentPoliciesData?.items || [];
+  const agentPoliciesById = agentPolicies.reduce(
+    (acc: { [key: string]: GetAgentPoliciesResponseItem }, policy) => {
+      acc[policy.id] = policy;
       return acc;
     },
     {}
@@ -107,63 +107,63 @@ export const StepSelectConfig: React.FunctionComponent<{
     }
   }, [packageInfoData, updatePackageInfo]);
 
-  // Update parent selected agent config state
+  // Update parent selected agent policy state
   useEffect(() => {
-    const fetchAgentConfigInfo = async () => {
-      if (selectedConfigId) {
+    const fetchAgentPolicyInfo = async () => {
+      if (selectedPolicyId) {
         setIsLoadingSecondStep(true);
-        const { data, error } = await sendGetOneAgentConfig(selectedConfigId);
+        const { data, error } = await sendGetOneAgentPolicy(selectedPolicyId);
         if (error) {
-          setSelectedConfigError(error);
-          updateAgentConfig(undefined);
+          setSelectedAgentPolicyError(error);
+          updateAgentPolicy(undefined);
         } else if (data && data.item) {
-          setSelectedConfigError(undefined);
-          updateAgentConfig(data.item);
+          setSelectedAgentPolicyError(undefined);
+          updateAgentPolicy(data.item);
         }
       } else {
-        setSelectedConfigError(undefined);
-        updateAgentConfig(undefined);
+        setSelectedAgentPolicyError(undefined);
+        updateAgentPolicy(undefined);
       }
       setIsLoadingSecondStep(false);
     };
-    if (!agentConfig || selectedConfigId !== agentConfig.id) {
-      fetchAgentConfigInfo();
+    if (!agentPolicy || selectedPolicyId !== agentPolicy.id) {
+      fetchAgentPolicyInfo();
     }
-  }, [selectedConfigId, agentConfig, updateAgentConfig, setIsLoadingSecondStep]);
+  }, [selectedPolicyId, agentPolicy, updateAgentPolicy, setIsLoadingSecondStep]);
 
-  const agentConfigOptions: Array<EuiComboBoxOptionOption<string>> = packageInfoData
-    ? agentConfigs.map((agentConf) => {
+  const agentPolicyOptions: Array<EuiComboBoxOptionOption<string>> = packageInfoData
+    ? agentPolicies.map((agentConf) => {
         const alreadyHasLimitedPackage =
           (isLimitedPackage &&
-            doesAgentConfigAlreadyIncludePackage(agentConf, packageInfoData.response.name)) ||
+            doesAgentPolicyAlreadyIncludePackage(agentConf, packageInfoData.response.name)) ||
           false;
         return {
           label: agentConf.name,
           value: agentConf.id,
           disabled: alreadyHasLimitedPackage,
-          'data-test-subj': 'agentConfigItem',
+          'data-test-subj': 'agentPolicyItem',
         };
       })
     : [];
 
-  const selectedConfigOption = agentConfigOptions.find(
-    (option) => option.value === selectedConfigId
+  const selectedAgentPolicyOption = agentPolicyOptions.find(
+    (option) => option.value === selectedPolicyId
   );
 
-  // Try to select default agent config
+  // Try to select default agent policy
   useEffect(() => {
-    if (!selectedConfigId && agentConfigs.length && agentConfigOptions.length) {
-      const defaultAgentConfig = agentConfigs.find((config) => config.is_default);
-      if (defaultAgentConfig) {
-        const defaultAgentConfigOption = agentConfigOptions.find(
-          (option) => option.value === defaultAgentConfig.id
+    if (!selectedPolicyId && agentPolicies.length && agentPolicyOptions.length) {
+      const defaultAgentPolicy = agentPolicies.find((policy) => policy.is_default);
+      if (defaultAgentPolicy) {
+        const defaultAgentPolicyOption = agentPolicyOptions.find(
+          (option) => option.value === defaultAgentPolicy.id
         );
-        if (defaultAgentConfigOption && !defaultAgentConfigOption.disabled) {
-          setSelectedConfigId(defaultAgentConfig.id);
+        if (defaultAgentPolicyOption && !defaultAgentPolicyOption.disabled) {
+          setSelectedPolicyId(defaultAgentPolicy.id);
         }
       }
     }
-  }, [agentConfigs, agentConfigOptions, selectedConfigId]);
+  }, [agentPolicies, agentPolicyOptions, selectedPolicyId]);
 
   // Display package error if there is one
   if (packageInfoError) {
@@ -171,7 +171,7 @@ export const StepSelectConfig: React.FunctionComponent<{
       <Error
         title={
           <FormattedMessage
-            id="xpack.ingestManager.createPackageConfig.StepSelectConfig.errorLoadingPackageTitle"
+            id="xpack.ingestManager.createPackagePolicy.StepSelectPolicy.errorLoadingPackageTitle"
             defaultMessage="Error loading package information"
           />
         }
@@ -180,31 +180,31 @@ export const StepSelectConfig: React.FunctionComponent<{
     );
   }
 
-  // Display agent configs list error if there is one
-  if (agentConfigsError) {
+  // Display agent policies list error if there is one
+  if (agentPoliciesError) {
     return (
       <Error
         title={
           <FormattedMessage
-            id="xpack.ingestManager.createPackageConfig.StepSelectConfig.errorLoadingAgentConfigsTitle"
-            defaultMessage="Error loading agent configurations"
+            id="xpack.ingestManager.createPackagePolicy.StepSelectPolicy.errorLoadingAgentPoliciesTitle"
+            defaultMessage="Error loading agent policies"
           />
         }
-        error={agentConfigsError}
+        error={agentPoliciesError}
       />
     );
   }
 
   return (
     <>
-      {isCreateAgentConfigFlyoutOpen ? (
+      {isCreateAgentPolicyFlyoutOpen ? (
         <EuiPortal>
-          <CreateAgentConfigFlyout
-            onClose={(newAgentConfig?: AgentConfig) => {
-              setIsCreateAgentConfigFlyoutOpen(false);
-              if (newAgentConfig) {
-                refreshAgentConfigs();
-                setSelectedConfigId(newAgentConfig.id);
+          <CreateAgentPolicyFlyout
+            onClose={(newAgentPolicy?: AgentPolicy) => {
+              setIsCreateAgentPolicyFlyoutOpen(false);
+              if (newAgentPolicy) {
+                refreshAgentPolicies();
+                setSelectedPolicyId(newAgentPolicy.id);
               }
             }}
             ownFocus={true}
@@ -213,25 +213,25 @@ export const StepSelectConfig: React.FunctionComponent<{
       ) : null}
       <EuiFlexGroup direction="column" gutterSize="m">
         <EuiFlexItem>
-          <AgentConfigWrapper
+          <AgentPolicyWrapper
             fullWidth={true}
             label={
               <EuiFlexGroup justifyContent="spaceBetween">
                 <EuiFlexItem>
                   <FormattedMessage
-                    id="xpack.ingestManager.createPackageConfig.StepSelectConfig.agentConfigLabel"
-                    defaultMessage="Agent configuration"
+                    id="xpack.ingestManager.createPackagePolicy.StepSelectPolicy.agentPolicyLabel"
+                    defaultMessage="Agent policy"
                   />
                 </EuiFlexItem>
                 <EuiFlexItem grow={false}>
                   <div>
                     <EuiLink
                       disabled={!hasWriteCapabilites}
-                      onClick={() => setIsCreateAgentConfigFlyoutOpen(true)}
+                      onClick={() => setIsCreateAgentPolicyFlyoutOpen(true)}
                     >
                       <FormattedMessage
-                        id="xpack.ingestManager.createPackageConfig.StepSelectConfig.addButton"
-                        defaultMessage="Create agent configuration"
+                        id="xpack.ingestManager.createPackagePolicy.StepSelectPolicy.addButton"
+                        defaultMessage="Create agent policy"
                       />
                     </EuiLink>
                   </div>
@@ -239,12 +239,12 @@ export const StepSelectConfig: React.FunctionComponent<{
               </EuiFlexGroup>
             }
             helpText={
-              isFleetReady && selectedConfigId ? (
+              isFleetReady && selectedPolicyId ? (
                 <FormattedMessage
-                  id="xpack.ingestManager.createPackageConfig.StepSelectConfig.agentConfigAgentsDescriptionText"
-                  defaultMessage="{count, plural, one {# agent} other {# agents}} are enrolled with the selected agent configuration."
+                  id="xpack.ingestManager.createPackagePolicy.StepSelectPolicy.agentPolicyAgentsDescriptionText"
+                  defaultMessage="{count, plural, one {# agent} other {# agents}} are enrolled with the selected agent policy."
                   values={{
-                    count: agentConfigsById[selectedConfigId].agents || 0,
+                    count: agentPoliciesById[selectedPolicyId].agents || 0,
                   }}
                 />
               ) : null
@@ -252,35 +252,35 @@ export const StepSelectConfig: React.FunctionComponent<{
           >
             <EuiComboBox
               placeholder={i18n.translate(
-                'xpack.ingestManager.createPackageConfig.StepSelectConfig.agentConfigPlaceholderText',
+                'xpack.ingestManager.createPackagePolicy.StepSelectPolicy.agentPolicyPlaceholderText',
                 {
-                  defaultMessage: 'Select an agent configuration to add this integration to',
+                  defaultMessage: 'Select an agent policy to add this integration to',
                 }
               )}
               singleSelection={{ asPlainText: true }}
               isClearable={false}
               fullWidth={true}
-              isLoading={isAgentConfigsLoading || isPackageInfoLoading}
-              options={agentConfigOptions}
+              isLoading={isAgentPoliciesLoading || isPackageInfoLoading}
+              options={agentPolicyOptions}
               renderOption={(option: EuiComboBoxOptionOption<string>) => {
                 return (
                   <EuiFlexGroup>
-                    <AgentConfigNameColumn grow={2}>
+                    <AgentPolicyNameColumn grow={2}>
                       <span className="eui-textTruncate">{option.label}</span>
-                    </AgentConfigNameColumn>
-                    <AgentConfigDescriptionColumn grow={isFleetReady ? 5 : 7}>
+                    </AgentPolicyNameColumn>
+                    <AgentPolicyDescriptionColumn grow={isFleetReady ? 5 : 7}>
                       <EuiTextColor className="eui-textTruncate" color="subdued">
-                        {agentConfigsById[option.value!].description}
+                        {agentPoliciesById[option.value!].description}
                       </EuiTextColor>
-                    </AgentConfigDescriptionColumn>
+                    </AgentPolicyDescriptionColumn>
                     {isFleetReady ? (
                       <EuiFlexItem grow={2} className="eui-textRight">
                         <EuiTextColor color="subdued">
                           <FormattedMessage
-                            id="xpack.ingestManager.createPackageConfig.StepSelectConfig.agentConfigAgentsCountText"
+                            id="xpack.ingestManager.createPackagePolicy.StepSelectPolicy.agentPolicyAgentsCountText"
                             defaultMessage="{count, plural, one {# agent} other {# agents}} enrolled"
                             values={{
-                              count: agentConfigsById[option.value!].agents || 0,
+                              count: agentPoliciesById[option.value!].agents || 0,
                             }}
                           />
                         </EuiTextColor>
@@ -289,31 +289,31 @@ export const StepSelectConfig: React.FunctionComponent<{
                   </EuiFlexGroup>
                 );
               }}
-              selectedOptions={selectedConfigOption ? [selectedConfigOption] : []}
+              selectedOptions={selectedAgentPolicyOption ? [selectedAgentPolicyOption] : []}
               onChange={(options) => {
                 const selectedOption = options[0] || undefined;
                 if (selectedOption) {
-                  if (selectedOption.value !== selectedConfigId) {
-                    setSelectedConfigId(selectedOption.value);
+                  if (selectedOption.value !== selectedPolicyId) {
+                    setSelectedPolicyId(selectedOption.value);
                   }
                 } else {
-                  setSelectedConfigId(undefined);
+                  setSelectedPolicyId(undefined);
                 }
               }}
             />
-          </AgentConfigWrapper>
+          </AgentPolicyWrapper>
         </EuiFlexItem>
-        {/* Display selected agent config error if there is one */}
-        {selectedConfigError ? (
+        {/* Display selected agent policy error if there is one */}
+        {selectedAgentPolicyError ? (
           <EuiFlexItem>
             <Error
               title={
                 <FormattedMessage
-                  id="xpack.ingestManager.createPackageConfig.StepSelectConfig.errorLoadingSelectedAgentConfigTitle"
-                  defaultMessage="Error loading selected agent config"
+                  id="xpack.ingestManager.createPackagePolicy.StepSelectPolicy.errorLoadingSelectedAgentPolicyTitle"
+                  defaultMessage="Error loading selected agent policy"
                 />
               }
-              error={selectedConfigError}
+              error={selectedAgentPolicyError}
             />
           </EuiFlexItem>
         ) : null}
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_package.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/step_select_package.tsx
similarity index 80%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_package.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/step_select_package.tsx
index 048ae101fcd6f..704455b21d64a 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_package.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/step_select_package.tsx
@@ -8,9 +8,9 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiFlexGroup, EuiFlexItem, EuiSelectable, EuiSpacer } from '@elastic/eui';
 import { Error } from '../../../components';
-import { AgentConfig, PackageInfo, PackageConfig, GetPackagesResponse } from '../../../types';
+import { AgentPolicy, PackageInfo, PackagePolicy, GetPackagesResponse } from '../../../types';
 import {
-  useGetOneAgentConfig,
+  useGetOneAgentPolicy,
   useGetPackages,
   useGetLimitedPackages,
   sendGetPackageInfoByKey,
@@ -18,14 +18,14 @@ import {
 import { PackageIcon } from '../../../components/package_icon';
 
 export const StepSelectPackage: React.FunctionComponent<{
-  agentConfigId: string;
-  updateAgentConfig: (config: AgentConfig | undefined) => void;
+  agentPolicyId: string;
+  updateAgentPolicy: (agentPolicy: AgentPolicy | undefined) => void;
   packageInfo?: PackageInfo;
   updatePackageInfo: (packageInfo: PackageInfo | undefined) => void;
   setIsLoadingSecondStep: (isLoading: boolean) => void;
 }> = ({
-  agentConfigId,
-  updateAgentConfig,
+  agentPolicyId,
+  updateAgentPolicy,
   packageInfo,
   updatePackageInfo,
   setIsLoadingSecondStep,
@@ -36,15 +36,15 @@ export const StepSelectPackage: React.FunctionComponent<{
   );
   const [selectedPkgError, setSelectedPkgError] = useState<Error>();
 
-  // Fetch agent config info
+  // Fetch agent policy info
   const {
-    data: agentConfigData,
-    error: agentConfigError,
-    isLoading: isAgentConfigsLoading,
-  } = useGetOneAgentConfig(agentConfigId);
+    data: agentPolicyData,
+    error: agentPolicyError,
+    isLoading: isAgentPoliciesLoading,
+  } = useGetOneAgentPolicy(agentPolicyId);
 
   // Fetch packages info
-  // Filter out limited packages already part of selected agent config
+  // Filter out limited packages already part of selected agent policy
   const [packages, setPackages] = useState<GetPackagesResponse['response']>([]);
   const {
     data: packagesData,
@@ -56,22 +56,22 @@ export const StepSelectPackage: React.FunctionComponent<{
     isLoading: isLimitedPackagesLoading,
   } = useGetLimitedPackages();
   useEffect(() => {
-    if (packagesData?.response && limitedPackagesData?.response && agentConfigData?.item) {
+    if (packagesData?.response && limitedPackagesData?.response && agentPolicyData?.item) {
       const allPackages = packagesData.response;
       const limitedPackages = limitedPackagesData.response;
-      const usedLimitedPackages = (agentConfigData.item.package_configs as PackageConfig[])
-        .map((packageConfig) => packageConfig.package?.name || '')
+      const usedLimitedPackages = (agentPolicyData.item.package_policies as PackagePolicy[])
+        .map((packagePolicy) => packagePolicy.package?.name || '')
         .filter((pkgName) => limitedPackages.includes(pkgName));
       setPackages(allPackages.filter((pkg) => !usedLimitedPackages.includes(pkg.name)));
     }
-  }, [packagesData, limitedPackagesData, agentConfigData]);
+  }, [packagesData, limitedPackagesData, agentPolicyData]);
 
-  // Update parent agent config state
+  // Update parent agent policy state
   useEffect(() => {
-    if (agentConfigData && agentConfigData.item) {
-      updateAgentConfig(agentConfigData.item);
+    if (agentPolicyData && agentPolicyData.item) {
+      updateAgentPolicy(agentPolicyData.item);
     }
-  }, [agentConfigData, updateAgentConfig]);
+  }, [agentPolicyData, updateAgentPolicy]);
 
   // Update parent selected package state
   useEffect(() => {
@@ -97,17 +97,17 @@ export const StepSelectPackage: React.FunctionComponent<{
     }
   }, [selectedPkgKey, packageInfo, updatePackageInfo, setIsLoadingSecondStep]);
 
-  // Display agent config error if there is one
-  if (agentConfigError) {
+  // Display agent policy error if there is one
+  if (agentPolicyError) {
     return (
       <Error
         title={
           <FormattedMessage
-            id="xpack.ingestManager.createPackageConfig.stepSelectPackage.errorLoadingConfigTitle"
-            defaultMessage="Error loading agent configuration information"
+            id="xpack.ingestManager.createPackagePolicy.stepSelectPackage.errorLoadingPolicyTitle"
+            defaultMessage="Error loading agent policy information"
           />
         }
-        error={agentConfigError}
+        error={agentPolicyError}
       />
     );
   }
@@ -118,7 +118,7 @@ export const StepSelectPackage: React.FunctionComponent<{
       <Error
         title={
           <FormattedMessage
-            id="xpack.ingestManager.createPackageConfig.stepSelectPackage.errorLoadingPackagesTitle"
+            id="xpack.ingestManager.createPackagePolicy.stepSelectPackage.errorLoadingPackagesTitle"
             defaultMessage="Error loading integrations"
           />
         }
@@ -134,7 +134,7 @@ export const StepSelectPackage: React.FunctionComponent<{
           searchable
           allowExclusions={false}
           singleSelection={true}
-          isLoading={isPackagesLoading || isLimitedPackagesLoading || isAgentConfigsLoading}
+          isLoading={isPackagesLoading || isLimitedPackagesLoading || isAgentPoliciesLoading}
           options={packages.map(({ title, name, version, icons }) => {
             const pkgkey = `${name}-${version}`;
             return {
@@ -157,7 +157,7 @@ export const StepSelectPackage: React.FunctionComponent<{
           }}
           searchProps={{
             placeholder: i18n.translate(
-              'xpack.ingestManager.createPackageConfig.stepSelectPackage.filterPackagesInputPlaceholder',
+              'xpack.ingestManager.createPackagePolicy.stepSelectPackage.filterPackagesInputPlaceholder',
               {
                 defaultMessage: 'Search for integrations',
               }
@@ -190,7 +190,7 @@ export const StepSelectPackage: React.FunctionComponent<{
           <Error
             title={
               <FormattedMessage
-                id="xpack.ingestManager.createPackageConfig.stepSelectPackage.errorLoadingSelectedPackageTitle"
+                id="xpack.ingestManager.createPackagePolicy.stepSelectPackage.errorLoadingSelectedPackageTitle"
                 defaultMessage="Error loading selected integration"
               />
             }
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/types.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/types.ts
similarity index 68%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/types.ts
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/types.ts
index 5386ff17fe96b..c6e16c2cb4d97 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/types.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/types.ts
@@ -4,5 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export type CreatePackageConfigFrom = 'package' | 'config' | 'edit';
-export type PackageConfigFormState = 'VALID' | 'INVALID' | 'CONFIRM' | 'LOADING' | 'SUBMITTED';
+export type CreatePackagePolicyFrom = 'package' | 'policy' | 'edit';
+export type PackagePolicyFormState = 'VALID' | 'INVALID' | 'CONFIRM' | 'LOADING' | 'SUBMITTED';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/index.ts
new file mode 100644
index 0000000000000..9ea1e77dce476
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+export { PackagePoliciesTable } from './package_policies/package_policies_table';
+export { PackagePoliciesView } from './package_policies';
+export { SettingsView } from './settings';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/package_policies/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/package_policies/index.tsx
new file mode 100644
index 0000000000000..494407b93f2a8
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/package_policies/index.tsx
@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { memo } from 'react';
+import { AgentPolicy, PackagePolicy } from '../../../../../types';
+import { NoPackagePolicies } from './no_package_policies';
+import { PackagePoliciesTable } from './package_policies_table';
+
+export const PackagePoliciesView = memo<{ agentPolicy: AgentPolicy }>(({ agentPolicy }) => {
+  if (agentPolicy.package_policies.length === 0) {
+    return <NoPackagePolicies policyId={agentPolicy.id} />;
+  }
+
+  return (
+    <PackagePoliciesTable
+      agentPolicy={agentPolicy}
+      packagePolicies={(agentPolicy.package_policies || []) as PackagePolicy[]}
+    />
+  );
+});
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/no_package_configs.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/package_policies/no_package_policies.tsx
similarity index 68%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/no_package_configs.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/package_policies/no_package_policies.tsx
index ad75c70783698..b84466ee073eb 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/no_package_configs.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/package_policies/no_package_policies.tsx
@@ -8,7 +8,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiButton, EuiEmptyPrompt } from '@elastic/eui';
 import { useCapabilities, useLink } from '../../../../../hooks';
 
-export const NoPackageConfigs = memo<{ configId: string }>(({ configId }) => {
+export const NoPackagePolicies = memo<{ policyId: string }>(({ policyId }) => {
   const { getHref } = useLink();
   const hasWriteCapabilities = useCapabilities().write;
 
@@ -18,25 +18,25 @@ export const NoPackageConfigs = memo<{ configId: string }>(({ configId }) => {
       title={
         <h3>
           <FormattedMessage
-            id="xpack.ingestManager.configDetailsPackageConfigs.createFirstTitle"
+            id="xpack.ingestManager.policyDetailsPackagePolicies.createFirstTitle"
             defaultMessage="Add your first integration"
           />
         </h3>
       }
       body={
         <FormattedMessage
-          id="xpack.ingestManager.configDetailsPackageConfigs.createFirstMessage"
-          defaultMessage="This configuration does not have any integrations yet."
+          id="xpack.ingestManager.policyDetailsPackagePolicies.createFirstMessage"
+          defaultMessage="This policy does not have any integrations yet."
         />
       }
       actions={
         <EuiButton
           isDisabled={!hasWriteCapabilities}
           fill
-          href={getHref('add_integration_from_configuration', { configId })}
+          href={getHref('add_integration_from_policy', { policyId })}
         >
           <FormattedMessage
-            id="xpack.ingestManager.configDetailsPackageConfigs.createFirstButtonText"
+            id="xpack.ingestManager.policyDetailsPackagePolicies.createFirstButtonText"
             defaultMessage="Add integration"
           />
         </EuiButton>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/package_configs_table.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/package_policies/package_policies_table.tsx
similarity index 62%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/package_configs_table.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/package_policies/package_policies_table.tsx
index 1aa0fd1220833..fa9ce24935429 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/package_configs_table.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/package_policies/package_policies_table.tsx
@@ -15,13 +15,13 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
 } from '@elastic/eui';
-import { AgentConfig, PackageConfig } from '../../../../../types';
+import { AgentPolicy, PackagePolicy } from '../../../../../types';
 import { PackageIcon, ContextMenuActions } from '../../../../../components';
-import { PackageConfigDeleteProvider, DangerEuiContextMenuItem } from '../../../components';
+import { PackagePolicyDeleteProvider, DangerEuiContextMenuItem } from '../../../components';
 import { useCapabilities, useLink } from '../../../../../hooks';
-import { useConfigRefresh } from '../../hooks';
+import { useAgentPolicyRefresh } from '../../hooks';
 
-interface InMemoryPackageConfig extends PackageConfig {
+interface InMemoryPackagePolicy extends PackagePolicy {
   inputTypes: string[];
   packageName?: string;
   packageTitle?: string;
@@ -29,11 +29,11 @@ interface InMemoryPackageConfig extends PackageConfig {
 }
 
 interface Props {
-  packageConfigs: PackageConfig[];
-  config: AgentConfig;
+  packagePolicies: PackagePolicy[];
+  agentPolicy: AgentPolicy;
   // Pass through props to InMemoryTable
-  loading?: EuiInMemoryTableProps<InMemoryPackageConfig>['loading'];
-  message?: EuiInMemoryTableProps<InMemoryPackageConfig>['message'];
+  loading?: EuiInMemoryTableProps<InMemoryPackagePolicy>['loading'];
+  message?: EuiInMemoryTableProps<InMemoryPackagePolicy>['message'];
 }
 
 interface FilterOption {
@@ -44,29 +44,29 @@ interface FilterOption {
 const stringSortAscending = (a: string, b: string): number => a.localeCompare(b);
 const toFilterOption = (value: string): FilterOption => ({ name: value, value });
 
-export const PackageConfigsTable: React.FunctionComponent<Props> = ({
-  packageConfigs: originalPackageConfigs,
-  config,
+export const PackagePoliciesTable: React.FunctionComponent<Props> = ({
+  packagePolicies: originalPackagePolicies,
+  agentPolicy,
   ...rest
 }) => {
   const { getHref } = useLink();
   const hasWriteCapabilities = useCapabilities().write;
-  const refreshConfig = useConfigRefresh();
+  const refreshAgentPolicy = useAgentPolicyRefresh();
 
-  // With the package configs provided on input, generate the list of package configs
+  // With the package policies provided on input, generate the list of package policies
   // used in the InMemoryTable (flattens some values for search) as well as
   // the list of options that will be used in the filters dropdowns
-  const [packageConfigs, namespaces, inputTypes] = useMemo((): [
-    InMemoryPackageConfig[],
+  const [packagePolicies, namespaces, inputTypes] = useMemo((): [
+    InMemoryPackagePolicy[],
     FilterOption[],
     FilterOption[]
   ] => {
     const namespacesValues: string[] = [];
     const inputTypesValues: string[] = [];
-    const mappedPackageConfigs = originalPackageConfigs.map<InMemoryPackageConfig>(
-      (packageConfig) => {
-        if (packageConfig.namespace && !namespacesValues.includes(packageConfig.namespace)) {
-          namespacesValues.push(packageConfig.namespace);
+    const mappedPackagePolicies = originalPackagePolicies.map<InMemoryPackagePolicy>(
+      (packagePolicy) => {
+        if (packagePolicy.namespace && !namespacesValues.includes(packagePolicy.namespace)) {
+          namespacesValues.push(packagePolicy.namespace);
         }
 
         const dsInputTypes: string[] = [];
@@ -74,11 +74,11 @@ export const PackageConfigsTable: React.FunctionComponent<Props> = ({
         dsInputTypes.sort(stringSortAscending);
 
         return {
-          ...packageConfig,
+          ...packagePolicy,
           inputTypes: dsInputTypes,
-          packageName: packageConfig.package?.name ?? '',
-          packageTitle: packageConfig.package?.title ?? '',
-          packageVersion: packageConfig.package?.version ?? '',
+          packageName: packagePolicy.package?.name ?? '',
+          packageTitle: packagePolicy.package?.title ?? '',
+          packageVersion: packagePolicy.package?.version ?? '',
         };
       }
     );
@@ -87,19 +87,19 @@ export const PackageConfigsTable: React.FunctionComponent<Props> = ({
     inputTypesValues.sort(stringSortAscending);
 
     return [
-      mappedPackageConfigs,
+      mappedPackagePolicies,
       namespacesValues.map(toFilterOption),
       inputTypesValues.map(toFilterOption),
     ];
-  }, [originalPackageConfigs]);
+  }, [originalPackagePolicies]);
 
   const columns = useMemo(
-    (): EuiInMemoryTableProps<InMemoryPackageConfig>['columns'] => [
+    (): EuiInMemoryTableProps<InMemoryPackagePolicy>['columns'] => [
       {
         field: 'name',
         sortable: true,
         name: i18n.translate(
-          'xpack.ingestManager.configDetails.packageConfigsTable.nameColumnTitle',
+          'xpack.ingestManager.policyDetails.packagePoliciesTable.nameColumnTitle',
           {
             defaultMessage: 'Name',
           }
@@ -113,7 +113,7 @@ export const PackageConfigsTable: React.FunctionComponent<Props> = ({
       {
         field: 'description',
         name: i18n.translate(
-          'xpack.ingestManager.configDetails.packageConfigsTable.descriptionColumnTitle',
+          'xpack.ingestManager.policyDetails.packagePoliciesTable.descriptionColumnTitle',
           {
             defaultMessage: 'Description',
           }
@@ -128,19 +128,19 @@ export const PackageConfigsTable: React.FunctionComponent<Props> = ({
         field: 'packageTitle',
         sortable: true,
         name: i18n.translate(
-          'xpack.ingestManager.configDetails.packageConfigsTable.packageNameColumnTitle',
+          'xpack.ingestManager.policyDetails.packagePoliciesTable.packageNameColumnTitle',
           {
             defaultMessage: 'Integration',
           }
         ),
-        render(packageTitle: string, packageConfig: InMemoryPackageConfig) {
+        render(packageTitle: string, packagePolicy: InMemoryPackagePolicy) {
           return (
             <EuiFlexGroup gutterSize="s" alignItems="center">
-              {packageConfig.package && (
+              {packagePolicy.package && (
                 <EuiFlexItem grow={false}>
                   <PackageIcon
-                    packageName={packageConfig.package.name}
-                    version={packageConfig.package.version}
+                    packageName={packagePolicy.package.name}
+                    version={packagePolicy.package.version}
                     size="m"
                     tryApi={true}
                   />
@@ -154,36 +154,36 @@ export const PackageConfigsTable: React.FunctionComponent<Props> = ({
       {
         field: 'namespace',
         name: i18n.translate(
-          'xpack.ingestManager.configDetails.packageConfigsTable.namespaceColumnTitle',
+          'xpack.ingestManager.policyDetails.packagePoliciesTable.namespaceColumnTitle',
           {
             defaultMessage: 'Namespace',
           }
         ),
-        render: (namespace: InMemoryPackageConfig['namespace']) => {
+        render: (namespace: InMemoryPackagePolicy['namespace']) => {
           return namespace ? <EuiBadge color="hollow">{namespace}</EuiBadge> : '';
         },
       },
       {
         name: i18n.translate(
-          'xpack.ingestManager.configDetails.packageConfigsTable.actionsColumnTitle',
+          'xpack.ingestManager.policyDetails.packagePoliciesTable.actionsColumnTitle',
           {
             defaultMessage: 'Actions',
           }
         ),
         actions: [
           {
-            render: (packageConfig: InMemoryPackageConfig) => (
+            render: (packagePolicy: InMemoryPackagePolicy) => (
               <ContextMenuActions
                 items={[
-                  // FIXME: implement View package config action
+                  // FIXME: implement View package policy action
                   // <EuiContextMenuItem
                   //   disabled
                   //   icon="inspect"
                   //   onClick={() => {}}
-                  //   key="packageConfigView"
+                  //   key="packagePolicyView"
                   // >
                   //   <FormattedMessage
-                  //     id="xpack.ingestManager.configDetails.packageConfigsTable.viewActionTitle"
+                  //     id="xpack.ingestManager.policyDetails.packagePoliciesTable.viewActionTitle"
                   //     defaultMessage="View integration"
                   //   />
                   // </EuiContextMenuItem>,
@@ -191,41 +191,41 @@ export const PackageConfigsTable: React.FunctionComponent<Props> = ({
                     disabled={!hasWriteCapabilities}
                     icon="pencil"
                     href={getHref('edit_integration', {
-                      configId: config.id,
-                      packageConfigId: packageConfig.id,
+                      policyId: agentPolicy.id,
+                      packagePolicyId: packagePolicy.id,
                     })}
-                    key="packageConfigEdit"
+                    key="packagePolicyEdit"
                   >
                     <FormattedMessage
-                      id="xpack.ingestManager.configDetails.packageConfigsTable.editActionTitle"
+                      id="xpack.ingestManager.policyDetails.packagePoliciesTable.editActionTitle"
                       defaultMessage="Edit integration"
                     />
                   </EuiContextMenuItem>,
-                  // FIXME: implement Copy package config action
-                  // <EuiContextMenuItem disabled icon="copy" onClick={() => {}} key="packageConfigCopy">
+                  // FIXME: implement Copy package policy action
+                  // <EuiContextMenuItem disabled icon="copy" onClick={() => {}} key="packagePolicyCopy">
                   //   <FormattedMessage
-                  //     id="xpack.ingestManager.configDetails.packageConfigsTable.copyActionTitle"
+                  //     id="xpack.ingestManager.policyDetails.packagePoliciesTable.copyActionTitle"
                   //     defaultMessage="Copy integration"
                   //   />
                   // </EuiContextMenuItem>,
-                  <PackageConfigDeleteProvider agentConfig={config} key="packageConfigDelete">
-                    {(deletePackageConfigsPrompt) => {
+                  <PackagePolicyDeleteProvider agentPolicy={agentPolicy} key="packagePolicyDelete">
+                    {(deletePackagePoliciesPrompt) => {
                       return (
                         <DangerEuiContextMenuItem
                           disabled={!hasWriteCapabilities}
                           icon="trash"
                           onClick={() => {
-                            deletePackageConfigsPrompt([packageConfig.id], refreshConfig);
+                            deletePackagePoliciesPrompt([packagePolicy.id], refreshAgentPolicy);
                           }}
                         >
                           <FormattedMessage
-                            id="xpack.ingestManager.configDetails.packageConfigsTable.deleteActionTitle"
+                            id="xpack.ingestManager.policyDetails.packagePoliciesTable.deleteActionTitle"
                             defaultMessage="Delete integration"
                           />
                         </DangerEuiContextMenuItem>
                       );
                     }}
-                  </PackageConfigDeleteProvider>,
+                  </PackagePolicyDeleteProvider>,
                 ]}
               />
             ),
@@ -233,13 +233,13 @@ export const PackageConfigsTable: React.FunctionComponent<Props> = ({
         ],
       },
     ],
-    [config, getHref, hasWriteCapabilities, refreshConfig]
+    [agentPolicy, getHref, hasWriteCapabilities, refreshAgentPolicy]
   );
 
   return (
-    <EuiInMemoryTable<InMemoryPackageConfig>
+    <EuiInMemoryTable<InMemoryPackagePolicy>
       itemId="id"
-      items={packageConfigs}
+      items={packagePolicies}
       columns={columns}
       sorting={{
         sort: {
@@ -251,13 +251,13 @@ export const PackageConfigsTable: React.FunctionComponent<Props> = ({
       search={{
         toolsRight: [
           <EuiButton
-            key="addPackageConfigButton"
+            key="addPackagePolicyButton"
             isDisabled={!hasWriteCapabilities}
             iconType="plusInCircle"
-            href={getHref('add_integration_from_configuration', { configId: config.id })}
+            href={getHref('add_integration_from_policy', { policyId: agentPolicy.id })}
           >
             <FormattedMessage
-              id="xpack.ingestManager.configDetails.addPackageConfigButtonText"
+              id="xpack.ingestManager.policyDetails.addPackagePolicyButtonText"
               defaultMessage="Add integration"
             />
           </EuiButton>,
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/settings/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/settings/index.tsx
similarity index 73%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/settings/index.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/settings/index.tsx
index dfdd63bd984dd..766bdc2e2c193 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/settings/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/settings/index.tsx
@@ -9,21 +9,21 @@ import styled from 'styled-components';
 import { EuiBottomBar, EuiFlexGroup, EuiFlexItem, EuiButtonEmpty, EuiButton } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { AgentConfig } from '../../../../../types';
+import { AgentPolicy } from '../../../../../types';
 import {
   useLink,
   useCore,
   useCapabilities,
-  sendUpdateAgentConfig,
+  sendUpdateAgentPolicy,
   useConfig,
   sendGetAgentStatus,
 } from '../../../../../hooks';
 import {
-  AgentConfigForm,
-  agentConfigFormValidation,
-  ConfirmDeployConfigModal,
+  AgentPolicyForm,
+  agentPolicyFormValidation,
+  ConfirmDeployAgentPolicyModal,
 } from '../../../components';
-import { useConfigRefresh } from '../../hooks';
+import { useAgentPolicyRefresh } from '../../hooks';
 
 const FormWrapper = styled.div`
   max-width: 800px;
@@ -31,8 +31,8 @@ const FormWrapper = styled.div`
   margin-left: auto;
 `;
 
-export const ConfigSettingsView = memo<{ config: AgentConfig }>(
-  ({ config: originalAgentConfig }) => {
+export const SettingsView = memo<{ agentPolicy: AgentPolicy }>(
+  ({ agentPolicy: originalAgentPolicy }) => {
     const {
       notifications,
       chrome: { getIsNavDrawerLocked$ },
@@ -44,16 +44,16 @@ export const ConfigSettingsView = memo<{ config: AgentConfig }>(
     const history = useHistory();
     const { getPath } = useLink();
     const hasWriteCapabilites = useCapabilities().write;
-    const refreshConfig = useConfigRefresh();
+    const refreshAgentPolicy = useAgentPolicyRefresh();
     const [isNavDrawerLocked, setIsNavDrawerLocked] = useState(false);
-    const [agentConfig, setAgentConfig] = useState<AgentConfig>({
-      ...originalAgentConfig,
+    const [agentPolicy, setAgentPolicy] = useState<AgentPolicy>({
+      ...originalAgentPolicy,
     });
     const [isLoading, setIsLoading] = useState<boolean>(false);
     const [hasChanges, setHasChanges] = useState<boolean>(false);
     const [agentCount, setAgentCount] = useState<number>(0);
     const [withSysMonitoring, setWithSysMonitoring] = useState<boolean>(true);
-    const validation = agentConfigFormValidation(agentConfig);
+    const validation = agentPolicyFormValidation(agentPolicy);
 
     useEffect(() => {
       const subscription = getIsNavDrawerLocked$().subscribe((newIsNavDrawerLocked: boolean) => {
@@ -63,20 +63,20 @@ export const ConfigSettingsView = memo<{ config: AgentConfig }>(
       return () => subscription.unsubscribe();
     });
 
-    const updateAgentConfig = (updatedFields: Partial<AgentConfig>) => {
-      setAgentConfig({
-        ...agentConfig,
+    const updateAgentPolicy = (updatedFields: Partial<AgentPolicy>) => {
+      setAgentPolicy({
+        ...agentPolicy,
         ...updatedFields,
       });
       setHasChanges(true);
     };
 
-    const submitUpdateAgentConfig = async () => {
+    const submitUpdateAgentPolicy = async () => {
       setIsLoading(true);
       try {
         // eslint-disable-next-line @typescript-eslint/naming-convention
-        const { name, description, namespace, monitoring_enabled } = agentConfig;
-        const { data, error } = await sendUpdateAgentConfig(agentConfig.id, {
+        const { name, description, namespace, monitoring_enabled } = agentPolicy;
+        const { data, error } = await sendUpdateAgentPolicy(agentPolicy.id, {
           name,
           description,
           namespace,
@@ -84,26 +84,26 @@ export const ConfigSettingsView = memo<{ config: AgentConfig }>(
         });
         if (data?.success) {
           notifications.toasts.addSuccess(
-            i18n.translate('xpack.ingestManager.editAgentConfig.successNotificationTitle', {
+            i18n.translate('xpack.ingestManager.editAgentPolicy.successNotificationTitle', {
               defaultMessage: "Successfully updated '{name}' settings",
-              values: { name: agentConfig.name },
+              values: { name: agentPolicy.name },
             })
           );
-          refreshConfig();
+          refreshAgentPolicy();
           setHasChanges(false);
         } else {
           notifications.toasts.addDanger(
             error
               ? error.message
-              : i18n.translate('xpack.ingestManager.editAgentConfig.errorNotificationTitle', {
-                  defaultMessage: 'Unable to update agent config',
+              : i18n.translate('xpack.ingestManager.editAgentPolicy.errorNotificationTitle', {
+                  defaultMessage: 'Unable to update agent policy',
                 })
           );
         }
       } catch (e) {
         notifications.toasts.addDanger(
-          i18n.translate('xpack.ingestManager.editAgentConfig.errorNotificationTitle', {
-            defaultMessage: 'Unable to update agent config',
+          i18n.translate('xpack.ingestManager.editAgentPolicy.errorNotificationTitle', {
+            defaultMessage: 'Unable to update agent policy',
           })
         );
       }
@@ -114,26 +114,26 @@ export const ConfigSettingsView = memo<{ config: AgentConfig }>(
       // Retrieve agent count if fleet is enabled
       if (isFleetEnabled) {
         setIsLoading(true);
-        const { data } = await sendGetAgentStatus({ configId: agentConfig.id });
+        const { data } = await sendGetAgentStatus({ policyId: agentPolicy.id });
         if (data?.results.total) {
           setAgentCount(data.results.total);
         } else {
-          await submitUpdateAgentConfig();
+          await submitUpdateAgentPolicy();
         }
       } else {
-        await submitUpdateAgentConfig();
+        await submitUpdateAgentPolicy();
       }
     };
 
     return (
       <FormWrapper>
         {agentCount ? (
-          <ConfirmDeployConfigModal
+          <ConfirmDeployAgentPolicyModal
             agentCount={agentCount}
-            agentConfig={agentConfig}
+            agentPolicy={agentPolicy}
             onConfirm={() => {
               setAgentCount(0);
-              submitUpdateAgentConfig();
+              submitUpdateAgentPolicy();
             }}
             onCancel={() => {
               setAgentCount(0);
@@ -141,15 +141,15 @@ export const ConfigSettingsView = memo<{ config: AgentConfig }>(
             }}
           />
         ) : null}
-        <AgentConfigForm
-          agentConfig={agentConfig}
-          updateAgentConfig={updateAgentConfig}
+        <AgentPolicyForm
+          agentPolicy={agentPolicy}
+          updateAgentPolicy={updateAgentPolicy}
           withSysMonitoring={withSysMonitoring}
           updateSysMonitoring={(newValue) => setWithSysMonitoring(newValue)}
           validation={validation}
           isEditing={true}
           onDelete={() => {
-            history.push(getPath('configurations_list'));
+            history.push(getPath('policies_list'));
           }}
         />
         {/* TODO #64541 - Remove classes */}
@@ -166,7 +166,7 @@ export const ConfigSettingsView = memo<{ config: AgentConfig }>(
             <EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
               <EuiFlexItem>
                 <FormattedMessage
-                  id="xpack.ingestManager.editAgentConfig.unsavedChangesText"
+                  id="xpack.ingestManager.editAgentPolicy.unsavedChangesText"
                   defaultMessage="You have unsaved changes"
                 />
               </EuiFlexItem>
@@ -176,12 +176,12 @@ export const ConfigSettingsView = memo<{ config: AgentConfig }>(
                     <EuiButtonEmpty
                       color="ghost"
                       onClick={() => {
-                        setAgentConfig({ ...originalAgentConfig });
+                        setAgentPolicy({ ...originalAgentPolicy });
                         setHasChanges(false);
                       }}
                     >
                       <FormattedMessage
-                        id="xpack.ingestManager.editAgentConfig.cancelButtonText"
+                        id="xpack.ingestManager.editAgentPolicy.cancelButtonText"
                         defaultMessage="Cancel"
                       />
                     </EuiButtonEmpty>
@@ -199,12 +199,12 @@ export const ConfigSettingsView = memo<{ config: AgentConfig }>(
                     >
                       {isLoading ? (
                         <FormattedMessage
-                          id="xpack.ingestManager.editAgentConfig.savingButtonText"
+                          id="xpack.ingestManager.editAgentPolicy.savingButtonText"
                           defaultMessage="Saving…"
                         />
                       ) : (
                         <FormattedMessage
-                          id="xpack.ingestManager.editAgentConfig.saveButtonText"
+                          id="xpack.ingestManager.editAgentPolicy.saveButtonText"
                           defaultMessage="Save changes"
                         />
                       )}
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/hooks/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/hooks/index.ts
similarity index 80%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/hooks/index.ts
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/hooks/index.ts
index 76c6d64eb9e07..4bdf49d5764ea 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/hooks/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/hooks/index.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 export { useGetAgentStatus, AgentStatusRefreshContext } from './use_agent_status';
-export { ConfigRefreshContext, useConfigRefresh } from './use_config';
+export { AgentPolicyRefreshContext, useAgentPolicyRefresh } from './use_config';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/hooks/use_agent_status.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/hooks/use_agent_status.tsx
similarity index 93%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/hooks/use_agent_status.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/hooks/use_agent_status.tsx
index 214deb81f535c..71dcd728d5d1b 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/hooks/use_agent_status.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/hooks/use_agent_status.tsx
@@ -11,11 +11,11 @@ import { UseRequestConfig } from '../../../../hooks/use_request/use_request';
 
 type RequestOptions = Pick<Partial<UseRequestConfig>, 'pollIntervalMs'>;
 
-export function useGetAgentStatus(configId?: string, options?: RequestOptions) {
+export function useGetAgentStatus(policyId?: string, options?: RequestOptions) {
   const agentStatusRequest = useRequest<GetAgentStatusResponse>({
     path: agentRouteService.getStatusPath(),
     query: {
-      configId,
+      policyId,
     },
     method: 'get',
     ...options,
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/hooks/use_config.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/hooks/use_config.tsx
similarity index 59%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/hooks/use_config.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/hooks/use_config.tsx
index b61986e7abb4f..83004af7a79ee 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/hooks/use_config.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/hooks/use_config.tsx
@@ -5,8 +5,8 @@
  */
 import React from 'react';
 
-export const ConfigRefreshContext = React.createContext({ refresh: () => {} });
+export const AgentPolicyRefreshContext = React.createContext({ refresh: () => {} });
 
-export function useConfigRefresh() {
-  return React.useContext(ConfigRefreshContext).refresh;
+export function useAgentPolicyRefresh() {
+  return React.useContext(AgentPolicyRefreshContext).refresh;
 }
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/index.tsx
similarity index 64%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/index.tsx
index b87bd66cce0ea..4c317c54c68c4 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/index.tsx
@@ -20,14 +20,14 @@ import {
 } from '@elastic/eui';
 import { Props as EuiTabProps } from '@elastic/eui/src/components/tabs/tab';
 import styled from 'styled-components';
-import { AgentConfig, AgentConfigDetailsDeployAgentAction } from '../../../types';
+import { AgentPolicy, AgentPolicyDetailsDeployAgentAction } from '../../../types';
 import { PAGE_ROUTING_PATHS } from '../../../constants';
-import { useGetOneAgentConfig, useLink, useBreadcrumbs, useCore } from '../../../hooks';
+import { useGetOneAgentPolicy, useLink, useBreadcrumbs, useCore } from '../../../hooks';
 import { Loading, Error } from '../../../components';
 import { WithHeaderLayout } from '../../../layouts';
-import { ConfigRefreshContext, useGetAgentStatus, AgentStatusRefreshContext } from './hooks';
-import { LinkedAgentCount, AgentConfigActionMenu } from '../components';
-import { ConfigPackageConfigsView, ConfigSettingsView } from './components';
+import { AgentPolicyRefreshContext, useGetAgentStatus, AgentStatusRefreshContext } from './hooks';
+import { LinkedAgentCount, AgentPolicyActionMenu } from '../components';
+import { PackagePoliciesView, SettingsView } from './components';
 import { useIntraAppState } from '../../../hooks/use_intra_app_state';
 
 const Divider = styled.div`
@@ -36,22 +36,22 @@ const Divider = styled.div`
   border-left: ${(props) => props.theme.eui.euiBorderThin};
 `;
 
-export const AgentConfigDetailsPage: React.FunctionComponent = () => {
+export const AgentPolicyDetailsPage: React.FunctionComponent = () => {
   const {
-    params: { configId, tabId = '' },
-  } = useRouteMatch<{ configId: string; tabId?: string }>();
+    params: { policyId, tabId = '' },
+  } = useRouteMatch<{ policyId: string; tabId?: string }>();
   const history = useHistory();
   const { getHref, getPath } = useLink();
-  const agentConfigRequest = useGetOneAgentConfig(configId);
-  const agentConfig = agentConfigRequest.data ? agentConfigRequest.data.item : null;
-  const { isLoading, error, sendRequest: refreshAgentConfig } = agentConfigRequest;
-  const [redirectToAgentConfigList] = useState<boolean>(false);
-  const agentStatusRequest = useGetAgentStatus(configId);
+  const agentPolicyRequest = useGetOneAgentPolicy(policyId);
+  const agentPolicy = agentPolicyRequest.data ? agentPolicyRequest.data.item : null;
+  const { isLoading, error, sendRequest: refreshAgentPolicy } = agentPolicyRequest;
+  const [redirectToAgentPolicyList] = useState<boolean>(false);
+  const agentStatusRequest = useGetAgentStatus(policyId);
   const { refreshAgentStatus } = agentStatusRequest;
   const {
     application: { navigateToApp },
   } = useCore();
-  const routeState = useIntraAppState<AgentConfigDetailsDeployAgentAction>();
+  const routeState = useIntraAppState<AgentPolicyDetailsDeployAgentAction>();
   const agentStatus = agentStatusRequest.data?.results;
   const queryParams = new URLSearchParams(useLocation().search);
   const openEnrollmentFlyoutOpenByDefault = queryParams.get('openEnrollmentFlyout') === 'true';
@@ -62,25 +62,25 @@ export const AgentConfigDetailsPage: React.FunctionComponent = () => {
         <EuiFlexItem>
           <EuiButtonEmpty
             iconType="arrowLeft"
-            href={getHref('configurations_list')}
+            href={getHref('policies_list')}
             flush="left"
             size="xs"
           >
             <FormattedMessage
-              id="xpack.ingestManager.configDetails.viewAgentListTitle"
-              defaultMessage="View all agent configurations"
+              id="xpack.ingestManager.policyDetails.viewAgentListTitle"
+              defaultMessage="View all agent policies"
             />
           </EuiButtonEmpty>
         </EuiFlexItem>
         <EuiFlexItem>
           <EuiText className="eui-textBreakWord">
             <h1>
-              {(agentConfig && agentConfig.name) || (
+              {(agentPolicy && agentPolicy.name) || (
                 <FormattedMessage
-                  id="xpack.ingestManager.configDetails.configDetailsTitle"
-                  defaultMessage="Config '{id}'"
+                  id="xpack.ingestManager.policyDetails.policyDetailsTitle"
+                  defaultMessage="Policy '{id}'"
                   values={{
-                    id: configId,
+                    id: policyId,
                   }}
                 />
               )}
@@ -88,17 +88,17 @@ export const AgentConfigDetailsPage: React.FunctionComponent = () => {
           </EuiText>
         </EuiFlexItem>
 
-        {agentConfig && agentConfig.description ? (
+        {agentPolicy && agentPolicy.description ? (
           <EuiFlexItem>
             <EuiSpacer size="s" />
             <EuiText color="subdued" size="s" className="eui-textBreakWord">
-              {agentConfig.description}
+              {agentPolicy.description}
             </EuiText>
           </EuiFlexItem>
         ) : null}
       </EuiFlexGroup>
     ),
-    [getHref, agentConfig, configId]
+    [getHref, agentPolicy, policyId]
   );
 
   const enrollmentCancelClickHandler = useCallback(() => {
@@ -109,26 +109,26 @@ export const AgentConfigDetailsPage: React.FunctionComponent = () => {
 
   const headerRightContent = useMemo(
     () =>
-      agentConfig ? (
+      agentPolicy ? (
         <EuiFlexGroup justifyContent={'flexEnd'} direction="row">
           {[
             {
-              label: i18n.translate('xpack.ingestManager.configDetails.summary.revision', {
+              label: i18n.translate('xpack.ingestManager.policyDetails.summary.revision', {
                 defaultMessage: 'Revision',
               }),
-              content: agentConfig?.revision ?? 0,
+              content: agentPolicy?.revision ?? 0,
             },
             { isDivider: true },
             {
-              label: i18n.translate('xpack.ingestManager.configDetails.summary.package_configs', {
+              label: i18n.translate('xpack.ingestManager.policyDetails.summary.integrations', {
                 defaultMessage: 'Integrations',
               }),
               content: (
                 <EuiI18nNumber
                   value={
-                    (agentConfig &&
-                      agentConfig.package_configs &&
-                      agentConfig.package_configs.length) ||
+                    (agentPolicy &&
+                      agentPolicy.package_policies &&
+                      agentPolicy.package_policies.length) ||
                     0
                   }
                 />
@@ -136,25 +136,25 @@ export const AgentConfigDetailsPage: React.FunctionComponent = () => {
             },
             { isDivider: true },
             {
-              label: i18n.translate('xpack.ingestManager.configDetails.summary.usedBy', {
+              label: i18n.translate('xpack.ingestManager.policyDetails.summary.usedBy', {
                 defaultMessage: 'Used by',
               }),
               content: (
                 <LinkedAgentCount
                   count={(agentStatus && agentStatus.total) || 0}
-                  agentConfigId={(agentConfig && agentConfig.id) || ''}
+                  agentPolicyId={(agentPolicy && agentPolicy.id) || ''}
                 />
               ),
             },
             { isDivider: true },
             {
-              label: i18n.translate('xpack.ingestManager.configDetails.summary.lastUpdated', {
+              label: i18n.translate('xpack.ingestManager.policyDetails.summary.lastUpdated', {
                 defaultMessage: 'Last updated on',
               }),
               content:
-                (agentConfig && (
+                (agentPolicy && (
                   <FormattedDate
-                    value={agentConfig?.updated_at}
+                    value={agentPolicy?.updated_at}
                     year="numeric"
                     month="short"
                     day="2-digit"
@@ -164,12 +164,12 @@ export const AgentConfigDetailsPage: React.FunctionComponent = () => {
             },
             { isDivider: true },
             {
-              content: agentConfig && (
-                <AgentConfigActionMenu
-                  config={agentConfig}
+              content: agentPolicy && (
+                <AgentPolicyActionMenu
+                  agentPolicy={agentPolicy}
                   fullButton={true}
-                  onCopySuccess={(newAgentConfig: AgentConfig) => {
-                    history.push(getPath('configuration_details', { configId: newAgentConfig.id }));
+                  onCopySuccess={(newAgentPolicy: AgentPolicy) => {
+                    history.push(getPath('policy_details', { policyId: newAgentPolicy.id }));
                   }}
                   enrollmentFlyoutOpenByDefault={openEnrollmentFlyoutOpenByDefault}
                   onCancelEnrollment={
@@ -201,32 +201,32 @@ export const AgentConfigDetailsPage: React.FunctionComponent = () => {
         </EuiFlexGroup>
       ) : undefined,
     /* eslint-disable-next-line react-hooks/exhaustive-deps */
-    [agentConfig, configId, agentStatus]
+    [agentPolicy, policyId, agentStatus]
   );
 
   const headerTabs = useMemo(() => {
     return [
       {
         id: 'integrations',
-        name: i18n.translate('xpack.ingestManager.configDetails.subTabs.packageConfigsTabText', {
+        name: i18n.translate('xpack.ingestManager.policyDetails.subTabs.packagePoliciesTabText', {
           defaultMessage: 'Integrations',
         }),
-        href: getHref('configuration_details', { configId, tabId: 'integrations' }),
+        href: getHref('policy_details', { policyId, tabId: 'integrations' }),
         isSelected: tabId === '' || tabId === 'integrations',
       },
       {
         id: 'settings',
-        name: i18n.translate('xpack.ingestManager.configDetails.subTabs.settingsTabText', {
+        name: i18n.translate('xpack.ingestManager.policyDetails.subTabs.settingsTabText', {
           defaultMessage: 'Settings',
         }),
-        href: getHref('configuration_details', { configId, tabId: 'settings' }),
+        href: getHref('policy_details', { policyId, tabId: 'settings' }),
         isSelected: tabId === 'settings',
       },
     ];
-  }, [getHref, configId, tabId]);
+  }, [getHref, policyId, tabId]);
 
   const content = useMemo(() => {
-    if (redirectToAgentConfigList) {
+    if (redirectToAgentPolicyList) {
       return <Redirect to="/" />;
     }
 
@@ -239,8 +239,8 @@ export const AgentConfigDetailsPage: React.FunctionComponent = () => {
         <Error
           title={
             <FormattedMessage
-              id="xpack.ingestManager.configDetails.unexceptedErrorTitle"
-              defaultMessage="An error happened while loading the config"
+              id="xpack.ingestManager.policyDetails.unexceptedErrorTitle"
+              defaultMessage="An error happened while loading the agent policy"
             />
           }
           error={error}
@@ -248,30 +248,30 @@ export const AgentConfigDetailsPage: React.FunctionComponent = () => {
       );
     }
 
-    if (!agentConfig) {
+    if (!agentPolicy) {
       return (
         <Error
           title={
             <FormattedMessage
-              id="xpack.ingestManager.configDetails.unexceptedErrorTitle"
-              defaultMessage="An error happened while loading the config"
+              id="xpack.ingestManager.policyDetails.unexceptedErrorTitle"
+              defaultMessage="An error happened while loading the agent policy"
             />
           }
-          error={i18n.translate('xpack.ingestManager.configDetails.configNotFoundErrorTitle', {
-            defaultMessage: "Config '{id}' not found",
+          error={i18n.translate('xpack.ingestManager.policyDetails.policyNotFoundErrorTitle', {
+            defaultMessage: "Policy '{id}' not found",
             values: {
-              id: configId,
+              id: policyId,
             },
           })}
         />
       );
     }
 
-    return <AgentConfigDetailsContent agentConfig={agentConfig} />;
-  }, [agentConfig, configId, error, isLoading, redirectToAgentConfigList]);
+    return <AgentPolicyDetailsContent agentPolicy={agentPolicy} />;
+  }, [agentPolicy, policyId, error, isLoading, redirectToAgentPolicyList]);
 
   return (
-    <ConfigRefreshContext.Provider value={{ refresh: refreshAgentConfig }}>
+    <AgentPolicyRefreshContext.Provider value={{ refresh: refreshAgentPolicy }}>
       <AgentStatusRefreshContext.Provider value={{ refresh: refreshAgentStatus }}>
         <WithHeaderLayout
           leftColumn={headerLeftContent}
@@ -281,26 +281,26 @@ export const AgentConfigDetailsPage: React.FunctionComponent = () => {
           {content}
         </WithHeaderLayout>
       </AgentStatusRefreshContext.Provider>
-    </ConfigRefreshContext.Provider>
+    </AgentPolicyRefreshContext.Provider>
   );
 };
 
-const AgentConfigDetailsContent: React.FunctionComponent<{ agentConfig: AgentConfig }> = ({
-  agentConfig,
+const AgentPolicyDetailsContent: React.FunctionComponent<{ agentPolicy: AgentPolicy }> = ({
+  agentPolicy,
 }) => {
-  useBreadcrumbs('configuration_details', { configName: agentConfig.name });
+  useBreadcrumbs('policy_details', { policyName: agentPolicy.name });
   return (
     <Switch>
       <Route
-        path={PAGE_ROUTING_PATHS.configuration_details_settings}
+        path={PAGE_ROUTING_PATHS.policy_details_settings}
         render={() => {
-          return <ConfigSettingsView config={agentConfig} />;
+          return <SettingsView agentPolicy={agentPolicy} />;
         }}
       />
       <Route
-        path={PAGE_ROUTING_PATHS.configuration_details}
+        path={PAGE_ROUTING_PATHS.policy_details}
         render={() => {
-          return <ConfigPackageConfigsView config={agentConfig} />;
+          return <PackagePoliciesView agentPolicy={agentPolicy} />;
         }}
       />
     </Switch>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_package_config_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/edit_package_policy_page/index.tsx
similarity index 59%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_package_config_page/index.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/edit_package_policy_page/index.tsx
index 3005f8d36f343..fc3d28c9392ce 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_package_config_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/edit_package_policy_page/index.tsx
@@ -15,34 +15,34 @@ import {
   EuiFlexItem,
   EuiSpacer,
 } from '@elastic/eui';
-import { AgentConfig, PackageInfo, UpdatePackageConfig } from '../../../types';
+import { AgentPolicy, PackageInfo, UpdatePackagePolicy } from '../../../types';
 import {
   useLink,
   useBreadcrumbs,
   useCore,
   useConfig,
-  sendUpdatePackageConfig,
+  sendUpdatePackagePolicy,
   sendGetAgentStatus,
-  sendGetOneAgentConfig,
-  sendGetOnePackageConfig,
+  sendGetOneAgentPolicy,
+  sendGetOnePackagePolicy,
   sendGetPackageInfoByKey,
 } from '../../../hooks';
 import { Loading, Error } from '../../../components';
-import { ConfirmDeployConfigModal } from '../components';
-import { CreatePackageConfigPageLayout } from '../create_package_config_page/components';
+import { ConfirmDeployAgentPolicyModal } from '../components';
+import { CreatePackagePolicyPageLayout } from '../create_package_policy_page/components';
 import {
-  PackageConfigValidationResults,
-  validatePackageConfig,
+  PackagePolicyValidationResults,
+  validatePackagePolicy,
   validationHasErrors,
-} from '../create_package_config_page/services';
+} from '../create_package_policy_page/services';
 import {
-  PackageConfigFormState,
-  CreatePackageConfigFrom,
-} from '../create_package_config_page/types';
-import { StepConfigurePackage } from '../create_package_config_page/step_configure_package';
-import { StepDefinePackageConfig } from '../create_package_config_page/step_define_package_config';
+  PackagePolicyFormState,
+  CreatePackagePolicyFrom,
+} from '../create_package_policy_page/types';
+import { StepConfigurePackagePolicy } from '../create_package_policy_page/step_configure_package';
+import { StepDefinePackagePolicy } from '../create_package_policy_page/step_define_package_policy';
 
-export const EditPackageConfigPage: React.FunctionComponent = () => {
+export const EditPackagePolicyPage: React.FunctionComponent = () => {
   const {
     notifications,
     chrome: { getIsNavDrawerLocked$ },
@@ -52,7 +52,7 @@ export const EditPackageConfigPage: React.FunctionComponent = () => {
     fleet: { enabled: isFleetEnabled },
   } = useConfig();
   const {
-    params: { configId, packageConfigId },
+    params: { policyId, packagePolicyId },
   } = useRouteMatch();
   const history = useHistory();
   const { getHref, getPath } = useLink();
@@ -66,36 +66,36 @@ export const EditPackageConfigPage: React.FunctionComponent = () => {
     return () => subscription.unsubscribe();
   });
 
-  // Agent config, package info, and package config states
+  // Agent policy, package info, and package policy states
   const [isLoadingData, setIsLoadingData] = useState<boolean>(true);
   const [loadingError, setLoadingError] = useState<Error>();
-  const [agentConfig, setAgentConfig] = useState<AgentConfig>();
+  const [agentPolicy, setAgentPolicy] = useState<AgentPolicy>();
   const [packageInfo, setPackageInfo] = useState<PackageInfo>();
-  const [packageConfig, setPackageConfig] = useState<UpdatePackageConfig>({
+  const [packagePolicy, setPackagePolicy] = useState<UpdatePackagePolicy>({
     name: '',
     description: '',
     namespace: '',
-    config_id: '',
+    policy_id: '',
     enabled: true,
     output_id: '',
     inputs: [],
     version: '',
   });
 
-  // Retrieve agent config, package, and package config info
+  // Retrieve agent policy, package, and package policy info
   useEffect(() => {
     const getData = async () => {
       setIsLoadingData(true);
       setLoadingError(undefined);
       try {
-        const [{ data: agentConfigData }, { data: packageConfigData }] = await Promise.all([
-          sendGetOneAgentConfig(configId),
-          sendGetOnePackageConfig(packageConfigId),
+        const [{ data: agentPolicyData }, { data: packagePolicyData }] = await Promise.all([
+          sendGetOneAgentPolicy(policyId),
+          sendGetOnePackagePolicy(packagePolicyId),
         ]);
-        if (agentConfigData?.item) {
-          setAgentConfig(agentConfigData.item);
+        if (agentPolicyData?.item) {
+          setAgentPolicy(agentPolicyData.item);
         }
-        if (packageConfigData?.item) {
+        if (packagePolicyData?.item) {
           const {
             id,
             revision,
@@ -106,11 +106,11 @@ export const EditPackageConfigPage: React.FunctionComponent = () => {
             updated_by,
             updated_at,
             /* eslint-enable @typescript-eslint/naming-convention */
-            ...restOfPackageConfig
-          } = packageConfigData.item;
+            ...restOfPackagePolicy
+          } = packagePolicyData.item;
           // Remove `compiled_stream` from all stream info, we assign this after saving
-          const newPackageConfig = {
-            ...restOfPackageConfig,
+          const newPackagePolicy = {
+            ...restOfPackagePolicy,
             inputs: inputs.map((input) => {
               const { streams, ...restOfInput } = input;
               return {
@@ -123,14 +123,14 @@ export const EditPackageConfigPage: React.FunctionComponent = () => {
               };
             }),
           };
-          setPackageConfig(newPackageConfig);
-          if (packageConfigData.item.package) {
+          setPackagePolicy(newPackagePolicy);
+          if (packagePolicyData.item.package) {
             const { data: packageData } = await sendGetPackageInfoByKey(
-              `${packageConfigData.item.package.name}-${packageConfigData.item.package.version}`
+              `${packagePolicyData.item.package.name}-${packagePolicyData.item.package.version}`
             );
             if (packageData?.response) {
               setPackageInfo(packageData.response);
-              setValidationResults(validatePackageConfig(newPackageConfig, packageData.response));
+              setValidationResults(validatePackagePolicy(newPackagePolicy, packageData.response));
               setFormState('VALID');
             }
           }
@@ -141,13 +141,13 @@ export const EditPackageConfigPage: React.FunctionComponent = () => {
       setIsLoadingData(false);
     };
     getData();
-  }, [configId, packageConfigId]);
+  }, [policyId, packagePolicyId]);
 
   // Retrieve agent count
   const [agentCount, setAgentCount] = useState<number>(0);
   useEffect(() => {
     const getAgentCount = async () => {
-      const { data } = await sendGetAgentStatus({ configId });
+      const { data } = await sendGetAgentStatus({ policyId });
       if (data?.results.total) {
         setAgentCount(data.results.total);
       }
@@ -156,42 +156,42 @@ export const EditPackageConfigPage: React.FunctionComponent = () => {
     if (isFleetEnabled) {
       getAgentCount();
     }
-  }, [configId, isFleetEnabled]);
+  }, [policyId, isFleetEnabled]);
 
-  // Package config validation state
-  const [validationResults, setValidationResults] = useState<PackageConfigValidationResults>();
+  // Package policy validation state
+  const [validationResults, setValidationResults] = useState<PackagePolicyValidationResults>();
   const hasErrors = validationResults ? validationHasErrors(validationResults) : false;
 
-  // Update package config validation
-  const updatePackageConfigValidation = useCallback(
-    (newPackageConfig?: UpdatePackageConfig) => {
+  // Update package policy validation
+  const updatePackagePolicyValidation = useCallback(
+    (newPackagePolicy?: UpdatePackagePolicy) => {
       if (packageInfo) {
-        const newValidationResult = validatePackageConfig(
-          newPackageConfig || packageConfig,
+        const newValidationResult = validatePackagePolicy(
+          newPackagePolicy || packagePolicy,
           packageInfo
         );
         setValidationResults(newValidationResult);
         // eslint-disable-next-line no-console
-        console.debug('Package config validation results', newValidationResult);
+        console.debug('Package policy validation results', newValidationResult);
 
         return newValidationResult;
       }
     },
-    [packageConfig, packageInfo]
+    [packagePolicy, packageInfo]
   );
 
-  // Update package config method
-  const updatePackageConfig = useCallback(
-    (updatedFields: Partial<UpdatePackageConfig>) => {
-      const newPackageConfig = {
-        ...packageConfig,
+  // Update package policy method
+  const updatePackagePolicy = useCallback(
+    (updatedFields: Partial<UpdatePackagePolicy>) => {
+      const newPackagePolicy = {
+        ...packagePolicy,
         ...updatedFields,
       };
-      setPackageConfig(newPackageConfig);
+      setPackagePolicy(newPackagePolicy);
 
       // eslint-disable-next-line no-console
-      console.debug('Package config updated', newPackageConfig);
-      const newValidationResults = updatePackageConfigValidation(newPackageConfig);
+      console.debug('Package policy updated', newPackagePolicy);
+      const newValidationResults = updatePackagePolicyValidation(newPackagePolicy);
       const hasValidationErrors = newValidationResults
         ? validationHasErrors(newValidationResults)
         : false;
@@ -199,17 +199,17 @@ export const EditPackageConfigPage: React.FunctionComponent = () => {
         setFormState('VALID');
       }
     },
-    [packageConfig, updatePackageConfigValidation]
+    [packagePolicy, updatePackagePolicyValidation]
   );
 
   // Cancel url
-  const cancelUrl = getHref('configuration_details', { configId });
+  const cancelUrl = getHref('policy_details', { policyId });
 
-  // Save package config
-  const [formState, setFormState] = useState<PackageConfigFormState>('INVALID');
-  const savePackageConfig = async () => {
+  // Save package policy
+  const [formState, setFormState] = useState<PackagePolicyFormState>('INVALID');
+  const savePackagePolicy = async () => {
     setFormState('LOADING');
-    const result = await sendUpdatePackageConfig(packageConfigId, packageConfig);
+    const result = await sendUpdatePackagePolicy(packagePolicyId, packagePolicy);
     setFormState('SUBMITTED');
     return result;
   };
@@ -223,22 +223,22 @@ export const EditPackageConfigPage: React.FunctionComponent = () => {
       setFormState('CONFIRM');
       return;
     }
-    const { error } = await savePackageConfig();
+    const { error } = await savePackagePolicy();
     if (!error) {
-      history.push(getPath('configuration_details', { configId }));
+      history.push(getPath('policy_details', { policyId }));
       notifications.toasts.addSuccess({
-        title: i18n.translate('xpack.ingestManager.editPackageConfig.updatedNotificationTitle', {
-          defaultMessage: `Successfully updated '{packageConfigName}'`,
+        title: i18n.translate('xpack.ingestManager.editPackagePolicy.updatedNotificationTitle', {
+          defaultMessage: `Successfully updated '{packagePolicyName}'`,
           values: {
-            packageConfigName: packageConfig.name,
+            packagePolicyName: packagePolicy.name,
           },
         }),
         text:
-          agentCount && agentConfig
-            ? i18n.translate('xpack.ingestManager.editPackageConfig.updatedNotificationMessage', {
-                defaultMessage: `Fleet will deploy updates to all agents that use the '{agentConfigName}' configuration`,
+          agentCount && agentPolicy
+            ? i18n.translate('xpack.ingestManager.editPackagePolicy.updatedNotificationMessage', {
+                defaultMessage: `Fleet will deploy updates to all agents that use the '{agentPolicyName}' policy`,
                 values: {
-                  agentConfigName: agentConfig.name,
+                  agentPolicyName: agentPolicy.name,
                 },
               })
             : undefined,
@@ -246,25 +246,25 @@ export const EditPackageConfigPage: React.FunctionComponent = () => {
     } else {
       if (error.statusCode === 409) {
         notifications.toasts.addError(error, {
-          title: i18n.translate('xpack.ingestManager.editPackageConfig.failedNotificationTitle', {
-            defaultMessage: `Error updating '{packageConfigName}'`,
+          title: i18n.translate('xpack.ingestManager.editPackagePolicy.failedNotificationTitle', {
+            defaultMessage: `Error updating '{packagePolicyName}'`,
             values: {
-              packageConfigName: packageConfig.name,
+              packagePolicyName: packagePolicy.name,
             },
           }),
           toastMessage: i18n.translate(
-            'xpack.ingestManager.editPackageConfig.failedConflictNotificationMessage',
+            'xpack.ingestManager.editPackagePolicy.failedConflictNotificationMessage',
             {
-              defaultMessage: `Data is out of date. Refresh the page to get the latest configuration.`,
+              defaultMessage: `Data is out of date. Refresh the page to get the latest policy.`,
             }
           ),
         });
       } else {
         notifications.toasts.addError(error, {
-          title: i18n.translate('xpack.ingestManager.editPackageConfig.failedNotificationTitle', {
-            defaultMessage: `Error updating '{packageConfigName}'`,
+          title: i18n.translate('xpack.ingestManager.editPackagePolicy.failedNotificationTitle', {
+            defaultMessage: `Error updating '{packagePolicyName}'`,
             values: {
-              packageConfigName: packageConfig.name,
+              packagePolicyName: packagePolicy.name,
             },
           }),
         });
@@ -274,72 +274,72 @@ export const EditPackageConfigPage: React.FunctionComponent = () => {
   };
 
   const layoutProps = {
-    from: 'edit' as CreatePackageConfigFrom,
+    from: 'edit' as CreatePackagePolicyFrom,
     cancelUrl,
-    agentConfig,
+    agentPolicy,
     packageInfo,
   };
 
   const configurePackage = useMemo(
     () =>
-      agentConfig && packageInfo ? (
+      agentPolicy && packageInfo ? (
         <>
-          <StepDefinePackageConfig
-            agentConfig={agentConfig}
+          <StepDefinePackagePolicy
+            agentPolicy={agentPolicy}
             packageInfo={packageInfo}
-            packageConfig={packageConfig}
-            updatePackageConfig={updatePackageConfig}
+            packagePolicy={packagePolicy}
+            updatePackagePolicy={updatePackagePolicy}
             validationResults={validationResults!}
           />
 
-          <StepConfigurePackage
+          <StepConfigurePackagePolicy
             from={'edit'}
             packageInfo={packageInfo}
-            packageConfig={packageConfig}
-            packageConfigId={packageConfigId}
-            updatePackageConfig={updatePackageConfig}
+            packagePolicy={packagePolicy}
+            packagePolicyId={packagePolicyId}
+            updatePackagePolicy={updatePackagePolicy}
             validationResults={validationResults!}
             submitAttempted={formState === 'INVALID'}
           />
         </>
       ) : null,
     [
-      agentConfig,
+      agentPolicy,
       formState,
-      packageConfig,
-      packageConfigId,
+      packagePolicy,
+      packagePolicyId,
       packageInfo,
-      updatePackageConfig,
+      updatePackagePolicy,
       validationResults,
     ]
   );
 
   return (
-    <CreatePackageConfigPageLayout {...layoutProps} data-test-subj="editPackageConfig">
+    <CreatePackagePolicyPageLayout {...layoutProps} data-test-subj="editPackagePolicy">
       {isLoadingData ? (
         <Loading />
-      ) : loadingError || !agentConfig || !packageInfo ? (
+      ) : loadingError || !agentPolicy || !packageInfo ? (
         <Error
           title={
             <FormattedMessage
-              id="xpack.ingestManager.editPackageConfig.errorLoadingDataTitle"
+              id="xpack.ingestManager.editPackagePolicy.errorLoadingDataTitle"
               defaultMessage="Error loading data"
             />
           }
           error={
             loadingError ||
-            i18n.translate('xpack.ingestManager.editPackageConfig.errorLoadingDataMessage', {
+            i18n.translate('xpack.ingestManager.editPackagePolicy.errorLoadingDataMessage', {
               defaultMessage: 'There was an error loading this intergration information',
             })
           }
         />
       ) : (
         <>
-          <Breadcrumb configName={agentConfig.name} configId={configId} />
+          <Breadcrumb policyName={agentPolicy.name} policyId={policyId} />
           {formState === 'CONFIRM' && (
-            <ConfirmDeployConfigModal
+            <ConfirmDeployAgentPolicyModal
               agentCount={agentCount}
-              agentConfig={agentConfig}
+              agentPolicy={agentPolicy}
               onConfirm={onSubmit}
               onCancel={() => setFormState('VALID')}
             />
@@ -358,10 +358,10 @@ export const EditPackageConfigPage: React.FunctionComponent = () => {
           >
             <EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
               <EuiFlexItem grow={false}>
-                {agentConfig && packageInfo && formState === 'INVALID' ? (
+                {agentPolicy && packageInfo && formState === 'INVALID' ? (
                   <FormattedMessage
-                    id="xpack.ingestManager.createPackageConfig.errorOnSaveText"
-                    defaultMessage="Your integration configuration has errors. Please fix them before saving."
+                    id="xpack.ingestManager.createPackagePolicy.errorOnSaveText"
+                    defaultMessage="Your integration policy has errors. Please fix them before saving."
                   />
                 ) : null}
               </EuiFlexItem>
@@ -370,7 +370,7 @@ export const EditPackageConfigPage: React.FunctionComponent = () => {
                   <EuiFlexItem grow={false}>
                     <EuiButtonEmpty color="ghost" href={cancelUrl}>
                       <FormattedMessage
-                        id="xpack.ingestManager.editPackageConfig.cancelButton"
+                        id="xpack.ingestManager.editPackagePolicy.cancelButton"
                         defaultMessage="Cancel"
                       />
                     </EuiButtonEmpty>
@@ -385,7 +385,7 @@ export const EditPackageConfigPage: React.FunctionComponent = () => {
                       fill
                     >
                       <FormattedMessage
-                        id="xpack.ingestManager.editPackageConfig.saveButton"
+                        id="xpack.ingestManager.editPackagePolicy.saveButton"
                         defaultMessage="Save integration"
                       />
                     </EuiButton>
@@ -396,14 +396,14 @@ export const EditPackageConfigPage: React.FunctionComponent = () => {
           </EuiBottomBar>
         </>
       )}
-    </CreatePackageConfigPageLayout>
+    </CreatePackagePolicyPageLayout>
   );
 };
 
-const Breadcrumb: React.FunctionComponent<{ configName: string; configId: string }> = ({
-  configName,
-  configId,
+const Breadcrumb: React.FunctionComponent<{ policyName: string; policyId: string }> = ({
+  policyName,
+  policyId,
 }) => {
-  useBreadcrumbs('edit_integration', { configName, configId });
+  useBreadcrumbs('edit_integration', { policyName, policyId });
   return null;
 };
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/index.tsx
new file mode 100644
index 0000000000000..ed6d1a6e4610c
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/index.tsx
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React from 'react';
+import { HashRouter as Router, Switch, Route } from 'react-router-dom';
+import { PAGE_ROUTING_PATHS } from '../../constants';
+import { useBreadcrumbs } from '../../hooks';
+import { AgentPolicyListPage } from './list_page';
+import { AgentPolicyDetailsPage } from './details_page';
+import { CreatePackagePolicyPage } from './create_package_policy_page';
+import { EditPackagePolicyPage } from './edit_package_policy_page';
+
+export const AgentPolicyApp: React.FunctionComponent = () => {
+  useBreadcrumbs('policies');
+
+  return (
+    <Router>
+      <Switch>
+        <Route path={PAGE_ROUTING_PATHS.edit_integration}>
+          <EditPackagePolicyPage />
+        </Route>
+        <Route path={PAGE_ROUTING_PATHS.add_integration_from_policy}>
+          <CreatePackagePolicyPage />
+        </Route>
+        <Route path={PAGE_ROUTING_PATHS.policy_details}>
+          <AgentPolicyDetailsPage />
+        </Route>
+        <Route path={PAGE_ROUTING_PATHS.policies_list}>
+          <AgentPolicyListPage />
+        </Route>
+      </Switch>
+    </Router>
+  );
+};
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/components/create_config.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/list_page/components/create_agent_policy.tsx
similarity index 65%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/components/create_config.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/list_page/components/create_agent_policy.tsx
index 749716b473c85..b072990727e3c 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/components/create_config.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/list_page/components/create_agent_policy.tsx
@@ -21,25 +21,25 @@ import {
   EuiFlyoutProps,
   EuiSpacer,
 } from '@elastic/eui';
-import { NewAgentConfig, AgentConfig } from '../../../../types';
-import { useCapabilities, useCore, sendCreateAgentConfig } from '../../../../hooks';
-import { AgentConfigForm, agentConfigFormValidation } from '../../components';
+import { NewAgentPolicy, AgentPolicy } from '../../../../types';
+import { useCapabilities, useCore, sendCreateAgentPolicy } from '../../../../hooks';
+import { AgentPolicyForm, agentPolicyFormValidation } from '../../components';
 
 const FlyoutWithHigherZIndex = styled(EuiFlyout)`
   z-index: ${(props) => props.theme.eui.euiZLevel5};
 `;
 
 interface Props extends EuiFlyoutProps {
-  onClose: (createdAgentConfig?: AgentConfig) => void;
+  onClose: (createdAgentPolicy?: AgentPolicy) => void;
 }
 
-export const CreateAgentConfigFlyout: React.FunctionComponent<Props> = ({
+export const CreateAgentPolicyFlyout: React.FunctionComponent<Props> = ({
   onClose,
   ...restOfProps
 }) => {
   const { notifications } = useCore();
   const hasWriteCapabilites = useCapabilities().write;
-  const [agentConfig, setAgentConfig] = useState<NewAgentConfig>({
+  const [agentPolicy, setAgentPolicy] = useState<NewAgentPolicy>({
     name: '',
     description: '',
     namespace: 'default',
@@ -48,26 +48,26 @@ export const CreateAgentConfigFlyout: React.FunctionComponent<Props> = ({
   });
   const [isLoading, setIsLoading] = useState<boolean>(false);
   const [withSysMonitoring, setWithSysMonitoring] = useState<boolean>(true);
-  const validation = agentConfigFormValidation(agentConfig);
+  const validation = agentPolicyFormValidation(agentPolicy);
 
-  const updateAgentConfig = (updatedFields: Partial<NewAgentConfig>) => {
-    setAgentConfig({
-      ...agentConfig,
+  const updateAgentPolicy = (updatedFields: Partial<NewAgentPolicy>) => {
+    setAgentPolicy({
+      ...agentPolicy,
       ...updatedFields,
     });
   };
 
-  const createAgentConfig = async () => {
-    return await sendCreateAgentConfig(agentConfig, { withSysMonitoring });
+  const createAgentPolicy = async () => {
+    return await sendCreateAgentPolicy(agentPolicy, { withSysMonitoring });
   };
 
   const header = (
-    <EuiFlyoutHeader hasBorder aria-labelledby="CreateAgentConfigFlyoutTitle">
+    <EuiFlyoutHeader hasBorder aria-labelledby="CreateAgentPolicyFlyoutTitle">
       <EuiTitle size="m">
-        <h2 id="CreateAgentConfigFlyoutTitle">
+        <h2 id="CreateAgentPolicyFlyoutTitle">
           <FormattedMessage
-            id="xpack.ingestManager.createAgentConfig.flyoutTitle"
-            defaultMessage="Create agent configuration"
+            id="xpack.ingestManager.createAgentPolicy.flyoutTitle"
+            defaultMessage="Create agent policy"
           />
         </h2>
       </EuiTitle>
@@ -75,8 +75,8 @@ export const CreateAgentConfigFlyout: React.FunctionComponent<Props> = ({
       <EuiText size="s">
         <p>
           <FormattedMessage
-            id="xpack.ingestManager.createAgentConfig.flyoutTitleDescription"
-            defaultMessage="Agent configurations are used to manage settings across a group of agents. You can add integrations to your agent configuration to specify what data your agents collect. When you edit an agent configuration, you can use Fleet to deploy updates to a specified group of agents."
+            id="xpack.ingestManager.createAgentPolicy.flyoutTitleDescription"
+            defaultMessage="Agent policies are used to manage settings across a group of agents. You can add integrations to your agent policy to specify what data your agents collect. When you edit an agent policy, you can use Fleet to deploy updates to a specified group of agents."
           />
         </p>
       </EuiText>
@@ -85,9 +85,9 @@ export const CreateAgentConfigFlyout: React.FunctionComponent<Props> = ({
 
   const body = (
     <EuiFlyoutBody>
-      <AgentConfigForm
-        agentConfig={agentConfig}
-        updateAgentConfig={updateAgentConfig}
+      <AgentPolicyForm
+        agentPolicy={agentPolicy}
+        updateAgentPolicy={updateAgentPolicy}
         withSysMonitoring={withSysMonitoring}
         updateSysMonitoring={(newValue) => setWithSysMonitoring(newValue)}
         validation={validation}
@@ -101,7 +101,7 @@ export const CreateAgentConfigFlyout: React.FunctionComponent<Props> = ({
         <EuiFlexItem grow={false}>
           <EuiButtonEmpty onClick={() => onClose()} flush="left">
             <FormattedMessage
-              id="xpack.ingestManager.createAgentConfig.cancelButtonLabel"
+              id="xpack.ingestManager.createAgentPolicy.cancelButtonLabel"
               defaultMessage="Cancel"
             />
           </EuiButtonEmpty>
@@ -114,15 +114,15 @@ export const CreateAgentConfigFlyout: React.FunctionComponent<Props> = ({
             onClick={async () => {
               setIsLoading(true);
               try {
-                const { data, error } = await createAgentConfig();
+                const { data, error } = await createAgentPolicy();
                 setIsLoading(false);
                 if (data?.success) {
                   notifications.toasts.addSuccess(
                     i18n.translate(
-                      'xpack.ingestManager.createAgentConfig.successNotificationTitle',
+                      'xpack.ingestManager.createAgentPolicy.successNotificationTitle',
                       {
-                        defaultMessage: "Agent config '{name}' created",
-                        values: { name: agentConfig.name },
+                        defaultMessage: "Agent policy '{name}' created",
+                        values: { name: agentPolicy.name },
                       }
                     )
                   );
@@ -132,9 +132,9 @@ export const CreateAgentConfigFlyout: React.FunctionComponent<Props> = ({
                     error
                       ? error.message
                       : i18n.translate(
-                          'xpack.ingestManager.createAgentConfig.errorNotificationTitle',
+                          'xpack.ingestManager.createAgentPolicy.errorNotificationTitle',
                           {
-                            defaultMessage: 'Unable to create agent config',
+                            defaultMessage: 'Unable to create agent policy',
                           }
                         )
                   );
@@ -142,16 +142,16 @@ export const CreateAgentConfigFlyout: React.FunctionComponent<Props> = ({
               } catch (e) {
                 setIsLoading(false);
                 notifications.toasts.addDanger(
-                  i18n.translate('xpack.ingestManager.createAgentConfig.errorNotificationTitle', {
-                    defaultMessage: 'Unable to create agent config',
+                  i18n.translate('xpack.ingestManager.createAgentPolicy.errorNotificationTitle', {
+                    defaultMessage: 'Unable to create agent policy',
                   })
                 );
               }
             }}
           >
             <FormattedMessage
-              id="xpack.ingestManager.createAgentConfig.submitButtonLabel"
-              defaultMessage="Create agent configuration"
+              id="xpack.ingestManager.createAgentPolicy.submitButtonLabel"
+              defaultMessage="Create agent policy"
             />
           </EuiButton>
         </EuiFlexItem>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/components/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/list_page/components/index.ts
similarity index 78%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/components/index.ts
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/list_page/components/index.ts
index 43668b4ffb804..de95b6748eb6c 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/components/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/list_page/components/index.ts
@@ -3,4 +3,4 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-export { CreateAgentConfigFlyout } from './create_config';
+export { CreateAgentPolicyFlyout } from './create_agent_policy';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/list_page/index.tsx
similarity index 61%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/index.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/list_page/index.tsx
index 229adb946412b..361b1c33f1a04 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/list_page/index.tsx
@@ -21,12 +21,12 @@ import { CriteriaWithPagination } from '@elastic/eui/src/components/basic_table/
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage, FormattedDate } from '@kbn/i18n/react';
 import { useHistory } from 'react-router-dom';
-import { AgentConfig } from '../../../types';
-import { AGENT_CONFIG_SAVED_OBJECT_TYPE } from '../../../constants';
+import { AgentPolicy } from '../../../types';
+import { AGENT_POLICY_SAVED_OBJECT_TYPE } from '../../../constants';
 import { WithHeaderLayout } from '../../../layouts';
 import {
   useCapabilities,
-  useGetAgentConfigs,
+  useGetAgentPolicies,
   usePagination,
   useSorting,
   useLink,
@@ -35,10 +35,10 @@ import {
   useBreadcrumbs,
 } from '../../../hooks';
 import { SearchBar } from '../../../components';
-import { LinkedAgentCount, AgentConfigActionMenu } from '../components';
-import { CreateAgentConfigFlyout } from './components';
+import { LinkedAgentCount, AgentPolicyActionMenu } from '../components';
+import { CreateAgentPolicyFlyout } from './components';
 
-const AgentConfigListPageLayout: React.FunctionComponent = ({ children }) => (
+const AgentPolicyListPageLayout: React.FunctionComponent = ({ children }) => (
   <WithHeaderLayout
     leftColumn={
       <EuiFlexGroup direction="column" gutterSize="m">
@@ -46,8 +46,8 @@ const AgentConfigListPageLayout: React.FunctionComponent = ({ children }) => (
           <EuiText>
             <h1>
               <FormattedMessage
-                id="xpack.ingestManager.agentConfigList.pageTitle"
-                defaultMessage="Agent Configurations"
+                id="xpack.ingestManager.agentPolicyList.pageTitle"
+                defaultMessage="Agent policies"
               />
             </h1>
           </EuiText>
@@ -56,8 +56,8 @@ const AgentConfigListPageLayout: React.FunctionComponent = ({ children }) => (
           <EuiText color="subdued">
             <p>
               <FormattedMessage
-                id="xpack.ingestManager.agentConfigList.pageSubtitle"
-                defaultMessage="Use agent configurations to manage your agents and the data they collect."
+                id="xpack.ingestManager.agentPolicyList.pageSubtitle"
+                defaultMessage="Use agent policies to manage your agents and the data they collect."
               />
             </p>
           </EuiText>
@@ -69,10 +69,9 @@ const AgentConfigListPageLayout: React.FunctionComponent = ({ children }) => (
   </WithHeaderLayout>
 );
 
-export const AgentConfigListPage: React.FunctionComponent<{}> = () => {
-  useBreadcrumbs('configurations_list');
+export const AgentPolicyListPage: React.FunctionComponent<{}> = () => {
+  useBreadcrumbs('policies_list');
   const { getHref, getPath } = useLink();
-  // Config information
   const hasWriteCapabilites = useCapabilities().write;
   const {
     fleet: { enabled: isFleetEnabled },
@@ -86,30 +85,30 @@ export const AgentConfigListPage: React.FunctionComponent<{}> = () => {
       : urlParams.kuery ?? ''
   );
   const { pagination, pageSizeOptions, setPagination } = usePagination();
-  const { sorting, setSorting } = useSorting<AgentConfig>({
+  const { sorting, setSorting } = useSorting<AgentPolicy>({
     field: 'updated_at',
     direction: 'desc',
   });
   const history = useHistory();
-  const isCreateAgentConfigFlyoutOpen = 'create' in urlParams;
-  const setIsCreateAgentConfigFlyoutOpen = useCallback(
+  const isCreateAgentPolicyFlyoutOpen = 'create' in urlParams;
+  const setIsCreateAgentPolicyFlyoutOpen = useCallback(
     (isOpen: boolean) => {
-      if (isOpen !== isCreateAgentConfigFlyoutOpen) {
+      if (isOpen !== isCreateAgentPolicyFlyoutOpen) {
         if (isOpen) {
           history.push(
-            `${getPath('configurations_list')}?${toUrlParams({ ...urlParams, create: null })}`
+            `${getPath('policies_list')}?${toUrlParams({ ...urlParams, create: null })}`
           );
         } else {
           const { create, ...params } = urlParams;
-          history.push(`${getPath('configurations_list')}?${toUrlParams(params)}`);
+          history.push(`${getPath('policies_list')}?${toUrlParams(params)}`);
         }
       }
     },
-    [getPath, history, isCreateAgentConfigFlyoutOpen, toUrlParams, urlParams]
+    [getPath, history, isCreateAgentPolicyFlyoutOpen, toUrlParams, urlParams]
   );
 
-  // Fetch agent configs
-  const { isLoading, data: agentConfigData, sendRequest } = useGetAgentConfigs({
+  // Fetch agent policies
+  const { isLoading, data: agentPolicyData, sendRequest } = useGetAgentPolicies({
     page: pagination.currentPage,
     perPage: pagination.pageSize,
     sortField: sorting?.field,
@@ -117,35 +116,35 @@ export const AgentConfigListPage: React.FunctionComponent<{}> = () => {
     kuery: search,
   });
 
-  // Some configs retrieved, set up table props
+  // Some policies retrieved, set up table props
   const columns = useMemo(() => {
     const cols: Array<
-      EuiTableFieldDataColumnType<AgentConfig> | EuiTableActionsColumnType<AgentConfig>
+      EuiTableFieldDataColumnType<AgentPolicy> | EuiTableActionsColumnType<AgentPolicy>
     > = [
       {
         field: 'name',
         sortable: true,
-        name: i18n.translate('xpack.ingestManager.agentConfigList.nameColumnTitle', {
+        name: i18n.translate('xpack.ingestManager.agentPolicyList.nameColumnTitle', {
           defaultMessage: 'Name',
         }),
         width: '20%',
-        render: (name: string, agentConfig: AgentConfig) => (
+        render: (name: string, agentPolicy: AgentPolicy) => (
           <EuiFlexGroup gutterSize="s" alignItems="baseline" style={{ minWidth: 0 }}>
             <EuiFlexItem grow={false} className="eui-textTruncate">
               <EuiLink
                 className="eui-textTruncate"
-                href={getHref('configuration_details', { configId: agentConfig.id })}
-                title={name || agentConfig.id}
+                href={getHref('policy_details', { policyId: agentPolicy.id })}
+                title={name || agentPolicy.id}
               >
-                {name || agentConfig.id}
+                {name || agentPolicy.id}
               </EuiLink>
             </EuiFlexItem>
             <EuiFlexItem grow={true}>
               <EuiText color="subdued" size="xs" style={{ whiteSpace: 'nowrap' }}>
                 <FormattedMessage
-                  id="xpack.ingestManager.agentConfigList.revisionNumber"
+                  id="xpack.ingestManager.agentPolicyList.revisionNumber"
                   defaultMessage="rev. {revNumber}"
-                  values={{ revNumber: agentConfig.revision }}
+                  values={{ revNumber: agentPolicy.revision }}
                 />
               </EuiText>
             </EuiFlexItem>
@@ -154,7 +153,7 @@ export const AgentConfigListPage: React.FunctionComponent<{}> = () => {
       },
       {
         field: 'description',
-        name: i18n.translate('xpack.ingestManager.agentConfigList.descriptionColumnTitle', {
+        name: i18n.translate('xpack.ingestManager.agentPolicyList.descriptionColumnTitle', {
           defaultMessage: 'Description',
         }),
         width: '35%',
@@ -167,40 +166,46 @@ export const AgentConfigListPage: React.FunctionComponent<{}> = () => {
       {
         field: 'updated_at',
         sortable: true,
-        name: i18n.translate('xpack.ingestManager.agentConfigList.updatedOnColumnTitle', {
+        name: i18n.translate('xpack.ingestManager.agentPolicyList.updatedOnColumnTitle', {
           defaultMessage: 'Last updated on',
         }),
-        render: (date: AgentConfig['updated_at']) => (
+        render: (date: AgentPolicy['updated_at']) => (
           <FormattedDate value={date} year="numeric" month="short" day="2-digit" />
         ),
       },
       {
         field: 'agents',
-        name: i18n.translate('xpack.ingestManager.agentConfigList.agentsColumnTitle', {
+        name: i18n.translate('xpack.ingestManager.agentPolicyList.agentsColumnTitle', {
           defaultMessage: 'Agents',
         }),
         dataType: 'number',
-        render: (agents: number, config: AgentConfig) => (
-          <LinkedAgentCount count={agents} agentConfigId={config.id} />
+        render: (agents: number, agentPolicy: AgentPolicy) => (
+          <LinkedAgentCount count={agents} agentPolicyId={agentPolicy.id} />
         ),
       },
       {
-        field: 'package_configs',
-        name: i18n.translate('xpack.ingestManager.agentConfigList.packageConfigsCountColumnTitle', {
-          defaultMessage: 'Integrations',
-        }),
+        field: 'package_policies',
+        name: i18n.translate(
+          'xpack.ingestManager.agentPolicyList.packagePoliciesCountColumnTitle',
+          {
+            defaultMessage: 'Integrations',
+          }
+        ),
         dataType: 'number',
-        render: (packageConfigs: AgentConfig['package_configs']) =>
-          packageConfigs ? packageConfigs.length : 0,
+        render: (packagePolicies: AgentPolicy['package_policies']) =>
+          packagePolicies ? packagePolicies.length : 0,
       },
       {
-        name: i18n.translate('xpack.ingestManager.agentConfigList.actionsColumnTitle', {
+        name: i18n.translate('xpack.ingestManager.agentPolicyList.actionsColumnTitle', {
           defaultMessage: 'Actions',
         }),
         actions: [
           {
-            render: (config: AgentConfig) => (
-              <AgentConfigActionMenu config={config} onCopySuccess={() => sendRequest()} />
+            render: (agentPolicy: AgentPolicy) => (
+              <AgentPolicyActionMenu
+                agentPolicy={agentPolicy}
+                onCopySuccess={() => sendRequest()}
+              />
             ),
           },
         ],
@@ -215,21 +220,21 @@ export const AgentConfigListPage: React.FunctionComponent<{}> = () => {
     return cols;
   }, [getHref, isFleetEnabled, sendRequest]);
 
-  const createAgentConfigButton = useMemo(
+  const createAgentPolicyButton = useMemo(
     () => (
       <EuiButton
         fill
         iconType="plusInCircle"
         isDisabled={!hasWriteCapabilites}
-        onClick={() => setIsCreateAgentConfigFlyoutOpen(true)}
+        onClick={() => setIsCreateAgentPolicyFlyoutOpen(true)}
       >
         <FormattedMessage
-          id="xpack.ingestManager.agentConfigList.addButton"
-          defaultMessage="Create agent configuration"
+          id="xpack.ingestManager.agentPolicyList.addButton"
+          defaultMessage="Create agent policy"
         />
       </EuiButton>
     ),
-    [hasWriteCapabilites, setIsCreateAgentConfigFlyoutOpen]
+    [hasWriteCapabilites, setIsCreateAgentPolicyFlyoutOpen]
   );
 
   const emptyPrompt = useMemo(
@@ -238,18 +243,18 @@ export const AgentConfigListPage: React.FunctionComponent<{}> = () => {
         title={
           <h2>
             <FormattedMessage
-              id="xpack.ingestManager.agentConfigList.noAgentConfigsPrompt"
-              defaultMessage="No agent configurations"
+              id="xpack.ingestManager.agentPolicyList.noAgentPoliciesPrompt"
+              defaultMessage="No agent policies"
             />
           </h2>
         }
-        actions={createAgentConfigButton}
+        actions={createAgentPolicyButton}
       />
     ),
-    [createAgentConfigButton]
+    [createAgentPolicyButton]
   );
 
-  const onTableChange = (criteria: CriteriaWithPagination<AgentConfig>) => {
+  const onTableChange = (criteria: CriteriaWithPagination<AgentPolicy>) => {
     const newPagination = {
       ...pagination,
       currentPage: criteria.page.index + 1,
@@ -260,11 +265,11 @@ export const AgentConfigListPage: React.FunctionComponent<{}> = () => {
   };
 
   return (
-    <AgentConfigListPageLayout>
-      {isCreateAgentConfigFlyoutOpen ? (
-        <CreateAgentConfigFlyout
+    <AgentPolicyListPageLayout>
+      {isCreateAgentPolicyFlyoutOpen ? (
+        <CreateAgentPolicyFlyout
           onClose={() => {
-            setIsCreateAgentConfigFlyoutOpen(false);
+            setIsCreateAgentPolicyFlyoutOpen(false);
             sendRequest();
           }}
         />
@@ -280,41 +285,41 @@ export const AgentConfigListPage: React.FunctionComponent<{}> = () => {
               });
               setSearch(newSearch);
             }}
-            fieldPrefix={AGENT_CONFIG_SAVED_OBJECT_TYPE}
+            fieldPrefix={AGENT_POLICY_SAVED_OBJECT_TYPE}
           />
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
           <EuiButton color="primary" iconType="refresh" onClick={() => sendRequest()}>
             <FormattedMessage
-              id="xpack.ingestManager.agentConfigList.reloadAgentConfigsButtonText"
+              id="xpack.ingestManager.agentPolicyList.reloadAgentPoliciesButtonText"
               defaultMessage="Reload"
             />
           </EuiButton>
         </EuiFlexItem>
-        <EuiFlexItem grow={false}>{createAgentConfigButton}</EuiFlexItem>
+        <EuiFlexItem grow={false}>{createAgentPolicyButton}</EuiFlexItem>
       </EuiFlexGroup>
 
       <EuiSpacer size="m" />
-      <EuiBasicTable<AgentConfig>
+      <EuiBasicTable<AgentPolicy>
         loading={isLoading}
         hasActions={true}
         noItemsMessage={
           isLoading ? (
             <FormattedMessage
-              id="xpack.ingestManager.agentConfigList.loadingAgentConfigsMessage"
-              defaultMessage="Loading agent configurations…"
+              id="xpack.ingestManager.agentPolicyList.loadingAgentPoliciesMessage"
+              defaultMessage="Loading agent policies…"
             />
-          ) : !search.trim() && (agentConfigData?.total ?? 0) === 0 ? (
+          ) : !search.trim() && (agentPolicyData?.total ?? 0) === 0 ? (
             emptyPrompt
           ) : (
             <FormattedMessage
-              id="xpack.ingestManager.agentConfigList.noFilteredAgentConfigsPrompt"
-              defaultMessage="No agent configurations found. {clearFiltersLink}"
+              id="xpack.ingestManager.agentPolicyList.noFilteredAgentPoliciesPrompt"
+              defaultMessage="No agent policies found. {clearFiltersLink}"
               values={{
                 clearFiltersLink: (
                   <EuiLink onClick={() => setSearch('')}>
                     <FormattedMessage
-                      id="xpack.ingestManager.agentConfigList.clearFiltersLinkText"
+                      id="xpack.ingestManager.agentPolicyList.clearFiltersLinkText"
                       defaultMessage="Clear filters"
                     />
                   </EuiLink>
@@ -323,19 +328,19 @@ export const AgentConfigListPage: React.FunctionComponent<{}> = () => {
             />
           )
         }
-        items={agentConfigData ? agentConfigData.items : []}
+        items={agentPolicyData ? agentPolicyData.items : []}
         itemId="id"
         columns={columns}
         isSelectable={false}
         pagination={{
           pageIndex: pagination.currentPage - 1,
           pageSize: pagination.pageSize,
-          totalItemCount: agentConfigData ? agentConfigData.total : 0,
+          totalItemCount: agentPolicyData ? agentPolicyData.total : 0,
           pageSizeOptions,
         }}
         sorting={{ sort: sorting }}
         onChange={onTableChange}
       />
-    </AgentConfigListPageLayout>
+    </AgentPolicyListPageLayout>
   );
 };
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/data_stream/list_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/data_stream/list_page/index.tsx
index 39e6d90e64bea..d8ab46fbf87f7 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/data_stream/list_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/data_stream/list_page/index.tsx
@@ -66,7 +66,7 @@ export const DataStreamListPage: React.FunctionComponent<{}> = () => {
   // Fetch data streams
   const { isLoading, data: dataStreamsData, sendRequest } = useGetDataStreams();
 
-  // Some configs retrieved, set up table props
+  // Some policies retrieved, set up table props
   const columns = useMemo(() => {
     const cols: Array<
       EuiTableFieldDataColumnType<DataStream> | EuiTableActionsColumnType<DataStream>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/index.tsx
index f15b7d7f182a8..b605b882bc82c 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/index.tsx
@@ -8,7 +8,7 @@ import React from 'react';
 import { HashRouter as Router, Switch, Route } from 'react-router-dom';
 import { PAGE_ROUTING_PATHS } from '../../constants';
 import { useBreadcrumbs } from '../../hooks';
-import { CreatePackageConfigPage } from '../agent_config/create_package_config_page';
+import { CreatePackagePolicyPage } from '../agent_policy/create_package_policy_page';
 import { EPMHomePage } from './screens/home';
 import { Detail } from './screens/detail';
 
@@ -18,8 +18,8 @@ export const EPMApp: React.FunctionComponent = () => {
   return (
     <Router>
       <Switch>
-        <Route path={PAGE_ROUTING_PATHS.add_integration_to_configuration}>
-          <CreatePackageConfigPage />
+        <Route path={PAGE_ROUTING_PATHS.add_integration_to_policy}>
+          <CreatePackagePolicyPage />
         </Route>
         <Route path={PAGE_ROUTING_PATHS.integration_details}>
           <Detail />
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/confirm_package_uninstall.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/confirm_package_uninstall.tsx
index 11cdbe0be7b62..f4d5226ebe950 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/confirm_package_uninstall.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/confirm_package_uninstall.tsx
@@ -56,7 +56,7 @@ export const ConfirmPackageUninstall = (props: ConfirmPackageUninstallProps) =>
           <p>
             <FormattedMessage
               id="xpack.ingestManager.integrations.settings.confirmUninstallModal.uninstallCallout.description"
-              defaultMessage="Kibana and Elasticsearch assets that were created by this integration will be removed. Agents configurations and any data sent by your agents will not be effected."
+              defaultMessage="Kibana and Elasticsearch assets that were created by this integration will be removed. Agents policies and any data sent by your agents will not be effected."
             />
           </p>
         </EuiCallOut>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/content.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/content.tsx
index f53b4e9150ca1..0443915d8224c 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/content.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/content.tsx
@@ -13,7 +13,7 @@ import { AssetsFacetGroup } from '../../components/assets_facet_group';
 import { CenterColumn, LeftColumn, RightColumn } from './layout';
 import { OverviewPanel } from './overview_panel';
 import { SideNavLinks } from './side_nav_links';
-import { PackageConfigsPanel } from './package_configs_panel';
+import { PackagePoliciesPanel } from './package_policies_panel';
 import { SettingsPanel } from './settings_panel';
 
 type ContentProps = PackageInfo & Pick<DetailParams, 'panel'>;
@@ -63,7 +63,7 @@ export function ContentPanel(props: ContentPanelProps) {
         />
       );
     case 'usages':
-      return <PackageConfigsPanel name={name} version={version} />;
+      return <PackagePoliciesPanel name={name} version={version} />;
     case 'overview':
     default:
       return <OverviewPanel {...props} />;
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/index.tsx
index 3267fbbe3733c..84d3f97f3ee05 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/index.tsx
@@ -182,12 +182,12 @@ export function Detail() {
                     fill
                     isDisabled={!hasWriteCapabilites}
                     iconType="plusInCircle"
-                    href={getHref('add_integration_to_configuration', {
+                    href={getHref('add_integration_to_policy', {
                       pkgkey,
                     })}
                   >
                     <FormattedMessage
-                      id="xpack.ingestManager.epm.addPackageConfigButtonText"
+                      id="xpack.ingestManager.epm.addPackagePolicyButtonText"
                       defaultMessage="Add {packageName}"
                       values={{
                         packageName: packageInfo.title,
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/package_configs_panel.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/package_policies_panel.tsx
similarity index 88%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/package_configs_panel.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/package_policies_panel.tsx
index 8f22d17984840..d97d891ac5e5d 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/package_configs_panel.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/package_policies_panel.tsx
@@ -10,11 +10,11 @@ import { useGetPackageInstallStatus } from '../../hooks';
 import { InstallStatus } from '../../../../types';
 import { useLink } from '../../../../hooks';
 
-interface PackageConfigsPanelProps {
+interface PackagePoliciesPanelProps {
   name: string;
   version: string;
 }
-export const PackageConfigsPanel = ({ name, version }: PackageConfigsPanelProps) => {
+export const PackagePoliciesPanel = ({ name, version }: PackagePoliciesPanelProps) => {
   const { getPath } = useLink();
   const getPackageInstallStatus = useGetPackageInstallStatus();
   const packageInstallStatus = getPackageInstallStatus(name);
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/settings_panel.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/settings_panel.tsx
index 4832a89479026..4ac6fe6872e17 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/settings_panel.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/settings_panel.tsx
@@ -10,8 +10,8 @@ import { EuiTitle, EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
 import { EuiSpacer } from '@elastic/eui';
 import styled from 'styled-components';
 import { InstallStatus, PackageInfo } from '../../../../types';
-import { useGetPackageConfigs } from '../../../../hooks';
-import { PACKAGE_CONFIG_SAVED_OBJECT_TYPE } from '../../../../constants';
+import { useGetPackagePolicies } from '../../../../hooks';
+import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../../constants';
 import { useGetPackageInstallStatus } from '../../hooks';
 import { InstallationButton } from './installation_button';
 import { UpdateIcon } from '../../components/icons';
@@ -46,13 +46,13 @@ export const SettingsPanel = (
 ) => {
   const { name, title, removable, latestVersion, version } = props;
   const getPackageInstallStatus = useGetPackageInstallStatus();
-  const { data: packageConfigsData } = useGetPackageConfigs({
+  const { data: packagePoliciesData } = useGetPackagePolicies({
     perPage: 0,
     page: 1,
-    kuery: `${PACKAGE_CONFIG_SAVED_OBJECT_TYPE}.package.name:${props.name}`,
+    kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name:${props.name}`,
   });
   const { status: installationStatus, version: installedVersion } = getPackageInstallStatus(name);
-  const packageHasUsages = !!packageConfigsData?.total;
+  const packageHasUsages = !!packagePoliciesData?.total;
   const updateAvailable = installedVersion && installedVersion < latestVersion ? true : false;
   const isViewingOldPackage = version < latestVersion;
   // hide install/remove options if the user has version of the package is installed
@@ -185,7 +185,7 @@ export const SettingsPanel = (
               <p>
                 <InstallationButton
                   {...props}
-                  disabled={!packageConfigsData || removable === false ? true : packageHasUsages}
+                  disabled={!packagePoliciesData || removable === false ? true : packageHasUsages}
                 />
               </p>
             </EuiFlexItem>
@@ -194,7 +194,7 @@ export const SettingsPanel = (
             <p>
               <FormattedMessage
                 id="xpack.ingestManager.integrations.settings.packageUninstallNoteDescription.packageUninstallNoteDetail"
-                defaultMessage="{strongNote} {title} cannot be uninstalled because there are active agents that use this integration. To uninstall, remove all {title} integrations from your agent configurations."
+                defaultMessage="{strongNote} {title} cannot be uninstalled because there are active agents that use this integration. To uninstall, remove all {title} integrations from your agent policies."
                 values={{
                   title,
                   strongNote: (
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/side_nav_links.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/side_nav_links.tsx
index 8e9b0bf7d0cfd..c508c8f68611a 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/side_nav_links.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/side_nav_links.tsx
@@ -18,7 +18,7 @@ const PanelDisplayNames: Record<DetailViewPanelName, string> = {
   overview: i18n.translate('xpack.ingestManager.epm.packageDetailsNav.overviewLinkText', {
     defaultMessage: 'Overview',
   }),
-  usages: i18n.translate('xpack.ingestManager.epm.packageDetailsNav.packageConfigsLinkText', {
+  usages: i18n.translate('xpack.ingestManager.epm.packageDetailsNav.packagePoliciesLinkText', {
     defaultMessage: 'Usages',
   }),
   settings: i18n.translate('xpack.ingestManager.epm.packageDetailsNav.settingsLinkText', {
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/actions_menu.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/actions_menu.tsx
index 0f48a230bbf5c..636ff7a5ff989 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/actions_menu.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/actions_menu.tsx
@@ -9,7 +9,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { Agent } from '../../../../types';
 import { useCapabilities } from '../../../../hooks';
 import { ContextMenuActions } from '../../../../components';
-import { AgentUnenrollProvider, AgentReassignConfigFlyout } from '../../components';
+import { AgentUnenrollProvider, AgentReassignAgentPolicyFlyout } from '../../components';
 import { useAgentRefresh } from '../hooks';
 
 export const AgentDetailsActionMenu: React.FunctionComponent<{
@@ -34,7 +34,7 @@ export const AgentDetailsActionMenu: React.FunctionComponent<{
     <>
       {isReassignFlyoutOpen && (
         <EuiPortal>
-          <AgentReassignConfigFlyout agent={agent} onClose={onClose} />
+          <AgentReassignAgentPolicyFlyout agent={agent} onClose={onClose} />
         </EuiPortal>
       )}
       <ContextMenuActions
@@ -54,11 +54,11 @@ export const AgentDetailsActionMenu: React.FunctionComponent<{
               setIsReassignFlyoutOpen(true);
             }}
             disabled={!agent.active}
-            key="reassignConfig"
+            key="reassignPolicy"
           >
             <FormattedMessage
               id="xpack.ingestManager.agentList.reassignActionText"
-              defaultMessage="Assign new agent config"
+              defaultMessage="Assign new agent policy"
             />
           </EuiContextMenuItem>,
           <AgentUnenrollProvider key="unenrollAgent" forceUnenroll={isUnenrolling}>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/agent_details.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/agent_details.tsx
index de0c65d508db9..68abb43abac18 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/agent_details.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/agent_details.tsx
@@ -13,14 +13,14 @@ import {
   EuiLink,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { Agent, AgentConfig } from '../../../../types';
+import { Agent, AgentPolicy } from '../../../../types';
 import { useLink } from '../../../../hooks';
 import { AgentHealth } from '../../components';
 
 export const AgentDetailsContent: React.FunctionComponent<{
   agent: Agent;
-  agentConfig?: AgentConfig;
-}> = memo(({ agent, agentConfig }) => {
+  agentPolicy?: AgentPolicy;
+}> = memo(({ agent, agentPolicy }) => {
   const { getHref } = useLink();
   return (
     <EuiDescriptionList>
@@ -48,18 +48,18 @@ export const AgentDetailsContent: React.FunctionComponent<{
           description: <AgentHealth agent={agent} />,
         },
         {
-          title: i18n.translate('xpack.ingestManager.agentDetails.agentConfigurationLabel', {
-            defaultMessage: 'Agent configuration',
+          title: i18n.translate('xpack.ingestManager.agentDetails.agentPolicyLabel', {
+            defaultMessage: 'Agent policy',
           }),
-          description: agentConfig ? (
+          description: agentPolicy ? (
             <EuiLink
-              href={getHref('configuration_details', { configId: agent.config_id! })}
+              href={getHref('policy_details', { policyId: agent.policy_id! })}
               className="eui-textBreakWord"
             >
-              {agentConfig.name || agent.config_id}
+              {agentPolicy.name || agent.policy_id}
             </EuiLink>
           ) : (
-            agent.config_id || '-'
+            agent.policy_id || '-'
           ),
         },
         {
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/type_labels.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/type_labels.tsx
index 43e4d696ded66..56af9519bc1da 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/type_labels.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/type_labels.tsx
@@ -66,8 +66,8 @@ export const SUBTYPE_LABEL: { [key in AgentEvent['subtype']]: JSX.Element } = {
   CONFIG: (
     <EuiBadge color="hollow">
       <FormattedMessage
-        id="xpack.ingestManager.agentEventSubtype.configLabel"
-        defaultMessage="Config"
+        id="xpack.ingestManager.agentEventSubtype.policyLabel"
+        defaultMessage="Policy"
       />
     </EuiBadge>
   ),
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/index.tsx
index 0bd25ac8cf401..219b343eba41b 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/index.tsx
@@ -19,12 +19,12 @@ import {
 import { Props as EuiTabProps } from '@elastic/eui/src/components/tabs/tab';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import { Agent, AgentConfig, AgentDetailsReassignConfigAction } from '../../../types';
+import { Agent, AgentPolicy, AgentDetailsReassignPolicyAction } from '../../../types';
 import { PAGE_ROUTING_PATHS } from '../../../constants';
 import { Loading, Error } from '../../../components';
 import {
   useGetOneAgent,
-  useGetOneAgentConfig,
+  useGetOneAgentPolicy,
   useLink,
   useBreadcrumbs,
   useCore,
@@ -56,15 +56,15 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
     pollIntervalMs: 5000,
   });
   const {
-    isLoading: isAgentConfigLoading,
-    data: agentConfigData,
-    sendRequest: sendAgentConfigRequest,
-  } = useGetOneAgentConfig(agentData?.item?.config_id);
+    isLoading: isAgentPolicyLoading,
+    data: agentPolicyData,
+    sendRequest: sendAgentPolicyRequest,
+  } = useGetOneAgentPolicy(agentData?.item?.policy_id);
 
   const {
     application: { navigateToApp },
   } = useCore();
-  const routeState = useIntraAppState<AgentDetailsReassignConfigAction>();
+  const routeState = useIntraAppState<AgentDetailsReassignPolicyAction>();
   const queryParams = new URLSearchParams(useLocation().search);
   const openReassignFlyoutOpenByDefault = queryParams.get('openReassignFlyout') === 'true';
 
@@ -127,20 +127,20 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
             },
             { isDivider: true },
             {
-              label: i18n.translate('xpack.ingestManager.agentDetails.configurationLabel', {
-                defaultMessage: 'Configuration',
+              label: i18n.translate('xpack.ingestManager.agentDetails.policyLabel', {
+                defaultMessage: 'Policy',
               }),
-              content: isAgentConfigLoading ? (
+              content: isAgentPolicyLoading ? (
                 <Loading size="m" />
-              ) : agentConfigData?.item ? (
+              ) : agentPolicyData?.item ? (
                 <EuiLink
-                  href={getHref('configuration_details', { configId: agentData.item.config_id! })}
+                  href={getHref('policy_details', { policyId: agentData.item.policy_id! })}
                   className="eui-textBreakWord"
                 >
-                  {agentConfigData.item.name || agentData.item.config_id}
+                  {agentPolicyData.item.name || agentData.item.policy_id}
                 </EuiLink>
               ) : (
-                agentData.item.config_id || '-'
+                agentData.item.policy_id || '-'
               ),
             },
             { isDivider: true },
@@ -174,7 +174,7 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
         </EuiFlexGroup>
       ) : undefined,
     /* eslint-disable-next-line react-hooks/exhaustive-deps */
-    [agentConfigData, agentData, getHref, isAgentConfigLoading]
+    [agentPolicyData, agentData, getHref, isAgentPolicyLoading]
   );
 
   const headerTabs = useMemo(() => {
@@ -203,7 +203,7 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
       value={{
         refresh: () => {
           sendAgentRequest();
-          sendAgentConfigRequest();
+          sendAgentPolicyRequest();
         },
       }}
     >
@@ -225,7 +225,7 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
             error={error}
           />
         ) : agentData && agentData.item ? (
-          <AgentDetailsPageContent agent={agentData.item} agentConfig={agentConfigData?.item} />
+          <AgentDetailsPageContent agent={agentData.item} agentPolicy={agentPolicyData?.item} />
         ) : (
           <Error
             title={
@@ -252,8 +252,8 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
 
 const AgentDetailsPageContent: React.FunctionComponent<{
   agent: Agent;
-  agentConfig?: AgentConfig;
-}> = ({ agent, agentConfig }) => {
+  agentPolicy?: AgentPolicy;
+}> = ({ agent, agentPolicy }) => {
   useBreadcrumbs('fleet_agent_details', {
     agentHost:
       typeof agent.local_metadata.host === 'object' &&
@@ -266,7 +266,7 @@ const AgentDetailsPageContent: React.FunctionComponent<{
       <Route
         path={PAGE_ROUTING_PATHS.fleet_agent_details_details}
         render={() => {
-          return <AgentDetailsContent agent={agent} agentConfig={agentConfig} />;
+          return <AgentDetailsContent agent={agent} agentPolicy={agentPolicy} />;
         }}
       />
       <Route
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx
index c52f8447214a0..9548340df5b30 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx
@@ -24,11 +24,11 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage, FormattedRelative } from '@kbn/i18n/react';
 import { AgentEnrollmentFlyout } from '../components';
-import { Agent, AgentConfig } from '../../../types';
+import { Agent, AgentPolicy } from '../../../types';
 import {
   usePagination,
   useCapabilities,
-  useGetAgentConfigs,
+  useGetAgentPolicies,
   useGetAgents,
   useUrlParams,
   useLink,
@@ -37,7 +37,7 @@ import {
 import { SearchBar, ContextMenuActions } from '../../../components';
 import { AgentStatusKueryHelper } from '../../../services';
 import { AGENT_SAVED_OBJECT_TYPE } from '../../../constants';
-import { AgentReassignConfigFlyout, AgentHealth, AgentUnenrollProvider } from '../components';
+import { AgentReassignAgentPolicyFlyout, AgentHealth, AgentUnenrollProvider } from '../components';
 
 const REFRESH_INTERVAL_MS = 5000;
 
@@ -78,7 +78,7 @@ const RowActions = React.memo<{ agent: Agent; onReassignClick: () => void; refre
           <EuiContextMenuItem
             icon="inspect"
             href={getHref('fleet_agent_details', { agentId: agent.id })}
-            key="viewConfig"
+            key="viewAgent"
           >
             <FormattedMessage
               id="xpack.ingestManager.agentList.viewActionText"
@@ -91,11 +91,11 @@ const RowActions = React.memo<{ agent: Agent; onReassignClick: () => void; refre
               onReassignClick();
             }}
             disabled={!agent.active}
-            key="reassignConfig"
+            key="reassignPolicy"
           >
             <FormattedMessage
               id="xpack.ingestManager.agentList.reassignActionText"
-              defaultMessage="Assign new agent config"
+              defaultMessage="Assign new agent policy"
             />
           </EuiContextMenuItem>,
           <AgentUnenrollProvider forceUnenroll={isUnenrolling}>
@@ -150,9 +150,9 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
   const [search, setSearch] = useState(defaultKuery);
   const { pagination, pageSizeOptions, setPagination } = usePagination();
 
-  // Configs state for filtering
-  const [isConfigsFilterOpen, setIsConfigsFilterOpen] = useState<boolean>(false);
-  const [selectedConfigs, setSelectedConfigs] = useState<string[]>([]);
+  // Policies state for filtering
+  const [isAgentPoliciesFilterOpen, setIsAgentPoliciesFilterOpen] = useState<boolean>(false);
+  const [selectedAgentPolicies, setSelectedAgentPolicies] = useState<string[]>([]);
 
   // Status for filtering
   const [isStatusFilterOpen, setIsStatutsFilterOpen] = useState<boolean>(false);
@@ -160,18 +160,20 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
 
   const clearFilters = useCallback(() => {
     setSearch('');
-    setSelectedConfigs([]);
+    setSelectedAgentPolicies([]);
     setSelectedStatus([]);
-  }, [setSearch, setSelectedConfigs, setSelectedStatus]);
+  }, [setSearch, setSelectedAgentPolicies, setSelectedStatus]);
 
-  // Add a config id to current search
-  const addConfigFilter = (configId: string) => {
-    setSelectedConfigs([...selectedConfigs, configId]);
+  // Add a agent policy id to current search
+  const addAgentPolicyFilter = (policyId: string) => {
+    setSelectedAgentPolicies([...selectedAgentPolicies, policyId]);
   };
 
-  // Remove a config id from current search
-  const removeConfigFilter = (configId: string) => {
-    setSelectedConfigs(selectedConfigs.filter((config) => config !== configId));
+  // Remove a agent policy id from current search
+  const removeAgentPolicyFilter = (policyId: string) => {
+    setSelectedAgentPolicies(
+      selectedAgentPolicies.filter((agentPolicy) => agentPolicy !== policyId)
+    );
   };
 
   // Agent enrollment flyout state
@@ -181,12 +183,12 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
   const [agentToReassignId, setAgentToReassignId] = useState<string | undefined>(undefined);
 
   let kuery = search.trim();
-  if (selectedConfigs.length) {
+  if (selectedAgentPolicies.length) {
     if (kuery) {
       kuery = `(${kuery}) and`;
     }
-    kuery = `${kuery} ${AGENT_SAVED_OBJECT_TYPE}.config_id : (${selectedConfigs
-      .map((config) => `"${config}"`)
+    kuery = `${kuery} ${AGENT_SAVED_OBJECT_TYPE}.policy_id : (${selectedAgentPolicies
+      .map((agentPolicy) => `"${agentPolicy}"`)
       .join(' or ')})`;
   }
 
@@ -229,20 +231,20 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
   const totalAgents = agentsRequest.data ? agentsRequest.data.total : 0;
   const { isLoading } = agentsRequest;
 
-  const agentConfigsRequest = useGetAgentConfigs({
+  const agentPoliciesRequest = useGetAgentPolicies({
     page: 1,
     perPage: 1000,
   });
 
-  const agentConfigs = agentConfigsRequest.data ? agentConfigsRequest.data.items : [];
-  const agentConfigsIndexedById = useMemo(() => {
-    return agentConfigs.reduce((acc, config) => {
-      acc[config.id] = config;
+  const agentPolicies = agentPoliciesRequest.data ? agentPoliciesRequest.data.items : [];
+  const agentPoliciesIndexedById = useMemo(() => {
+    return agentPolicies.reduce((acc, agentPolicy) => {
+      acc[agentPolicy.id] = agentPolicy;
 
       return acc;
-    }, {} as { [k: string]: AgentConfig });
-  }, [agentConfigs]);
-  const { isLoading: isAgentConfigsLoading } = agentConfigsRequest;
+    }, {} as { [k: string]: AgentPolicy });
+  }, [agentPolicies]);
+  const { isLoading: isAgentPoliciesLoading } = agentPoliciesRequest;
 
   const columns = [
     {
@@ -265,38 +267,38 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
       render: (active: boolean, agent: any) => <AgentHealth agent={agent} />,
     },
     {
-      field: 'config_id',
-      name: i18n.translate('xpack.ingestManager.agentList.configColumnTitle', {
-        defaultMessage: 'Agent config',
+      field: 'policy_id',
+      name: i18n.translate('xpack.ingestManager.agentList.policyColumnTitle', {
+        defaultMessage: 'Agent policy',
       }),
-      render: (configId: string, agent: Agent) => {
-        const configName = agentConfigs.find((p) => p.id === configId)?.name;
+      render: (policyId: string, agent: Agent) => {
+        const policyName = agentPolicies.find((p) => p.id === policyId)?.name;
         return (
           <EuiFlexGroup gutterSize="s" alignItems="center" style={{ minWidth: 0 }}>
             <EuiFlexItem grow={false} className="eui-textTruncate">
               <EuiLink
-                href={getHref('configuration_details', { configId })}
+                href={getHref('policy_details', { policyId })}
                 className="eui-textTruncate"
-                title={configName || configId}
+                title={policyName || policyId}
               >
-                {configName || configId}
+                {policyName || policyId}
               </EuiLink>
             </EuiFlexItem>
-            {agent.config_revision && (
+            {agent.policy_revision && (
               <EuiFlexItem grow={false}>
                 <EuiText color="default" size="xs" className="eui-textNoWrap">
                   <FormattedMessage
                     id="xpack.ingestManager.agentList.revisionNumber"
                     defaultMessage="rev. {revNumber}"
-                    values={{ revNumber: agent.config_revision }}
+                    values={{ revNumber: agent.policy_revision }}
                   />
                 </EuiText>
               </EuiFlexItem>
             )}
-            {agent.config_id &&
-              agent.config_revision &&
-              agentConfigsIndexedById[agent.config_id] &&
-              agentConfigsIndexedById[agent.config_id].revision > agent.config_revision && (
+            {agent.policy_id &&
+              agent.policy_revision &&
+              agentPoliciesIndexedById[agent.policy_id] &&
+              agentPoliciesIndexedById[agent.policy_id].revision > agent.policy_revision && (
                 <EuiFlexItem grow={false}>
                   <EuiText color="subdued" size="xs" className="eui-textNoWrap">
                     <EuiIcon size="m" type="alert" color="warning" />
@@ -382,13 +384,13 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
     <>
       {isEnrollmentFlyoutOpen ? (
         <AgentEnrollmentFlyout
-          agentConfigs={agentConfigs}
+          agentPolicies={agentPolicies}
           onClose={() => setIsEnrollmentFlyoutOpen(false)}
         />
       ) : null}
       {agentToReassign && (
         <EuiPortal>
-          <AgentReassignConfigFlyout
+          <AgentReassignAgentPolicyFlyout
             agent={agentToReassign}
             onClose={() => {
               setAgentToReassignId(undefined);
@@ -424,7 +426,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
                       isSelected={isStatusFilterOpen}
                       hasActiveFilters={selectedStatus.length > 0}
                       numActiveFilters={selectedStatus.length}
-                      disabled={isAgentConfigsLoading}
+                      disabled={isAgentPoliciesLoading}
                     >
                       <FormattedMessage
                         id="xpack.ingestManager.agentList.statusFilterText"
@@ -459,37 +461,37 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
                   button={
                     <EuiFilterButton
                       iconType="arrowDown"
-                      onClick={() => setIsConfigsFilterOpen(!isConfigsFilterOpen)}
-                      isSelected={isConfigsFilterOpen}
-                      hasActiveFilters={selectedConfigs.length > 0}
-                      numActiveFilters={selectedConfigs.length}
-                      numFilters={agentConfigs.length}
-                      disabled={isAgentConfigsLoading}
+                      onClick={() => setIsAgentPoliciesFilterOpen(!isAgentPoliciesFilterOpen)}
+                      isSelected={isAgentPoliciesFilterOpen}
+                      hasActiveFilters={selectedAgentPolicies.length > 0}
+                      numActiveFilters={selectedAgentPolicies.length}
+                      numFilters={agentPolicies.length}
+                      disabled={isAgentPoliciesLoading}
                     >
                       <FormattedMessage
-                        id="xpack.ingestManager.agentList.configFilterText"
-                        defaultMessage="Agent config"
+                        id="xpack.ingestManager.agentList.policyFilterText"
+                        defaultMessage="Agent policy"
                       />
                     </EuiFilterButton>
                   }
-                  isOpen={isConfigsFilterOpen}
-                  closePopover={() => setIsConfigsFilterOpen(false)}
+                  isOpen={isAgentPoliciesFilterOpen}
+                  closePopover={() => setIsAgentPoliciesFilterOpen(false)}
                   panelPaddingSize="none"
                 >
                   <div className="euiFilterSelect__items">
-                    {agentConfigs.map((config, index) => (
+                    {agentPolicies.map((agentPolicy, index) => (
                       <EuiFilterSelectItem
-                        checked={selectedConfigs.includes(config.id) ? 'on' : undefined}
+                        checked={selectedAgentPolicies.includes(agentPolicy.id) ? 'on' : undefined}
                         key={index}
                         onClick={() => {
-                          if (selectedConfigs.includes(config.id)) {
-                            removeConfigFilter(config.id);
+                          if (selectedAgentPolicies.includes(agentPolicy.id)) {
+                            removeAgentPolicyFilter(agentPolicy.id);
                           } else {
-                            addConfigFilter(config.id);
+                            addAgentPolicyFilter(agentPolicy.id);
                           }
                         }}
                       >
-                        {config.name}
+                        {agentPolicy.name}
                       </EuiFilterSelectItem>
                     ))}
                   </div>
@@ -521,7 +523,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
               id="xpack.ingestManager.agentList.loadingAgentsMessage"
               defaultMessage="Loading agents…"
             />
-          ) : search.trim() || selectedConfigs.length || selectedStatus.length ? (
+          ) : search.trim() || selectedAgentPolicies.length || selectedStatus.length ? (
             <FormattedMessage
               id="xpack.ingestManager.agentList.noFilteredAgentsPrompt"
               defaultMessage="No agents found. {clearFiltersLink}"
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/config_selection.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/agent_policy_selection.tsx
similarity index 67%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/config_selection.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/agent_policy_selection.tsx
index 5343d86244f1e..7f23c645f9a2e 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/config_selection.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/agent_policy_selection.tsx
@@ -8,13 +8,13 @@ import React, { useState, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiSelect, EuiSpacer, EuiText, EuiButtonEmpty } from '@elastic/eui';
-import { AgentConfig, GetEnrollmentAPIKeysResponse } from '../../../../types';
+import { AgentPolicy, GetEnrollmentAPIKeysResponse } from '../../../../types';
 import { sendGetEnrollmentAPIKeys, useCore } from '../../../../hooks';
-import { AgentConfigPackageBadges } from '../agent_config_package_badges';
+import { AgentPolicyPackageBadges } from '../agent_policy_package_badges';
 
 type Props = {
-  agentConfigs?: AgentConfig[];
-  onConfigChange?: (key: string) => void;
+  agentPolicies?: AgentPolicy[];
+  onAgentPolicyChange?: (key: string) => void;
 } & (
   | {
       withKeySelection: true;
@@ -25,9 +25,9 @@ type Props = {
     }
 );
 
-export const EnrollmentStepAgentConfig: React.FC<Props> = (props) => {
+export const EnrollmentStepAgentPolicy: React.FC<Props> = (props) => {
   const { notifications } = useCore();
-  const { withKeySelection, agentConfigs, onConfigChange } = props;
+  const { withKeySelection, agentPolicies, onAgentPolicyChange } = props;
   const onKeyChange = props.withKeySelection && props.onKeyChange;
 
   const [isAuthenticationSettingsOpen, setIsAuthenticationSettingsOpen] = useState(false);
@@ -35,17 +35,17 @@ export const EnrollmentStepAgentConfig: React.FC<Props> = (props) => {
     []
   );
   const [selectedState, setSelectedState] = useState<{
-    agentConfigId?: string;
+    agentPolicyId?: string;
     enrollmentAPIKeyId?: string;
   }>({});
 
   useEffect(
-    function triggerOnConfigChangeEffect() {
-      if (onConfigChange && selectedState.agentConfigId) {
-        onConfigChange(selectedState.agentConfigId);
+    function triggerOnAgentPolicyChangeEffect() {
+      if (onAgentPolicyChange && selectedState.agentPolicyId) {
+        onAgentPolicyChange(selectedState.agentPolicyId);
       }
     },
-    [selectedState.agentConfigId, onConfigChange]
+    [selectedState.agentPolicyId, onAgentPolicyChange]
   );
 
   useEffect(
@@ -62,34 +62,34 @@ export const EnrollmentStepAgentConfig: React.FC<Props> = (props) => {
   );
 
   useEffect(
-    function useDefaultConfigEffect() {
-      if (agentConfigs && agentConfigs.length && !selectedState.agentConfigId) {
-        if (agentConfigs.length === 1) {
+    function useDefaultAgentPolicyEffect() {
+      if (agentPolicies && agentPolicies.length && !selectedState.agentPolicyId) {
+        if (agentPolicies.length === 1) {
           setSelectedState({
             ...selectedState,
-            agentConfigId: agentConfigs[0].id,
+            agentPolicyId: agentPolicies[0].id,
           });
           return;
         }
 
-        const defaultConfig = agentConfigs.find((config) => config.is_default);
-        if (defaultConfig) {
+        const defaultAgentPolicy = agentPolicies.find((agentPolicy) => agentPolicy.is_default);
+        if (defaultAgentPolicy) {
           setSelectedState({
             ...selectedState,
-            agentConfigId: defaultConfig.id,
+            agentPolicyId: defaultAgentPolicy.id,
           });
         }
       }
     },
-    [agentConfigs, selectedState]
+    [agentPolicies, selectedState]
   );
 
   useEffect(
-    function useEnrollmentKeysForConfigEffect() {
+    function useEnrollmentKeysForAgentPolicyEffect() {
       if (!withKeySelection) {
         return;
       }
-      if (!selectedState.agentConfigId) {
+      if (!selectedState.agentPolicyId) {
         setEnrollmentAPIKeys([]);
         return;
       }
@@ -109,7 +109,7 @@ export const EnrollmentStepAgentConfig: React.FC<Props> = (props) => {
           }
 
           setEnrollmentAPIKeys(
-            res.data.list.filter((key) => key.config_id === selectedState.agentConfigId)
+            res.data.list.filter((key) => key.policy_id === selectedState.agentPolicyId)
           );
         } catch (error) {
           notifications.toasts.addError(error, {
@@ -119,22 +119,22 @@ export const EnrollmentStepAgentConfig: React.FC<Props> = (props) => {
       }
       fetchEnrollmentAPIKeys();
     },
-    [withKeySelection, selectedState.agentConfigId, notifications.toasts]
+    [withKeySelection, selectedState.agentPolicyId, notifications.toasts]
   );
 
   useEffect(
-    function useDefaultEnrollmentKeyForConfigEffect() {
+    function useDefaultEnrollmentKeyForAgentPolicyEffect() {
       if (!withKeySelection) {
         return;
       }
       if (
         !selectedState.enrollmentAPIKeyId &&
         enrollmentAPIKeys.length > 0 &&
-        enrollmentAPIKeys[0].config_id === selectedState.agentConfigId
+        enrollmentAPIKeys[0].policy_id === selectedState.agentPolicyId
       ) {
         const enrollmentAPIKeyId = enrollmentAPIKeys[0].id;
         setSelectedState({
-          agentConfigId: selectedState.agentConfigId,
+          agentPolicyId: selectedState.agentPolicyId,
           enrollmentAPIKeyId,
         });
       }
@@ -143,7 +143,7 @@ export const EnrollmentStepAgentConfig: React.FC<Props> = (props) => {
       withKeySelection,
       enrollmentAPIKeys,
       selectedState.enrollmentAPIKeyId,
-      selectedState.agentConfigId,
+      selectedState.agentPolicyId,
     ]
   );
 
@@ -154,31 +154,31 @@ export const EnrollmentStepAgentConfig: React.FC<Props> = (props) => {
         prepend={
           <EuiText>
             <FormattedMessage
-              id="xpack.ingestManager.enrollmentStepAgentConfig.configSelectLabel"
-              defaultMessage="Agent configuration"
+              id="xpack.ingestManager.enrollmentStepAgentPolicy.policySelectLabel"
+              defaultMessage="Agent policy"
             />
           </EuiText>
         }
-        isLoading={!agentConfigs}
-        options={(agentConfigs || []).map((config) => ({
-          value: config.id,
-          text: config.name,
+        isLoading={!agentPolicies}
+        options={(agentPolicies || []).map((agentPolicy) => ({
+          value: agentPolicy.id,
+          text: agentPolicy.name,
         }))}
-        value={selectedState.agentConfigId || undefined}
+        value={selectedState.agentPolicyId || undefined}
         onChange={(e) =>
           setSelectedState({
-            agentConfigId: e.target.value,
+            agentPolicyId: e.target.value,
             enrollmentAPIKeyId: undefined,
           })
         }
         aria-label={i18n.translate(
-          'xpack.ingestManager.enrollmentStepAgentConfig.configSelectAriaLabel',
-          { defaultMessage: 'Agent configuration' }
+          'xpack.ingestManager.enrollmentStepAgentPolicy.policySelectAriaLabel',
+          { defaultMessage: 'Agent policy' }
         )}
       />
       <EuiSpacer size="m" />
-      {selectedState.agentConfigId && (
-        <AgentConfigPackageBadges agentConfigId={selectedState.agentConfigId} />
+      {selectedState.agentPolicyId && (
+        <AgentPolicyPackageBadges agentPolicyId={selectedState.agentPolicyId} />
       )}
       {withKeySelection && onKeyChange && (
         <>
@@ -189,7 +189,7 @@ export const EnrollmentStepAgentConfig: React.FC<Props> = (props) => {
             onClick={() => setIsAuthenticationSettingsOpen(!isAuthenticationSettingsOpen)}
           >
             <FormattedMessage
-              id="xpack.ingestManager.enrollmentStepAgentConfig.showAuthenticationSettingsButton"
+              id="xpack.ingestManager.enrollmentStepAgentPolicy.showAuthenticationSettingsButton"
               defaultMessage="Authentication settings"
             />
           </EuiButtonEmpty>
@@ -206,7 +206,7 @@ export const EnrollmentStepAgentConfig: React.FC<Props> = (props) => {
                 prepend={
                   <EuiText>
                     <FormattedMessage
-                      id="xpack.ingestManager.enrollmentStepAgentConfig.enrollmentTokenSelectLabel"
+                      id="xpack.ingestManager.enrollmentStepAgentPolicy.enrollmentTokenSelectLabel"
                       defaultMessage="Enrollment token"
                     />
                   </EuiText>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/index.tsx
index 9c7bea51f46ea..f85d0bea74f22 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/index.tsx
@@ -18,18 +18,18 @@ import {
   EuiTabs,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { AgentConfig } from '../../../../types';
+import { AgentPolicy } from '../../../../types';
 import { ManagedInstructions } from './managed_instructions';
 import { StandaloneInstructions } from './standalone_instructions';
 
 interface Props {
   onClose: () => void;
-  agentConfigs?: AgentConfig[];
+  agentPolicies?: AgentPolicy[];
 }
 
 export const AgentEnrollmentFlyout: React.FunctionComponent<Props> = ({
   onClose,
-  agentConfigs,
+  agentPolicies,
 }) => {
   const [mode, setMode] = useState<'managed' | 'standalone'>('managed');
 
@@ -62,9 +62,9 @@ export const AgentEnrollmentFlyout: React.FunctionComponent<Props> = ({
 
       <EuiFlyoutBody>
         {mode === 'managed' ? (
-          <ManagedInstructions agentConfigs={agentConfigs} />
+          <ManagedInstructions agentPolicies={agentPolicies} />
         ) : (
-          <StandaloneInstructions agentConfigs={agentConfigs} />
+          <StandaloneInstructions agentPolicies={agentPolicies} />
         )}
       </EuiFlyoutBody>
       <EuiFlyoutFooter>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/managed_instructions.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/managed_instructions.tsx
index eefb7f1bb7b5f..3821d8a2384ca 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/managed_instructions.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/managed_instructions.tsx
@@ -9,7 +9,7 @@ import { EuiSteps, EuiLink, EuiText, EuiSpacer } from '@elastic/eui';
 import { EuiContainedStepProps } from '@elastic/eui/src/components/steps/steps';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { AgentConfig } from '../../../../types';
+import { AgentPolicy } from '../../../../types';
 import {
   useGetOneEnrollmentAPIKey,
   useCore,
@@ -18,13 +18,13 @@ import {
   useFleetStatus,
 } from '../../../../hooks';
 import { ManualInstructions } from '../../../../components/enrollment_instructions';
-import { DownloadStep, AgentConfigSelectionStep } from './steps';
+import { DownloadStep, AgentPolicySelectionStep } from './steps';
 
 interface Props {
-  agentConfigs?: AgentConfig[];
+  agentPolicies?: AgentPolicy[];
 }
 
-export const ManagedInstructions: React.FunctionComponent<Props> = ({ agentConfigs }) => {
+export const ManagedInstructions: React.FunctionComponent<Props> = ({ agentPolicies }) => {
   const { getHref } = useLink();
   const core = useCore();
   const fleetStatus = useFleetStatus();
@@ -40,7 +40,7 @@ export const ManagedInstructions: React.FunctionComponent<Props> = ({ agentConfi
 
   const steps: EuiContainedStepProps[] = [
     DownloadStep(),
-    AgentConfigSelectionStep({ agentConfigs, setSelectedAPIKeyId }),
+    AgentPolicySelectionStep({ agentPolicies, setSelectedAPIKeyId }),
     {
       title: i18n.translate('xpack.ingestManager.agentEnrollment.stepEnrollAndRunAgentTitle', {
         defaultMessage: 'Enroll and start the Elastic Agent',
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/standalone_instructions.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/standalone_instructions.tsx
index bb3b2d1797ca9..c2da0b704eaff 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/standalone_instructions.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/standalone_instructions.tsx
@@ -19,59 +19,59 @@ import {
 import { EuiContainedStepProps } from '@elastic/eui/src/components/steps/steps';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { AgentConfig } from '../../../../types';
-import { useCore, sendGetOneAgentConfigFull } from '../../../../hooks';
-import { DownloadStep, AgentConfigSelectionStep } from './steps';
-import { configToYaml, agentConfigRouteService } from '../../../../services';
+import { AgentPolicy } from '../../../../types';
+import { useCore, sendGetOneAgentPolicyFull } from '../../../../hooks';
+import { DownloadStep, AgentPolicySelectionStep } from './steps';
+import { fullAgentPolicyToYaml, agentPolicyRouteService } from '../../../../services';
 
 interface Props {
-  agentConfigs?: AgentConfig[];
+  agentPolicies?: AgentPolicy[];
 }
 
 const RUN_INSTRUCTIONS = './elastic-agent run';
 
-export const StandaloneInstructions: React.FunctionComponent<Props> = ({ agentConfigs }) => {
+export const StandaloneInstructions: React.FunctionComponent<Props> = ({ agentPolicies }) => {
   const core = useCore();
   const { notifications } = core;
 
-  const [selectedConfigId, setSelectedConfigId] = useState<string | undefined>();
-  const [fullAgentConfig, setFullAgentConfig] = useState<any | undefined>();
+  const [selectedPolicyId, setSelectedPolicyId] = useState<string | undefined>();
+  const [fullAgentPolicy, setFullAgentPolicy] = useState<any | undefined>();
 
-  const downloadLink = selectedConfigId
+  const downloadLink = selectedPolicyId
     ? core.http.basePath.prepend(
-        `${agentConfigRouteService.getInfoFullDownloadPath(selectedConfigId)}?standalone=true`
+        `${agentPolicyRouteService.getInfoFullDownloadPath(selectedPolicyId)}?standalone=true`
       )
     : undefined;
 
   useEffect(() => {
-    async function fetchFullConfig() {
+    async function fetchFullPolicy() {
       try {
-        if (!selectedConfigId) {
+        if (!selectedPolicyId) {
           return;
         }
-        const res = await sendGetOneAgentConfigFull(selectedConfigId, { standalone: true });
+        const res = await sendGetOneAgentPolicyFull(selectedPolicyId, { standalone: true });
         if (res.error) {
           throw res.error;
         }
 
         if (!res.data) {
-          throw new Error('No data while fetching full agent config');
+          throw new Error('No data while fetching full agent policy');
         }
 
-        setFullAgentConfig(res.data.item);
+        setFullAgentPolicy(res.data.item);
       } catch (error) {
         notifications.toasts.addError(error, {
           title: 'Error',
         });
       }
     }
-    fetchFullConfig();
-  }, [selectedConfigId, notifications.toasts]);
+    fetchFullPolicy();
+  }, [selectedPolicyId, notifications.toasts]);
 
-  const yaml = useMemo(() => configToYaml(fullAgentConfig), [fullAgentConfig]);
+  const yaml = useMemo(() => fullAgentPolicyToYaml(fullAgentPolicy), [fullAgentPolicy]);
   const steps: EuiContainedStepProps[] = [
     DownloadStep(),
-    AgentConfigSelectionStep({ agentConfigs, setSelectedConfigId }),
+    AgentPolicySelectionStep({ agentPolicies, setSelectedPolicyId }),
     {
       title: i18n.translate('xpack.ingestManager.agentEnrollment.stepConfigureAgentTitle', {
         defaultMessage: 'Configure the agent',
@@ -81,7 +81,7 @@ export const StandaloneInstructions: React.FunctionComponent<Props> = ({ agentCo
           <EuiText>
             <FormattedMessage
               id="xpack.ingestManager.agentEnrollment.stepConfigureAgentDescription"
-              defaultMessage="Copy this configuration and put it into a file named {fileName} on the system where the Elastic Agent is installed. Don’t forget to modify {ESUsernameVariable} and {ESPasswordVariable} in the {outputSection} section of the configuration file so that it uses your actual Elasticsearch credentials."
+              defaultMessage="Copy this policy and put it into a file named {fileName} on the system where the Elastic Agent is installed. Don’t forget to modify {ESUsernameVariable} and {ESPasswordVariable} in the {outputSection} section of the policy file so that it uses your actual Elasticsearch credentials."
               values={{
                 fileName: <EuiCode>elastic-agent.yml</EuiCode>,
                 ESUsernameVariable: <EuiCode>ES_USERNAME</EuiCode>,
@@ -96,7 +96,7 @@ export const StandaloneInstructions: React.FunctionComponent<Props> = ({ agentCo
                   {(copy) => (
                     <EuiButton onClick={copy} iconType="copyClipboard">
                       <FormattedMessage
-                        id="xpack.ingestManager.agentEnrollment.copyConfigurationButton"
+                        id="xpack.ingestManager.agentEnrollment.copyPolicyButton"
                         defaultMessage="Copy to clipboard"
                       />
                     </EuiButton>
@@ -106,8 +106,8 @@ export const StandaloneInstructions: React.FunctionComponent<Props> = ({ agentCo
               <EuiFlexItem grow={false}>
                 <EuiButton iconType="download" href={downloadLink} isDisabled={!downloadLink}>
                   <FormattedMessage
-                    id="xpack.ingestManager.agentEnrollment.downloadConfigurationButton"
-                    defaultMessage="Download configuration"
+                    id="xpack.ingestManager.agentEnrollment.downloadPolicyButton"
+                    defaultMessage="Download policy"
                   />
                 </EuiButton>
               </EuiFlexItem>
@@ -170,7 +170,7 @@ export const StandaloneInstructions: React.FunctionComponent<Props> = ({ agentCo
       <EuiText>
         <FormattedMessage
           id="xpack.ingestManager.agentEnrollment.standaloneDescription"
-          defaultMessage="Agents running in standalone mode need to be updated manually if you ever wish to make changes to their configuration. Follow the instructions below to download and setup an Elastic Agent in standalone mode."
+          defaultMessage="Agents running in standalone mode need to be updated manually if you ever wish to make changes to their policy. Follow the instructions below to download and setup an Elastic Agent in standalone mode."
         />
       </EuiText>
       <EuiSpacer size="l" />
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/steps.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/steps.tsx
index d01e207169920..a70741d1df7f7 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/steps.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/steps.tsx
@@ -8,8 +8,8 @@ import React from 'react';
 import { EuiText, EuiButton, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import { EnrollmentStepAgentConfig } from './config_selection';
-import { AgentConfig } from '../../../../types';
+import { EnrollmentStepAgentPolicy } from './agent_policy_selection';
+import { AgentPolicy } from '../../../../types';
 
 export const DownloadStep = () => {
   return {
@@ -41,25 +41,25 @@ export const DownloadStep = () => {
   };
 };
 
-export const AgentConfigSelectionStep = ({
-  agentConfigs,
+export const AgentPolicySelectionStep = ({
+  agentPolicies,
   setSelectedAPIKeyId,
-  setSelectedConfigId,
+  setSelectedPolicyId,
 }: {
-  agentConfigs?: AgentConfig[];
+  agentPolicies?: AgentPolicy[];
   setSelectedAPIKeyId?: (key: string) => void;
-  setSelectedConfigId?: (configId: string) => void;
+  setSelectedPolicyId?: (policyId: string) => void;
 }) => {
   return {
-    title: i18n.translate('xpack.ingestManager.agentEnrollment.stepChooseAgentConfigTitle', {
-      defaultMessage: 'Choose an agent configuration',
+    title: i18n.translate('xpack.ingestManager.agentEnrollment.stepChooseAgentPolicyTitle', {
+      defaultMessage: 'Choose an agent policy',
     }),
     children: (
-      <EnrollmentStepAgentConfig
-        agentConfigs={agentConfigs}
+      <EnrollmentStepAgentPolicy
+        agentPolicies={agentPolicies}
         withKeySelection={setSelectedAPIKeyId ? true : false}
         onKeyChange={setSelectedAPIKeyId}
-        onConfigChange={setSelectedConfigId}
+        onAgentPolicyChange={setSelectedPolicyId}
       />
     ),
   };
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_config_package_badges.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_policy_package_badges.tsx
similarity index 52%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_config_package_badges.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_policy_package_badges.tsx
index fcdb5ff02e7a4..0a3d6d54da834 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_config_package_badges.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_policy_package_badges.tsx
@@ -6,36 +6,36 @@
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiSpacer, EuiText, EuiFlexGroup, EuiFlexItem, EuiBadge } from '@elastic/eui';
-import { PackageConfig } from '../../../types';
-import { useGetOneAgentConfig } from '../../../hooks';
+import { PackagePolicy } from '../../../types';
+import { useGetOneAgentPolicy } from '../../../hooks';
 import { PackageIcon } from '../../../components/package_icon';
 
 interface Props {
-  agentConfigId: string;
+  agentPolicyId: string;
 }
 
-export const AgentConfigPackageBadges: React.FunctionComponent<Props> = ({ agentConfigId }) => {
-  const agentConfigRequest = useGetOneAgentConfig(agentConfigId);
-  const agentConfig = agentConfigRequest.data ? agentConfigRequest.data.item : null;
+export const AgentPolicyPackageBadges: React.FunctionComponent<Props> = ({ agentPolicyId }) => {
+  const agentPolicyRequest = useGetOneAgentPolicy(agentPolicyId);
+  const agentPolicy = agentPolicyRequest.data ? agentPolicyRequest.data.item : null;
 
-  if (!agentConfig) {
+  if (!agentPolicy) {
     return null;
   }
   return (
     <>
       <EuiText>
         <FormattedMessage
-          id="xpack.ingestManager.agentReassignConfig.configDescription"
-          defaultMessage="The selected agent configuration will collect data for {count, plural, one {{countValue} integration} other {{countValue} integrations}}:"
+          id="xpack.ingestManager.agentReassignPolicy.policyDescription"
+          defaultMessage="The selected agent policy will collect data for {count, plural, one {{countValue} integration} other {{countValue} integrations}}:"
           values={{
-            count: agentConfig.package_configs.length,
-            countValue: <b>{agentConfig.package_configs.length}</b>,
+            count: agentPolicy.package_policies.length,
+            countValue: <b>{agentPolicy.package_policies.length}</b>,
           }}
         />
       </EuiText>
       <EuiSpacer size="s" />
-      {(agentConfig.package_configs as PackageConfig[]).map((packageConfig, idx) => {
-        if (!packageConfig.package) {
+      {(agentPolicy.package_policies as PackagePolicy[]).map((packagePolicy, idx) => {
+        if (!packagePolicy.package) {
           return null;
         }
         return (
@@ -43,13 +43,13 @@ export const AgentConfigPackageBadges: React.FunctionComponent<Props> = ({ agent
             <EuiFlexGroup direction="row" gutterSize="xs" alignItems="center">
               <EuiFlexItem grow={false}>
                 <PackageIcon
-                  packageName={packageConfig.package.name}
-                  version={packageConfig.package.version}
+                  packageName={packagePolicy.package.name}
+                  version={packagePolicy.package.version}
                   size="s"
                   tryApi={true}
                 />
               </EuiFlexItem>
-              <EuiFlexItem grow={false}>{packageConfig.package.title}</EuiFlexItem>
+              <EuiFlexItem grow={false}>{packagePolicy.package.title}</EuiFlexItem>
             </EuiFlexGroup>
           </EuiBadge>
         );
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_policy_flyout/index.tsx
similarity index 63%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_policy_flyout/index.tsx
index c067de1cfea5a..0c154bf1074c0 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_policy_flyout/index.tsx
@@ -22,45 +22,48 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { Agent } from '../../../../types';
-import { sendPutAgentReassign, useCore, useGetAgentConfigs } from '../../../../hooks';
-import { AgentConfigPackageBadges } from '../agent_config_package_badges';
+import { sendPutAgentReassign, useCore, useGetAgentPolicies } from '../../../../hooks';
+import { AgentPolicyPackageBadges } from '../agent_policy_package_badges';
 
 interface Props {
   onClose: () => void;
   agent: Agent;
 }
 
-export const AgentReassignConfigFlyout: React.FunctionComponent<Props> = ({ onClose, agent }) => {
+export const AgentReassignAgentPolicyFlyout: React.FunctionComponent<Props> = ({
+  onClose,
+  agent,
+}) => {
   const { notifications } = useCore();
-  const [selectedAgentConfigId, setSelectedAgentConfigId] = useState<string | undefined>(
-    agent.config_id
+  const [selectedAgentPolicyId, setSelectedAgentPolicyId] = useState<string | undefined>(
+    agent.policy_id
   );
 
-  const agentConfigsRequest = useGetAgentConfigs({
+  const agentPoliciesRequest = useGetAgentPolicies({
     page: 1,
     perPage: 1000,
   });
-  const agentConfigs = agentConfigsRequest.data ? agentConfigsRequest.data.items : [];
+  const agentPolicies = agentPoliciesRequest.data ? agentPoliciesRequest.data.items : [];
 
   const [isSubmitting, setIsSubmitting] = useState(false);
 
   async function onSubmit() {
     try {
       setIsSubmitting(true);
-      if (!selectedAgentConfigId) {
-        throw new Error('No selected config id');
+      if (!selectedAgentPolicyId) {
+        throw new Error('No selected agent policy id');
       }
       const res = await sendPutAgentReassign(agent.id, {
-        config_id: selectedAgentConfigId,
+        policy_id: selectedAgentPolicyId,
       });
       if (res.error) {
         throw res.error;
       }
       setIsSubmitting(false);
       const successMessage = i18n.translate(
-        'xpack.ingestManager.agentReassignConfig.successSingleNotificationTitle',
+        'xpack.ingestManager.agentReassignPolicy.successSingleNotificationTitle',
         {
-          defaultMessage: 'Agent configuration reassigned',
+          defaultMessage: 'Agent policy reassigned',
         }
       );
       notifications.toasts.addSuccess(successMessage);
@@ -68,7 +71,7 @@ export const AgentReassignConfigFlyout: React.FunctionComponent<Props> = ({ onCl
     } catch (error) {
       setIsSubmitting(false);
       notifications.toasts.addError(error, {
-        title: 'Unable to reassign agent configuration',
+        title: 'Unable to reassign agent policy',
       });
     }
   }
@@ -79,16 +82,16 @@ export const AgentReassignConfigFlyout: React.FunctionComponent<Props> = ({ onCl
         <EuiTitle size="m">
           <h2 id="FleetAgentReassigmentFlyoutTitle">
             <FormattedMessage
-              id="xpack.ingestManager.agentReassignConfig.flyoutTitle"
-              defaultMessage="Assign new agent configuration"
+              id="xpack.ingestManager.agentReassignPolicy.flyoutTitle"
+              defaultMessage="Assign new agent policy"
             />
           </h2>
         </EuiTitle>
         <EuiSpacer size="m" />
         <EuiText size="s">
           <FormattedMessage
-            id="xpack.ingestManager.agentReassignConfig.flyoutDescription"
-            defaultMessage="Choose a new agent configuration to assign the selected agent to."
+            id="xpack.ingestManager.agentReassignPolicy.flyoutDescription"
+            defaultMessage="Choose a new agent policy to assign the selected agent to."
           />
         </EuiText>
       </EuiFlyoutHeader>
@@ -97,26 +100,26 @@ export const AgentReassignConfigFlyout: React.FunctionComponent<Props> = ({ onCl
           <EuiFlexItem>
             <EuiFormRow
               fullWidth
-              label={i18n.translate('xpack.ingestManager.agentReassignConfig.selectConfigLabel', {
-                defaultMessage: 'Agent configuration',
+              label={i18n.translate('xpack.ingestManager.agentReassignPolicy.selectPolicyLabel', {
+                defaultMessage: 'Agent policy',
               })}
             >
               <EuiSelect
                 fullWidth
-                options={agentConfigs.map((config) => ({
-                  value: config.id,
-                  text: config.name,
+                options={agentPolicies.map((agentPolicy) => ({
+                  value: agentPolicy.id,
+                  text: agentPolicy.name,
                 }))}
-                value={selectedAgentConfigId}
-                onChange={(e) => setSelectedAgentConfigId(e.target.value)}
+                value={selectedAgentPolicyId}
+                onChange={(e) => setSelectedAgentPolicyId(e.target.value)}
               />
             </EuiFormRow>
           </EuiFlexItem>
         </EuiFlexGroup>
         <EuiSpacer size="l" />
 
-        {selectedAgentConfigId && (
-          <AgentConfigPackageBadges agentConfigId={selectedAgentConfigId} />
+        {selectedAgentPolicyId && (
+          <AgentPolicyPackageBadges agentPolicyId={selectedAgentPolicyId} />
         )}
       </EuiFlyoutBody>
       <EuiFlyoutFooter>
@@ -124,21 +127,21 @@ export const AgentReassignConfigFlyout: React.FunctionComponent<Props> = ({ onCl
           <EuiFlexItem grow={false}>
             <EuiButtonEmpty onClick={onClose} flush="left">
               <FormattedMessage
-                id="xpack.ingestManager.agentReassignConfig.cancelButtonLabel"
+                id="xpack.ingestManager.agentReassignPolicy.cancelButtonLabel"
                 defaultMessage="Cancel"
               />
             </EuiButtonEmpty>
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
             <EuiButton
-              disabled={selectedAgentConfigId === agent.config_id}
+              disabled={selectedAgentPolicyId === agent.policy_id}
               fill
               onClick={onSubmit}
               isLoading={isSubmitting}
             >
               <FormattedMessage
-                id="xpack.ingestManager.agentReassignConfig.continueButtonLabel"
-                defaultMessage="Assign configuration"
+                id="xpack.ingestManager.agentReassignPolicy.continueButtonLabel"
+                defaultMessage="Assign policy"
               />
             </EuiButton>
           </EuiFlexItem>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/index.tsx
index 8dd329806ac5c..527f920f24365 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/index.tsx
@@ -5,7 +5,7 @@
  */
 
 export * from './loading';
-export * from './agent_reassign_config_flyout';
+export * from './agent_reassign_policy_flyout';
 export * from './agent_enrollment_flyout';
 export * from './agent_health';
 export * from './agent_unenroll_provider';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/list_layout.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/list_layout.tsx
index 16acda9dc4afd..b01dbbd57c16f 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/list_layout.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/list_layout.tsx
@@ -21,8 +21,8 @@ import { Props as EuiTabProps } from '@elastic/eui/src/components/tabs/tab';
 import { useRouteMatch } from 'react-router-dom';
 import { PAGE_ROUTING_PATHS } from '../../../constants';
 import { WithHeaderLayout } from '../../../layouts';
-import { useCapabilities, useLink, useGetAgentConfigs } from '../../../hooks';
-import { useGetAgentStatus } from '../../agent_config/details_page/hooks';
+import { useCapabilities, useLink, useGetAgentPolicies } from '../../../hooks';
+import { useGetAgentStatus } from '../../agent_policy/details_page/hooks';
 import { AgentEnrollmentFlyout } from '../components';
 import { DonutChart } from './donut_chart';
 
@@ -135,7 +135,7 @@ export const ListLayout: React.FunctionComponent<{}> = ({ children }) => {
           <p>
             <FormattedMessage
               id="xpack.ingestManager.fleet.pageSubtitle"
-              defaultMessage="Manage and deploy configuration updates to a group of agents of any size."
+              defaultMessage="Manage and deploy policy updates to a group of agents of any size."
             />
           </p>
         </EuiText>
@@ -143,12 +143,12 @@ export const ListLayout: React.FunctionComponent<{}> = ({ children }) => {
     </EuiFlexGroup>
   );
 
-  const agentConfigsRequest = useGetAgentConfigs({
+  const agentPoliciesRequest = useGetAgentPolicies({
     page: 1,
     perPage: 1000,
   });
 
-  const agentConfigs = agentConfigsRequest.data ? agentConfigsRequest.data.items : [];
+  const agentPolicies = agentPoliciesRequest.data ? agentPoliciesRequest.data.items : [];
 
   const routeMatch = useRouteMatch();
 
@@ -183,7 +183,7 @@ export const ListLayout: React.FunctionComponent<{}> = ({ children }) => {
     >
       {isEnrollmentFlyoutOpen ? (
         <AgentEnrollmentFlyout
-          agentConfigs={agentConfigs}
+          agentPolicies={agentPolicies}
           onClose={() => setIsEnrollmentFlyoutOpen(false)}
         />
       ) : null}
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/components/new_enrollment_key_flyout.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/components/new_enrollment_key_flyout.tsx
index f191b6889a60a..8921b690690fb 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/components/new_enrollment_key_flyout.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/components/new_enrollment_key_flyout.tsx
@@ -21,18 +21,18 @@ import {
   EuiSelect,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { AgentConfig } from '../../../../types';
+import { AgentPolicy } from '../../../../types';
 import { useInput, useCore, sendRequest } from '../../../../hooks';
 import { enrollmentAPIKeyRouteService } from '../../../../services';
 
 function useCreateApiKeyForm(
-  configDefaultValue: string | undefined,
+  policyIdDefaultValue: string | undefined,
   onSuccess: (keyId: string) => void
 ) {
   const { notifications } = useCore();
   const [isLoading, setIsLoading] = useState(false);
   const apiKeyNameInput = useInput('');
-  const configIdInput = useInput(configDefaultValue);
+  const policyIdInput = useInput(policyIdDefaultValue);
 
   const onSubmit = async (event: React.FormEvent) => {
     event.preventDefault();
@@ -43,10 +43,10 @@ function useCreateApiKeyForm(
         path: enrollmentAPIKeyRouteService.getCreatePath(),
         body: JSON.stringify({
           name: apiKeyNameInput.value,
-          config_id: configIdInput.value,
+          policy_id: policyIdInput.value,
         }),
       });
-      configIdInput.clear();
+      policyIdInput.clear();
       apiKeyNameInput.clear();
       setIsLoading(false);
       onSuccess(res.data.item.id);
@@ -66,22 +66,22 @@ function useCreateApiKeyForm(
   return {
     isLoading,
     onSubmit,
-    configIdInput,
+    policyIdInput,
     apiKeyNameInput,
   };
 }
 
 interface Props {
   onClose: () => void;
-  agentConfigs: AgentConfig[];
+  agentPolicies: AgentPolicy[];
 }
 
 export const NewEnrollmentTokenFlyout: React.FunctionComponent<Props> = ({
   onClose,
-  agentConfigs = [],
+  agentPolicies = [],
 }) => {
-  const configDefaultValue = agentConfigs.find((config) => config.is_default)?.id;
-  const form = useCreateApiKeyForm(configDefaultValue, () => {
+  const policyIdDefaultValue = agentPolicies.find((agentPolicy) => agentPolicy.is_default)?.id;
+  const form = useCreateApiKeyForm(policyIdDefaultValue, () => {
     onClose();
   });
 
@@ -102,15 +102,18 @@ export const NewEnrollmentTokenFlyout: React.FunctionComponent<Props> = ({
         </EuiFormRow>
 
         <EuiFormRow
-          label={i18n.translate('xpack.ingestManager.newEnrollmentKey.configLabel', {
-            defaultMessage: 'Configuration',
+          label={i18n.translate('xpack.ingestManager.newEnrollmentKey.policyLabel', {
+            defaultMessage: 'Policy',
           })}
         >
           <EuiSelect
             required={true}
-            defaultValue={configDefaultValue}
-            {...form.configIdInput.props}
-            options={agentConfigs.map((config) => ({ value: config.id, text: config.name }))}
+            defaultValue={policyIdDefaultValue}
+            {...form.policyIdInput.props}
+            options={agentPolicies.map((agentPolicy) => ({
+              value: agentPolicy.id,
+              text: agentPolicy.name,
+            }))}
           />
         </EuiFormRow>
         <EuiButton type="submit" fill isLoading={form.isLoading}>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/index.tsx
index 6e8796135214e..b3a4938b22310 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/index.tsx
@@ -24,7 +24,7 @@ import {
   useBreadcrumbs,
   usePagination,
   useGetEnrollmentAPIKeys,
-  useGetAgentConfigs,
+  useGetAgentPolicies,
   sendGetOneEnrollmentAPIKey,
   useCore,
   sendDeleteOneEnrollmentAPIKey,
@@ -165,12 +165,12 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
     perPage: pagination.pageSize,
     kuery: search.trim() !== '' ? search : undefined,
   });
-  const agentConfigsRequest = useGetAgentConfigs({
+  const agentPoliciesRequest = useGetAgentPolicies({
     page: 1,
     perPage: 1000,
   });
 
-  const agentConfigs = agentConfigsRequest.data ? agentConfigsRequest.data.items : [];
+  const agentPolicies = agentPoliciesRequest.data ? agentPoliciesRequest.data.items : [];
 
   const total = enrollmentAPIKeysRequest?.data?.total ?? 0;
   const items = enrollmentAPIKeysRequest?.data?.list ?? [];
@@ -198,13 +198,13 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
       },
     },
     {
-      field: 'config_id',
-      name: i18n.translate('xpack.ingestManager.enrollmentTokensList.configTitle', {
-        defaultMessage: 'Agent config',
+      field: 'policy_id',
+      name: i18n.translate('xpack.ingestManager.enrollmentTokensList.policyTitle', {
+        defaultMessage: 'Agent policy',
       }),
-      render: (configId: string) => {
-        const config = agentConfigs.find((c) => c.id === configId);
-        const value = config ? config.name : configId;
+      render: (policyId: string) => {
+        const agentPolicy = agentPolicies.find((c) => c.id === policyId);
+        const value = agentPolicy ? agentPolicy.name : policyId;
         return (
           <span className="eui-textTruncate" title={value}>
             {value}
@@ -255,7 +255,7 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
     <>
       {flyoutOpen && (
         <NewEnrollmentTokenFlyout
-          agentConfigs={agentConfigs}
+          agentPolicies={agentPolicies}
           onClose={() => {
             setFlyoutOpen(false);
             enrollmentAPIKeysRequest.sendRequest();
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/setup_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/setup_page/index.tsx
index ffd8591a642c1..eeade9036df00 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/setup_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/setup_page/index.tsx
@@ -134,7 +134,7 @@ export const SetupPage: React.FunctionComponent<{
           <EuiSpacer size="m" />
           <FormattedMessage
             id="xpack.ingestManager.setupPage.missingRequirementsElasticsearchTitle"
-            defaultMessage="In your Elasticsearch configuration, enable:"
+            defaultMessage="In your Elasticsearch policy, enable:"
           />
           <EuiSpacer size="l" />
           <RequirementItem isMissing={false}>
@@ -190,7 +190,7 @@ xpack.security.authc.api_key.enabled: true`}
           <EuiSpacer size="l" />
           <FormattedMessage
             id="xpack.ingestManager.setupPage.missingRequirementsKibanaTitle"
-            defaultMessage="In your Kibana configuration, enable:"
+            defaultMessage="In your Kibana policy, enable:"
           />
           <EuiSpacer size="l" />
           <RequirementItem isMissing={missingRequirements.includes('tls_required')}>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/index.tsx
index 1f46c4cc820cb..3a0f2c3ea8d58 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/index.tsx
@@ -5,8 +5,8 @@
  */
 export { IngestManagerOverview } from './overview';
 export { EPMApp } from './epm';
-export { AgentConfigApp } from './agent_config';
+export { AgentPolicyApp } from './agent_policy';
 export { DataStreamApp } from './data_stream';
 export { FleetApp } from './fleet';
 
-export type Section = 'overview' | 'epm' | 'agent_config' | 'fleet' | 'data_stream';
+export type Section = 'overview' | 'epm' | 'agent_policy' | 'fleet' | 'data_stream';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/configuration_section.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/agent_policy_section.tsx
similarity index 61%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/configuration_section.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/agent_policy_section.tsx
index 56aaba1d43321..617be92b3b1fe 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/configuration_section.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/agent_policy_section.tsx
@@ -15,15 +15,15 @@ import {
 } from '@elastic/eui';
 import { OverviewPanel } from './overview_panel';
 import { OverviewStats } from './overview_stats';
-import { useLink, useGetPackageConfigs } from '../../../hooks';
-import { AgentConfig } from '../../../types';
+import { useLink, useGetPackagePolicies } from '../../../hooks';
+import { AgentPolicy } from '../../../types';
 import { Loading } from '../../fleet/components';
 
-export const OverviewConfigurationSection: React.FC<{ agentConfigs: AgentConfig[] }> = ({
-  agentConfigs,
+export const OverviewPolicySection: React.FC<{ agentPolicies: AgentPolicy[] }> = ({
+  agentPolicies,
 }) => {
   const { getHref } = useLink();
-  const packageConfigsRequest = useGetPackageConfigs({
+  const packagePoliciesRequest = useGetPackagePolicies({
     page: 1,
     perPage: 10000,
   });
@@ -31,39 +31,39 @@ export const OverviewConfigurationSection: React.FC<{ agentConfigs: AgentConfig[
   return (
     <EuiFlexItem component="section">
       <OverviewPanel
-        title={i18n.translate('xpack.ingestManager.overviewPageConfigurationsPanelTitle', {
-          defaultMessage: 'Agent configurations',
+        title={i18n.translate('xpack.ingestManager.overviewPagePoliciesPanelTitle', {
+          defaultMessage: 'Agent policies',
         })}
-        tooltip={i18n.translate('xpack.ingestManager.overviewPageConfigurationsPanelTooltip', {
-          defaultMessage: 'Use agent configurations to control the data that your agents collect.',
+        tooltip={i18n.translate('xpack.ingestManager.overviewPagePoliciesPanelTooltip', {
+          defaultMessage: 'Use agent policies to control the data that your agents collect.',
         })}
-        linkTo={getHref('configurations_list')}
-        linkToText={i18n.translate('xpack.ingestManager.overviewPageConfigurationsPanelAction', {
-          defaultMessage: 'View configurations',
+        linkTo={getHref('policies_list')}
+        linkToText={i18n.translate('xpack.ingestManager.overviewPagePoliciesPanelAction', {
+          defaultMessage: 'View policies',
         })}
       >
         <OverviewStats>
-          {packageConfigsRequest.isLoading ? (
+          {packagePoliciesRequest.isLoading ? (
             <Loading />
           ) : (
             <>
               <EuiDescriptionListTitle>
                 <FormattedMessage
-                  id="xpack.ingestManager.overviewConfigTotalTitle"
+                  id="xpack.ingestManager.overviewPolicyTotalTitle"
                   defaultMessage="Total available"
                 />
               </EuiDescriptionListTitle>
               <EuiDescriptionListDescription>
-                <EuiI18nNumber value={agentConfigs.length} />
+                <EuiI18nNumber value={agentPolicies.length} />
               </EuiDescriptionListDescription>
               <EuiDescriptionListTitle>
                 <FormattedMessage
-                  id="xpack.ingestManager.overviewPackageConfigTitle"
-                  defaultMessage="Configured integrations"
+                  id="xpack.ingestManager.overviewPackagePolicyTitle"
+                  defaultMessage="Used integrations"
                 />
               </EuiDescriptionListTitle>
               <EuiDescriptionListDescription>
-                <EuiI18nNumber value={packageConfigsRequest.data?.total ?? 0} />
+                <EuiI18nNumber value={packagePoliciesRequest.data?.total ?? 0} />
               </EuiDescriptionListDescription>
             </>
           )}
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/agent_section.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/agent_section.tsx
index 7e33589bffea1..d7b08bf5ffa3a 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/agent_section.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/agent_section.tsx
@@ -30,7 +30,7 @@ export const OverviewAgentSection = () => {
         })}
         tooltip={i18n.translate('xpack.ingestManager.overviewPageFleetPanelTooltip', {
           defaultMessage:
-            'Use Fleet to enroll agents and manage their configurations from a central location.',
+            'Use Fleet to enroll agents and manage their policies from a central location.',
         })}
         linkTo={getHref('fleet_agent_list')}
         linkToText={i18n.translate('xpack.ingestManager.overviewPageFleetPanelAction', {
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/integration_section.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/integration_section.tsx
index ba16b47e73051..1e138ae922afc 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/integration_section.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/integration_section.tsx
@@ -37,7 +37,7 @@ export const OverviewIntegrationSection: React.FC = () => {
         })}
         tooltip={i18n.translate('xpack.ingestManager.overviewPageIntegrationsPanelTooltip', {
           defaultMessage:
-            'Browse and install integrations for the Elastic Stack. Add integrations to your agent configurations to start sending data.',
+            'Browse and install integrations for the Elastic Stack. Add integrations to your agent policies to start sending data.',
         })}
         linkTo={getHref('integrations_all')}
         linkToText={i18n.translate('xpack.ingestManager.overviewPageIntegrationsPanelAction', {
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx
index ea7ae093ee59a..187b701dc4167 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx
@@ -16,10 +16,10 @@ import {
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 import { WithHeaderLayout } from '../../layouts';
-import { useGetAgentConfigs, useBreadcrumbs } from '../../hooks';
+import { useGetAgentPolicies, useBreadcrumbs } from '../../hooks';
 import { AgentEnrollmentFlyout } from '../fleet/components';
 import { OverviewAgentSection } from './components/agent_section';
-import { OverviewConfigurationSection } from './components/configuration_section';
+import { OverviewPolicySection } from './components/agent_policy_section';
 import { OverviewIntegrationSection } from './components/integration_section';
 import { OverviewDatastreamSection } from './components/datastream_section';
 
@@ -29,12 +29,12 @@ export const IngestManagerOverview: React.FunctionComponent = () => {
   // Agent enrollment flyout state
   const [isEnrollmentFlyoutOpen, setIsEnrollmentFlyoutOpen] = useState<boolean>(false);
 
-  // Agent configs required for enrollment flyout
-  const agentConfigsRequest = useGetAgentConfigs({
+  // Agent policies required for enrollment flyout
+  const agentPoliciesRequest = useGetAgentPolicies({
     page: 1,
     perPage: 1000,
   });
-  const agentConfigs = agentConfigsRequest.data ? agentConfigsRequest.data.items : [];
+  const agentPolicies = agentPoliciesRequest.data ? agentPoliciesRequest.data.items : [];
 
   return (
     <WithHeaderLayout
@@ -71,7 +71,7 @@ export const IngestManagerOverview: React.FunctionComponent = () => {
               <p>
                 <FormattedMessage
                   id="xpack.ingestManager.overviewPageSubtitle"
-                  defaultMessage="Central management for Elastic Agents and agent configurations."
+                  defaultMessage="Central management for Elastic Agents and agent policies."
                 />
               </p>
             </EuiText>
@@ -93,14 +93,14 @@ export const IngestManagerOverview: React.FunctionComponent = () => {
     >
       {isEnrollmentFlyoutOpen && (
         <AgentEnrollmentFlyout
-          agentConfigs={agentConfigs}
+          agentPolicies={agentPolicies}
           onClose={() => setIsEnrollmentFlyoutOpen(false)}
         />
       )}
 
       <EuiFlexGrid gutterSize="l" columns={2}>
         <OverviewIntegrationSection />
-        <OverviewConfigurationSection agentConfigs={agentConfigs} />
+        <OverviewPolicySection agentPolicies={agentPolicies} />
         <OverviewAgentSection />
         <OverviewDatastreamSection />
       </EuiFlexGrid>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/services/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/services/index.ts
index 9c3b84d0835b8..7d426c11c0aab 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/services/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/services/index.ts
@@ -8,8 +8,8 @@ export { getFlattenedObject } from '../../../../../../../src/core/public';
 
 export {
   AgentStatusKueryHelper,
-  agentConfigRouteService,
-  packageConfigRouteService,
+  agentPolicyRouteService,
+  packagePolicyRouteService,
   dataStreamRouteService,
   fleetSetupRouteService,
   agentRouteService,
@@ -19,9 +19,9 @@ export {
   outputRoutesService,
   settingsRoutesService,
   appRoutesService,
-  packageToPackageConfigInputs,
-  storedPackageConfigsToAgentInputs,
-  configToYaml,
+  packageToPackagePolicyInputs,
+  storedPackagePoliciesToAgentInputs,
+  fullAgentPolicyToYaml,
   isPackageLimited,
-  doesAgentConfigAlreadyIncludePackage,
+  doesAgentPolicyAlreadyIncludePackage,
 } from '../../../../common';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/types/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/types/index.ts
index dc27da18bc008..80e27b7c4d0bf 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/types/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/types/index.ts
@@ -9,40 +9,40 @@ export {
   // Object types
   Agent,
   AgentMetadata,
-  AgentConfig,
-  NewAgentConfig,
+  AgentPolicy,
+  NewAgentPolicy,
   AgentEvent,
   EnrollmentAPIKey,
-  PackageConfig,
-  NewPackageConfig,
-  UpdatePackageConfig,
-  PackageConfigInput,
-  PackageConfigInputStream,
-  PackageConfigConfigRecord,
-  PackageConfigConfigRecordEntry,
+  PackagePolicy,
+  NewPackagePolicy,
+  UpdatePackagePolicy,
+  PackagePolicyInput,
+  PackagePolicyInputStream,
+  PackagePolicyConfigRecord,
+  PackagePolicyConfigRecordEntry,
   Output,
   DataStream,
   // API schema - misc setup, status
   GetFleetStatusResponse,
-  // API schemas - Agent Config
-  GetAgentConfigsRequest,
-  GetAgentConfigsResponse,
-  GetAgentConfigsResponseItem,
-  GetOneAgentConfigResponse,
-  GetFullAgentConfigResponse,
-  CreateAgentConfigRequest,
-  CreateAgentConfigResponse,
-  UpdateAgentConfigRequest,
-  UpdateAgentConfigResponse,
-  CopyAgentConfigRequest,
-  CopyAgentConfigResponse,
-  DeleteAgentConfigRequest,
-  DeleteAgentConfigResponse,
-  // API schemas - Package config
-  CreatePackageConfigRequest,
-  CreatePackageConfigResponse,
-  UpdatePackageConfigRequest,
-  UpdatePackageConfigResponse,
+  // API schemas - Agent policy
+  GetAgentPoliciesRequest,
+  GetAgentPoliciesResponse,
+  GetAgentPoliciesResponseItem,
+  GetOneAgentPolicyResponse,
+  GetFullAgentPolicyResponse,
+  CreateAgentPolicyRequest,
+  CreateAgentPolicyResponse,
+  UpdateAgentPolicyRequest,
+  UpdateAgentPolicyResponse,
+  CopyAgentPolicyRequest,
+  CopyAgentPolicyResponse,
+  DeleteAgentPolicyRequest,
+  DeleteAgentPolicyResponse,
+  // API schemas - Package policy
+  CreatePackagePolicyRequest,
+  CreatePackagePolicyResponse,
+  UpdatePackagePolicyRequest,
+  UpdatePackagePolicyResponse,
   // API schemas - Data Streams
   GetDataStreamsResponse,
   // API schemas - Agents
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/types/intra_app_route_state.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/types/intra_app_route_state.ts
index 4fd770501ae3f..c3faf7fc450d8 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/types/intra_app_route_state.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/types/intra_app_route_state.ts
@@ -5,16 +5,16 @@
  */
 
 import { ApplicationStart } from 'kibana/public';
-import { PackageConfig } from './';
+import { PackagePolicy } from './';
 
 /**
- * Supported routing state for the create package config page routes
+ * Supported routing state for the create package policy page routes
  */
-export interface CreatePackageConfigRouteState {
-  /** On a successful save of the package config, use navigate to the given app */
+export interface CreatePackagePolicyRouteState {
+  /** On a successful save of the package policy, use navigate to the given app */
   onSaveNavigateTo?:
     | Parameters<ApplicationStart['navigateToApp']>
-    | ((newPackageConfig: PackageConfig) => Parameters<ApplicationStart['navigateToApp']>);
+    | ((newPackagePolicy: PackagePolicy) => Parameters<ApplicationStart['navigateToApp']>);
   /** On cancel, navigate to the given app */
   onCancelNavigateTo?: Parameters<ApplicationStart['navigateToApp']>;
   /** Url to be used on cancel links */
@@ -22,17 +22,17 @@ export interface CreatePackageConfigRouteState {
 }
 
 /**
- * Supported routing state for the agent config details page routes with deploy agents action
+ * Supported routing state for the agent policy details page routes with deploy agents action
  */
-export interface AgentConfigDetailsDeployAgentAction {
+export interface AgentPolicyDetailsDeployAgentAction {
   /** On done, navigate to the given app */
   onDoneNavigateTo?: Parameters<ApplicationStart['navigateToApp']>;
 }
 
 /**
- * Supported routing state for the agent config details page routes with deploy agents action
+ * Supported routing state for the agent policy details page routes with deploy agents action
  */
-export interface AgentDetailsReassignConfigAction {
+export interface AgentDetailsReassignPolicyAction {
   /** On done, navigate to the given app */
   onDoneNavigateTo?: Parameters<ApplicationStart['navigateToApp']>;
 }
@@ -41,6 +41,6 @@ export interface AgentDetailsReassignConfigAction {
  * All possible Route states.
  */
 export type AnyIntraAppRouteState =
-  | CreatePackageConfigRouteState
-  | AgentConfigDetailsDeployAgentAction
-  | AgentDetailsReassignConfigAction;
+  | CreatePackagePolicyRouteState
+  | AgentPolicyDetailsDeployAgentAction
+  | AgentDetailsReassignPolicyAction;
diff --git a/x-pack/plugins/ingest_manager/public/index.ts b/x-pack/plugins/ingest_manager/public/index.ts
index 866d17145b075..75ba0e584230f 100644
--- a/x-pack/plugins/ingest_manager/public/index.ts
+++ b/x-pack/plugins/ingest_manager/public/index.ts
@@ -13,10 +13,10 @@ export const plugin = (initializerContext: PluginInitializerContext) => {
 };
 
 export {
-  CustomConfigurePackageConfigContent,
-  CustomConfigurePackageConfigProps,
-  registerPackageConfigComponent,
-} from './applications/ingest_manager/sections/agent_config/create_package_config_page/components/custom_package_config';
+  CustomConfigurePackagePolicyContent,
+  CustomConfigurePackagePolicyProps,
+  registerPackagePolicyComponent,
+} from './applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/custom_package_policy';
 
-export { NewPackageConfig } from './applications/ingest_manager/types';
+export { NewPackagePolicy } from './applications/ingest_manager/types';
 export * from './applications/ingest_manager/types/intra_app_route_state';
diff --git a/x-pack/plugins/ingest_manager/public/plugin.ts b/x-pack/plugins/ingest_manager/public/plugin.ts
index fde4e93f8e39f..a8cc7b72eb17f 100644
--- a/x-pack/plugins/ingest_manager/public/plugin.ts
+++ b/x-pack/plugins/ingest_manager/public/plugin.ts
@@ -25,7 +25,7 @@ import {
   TutorialDirectoryHeaderLink,
   TutorialModuleNotice,
 } from './applications/ingest_manager/components/home_integration';
-import { registerPackageConfigComponent } from './applications/ingest_manager/sections/agent_config/create_package_config_page/components/custom_package_config';
+import { registerPackagePolicyComponent } from './applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/custom_package_policy';
 
 export { IngestManagerConfigType } from '../common/types';
 
@@ -38,7 +38,7 @@ export interface IngestManagerSetup {}
  * Describes public IngestManager plugin contract returned at the `start` stage.
  */
 export interface IngestManagerStart {
-  registerPackageConfigComponent: typeof registerPackageConfigComponent;
+  registerPackagePolicyComponent: typeof registerPackagePolicyComponent;
   isInitialized: () => Promise<true>;
 }
 
@@ -127,7 +127,7 @@ export class IngestManagerPlugin
 
         return successPromise;
       },
-      registerPackageConfigComponent,
+      registerPackagePolicyComponent,
     };
   }
 
diff --git a/x-pack/plugins/ingest_manager/server/collectors/agent_collectors.ts b/x-pack/plugins/ingest_manager/server/collectors/agent_collectors.ts
index 920b336297171..fe5e5fa735b24 100644
--- a/x-pack/plugins/ingest_manager/server/collectors/agent_collectors.ts
+++ b/x-pack/plugins/ingest_manager/server/collectors/agent_collectors.ts
@@ -23,7 +23,9 @@ export const getAgentUsage = async (soClient?: SavedObjectsClient): Promise<Agen
       offline: 0,
     };
   }
-  const { total, online, error, offline } = await AgentService.getAgentStatusForConfig(soClient);
+  const { total, online, error, offline } = await AgentService.getAgentStatusForAgentPolicy(
+    soClient
+  );
   return {
     total,
     online,
diff --git a/x-pack/plugins/ingest_manager/server/collectors/package_collectors.ts b/x-pack/plugins/ingest_manager/server/collectors/package_collectors.ts
index 399e38f1919ba..63f118c84301f 100644
--- a/x-pack/plugins/ingest_manager/server/collectors/package_collectors.ts
+++ b/x-pack/plugins/ingest_manager/server/collectors/package_collectors.ts
@@ -7,8 +7,8 @@
 import { SavedObjectsClient } from 'kibana/server';
 import _ from 'lodash';
 import { getPackageSavedObjects } from '../services/epm/packages/get';
-import { agentConfigService } from '../services';
-import { NewPackageConfig } from '../types';
+import { agentPolicyService } from '../services';
+import { NewPackagePolicy } from '../types';
 
 export interface PackageUsage {
   name: string;
@@ -21,23 +21,22 @@ export const getPackageUsage = async (soClient?: SavedObjectsClient): Promise<Pa
     return [];
   }
   const packagesSavedObjects = await getPackageSavedObjects(soClient);
-  const agentConfigs = await agentConfigService.list(soClient, {
+  const agentPolicies = await agentPolicyService.list(soClient, {
     perPage: 1000, // avoiding pagination
-    withPackageConfigs: true,
+    withPackagePolicies: true,
   });
 
-  // Once we provide detailed telemetry on agent configs, this logic should probably be moved
-  // to the (then to be created) agent config collector, so we only query and loop over these
+  // Once we provide detailed telemetry on agent policies, this logic should probably be moved
+  // to the (then to be created) agent policy collector, so we only query and loop over these
   // objects once.
-
-  const packagesInConfigs = agentConfigs.items.map((agentConfig) => {
-    const packageConfigs: NewPackageConfig[] = agentConfig.package_configs as NewPackageConfig[];
-    return packageConfigs
-      .map((packageConfig) => packageConfig.package?.name)
+  const packagesInAgentPolicies = agentPolicies.items.map((agentPolicy) => {
+    const packagePolicies: NewPackagePolicy[] = agentPolicy.package_policies as NewPackagePolicy[];
+    return packagePolicies
+      .map((packagePolicy) => packagePolicy.package?.name)
       .filter((packageName): packageName is string => packageName !== undefined);
   });
 
-  const enabledPackages = _.uniq(_.flatten(packagesInConfigs));
+  const enabledPackages = _.uniq(_.flatten(packagesInAgentPolicies));
 
   return packagesSavedObjects.saved_objects.map((p) => {
     return {
diff --git a/x-pack/plugins/ingest_manager/server/constants/index.ts b/x-pack/plugins/ingest_manager/server/constants/index.ts
index 730d8cf7b172c..54d2d876c75b1 100644
--- a/x-pack/plugins/ingest_manager/server/constants/index.ts
+++ b/x-pack/plugins/ingest_manager/server/constants/index.ts
@@ -10,8 +10,8 @@ export {
   AGENT_POLLING_THRESHOLD_MS,
   AGENT_POLLING_INTERVAL,
   AGENT_UPDATE_LAST_CHECKIN_INTERVAL_MS,
-  AGENT_CONFIG_ROLLOUT_RATE_LIMIT_REQUEST_PER_INTERVAL,
-  AGENT_CONFIG_ROLLOUT_RATE_LIMIT_INTERVAL_MS,
+  AGENT_POLICY_ROLLOUT_RATE_LIMIT_REQUEST_PER_INTERVAL,
+  AGENT_POLICY_ROLLOUT_RATE_LIMIT_INTERVAL_MS,
   AGENT_UPDATE_ACTIONS_INTERVAL_MS,
   INDEX_PATTERN_PLACEHOLDER_SUFFIX,
   // Routes
@@ -19,9 +19,9 @@ export {
   PLUGIN_ID,
   EPM_API_ROUTES,
   DATA_STREAM_API_ROUTES,
-  PACKAGE_CONFIG_API_ROUTES,
+  PACKAGE_POLICY_API_ROUTES,
   AGENT_API_ROUTES,
-  AGENT_CONFIG_API_ROUTES,
+  AGENT_POLICY_API_ROUTES,
   FLEET_SETUP_API_ROUTES,
   ENROLLMENT_API_KEY_ROUTES,
   INSTALL_SCRIPT_API_ROUTES,
@@ -33,14 +33,14 @@ export {
   AGENT_SAVED_OBJECT_TYPE,
   AGENT_EVENT_SAVED_OBJECT_TYPE,
   AGENT_ACTION_SAVED_OBJECT_TYPE,
-  AGENT_CONFIG_SAVED_OBJECT_TYPE,
-  PACKAGE_CONFIG_SAVED_OBJECT_TYPE,
+  AGENT_POLICY_SAVED_OBJECT_TYPE,
+  PACKAGE_POLICY_SAVED_OBJECT_TYPE,
   OUTPUT_SAVED_OBJECT_TYPE,
   PACKAGES_SAVED_OBJECT_TYPE,
   INDEX_PATTERN_SAVED_OBJECT_TYPE,
   ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE,
   GLOBAL_SETTINGS_SAVED_OBJECT_TYPE,
   // Defaults
-  DEFAULT_AGENT_CONFIG,
+  DEFAULT_AGENT_POLICY,
   DEFAULT_OUTPUT,
 } from '../../common';
diff --git a/x-pack/plugins/ingest_manager/server/index.ts b/x-pack/plugins/ingest_manager/server/index.ts
index 9933266a441e2..962cddb2e411e 100644
--- a/x-pack/plugins/ingest_manager/server/index.ts
+++ b/x-pack/plugins/ingest_manager/server/index.ts
@@ -7,8 +7,8 @@ import { schema, TypeOf } from '@kbn/config-schema';
 import { PluginInitializerContext } from 'src/core/server';
 import { IngestManagerPlugin } from './plugin';
 import {
-  AGENT_CONFIG_ROLLOUT_RATE_LIMIT_INTERVAL_MS,
-  AGENT_CONFIG_ROLLOUT_RATE_LIMIT_REQUEST_PER_INTERVAL,
+  AGENT_POLICY_ROLLOUT_RATE_LIMIT_INTERVAL_MS,
+  AGENT_POLICY_ROLLOUT_RATE_LIMIT_REQUEST_PER_INTERVAL,
 } from '../common';
 export { AgentService, ESIndexPatternService, getRegistryUrl } from './services';
 export {
@@ -39,11 +39,11 @@ export const config = {
         host: schema.maybe(schema.string()),
         ca_sha256: schema.maybe(schema.string()),
       }),
-      agentConfigRolloutRateLimitIntervalMs: schema.number({
-        defaultValue: AGENT_CONFIG_ROLLOUT_RATE_LIMIT_INTERVAL_MS,
+      agentPolicyRolloutRateLimitIntervalMs: schema.number({
+        defaultValue: AGENT_POLICY_ROLLOUT_RATE_LIMIT_INTERVAL_MS,
       }),
-      agentConfigRolloutRateLimitRequestPerInterval: schema.number({
-        defaultValue: AGENT_CONFIG_ROLLOUT_RATE_LIMIT_REQUEST_PER_INTERVAL,
+      agentPolicyRolloutRateLimitRequestPerInterval: schema.number({
+        defaultValue: AGENT_POLICY_ROLLOUT_RATE_LIMIT_REQUEST_PER_INTERVAL,
       }),
     }),
   }),
@@ -51,7 +51,7 @@ export const config = {
 
 export type IngestManagerConfigType = TypeOf<typeof config.schema>;
 
-export { PackageConfigServiceInterface } from './services/package_config';
+export { PackagePolicyServiceInterface } from './services/package_policy';
 
 export const plugin = (initializerContext: PluginInitializerContext) => {
   return new IngestManagerPlugin(initializerContext);
diff --git a/x-pack/plugins/ingest_manager/server/integration_tests/router.test.ts b/x-pack/plugins/ingest_manager/server/integration_tests/router.test.ts
index 9d671c629ef91..60ef6851bd996 100644
--- a/x-pack/plugins/ingest_manager/server/integration_tests/router.test.ts
+++ b/x-pack/plugins/ingest_manager/server/integration_tests/router.test.ts
@@ -42,12 +42,12 @@ describe('ingestManager', () => {
 
     afterAll(async () => await root.shutdown());
 
-    it('does not have agent config api', async () => {
-      await kbnTestServer.request.get(root, '/api/ingest_manager/agent_configs').expect(404);
+    it('does not have agent policy api', async () => {
+      await kbnTestServer.request.get(root, '/api/ingest_manager/agent_policies').expect(404);
     });
 
-    it('does not have package configs api', async () => {
-      await kbnTestServer.request.get(root, '/api/ingest_manager/package_configs').expect(404);
+    it('does not have package policies api', async () => {
+      await kbnTestServer.request.get(root, '/api/ingest_manager/package_policies').expect(404);
     });
 
     it('does not have EPM api', async () => {
@@ -75,12 +75,12 @@ describe('ingestManager', () => {
 
     afterAll(async () => await root.shutdown());
 
-    it('has agent config api', async () => {
-      await kbnTestServer.request.get(root, '/api/ingest_manager/agent_configs').expect(200);
+    it('has agent policy api', async () => {
+      await kbnTestServer.request.get(root, '/api/ingest_manager/agent_policies').expect(200);
     });
 
-    it('has package configs api', async () => {
-      await kbnTestServer.request.get(root, '/api/ingest_manager/package_configs').expect(200);
+    it('has package policies api', async () => {
+      await kbnTestServer.request.get(root, '/api/ingest_manager/package_policies').expect(200);
     });
 
     it('does not have EPM api', async () => {
@@ -92,7 +92,7 @@ describe('ingestManager', () => {
     });
   });
 
-  // For now, only the manager routes (/agent_configs & /package_configs) are added
+  // For now, only the manager routes (/agent_policies & /package_policies) are added
   // EPM and ingest will be conditionally added when we enable these lines
   // https://github.com/jfsiii/kibana/blob/f73b54ebb7e0f6fc00efd8a6800a01eb2d9fb772/x-pack/plugins/ingest_manager/server/plugin.ts#L84
   // adding tests to confirm the Fleet & EPM routes are never added
@@ -114,12 +114,12 @@ describe('ingestManager', () => {
 
     afterAll(async () => await root.shutdown());
 
-    it('has agent config api', async () => {
-      await kbnTestServer.request.get(root, '/api/ingest_manager/agent_configs').expect(200);
+    it('has agent policy api', async () => {
+      await kbnTestServer.request.get(root, '/api/ingest_manager/agent_policies').expect(200);
     });
 
-    it('has package configs api', async () => {
-      await kbnTestServer.request.get(root, '/api/ingest_manager/package_configs').expect(200);
+    it('has package policies api', async () => {
+      await kbnTestServer.request.get(root, '/api/ingest_manager/package_policies').expect(200);
     });
 
     it('does have EPM api', async () => {
@@ -148,12 +148,12 @@ describe('ingestManager', () => {
 
     afterAll(async () => await root.shutdown());
 
-    it('has agent config api', async () => {
-      await kbnTestServer.request.get(root, '/api/ingest_manager/agent_configs').expect(200);
+    it('has agent policy api', async () => {
+      await kbnTestServer.request.get(root, '/api/ingest_manager/agent_policies').expect(200);
     });
 
-    it('has package configs api', async () => {
-      await kbnTestServer.request.get(root, '/api/ingest_manager/package_configs').expect(200);
+    it('has package policies api', async () => {
+      await kbnTestServer.request.get(root, '/api/ingest_manager/package_policies').expect(200);
     });
 
     it('does not have EPM api', async () => {
@@ -183,12 +183,12 @@ describe('ingestManager', () => {
 
     afterAll(async () => await root.shutdown());
 
-    it('has agent config api', async () => {
-      await kbnTestServer.request.get(root, '/api/ingest_manager/agent_configs').expect(200);
+    it('has agent policy api', async () => {
+      await kbnTestServer.request.get(root, '/api/ingest_manager/agent_policies').expect(200);
     });
 
-    it('has package configs api', async () => {
-      await kbnTestServer.request.get(root, '/api/ingest_manager/package_configs').expect(200);
+    it('has package policies api', async () => {
+      await kbnTestServer.request.get(root, '/api/ingest_manager/package_policies').expect(200);
     });
 
     it('does have EPM api', async () => {
diff --git a/x-pack/plugins/ingest_manager/server/mocks.ts b/x-pack/plugins/ingest_manager/server/mocks.ts
index 52cd294783087..18b58b5673651 100644
--- a/x-pack/plugins/ingest_manager/server/mocks.ts
+++ b/x-pack/plugins/ingest_manager/server/mocks.ts
@@ -8,7 +8,7 @@ import { loggingSystemMock, savedObjectsServiceMock } from 'src/core/server/mock
 import { IngestManagerAppContext } from './plugin';
 import { encryptedSavedObjectsMock } from '../../encrypted_saved_objects/server/mocks';
 import { securityMock } from '../../security/server/mocks';
-import { PackageConfigServiceInterface } from './services/package_config';
+import { PackagePolicyServiceInterface } from './services/package_policy';
 
 export const createAppContextStartContractMock = (): IngestManagerAppContext => {
   return {
@@ -22,10 +22,10 @@ export const createAppContextStartContractMock = (): IngestManagerAppContext =>
   };
 };
 
-export const createPackageConfigServiceMock = () => {
+export const createPackagePolicyServiceMock = () => {
   return {
     assignPackageStream: jest.fn(),
-    buildPackageConfigFromPackage: jest.fn(),
+    buildPackagePolicyFromPackage: jest.fn(),
     bulkCreate: jest.fn(),
     create: jest.fn(),
     delete: jest.fn(),
@@ -33,5 +33,5 @@ export const createPackageConfigServiceMock = () => {
     getByIDs: jest.fn(),
     list: jest.fn(),
     update: jest.fn(),
-  } as jest.Mocked<PackageConfigServiceInterface>;
+  } as jest.Mocked<PackagePolicyServiceInterface>;
 };
diff --git a/x-pack/plugins/ingest_manager/server/plugin.ts b/x-pack/plugins/ingest_manager/server/plugin.ts
index e5e1194d59ecb..ce1659176faaf 100644
--- a/x-pack/plugins/ingest_manager/server/plugin.ts
+++ b/x-pack/plugins/ingest_manager/server/plugin.ts
@@ -25,8 +25,8 @@ import { PluginSetupContract as FeaturesPluginSetup } from '../../features/serve
 import {
   PLUGIN_ID,
   OUTPUT_SAVED_OBJECT_TYPE,
-  AGENT_CONFIG_SAVED_OBJECT_TYPE,
-  PACKAGE_CONFIG_SAVED_OBJECT_TYPE,
+  AGENT_POLICY_SAVED_OBJECT_TYPE,
+  PACKAGE_POLICY_SAVED_OBJECT_TYPE,
   PACKAGES_SAVED_OBJECT_TYPE,
   AGENT_SAVED_OBJECT_TYPE,
   AGENT_EVENT_SAVED_OBJECT_TYPE,
@@ -36,9 +36,9 @@ import { registerSavedObjects, registerEncryptedSavedObjects } from './saved_obj
 import {
   registerLimitedConcurrencyRoutes,
   registerEPMRoutes,
-  registerPackageConfigRoutes,
+  registerPackagePolicyRoutes,
   registerDataStreamRoutes,
-  registerAgentConfigRoutes,
+  registerAgentPolicyRoutes,
   registerSetupRoutes,
   registerAgentRoutes,
   registerEnrollmentApiKeyRoutes,
@@ -47,14 +47,14 @@ import {
   registerSettingsRoutes,
   registerAppRoutes,
 } from './routes';
-import { IngestManagerConfigType, NewPackageConfig } from '../common';
+import { IngestManagerConfigType, NewPackagePolicy } from '../common';
 import {
   appContextService,
   licenseService,
   ESIndexPatternSavedObjectService,
   ESIndexPatternService,
   AgentService,
-  packageConfigService,
+  packagePolicyService,
 } from './services';
 import {
   getAgentStatusById,
@@ -95,8 +95,8 @@ export type IngestManagerSetupContract = void;
 
 const allSavedObjectTypes = [
   OUTPUT_SAVED_OBJECT_TYPE,
-  AGENT_CONFIG_SAVED_OBJECT_TYPE,
-  PACKAGE_CONFIG_SAVED_OBJECT_TYPE,
+  AGENT_POLICY_SAVED_OBJECT_TYPE,
+  PACKAGE_POLICY_SAVED_OBJECT_TYPE,
   PACKAGES_SAVED_OBJECT_TYPE,
   AGENT_SAVED_OBJECT_TYPE,
   AGENT_EVENT_SAVED_OBJECT_TYPE,
@@ -107,8 +107,8 @@ const allSavedObjectTypes = [
  * Callbacks supported by the Ingest plugin
  */
 export type ExternalCallback = [
-  'packageConfigCreate',
-  (newPackageConfig: NewPackageConfig) => Promise<NewPackageConfig>
+  'packagePolicyCreate',
+  (newPackagePolicy: NewPackagePolicy) => Promise<NewPackagePolicy>
 ];
 
 export type ExternalCallbacksStorage = Map<ExternalCallback[0], Set<ExternalCallback[1]>>;
@@ -120,9 +120,9 @@ export interface IngestManagerStartContract {
   esIndexPatternService: ESIndexPatternService;
   agentService: AgentService;
   /**
-   * Services for Ingest's package configs
+   * Services for Ingest's package policies
    */
-  packageConfigService: typeof packageConfigService;
+  packagePolicyService: typeof packagePolicyService;
   /**
    * Register callbacks for inclusion in ingest API processing
    * @param args
@@ -214,8 +214,8 @@ export class IngestManagerPlugin
     // Register rest of routes only if security is enabled
     if (this.security) {
       registerSetupRoutes(router, config);
-      registerAgentConfigRoutes(router);
-      registerPackageConfigRoutes(router);
+      registerAgentPolicyRoutes(router);
+      registerPackagePolicyRoutes(router);
       registerOutputRoutes(router);
       registerSettingsRoutes(router);
       registerDataStreamRoutes(router);
@@ -276,7 +276,7 @@ export class IngestManagerPlugin
         getAgentStatusById,
         authenticateAgentWithAccessToken,
       },
-      packageConfigService,
+      packagePolicyService,
       registerExternalCallback: (...args: ExternalCallback) => {
         return appContextService.addExternalCallback(...args);
       },
diff --git a/x-pack/plugins/ingest_manager/server/routes/agent/handlers.ts b/x-pack/plugins/ingest_manager/server/routes/agent/handlers.ts
index 6cfe3d5b76266..3e80a74dc2b11 100644
--- a/x-pack/plugins/ingest_manager/server/routes/agent/handlers.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/agent/handlers.ts
@@ -239,7 +239,7 @@ export const postAgentEnrollHandler: RequestHandler<
     const agent = await AgentService.enroll(
       soClient,
       request.body.type,
-      enrollmentAPIKey.config_id as string,
+      enrollmentAPIKey.policy_id as string,
       {
         userProvided: request.body.metadata.user_provided,
         local: request.body.metadata.local,
@@ -310,7 +310,7 @@ export const putAgentsReassignHandler: RequestHandler<
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
   try {
-    await AgentService.reassignAgent(soClient, request.params.agentId, request.body.config_id);
+    await AgentService.reassignAgent(soClient, request.params.agentId, request.body.policy_id);
 
     const body: PutAgentReassignResponse = {
       success: true,
@@ -324,14 +324,17 @@ export const putAgentsReassignHandler: RequestHandler<
   }
 };
 
-export const getAgentStatusForConfigHandler: RequestHandler<
+export const getAgentStatusForAgentPolicyHandler: RequestHandler<
   undefined,
   TypeOf<typeof GetAgentStatusRequestSchema.query>
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
   try {
     // TODO change path
-    const results = await AgentService.getAgentStatusForConfig(soClient, request.query.configId);
+    const results = await AgentService.getAgentStatusForAgentPolicy(
+      soClient,
+      request.query.policyId
+    );
 
     const body: GetAgentStatusResponse = { results, success: true };
 
diff --git a/x-pack/plugins/ingest_manager/server/routes/agent/index.ts b/x-pack/plugins/ingest_manager/server/routes/agent/index.ts
index b85d96186f233..7c98ad31e5cdb 100644
--- a/x-pack/plugins/ingest_manager/server/routes/agent/index.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/agent/index.ts
@@ -33,7 +33,7 @@ import {
   getAgentEventsHandler,
   postAgentCheckinHandler,
   postAgentEnrollHandler,
-  getAgentStatusForConfigHandler,
+  getAgentStatusForAgentPolicyHandler,
   putAgentsReassignHandler,
 } from './handlers';
 import { postAgentAcksHandlerBuilder } from './acks_handlers';
@@ -158,13 +158,13 @@ export const registerRoutes = (router: IRouter) => {
     getAgentEventsHandler
   );
 
-  // Get agent status for config
+  // Get agent status for policy
   router.get(
     {
       path: AGENT_API_ROUTES.STATUS_PATTERN,
       validate: GetAgentStatusRequestSchema,
       options: { tags: [`access:${PLUGIN_ID}-read`] },
     },
-    getAgentStatusForConfigHandler
+    getAgentStatusForAgentPolicyHandler
   );
 };
diff --git a/x-pack/plugins/ingest_manager/server/routes/agent_config/index.ts b/x-pack/plugins/ingest_manager/server/routes/agent_config/index.ts
deleted file mode 100644
index 95c7c13377366..0000000000000
--- a/x-pack/plugins/ingest_manager/server/routes/agent_config/index.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { IRouter } from 'src/core/server';
-import { PLUGIN_ID, AGENT_CONFIG_API_ROUTES } from '../../constants';
-import {
-  GetAgentConfigsRequestSchema,
-  GetOneAgentConfigRequestSchema,
-  CreateAgentConfigRequestSchema,
-  UpdateAgentConfigRequestSchema,
-  CopyAgentConfigRequestSchema,
-  DeleteAgentConfigRequestSchema,
-  GetFullAgentConfigRequestSchema,
-} from '../../types';
-import {
-  getAgentConfigsHandler,
-  getOneAgentConfigHandler,
-  createAgentConfigHandler,
-  updateAgentConfigHandler,
-  copyAgentConfigHandler,
-  deleteAgentConfigsHandler,
-  getFullAgentConfig,
-  downloadFullAgentConfig,
-} from './handlers';
-
-export const registerRoutes = (router: IRouter) => {
-  // List
-  router.get(
-    {
-      path: AGENT_CONFIG_API_ROUTES.LIST_PATTERN,
-      validate: GetAgentConfigsRequestSchema,
-      options: { tags: [`access:${PLUGIN_ID}-read`] },
-    },
-    getAgentConfigsHandler
-  );
-
-  // Get one
-  router.get(
-    {
-      path: AGENT_CONFIG_API_ROUTES.INFO_PATTERN,
-      validate: GetOneAgentConfigRequestSchema,
-      options: { tags: [`access:${PLUGIN_ID}-read`] },
-    },
-    getOneAgentConfigHandler
-  );
-
-  // Create
-  router.post(
-    {
-      path: AGENT_CONFIG_API_ROUTES.CREATE_PATTERN,
-      validate: CreateAgentConfigRequestSchema,
-      options: { tags: [`access:${PLUGIN_ID}-all`] },
-    },
-    createAgentConfigHandler
-  );
-
-  // Update
-  router.put(
-    {
-      path: AGENT_CONFIG_API_ROUTES.UPDATE_PATTERN,
-      validate: UpdateAgentConfigRequestSchema,
-      options: { tags: [`access:${PLUGIN_ID}-all`] },
-    },
-    updateAgentConfigHandler
-  );
-
-  // Copy
-  router.post(
-    {
-      path: AGENT_CONFIG_API_ROUTES.COPY_PATTERN,
-      validate: CopyAgentConfigRequestSchema,
-      options: { tags: [`access:${PLUGIN_ID}-all`] },
-    },
-    copyAgentConfigHandler
-  );
-
-  // Delete
-  router.post(
-    {
-      path: AGENT_CONFIG_API_ROUTES.DELETE_PATTERN,
-      validate: DeleteAgentConfigRequestSchema,
-      options: { tags: [`access:${PLUGIN_ID}-all`] },
-    },
-    deleteAgentConfigsHandler
-  );
-
-  // Get one full agent config
-  router.get(
-    {
-      path: AGENT_CONFIG_API_ROUTES.FULL_INFO_PATTERN,
-      validate: GetFullAgentConfigRequestSchema,
-      options: { tags: [`access:${PLUGIN_ID}-read`] },
-    },
-    getFullAgentConfig
-  );
-
-  // Download one full agent config
-  router.get(
-    {
-      path: AGENT_CONFIG_API_ROUTES.FULL_INFO_DOWNLOAD_PATTERN,
-      validate: GetFullAgentConfigRequestSchema,
-      options: { tags: [`access:${PLUGIN_ID}-read`] },
-    },
-    downloadFullAgentConfig
-  );
-};
diff --git a/x-pack/plugins/ingest_manager/server/routes/agent_config/handlers.ts b/x-pack/plugins/ingest_manager/server/routes/agent_policy/handlers.ts
similarity index 54%
rename from x-pack/plugins/ingest_manager/server/routes/agent_config/handlers.ts
rename to x-pack/plugins/ingest_manager/server/routes/agent_policy/handlers.ts
index 4e4653ec023ce..cc178e1038e2e 100644
--- a/x-pack/plugins/ingest_manager/server/routes/agent_config/handlers.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/agent_policy/handlers.ts
@@ -6,45 +6,45 @@
 import { TypeOf } from '@kbn/config-schema';
 import { RequestHandler, ResponseHeaders } from 'src/core/server';
 import bluebird from 'bluebird';
-import { configToYaml } from '../../../common/services';
-import { appContextService, agentConfigService, packageConfigService } from '../../services';
+import { fullAgentPolicyToYaml } from '../../../common/services';
+import { appContextService, agentPolicyService, packagePolicyService } from '../../services';
 import { listAgents } from '../../services/agents';
 import { AGENT_SAVED_OBJECT_TYPE } from '../../constants';
 import {
-  GetAgentConfigsRequestSchema,
-  GetOneAgentConfigRequestSchema,
-  CreateAgentConfigRequestSchema,
-  UpdateAgentConfigRequestSchema,
-  CopyAgentConfigRequestSchema,
-  DeleteAgentConfigRequestSchema,
-  GetFullAgentConfigRequestSchema,
-  AgentConfig,
+  GetAgentPoliciesRequestSchema,
+  GetOneAgentPolicyRequestSchema,
+  CreateAgentPolicyRequestSchema,
+  UpdateAgentPolicyRequestSchema,
+  CopyAgentPolicyRequestSchema,
+  DeleteAgentPolicyRequestSchema,
+  GetFullAgentPolicyRequestSchema,
+  AgentPolicy,
   DefaultPackages,
-  NewPackageConfig,
+  NewPackagePolicy,
 } from '../../types';
 import {
-  GetAgentConfigsResponse,
-  GetAgentConfigsResponseItem,
-  GetOneAgentConfigResponse,
-  CreateAgentConfigResponse,
-  UpdateAgentConfigResponse,
-  CopyAgentConfigResponse,
-  DeleteAgentConfigResponse,
-  GetFullAgentConfigResponse,
+  GetAgentPoliciesResponse,
+  GetAgentPoliciesResponseItem,
+  GetOneAgentPolicyResponse,
+  CreateAgentPolicyResponse,
+  UpdateAgentPolicyResponse,
+  CopyAgentPolicyResponse,
+  DeleteAgentPolicyResponse,
+  GetFullAgentPolicyResponse,
 } from '../../../common';
 
-export const getAgentConfigsHandler: RequestHandler<
+export const getAgentPoliciesHandler: RequestHandler<
   undefined,
-  TypeOf<typeof GetAgentConfigsRequestSchema.query>
+  TypeOf<typeof GetAgentPoliciesRequestSchema.query>
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
-  const { full: withPackageConfigs = false, ...restOfQuery } = request.query;
+  const { full: withPackagePolicies = false, ...restOfQuery } = request.query;
   try {
-    const { items, total, page, perPage } = await agentConfigService.list(soClient, {
-      withPackageConfigs,
+    const { items, total, page, perPage } = await agentPolicyService.list(soClient, {
+      withPackagePolicies,
       ...restOfQuery,
     });
-    const body: GetAgentConfigsResponse = {
+    const body: GetAgentPoliciesResponse = {
       items,
       total,
       page,
@@ -54,13 +54,13 @@ export const getAgentConfigsHandler: RequestHandler<
 
     await bluebird.map(
       items,
-      (agentConfig: GetAgentConfigsResponseItem) =>
+      (agentPolicy: GetAgentPoliciesResponseItem) =>
         listAgents(soClient, {
           showInactive: false,
           perPage: 0,
           page: 1,
-          kuery: `${AGENT_SAVED_OBJECT_TYPE}.config_id:${agentConfig.id}`,
-        }).then(({ total: agentTotal }) => (agentConfig.agents = agentTotal)),
+          kuery: `${AGENT_SAVED_OBJECT_TYPE}.policy_id:${agentPolicy.id}`,
+        }).then(({ total: agentTotal }) => (agentPolicy.agents = agentTotal)),
       { concurrency: 10 }
     );
 
@@ -73,15 +73,15 @@ export const getAgentConfigsHandler: RequestHandler<
   }
 };
 
-export const getOneAgentConfigHandler: RequestHandler<TypeOf<
-  typeof GetOneAgentConfigRequestSchema.params
+export const getOneAgentPolicyHandler: RequestHandler<TypeOf<
+  typeof GetOneAgentPolicyRequestSchema.params
 >> = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
   try {
-    const agentConfig = await agentConfigService.get(soClient, request.params.agentConfigId);
-    if (agentConfig) {
-      const body: GetOneAgentConfigResponse = {
-        item: agentConfig,
+    const agentPolicy = await agentPolicyService.get(soClient, request.params.agentPolicyId);
+    if (agentPolicy) {
+      const body: GetOneAgentPolicyResponse = {
+        item: agentPolicy,
         success: true,
       };
       return response.ok({
@@ -90,7 +90,7 @@ export const getOneAgentConfigHandler: RequestHandler<TypeOf<
     } else {
       return response.customError({
         statusCode: 404,
-        body: { message: 'Agent config not found' },
+        body: { message: 'Agent policy not found' },
       });
     }
   } catch (e) {
@@ -101,10 +101,10 @@ export const getOneAgentConfigHandler: RequestHandler<TypeOf<
   }
 };
 
-export const createAgentConfigHandler: RequestHandler<
+export const createAgentPolicyHandler: RequestHandler<
   undefined,
-  TypeOf<typeof CreateAgentConfigRequestSchema.query>,
-  TypeOf<typeof CreateAgentConfigRequestSchema.body>
+  TypeOf<typeof CreateAgentPolicyRequestSchema.query>,
+  TypeOf<typeof CreateAgentPolicyRequestSchema.body>
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
   const callCluster = context.core.elasticsearch.legacy.client.callAsCurrentUser;
@@ -112,35 +112,35 @@ export const createAgentConfigHandler: RequestHandler<
   const withSysMonitoring = request.query.sys_monitoring ?? false;
   try {
     // eslint-disable-next-line prefer-const
-    let [agentConfig, newSysPackageConfig] = await Promise.all<
-      AgentConfig,
-      NewPackageConfig | undefined
+    let [agentPolicy, newSysPackagePolicy] = await Promise.all<
+      AgentPolicy,
+      NewPackagePolicy | undefined
     >([
-      agentConfigService.create(soClient, request.body, {
+      agentPolicyService.create(soClient, request.body, {
         user,
       }),
-      // If needed, retrieve System package information and build a new package config for the system package
-      // NOTE: we ignore failures in attempting to create package config, since config might have been created
+      // If needed, retrieve System package information and build a new package policy for the system package
+      // NOTE: we ignore failures in attempting to create package policy, since agent policy might have been created
       // successfully
       withSysMonitoring
-        ? packageConfigService
-            .buildPackageConfigFromPackage(soClient, DefaultPackages.system)
+        ? packagePolicyService
+            .buildPackagePolicyFromPackage(soClient, DefaultPackages.system)
             .catch(() => undefined)
         : undefined,
     ]);
 
-    // Create the system monitoring package config and add it to agent config.
-    if (withSysMonitoring && newSysPackageConfig !== undefined && agentConfig !== undefined) {
-      newSysPackageConfig.config_id = agentConfig.id;
-      newSysPackageConfig.namespace = agentConfig.namespace;
-      await packageConfigService.create(soClient, callCluster, newSysPackageConfig, {
+    // Create the system monitoring package policy and add it to agent policy.
+    if (withSysMonitoring && newSysPackagePolicy !== undefined && agentPolicy !== undefined) {
+      newSysPackagePolicy.policy_id = agentPolicy.id;
+      newSysPackagePolicy.namespace = agentPolicy.namespace;
+      await packagePolicyService.create(soClient, callCluster, newSysPackagePolicy, {
         user,
-        bumpConfigRevision: false,
+        bumpRevision: false,
       });
     }
 
-    const body: CreateAgentConfigResponse = {
-      item: agentConfig,
+    const body: CreateAgentPolicyResponse = {
+      item: agentPolicy,
       success: true,
     };
 
@@ -155,23 +155,23 @@ export const createAgentConfigHandler: RequestHandler<
   }
 };
 
-export const updateAgentConfigHandler: RequestHandler<
-  TypeOf<typeof UpdateAgentConfigRequestSchema.params>,
+export const updateAgentPolicyHandler: RequestHandler<
+  TypeOf<typeof UpdateAgentPolicyRequestSchema.params>,
   unknown,
-  TypeOf<typeof UpdateAgentConfigRequestSchema.body>
+  TypeOf<typeof UpdateAgentPolicyRequestSchema.body>
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
   const user = await appContextService.getSecurity()?.authc.getCurrentUser(request);
   try {
-    const agentConfig = await agentConfigService.update(
+    const agentPolicy = await agentPolicyService.update(
       soClient,
-      request.params.agentConfigId,
+      request.params.agentPolicyId,
       request.body,
       {
         user: user || undefined,
       }
     );
-    const body: UpdateAgentConfigResponse = { item: agentConfig, success: true };
+    const body: UpdateAgentPolicyResponse = { item: agentPolicy, success: true };
     return response.ok({
       body,
     });
@@ -183,23 +183,23 @@ export const updateAgentConfigHandler: RequestHandler<
   }
 };
 
-export const copyAgentConfigHandler: RequestHandler<
-  TypeOf<typeof CopyAgentConfigRequestSchema.params>,
+export const copyAgentPolicyHandler: RequestHandler<
+  TypeOf<typeof CopyAgentPolicyRequestSchema.params>,
   unknown,
-  TypeOf<typeof CopyAgentConfigRequestSchema.body>
+  TypeOf<typeof CopyAgentPolicyRequestSchema.body>
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
   const user = await appContextService.getSecurity()?.authc.getCurrentUser(request);
   try {
-    const agentConfig = await agentConfigService.copy(
+    const agentPolicy = await agentPolicyService.copy(
       soClient,
-      request.params.agentConfigId,
+      request.params.agentPolicyId,
       request.body,
       {
         user: user || undefined,
       }
     );
-    const body: CopyAgentConfigResponse = { item: agentConfig, success: true };
+    const body: CopyAgentPolicyResponse = { item: agentPolicy, success: true };
     return response.ok({
       body,
     });
@@ -211,16 +211,16 @@ export const copyAgentConfigHandler: RequestHandler<
   }
 };
 
-export const deleteAgentConfigsHandler: RequestHandler<
+export const deleteAgentPoliciesHandler: RequestHandler<
   unknown,
   unknown,
-  TypeOf<typeof DeleteAgentConfigRequestSchema.body>
+  TypeOf<typeof DeleteAgentPolicyRequestSchema.body>
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
   try {
-    const body: DeleteAgentConfigResponse = await agentConfigService.delete(
+    const body: DeleteAgentPolicyResponse = await agentPolicyService.delete(
       soClient,
-      request.body.agentConfigId
+      request.body.agentPolicyId
     );
     return response.ok({
       body,
@@ -233,21 +233,21 @@ export const deleteAgentConfigsHandler: RequestHandler<
   }
 };
 
-export const getFullAgentConfig: RequestHandler<
-  TypeOf<typeof GetFullAgentConfigRequestSchema.params>,
-  TypeOf<typeof GetFullAgentConfigRequestSchema.query>
+export const getFullAgentPolicy: RequestHandler<
+  TypeOf<typeof GetFullAgentPolicyRequestSchema.params>,
+  TypeOf<typeof GetFullAgentPolicyRequestSchema.query>
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
 
   try {
-    const fullAgentConfig = await agentConfigService.getFullConfig(
+    const fullAgentPolicy = await agentPolicyService.getFullAgentPolicy(
       soClient,
-      request.params.agentConfigId,
+      request.params.agentPolicyId,
       { standalone: request.query.standalone === true }
     );
-    if (fullAgentConfig) {
-      const body: GetFullAgentConfigResponse = {
-        item: fullAgentConfig,
+    if (fullAgentPolicy) {
+      const body: GetFullAgentPolicyResponse = {
+        item: fullAgentPolicy,
         success: true,
       };
       return response.ok({
@@ -256,7 +256,7 @@ export const getFullAgentConfig: RequestHandler<
     } else {
       return response.customError({
         statusCode: 404,
-        body: { message: 'Agent config not found' },
+        body: { message: 'Agent policy not found' },
       });
     }
   } catch (e) {
@@ -267,21 +267,21 @@ export const getFullAgentConfig: RequestHandler<
   }
 };
 
-export const downloadFullAgentConfig: RequestHandler<
-  TypeOf<typeof GetFullAgentConfigRequestSchema.params>,
-  TypeOf<typeof GetFullAgentConfigRequestSchema.query>
+export const downloadFullAgentPolicy: RequestHandler<
+  TypeOf<typeof GetFullAgentPolicyRequestSchema.params>,
+  TypeOf<typeof GetFullAgentPolicyRequestSchema.query>
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
   const {
-    params: { agentConfigId },
+    params: { agentPolicyId },
   } = request;
 
   try {
-    const fullAgentConfig = await agentConfigService.getFullConfig(soClient, agentConfigId, {
+    const fullAgentPolicy = await agentPolicyService.getFullAgentPolicy(soClient, agentPolicyId, {
       standalone: request.query.standalone === true,
     });
-    if (fullAgentConfig) {
-      const body = configToYaml(fullAgentConfig);
+    if (fullAgentPolicy) {
+      const body = fullAgentPolicyToYaml(fullAgentPolicy);
       const headers: ResponseHeaders = {
         'content-type': 'text/x-yaml',
         'content-disposition': `attachment; filename="elastic-agent.yml"`,
@@ -293,7 +293,7 @@ export const downloadFullAgentConfig: RequestHandler<
     } else {
       return response.customError({
         statusCode: 404,
-        body: { message: 'Agent config not found' },
+        body: { message: 'Agent policy not found' },
       });
     }
   } catch (e) {
diff --git a/x-pack/plugins/ingest_manager/server/routes/agent_policy/index.ts b/x-pack/plugins/ingest_manager/server/routes/agent_policy/index.ts
new file mode 100644
index 0000000000000..7a6af61f51006
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/server/routes/agent_policy/index.ts
@@ -0,0 +1,108 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { IRouter } from 'src/core/server';
+import { PLUGIN_ID, AGENT_POLICY_API_ROUTES } from '../../constants';
+import {
+  GetAgentPoliciesRequestSchema,
+  GetOneAgentPolicyRequestSchema,
+  CreateAgentPolicyRequestSchema,
+  UpdateAgentPolicyRequestSchema,
+  CopyAgentPolicyRequestSchema,
+  DeleteAgentPolicyRequestSchema,
+  GetFullAgentPolicyRequestSchema,
+} from '../../types';
+import {
+  getAgentPoliciesHandler,
+  getOneAgentPolicyHandler,
+  createAgentPolicyHandler,
+  updateAgentPolicyHandler,
+  copyAgentPolicyHandler,
+  deleteAgentPoliciesHandler,
+  getFullAgentPolicy,
+  downloadFullAgentPolicy,
+} from './handlers';
+
+export const registerRoutes = (router: IRouter) => {
+  // List
+  router.get(
+    {
+      path: AGENT_POLICY_API_ROUTES.LIST_PATTERN,
+      validate: GetAgentPoliciesRequestSchema,
+      options: { tags: [`access:${PLUGIN_ID}-read`] },
+    },
+    getAgentPoliciesHandler
+  );
+
+  // Get one
+  router.get(
+    {
+      path: AGENT_POLICY_API_ROUTES.INFO_PATTERN,
+      validate: GetOneAgentPolicyRequestSchema,
+      options: { tags: [`access:${PLUGIN_ID}-read`] },
+    },
+    getOneAgentPolicyHandler
+  );
+
+  // Create
+  router.post(
+    {
+      path: AGENT_POLICY_API_ROUTES.CREATE_PATTERN,
+      validate: CreateAgentPolicyRequestSchema,
+      options: { tags: [`access:${PLUGIN_ID}-all`] },
+    },
+    createAgentPolicyHandler
+  );
+
+  // Update
+  router.put(
+    {
+      path: AGENT_POLICY_API_ROUTES.UPDATE_PATTERN,
+      validate: UpdateAgentPolicyRequestSchema,
+      options: { tags: [`access:${PLUGIN_ID}-all`] },
+    },
+    updateAgentPolicyHandler
+  );
+
+  // Copy
+  router.post(
+    {
+      path: AGENT_POLICY_API_ROUTES.COPY_PATTERN,
+      validate: CopyAgentPolicyRequestSchema,
+      options: { tags: [`access:${PLUGIN_ID}-all`] },
+    },
+    copyAgentPolicyHandler
+  );
+
+  // Delete
+  router.post(
+    {
+      path: AGENT_POLICY_API_ROUTES.DELETE_PATTERN,
+      validate: DeleteAgentPolicyRequestSchema,
+      options: { tags: [`access:${PLUGIN_ID}-all`] },
+    },
+    deleteAgentPoliciesHandler
+  );
+
+  // Get one full agent policy
+  router.get(
+    {
+      path: AGENT_POLICY_API_ROUTES.FULL_INFO_PATTERN,
+      validate: GetFullAgentPolicyRequestSchema,
+      options: { tags: [`access:${PLUGIN_ID}-read`] },
+    },
+    getFullAgentPolicy
+  );
+
+  // Download one full agent policy
+  router.get(
+    {
+      path: AGENT_POLICY_API_ROUTES.FULL_INFO_DOWNLOAD_PATTERN,
+      validate: GetFullAgentPolicyRequestSchema,
+      options: { tags: [`access:${PLUGIN_ID}-read`] },
+    },
+    downloadFullAgentPolicy
+  );
+};
diff --git a/x-pack/plugins/ingest_manager/server/routes/enrollment_api_key/handler.ts b/x-pack/plugins/ingest_manager/server/routes/enrollment_api_key/handler.ts
index 94fc6de609613..2d6e2f67225e3 100644
--- a/x-pack/plugins/ingest_manager/server/routes/enrollment_api_key/handler.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/enrollment_api_key/handler.ts
@@ -51,7 +51,7 @@ export const postEnrollmentApiKeyHandler: RequestHandler<
     const apiKey = await APIKeyService.generateEnrollmentAPIKey(soClient, {
       name: request.body.name,
       expiration: request.body.expiration,
-      configId: request.body.config_id,
+      agentPolicyId: request.body.policy_id,
     });
 
     const body: PostEnrollmentAPIKeyResponse = { item: apiKey, success: true, action: 'created' };
diff --git a/x-pack/plugins/ingest_manager/server/routes/index.ts b/x-pack/plugins/ingest_manager/server/routes/index.ts
index 87be3a80cea96..0743270fd7121 100644
--- a/x-pack/plugins/ingest_manager/server/routes/index.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/index.ts
@@ -3,8 +3,8 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-export { registerRoutes as registerAgentConfigRoutes } from './agent_config';
-export { registerRoutes as registerPackageConfigRoutes } from './package_config';
+export { registerRoutes as registerAgentPolicyRoutes } from './agent_policy';
+export { registerRoutes as registerPackagePolicyRoutes } from './package_policy';
 export { registerRoutes as registerDataStreamRoutes } from './data_streams';
 export { registerRoutes as registerEPMRoutes } from './epm';
 export { registerRoutes as registerSetupRoutes } from './setup';
diff --git a/x-pack/plugins/ingest_manager/server/routes/package_config/index.ts b/x-pack/plugins/ingest_manager/server/routes/package_config/index.ts
deleted file mode 100644
index 1da045e052997..0000000000000
--- a/x-pack/plugins/ingest_manager/server/routes/package_config/index.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { IRouter } from 'src/core/server';
-import { PLUGIN_ID, PACKAGE_CONFIG_API_ROUTES } from '../../constants';
-import {
-  GetPackageConfigsRequestSchema,
-  GetOnePackageConfigRequestSchema,
-  CreatePackageConfigRequestSchema,
-  UpdatePackageConfigRequestSchema,
-  DeletePackageConfigsRequestSchema,
-} from '../../types';
-import {
-  getPackageConfigsHandler,
-  getOnePackageConfigHandler,
-  createPackageConfigHandler,
-  updatePackageConfigHandler,
-  deletePackageConfigHandler,
-} from './handlers';
-
-export const registerRoutes = (router: IRouter) => {
-  // List
-  router.get(
-    {
-      path: PACKAGE_CONFIG_API_ROUTES.LIST_PATTERN,
-      validate: GetPackageConfigsRequestSchema,
-      options: { tags: [`access:${PLUGIN_ID}-read`] },
-    },
-    getPackageConfigsHandler
-  );
-
-  // Get one
-  router.get(
-    {
-      path: PACKAGE_CONFIG_API_ROUTES.INFO_PATTERN,
-      validate: GetOnePackageConfigRequestSchema,
-      options: { tags: [`access:${PLUGIN_ID}-read`] },
-    },
-    getOnePackageConfigHandler
-  );
-
-  // Create
-  router.post(
-    {
-      path: PACKAGE_CONFIG_API_ROUTES.CREATE_PATTERN,
-      validate: CreatePackageConfigRequestSchema,
-      options: { tags: [`access:${PLUGIN_ID}-all`] },
-    },
-    createPackageConfigHandler
-  );
-
-  // Update
-  router.put(
-    {
-      path: PACKAGE_CONFIG_API_ROUTES.UPDATE_PATTERN,
-      validate: UpdatePackageConfigRequestSchema,
-      options: { tags: [`access:${PLUGIN_ID}-all`] },
-    },
-    updatePackageConfigHandler
-  );
-
-  // Delete
-  router.post(
-    {
-      path: PACKAGE_CONFIG_API_ROUTES.DELETE_PATTERN,
-      validate: DeletePackageConfigsRequestSchema,
-      options: { tags: [`access:${PLUGIN_ID}`] },
-    },
-    deletePackageConfigHandler
-  );
-};
diff --git a/x-pack/plugins/ingest_manager/server/routes/package_config/handlers.test.ts b/x-pack/plugins/ingest_manager/server/routes/package_policy/handlers.test.ts
similarity index 83%
rename from x-pack/plugins/ingest_manager/server/routes/package_config/handlers.test.ts
rename to x-pack/plugins/ingest_manager/server/routes/package_policy/handlers.test.ts
index 85ecc5027d64d..db23d6a139f20 100644
--- a/x-pack/plugins/ingest_manager/server/routes/package_config/handlers.test.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/package_policy/handlers.test.ts
@@ -7,23 +7,23 @@
 import { httpServerMock, httpServiceMock } from 'src/core/server/mocks';
 import { IRouter, KibanaRequest, Logger, RequestHandler, RouteConfig } from 'kibana/server';
 import { registerRoutes } from './index';
-import { PACKAGE_CONFIG_API_ROUTES } from '../../../common/constants';
+import { PACKAGE_POLICY_API_ROUTES } from '../../../common/constants';
 import { xpackMocks } from '../../../../../mocks';
 import { appContextService } from '../../services';
 import { createAppContextStartContractMock } from '../../mocks';
-import { PackageConfigServiceInterface, ExternalCallback } from '../..';
-import { CreatePackageConfigRequestSchema } from '../../types/rest_spec';
-import { packageConfigService } from '../../services';
+import { PackagePolicyServiceInterface, ExternalCallback } from '../..';
+import { CreatePackagePolicyRequestSchema } from '../../types/rest_spec';
+import { packagePolicyService } from '../../services';
 
-const packageConfigServiceMock = packageConfigService as jest.Mocked<PackageConfigServiceInterface>;
+const packagePolicyServiceMock = packagePolicyService as jest.Mocked<PackagePolicyServiceInterface>;
 
-jest.mock('../../services/package_config', (): {
-  packageConfigService: jest.Mocked<PackageConfigServiceInterface>;
+jest.mock('../../services/package_policy', (): {
+  packagePolicyService: jest.Mocked<PackagePolicyServiceInterface>;
 } => {
   return {
-    packageConfigService: {
+    packagePolicyService: {
       assignPackageStream: jest.fn((packageInfo, dataInputs) => Promise.resolve(dataInputs)),
-      buildPackageConfigFromPackage: jest.fn(),
+      buildPackagePolicyFromPackage: jest.fn(),
       bulkCreate: jest.fn(),
       create: jest.fn((soClient, callCluster, newData) =>
         Promise.resolve({
@@ -52,7 +52,7 @@ jest.mock('../../services/epm/packages', () => {
   };
 });
 
-describe('When calling package config', () => {
+describe('When calling package policy', () => {
   let routerMock: jest.Mocked<IRouter>;
   let routeHandler: RequestHandler<any, any, any>;
   let routeConfig: RouteConfig<any, any, any, any>;
@@ -77,19 +77,19 @@ describe('When calling package config', () => {
 
   describe('create api handler', () => {
     const getCreateKibanaRequest = (
-      newData?: typeof CreatePackageConfigRequestSchema.body
-    ): KibanaRequest<undefined, undefined, typeof CreatePackageConfigRequestSchema.body> => {
+      newData?: typeof CreatePackagePolicyRequestSchema.body
+    ): KibanaRequest<undefined, undefined, typeof CreatePackagePolicyRequestSchema.body> => {
       return httpServerMock.createKibanaRequest<
         undefined,
         undefined,
-        typeof CreatePackageConfigRequestSchema.body
+        typeof CreatePackagePolicyRequestSchema.body
       >({
         path: routeConfig.path,
         method: 'post',
         body: newData || {
           name: 'endpoint-1',
           description: '',
-          config_id: 'a5ca00c0-b30c-11ea-9732-1bb05811278c',
+          policy_id: 'a5ca00c0-b30c-11ea-9732-1bb05811278c',
           enabled: true,
           output_id: '',
           inputs: [],
@@ -102,7 +102,7 @@ describe('When calling package config', () => {
     // Set the routeConfig and routeHandler to the Create API
     beforeAll(() => {
       [routeConfig, routeHandler] = routerMock.post.mock.calls.find(([{ path }]) =>
-        path.startsWith(PACKAGE_CONFIG_API_ROUTES.CREATE_PATTERN)
+        path.startsWith(PACKAGE_POLICY_API_ROUTES.CREATE_PATTERN)
       )!;
     });
 
@@ -151,8 +151,8 @@ describe('When calling package config', () => {
       });
 
       beforeEach(() => {
-        appContextService.addExternalCallback('packageConfigCreate', callbackOne);
-        appContextService.addExternalCallback('packageConfigCreate', callbackTwo);
+        appContextService.addExternalCallback('packagePolicyCreate', callbackOne);
+        appContextService.addExternalCallback('packagePolicyCreate', callbackTwo);
       });
 
       afterEach(() => (callbackCallingOrder.length = 0));
@@ -164,12 +164,12 @@ describe('When calling package config', () => {
         expect(callbackCallingOrder).toEqual(['one', 'two']);
       });
 
-      it('should feed package config returned by last callback', async () => {
+      it('should feed package policy returned by last callback', async () => {
         const request = getCreateKibanaRequest();
         await routeHandler(context, request, response);
         expect(response.ok).toHaveBeenCalled();
         expect(callbackOne).toHaveBeenCalledWith({
-          config_id: 'a5ca00c0-b30c-11ea-9732-1bb05811278c',
+          policy_id: 'a5ca00c0-b30c-11ea-9732-1bb05811278c',
           description: '',
           enabled: true,
           inputs: [],
@@ -183,7 +183,7 @@ describe('When calling package config', () => {
           },
         });
         expect(callbackTwo).toHaveBeenCalledWith({
-          config_id: 'a5ca00c0-b30c-11ea-9732-1bb05811278c',
+          policy_id: 'a5ca00c0-b30c-11ea-9732-1bb05811278c',
           description: '',
           enabled: true,
           inputs: [
@@ -213,8 +213,8 @@ describe('When calling package config', () => {
         const request = getCreateKibanaRequest();
         await routeHandler(context, request, response);
         expect(response.ok).toHaveBeenCalled();
-        expect(packageConfigServiceMock.create.mock.calls[0][2]).toEqual({
-          config_id: 'a5ca00c0-b30c-11ea-9732-1bb05811278c',
+        expect(packagePolicyServiceMock.create.mock.calls[0][2]).toEqual({
+          policy_id: 'a5ca00c0-b30c-11ea-9732-1bb05811278c',
           description: '',
           enabled: true,
           inputs: [
@@ -268,8 +268,8 @@ describe('When calling package config', () => {
         });
 
         beforeEach(() => {
-          appContextService.addExternalCallback('packageConfigCreate', callbackThree);
-          appContextService.addExternalCallback('packageConfigCreate', callbackFour);
+          appContextService.addExternalCallback('packagePolicyCreate', callbackThree);
+          appContextService.addExternalCallback('packagePolicyCreate', callbackFour);
         });
 
         it('should skip over callback exceptions and still execute other callbacks', async () => {
@@ -285,17 +285,17 @@ describe('When calling package config', () => {
           await routeHandler(context, request, response);
           expect(response.ok).toHaveBeenCalled();
           expect(errorLogger.mock.calls).toEqual([
-            ['An external registered [packageConfigCreate] callback failed when executed'],
+            ['An external registered [packagePolicyCreate] callback failed when executed'],
             [new Error('callbackThree threw error on purpose')],
           ]);
         });
 
-        it('should create package config with last successful returned package config', async () => {
+        it('should create package policy with last successful returned package policy', async () => {
           const request = getCreateKibanaRequest();
           await routeHandler(context, request, response);
           expect(response.ok).toHaveBeenCalled();
-          expect(packageConfigServiceMock.create.mock.calls[0][2]).toEqual({
-            config_id: 'a5ca00c0-b30c-11ea-9732-1bb05811278c',
+          expect(packagePolicyServiceMock.create.mock.calls[0][2]).toEqual({
+            policy_id: 'a5ca00c0-b30c-11ea-9732-1bb05811278c',
             description: '',
             enabled: true,
             inputs: [
diff --git a/x-pack/plugins/ingest_manager/server/routes/package_config/handlers.ts b/x-pack/plugins/ingest_manager/server/routes/package_policy/handlers.ts
similarity index 61%
rename from x-pack/plugins/ingest_manager/server/routes/package_config/handlers.ts
rename to x-pack/plugins/ingest_manager/server/routes/package_policy/handlers.ts
index d2820cdbeb6c8..d19a73604b4f0 100644
--- a/x-pack/plugins/ingest_manager/server/routes/package_config/handlers.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/package_policy/handlers.ts
@@ -6,25 +6,25 @@
 import { TypeOf } from '@kbn/config-schema';
 import Boom from 'boom';
 import { RequestHandler, SavedObjectsErrorHelpers } from '../../../../../../src/core/server';
-import { appContextService, packageConfigService } from '../../services';
+import { appContextService, packagePolicyService } from '../../services';
 import { getPackageInfo } from '../../services/epm/packages';
 import {
-  GetPackageConfigsRequestSchema,
-  GetOnePackageConfigRequestSchema,
-  CreatePackageConfigRequestSchema,
-  UpdatePackageConfigRequestSchema,
-  DeletePackageConfigsRequestSchema,
-  NewPackageConfig,
+  GetPackagePoliciesRequestSchema,
+  GetOnePackagePolicyRequestSchema,
+  CreatePackagePolicyRequestSchema,
+  UpdatePackagePolicyRequestSchema,
+  DeletePackagePoliciesRequestSchema,
+  NewPackagePolicy,
 } from '../../types';
-import { CreatePackageConfigResponse, DeletePackageConfigsResponse } from '../../../common';
+import { CreatePackagePolicyResponse, DeletePackagePoliciesResponse } from '../../../common';
 
-export const getPackageConfigsHandler: RequestHandler<
+export const getPackagePoliciesHandler: RequestHandler<
   undefined,
-  TypeOf<typeof GetPackageConfigsRequestSchema.query>
+  TypeOf<typeof GetPackagePoliciesRequestSchema.query>
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
   try {
-    const { items, total, page, perPage } = await packageConfigService.list(
+    const { items, total, page, perPage } = await packagePolicyService.list(
       soClient,
       request.query
     );
@@ -45,20 +45,20 @@ export const getPackageConfigsHandler: RequestHandler<
   }
 };
 
-export const getOnePackageConfigHandler: RequestHandler<TypeOf<
-  typeof GetOnePackageConfigRequestSchema.params
+export const getOnePackagePolicyHandler: RequestHandler<TypeOf<
+  typeof GetOnePackagePolicyRequestSchema.params
 >> = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
-  const { packageConfigId } = request.params;
+  const { packagePolicyId } = request.params;
   const notFoundResponse = () =>
-    response.notFound({ body: { message: `Package config ${packageConfigId} not found` } });
+    response.notFound({ body: { message: `Package policy ${packagePolicyId} not found` } });
 
   try {
-    const packageConfig = await packageConfigService.get(soClient, packageConfigId);
-    if (packageConfig) {
+    const packagePolicy = await packagePolicyService.get(soClient, packagePolicyId);
+    if (packagePolicy) {
       return response.ok({
         body: {
-          item: packageConfig,
+          item: packagePolicy,
           success: true,
         },
       });
@@ -77,10 +77,10 @@ export const getOnePackageConfigHandler: RequestHandler<TypeOf<
   }
 };
 
-export const createPackageConfigHandler: RequestHandler<
+export const createPackagePolicyHandler: RequestHandler<
   undefined,
   undefined,
-  TypeOf<typeof CreatePackageConfigRequestSchema.body>
+  TypeOf<typeof CreatePackagePolicyRequestSchema.body>
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
   const callCluster = context.core.elasticsearch.legacy.client.callAsCurrentUser;
@@ -88,21 +88,21 @@ export const createPackageConfigHandler: RequestHandler<
   const logger = appContextService.getLogger();
   let newData = { ...request.body };
   try {
-    // If we have external callbacks, then process those now before creating the actual package config
-    const externalCallbacks = appContextService.getExternalCallbacks('packageConfigCreate');
+    // If we have external callbacks, then process those now before creating the actual package policy
+    const externalCallbacks = appContextService.getExternalCallbacks('packagePolicyCreate');
     if (externalCallbacks && externalCallbacks.size > 0) {
-      let updatedNewData: NewPackageConfig = newData;
+      let updatedNewData: NewPackagePolicy = newData;
 
       for (const callback of externalCallbacks) {
         try {
           // ensure that the returned value by the callback passes schema validation
-          updatedNewData = CreatePackageConfigRequestSchema.body.validate(
+          updatedNewData = CreatePackagePolicyRequestSchema.body.validate(
             await callback(updatedNewData)
           );
         } catch (error) {
           // Log the error, but keep going and process the other callbacks
           logger.error(
-            'An external registered [packageConfigCreate] callback failed when executed'
+            'An external registered [packagePolicyCreate] callback failed when executed'
           );
           logger.error(error);
         }
@@ -111,11 +111,11 @@ export const createPackageConfigHandler: RequestHandler<
       newData = updatedNewData;
     }
 
-    // Create package config
-    const packageConfig = await packageConfigService.create(soClient, callCluster, newData, {
+    // Create package policy
+    const packagePolicy = await packagePolicyService.create(soClient, callCluster, newData, {
       user,
     });
-    const body: CreatePackageConfigResponse = { item: packageConfig, success: true };
+    const body: CreatePackagePolicyResponse = { item: packagePolicy, success: true };
     return response.ok({
       body,
     });
@@ -128,42 +128,42 @@ export const createPackageConfigHandler: RequestHandler<
   }
 };
 
-export const updatePackageConfigHandler: RequestHandler<
-  TypeOf<typeof UpdatePackageConfigRequestSchema.params>,
+export const updatePackagePolicyHandler: RequestHandler<
+  TypeOf<typeof UpdatePackagePolicyRequestSchema.params>,
   unknown,
-  TypeOf<typeof UpdatePackageConfigRequestSchema.body>
+  TypeOf<typeof UpdatePackagePolicyRequestSchema.body>
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
   const user = (await appContextService.getSecurity()?.authc.getCurrentUser(request)) || undefined;
   try {
-    const packageConfig = await packageConfigService.get(soClient, request.params.packageConfigId);
+    const packagePolicy = await packagePolicyService.get(soClient, request.params.packagePolicyId);
 
-    if (!packageConfig) {
-      throw Boom.notFound('Package config not found');
+    if (!packagePolicy) {
+      throw Boom.notFound('Package policy not found');
     }
 
     const newData = { ...request.body };
-    const pkg = newData.package || packageConfig.package;
-    const inputs = newData.inputs || packageConfig.inputs;
+    const pkg = newData.package || packagePolicy.package;
+    const inputs = newData.inputs || packagePolicy.inputs;
     if (pkg && (newData.inputs || newData.package)) {
       const pkgInfo = await getPackageInfo({
         savedObjectsClient: soClient,
         pkgName: pkg.name,
         pkgVersion: pkg.version,
       });
-      newData.inputs = (await packageConfigService.assignPackageStream(pkgInfo, inputs)) as TypeOf<
-        typeof CreatePackageConfigRequestSchema.body
+      newData.inputs = (await packagePolicyService.assignPackageStream(pkgInfo, inputs)) as TypeOf<
+        typeof CreatePackagePolicyRequestSchema.body
       >['inputs'];
     }
 
-    const updatedPackageConfig = await packageConfigService.update(
+    const updatedPackagePolicy = await packagePolicyService.update(
       soClient,
-      request.params.packageConfigId,
+      request.params.packagePolicyId,
       newData,
       { user }
     );
     return response.ok({
-      body: { item: updatedPackageConfig, success: true },
+      body: { item: updatedPackagePolicy, success: true },
     });
   } catch (e) {
     return response.customError({
@@ -173,17 +173,17 @@ export const updatePackageConfigHandler: RequestHandler<
   }
 };
 
-export const deletePackageConfigHandler: RequestHandler<
+export const deletePackagePolicyHandler: RequestHandler<
   unknown,
   unknown,
-  TypeOf<typeof DeletePackageConfigsRequestSchema.body>
+  TypeOf<typeof DeletePackagePoliciesRequestSchema.body>
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
   const user = (await appContextService.getSecurity()?.authc.getCurrentUser(request)) || undefined;
   try {
-    const body: DeletePackageConfigsResponse = await packageConfigService.delete(
+    const body: DeletePackagePoliciesResponse = await packagePolicyService.delete(
       soClient,
-      request.body.packageConfigIds,
+      request.body.packagePolicyIds,
       { user }
     );
     return response.ok({
diff --git a/x-pack/plugins/ingest_manager/server/routes/package_policy/index.ts b/x-pack/plugins/ingest_manager/server/routes/package_policy/index.ts
new file mode 100644
index 0000000000000..e571896ebe82d
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/server/routes/package_policy/index.ts
@@ -0,0 +1,73 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { IRouter } from 'src/core/server';
+import { PLUGIN_ID, PACKAGE_POLICY_API_ROUTES } from '../../constants';
+import {
+  GetPackagePoliciesRequestSchema,
+  GetOnePackagePolicyRequestSchema,
+  CreatePackagePolicyRequestSchema,
+  UpdatePackagePolicyRequestSchema,
+  DeletePackagePoliciesRequestSchema,
+} from '../../types';
+import {
+  getPackagePoliciesHandler,
+  getOnePackagePolicyHandler,
+  createPackagePolicyHandler,
+  updatePackagePolicyHandler,
+  deletePackagePolicyHandler,
+} from './handlers';
+
+export const registerRoutes = (router: IRouter) => {
+  // List
+  router.get(
+    {
+      path: PACKAGE_POLICY_API_ROUTES.LIST_PATTERN,
+      validate: GetPackagePoliciesRequestSchema,
+      options: { tags: [`access:${PLUGIN_ID}-read`] },
+    },
+    getPackagePoliciesHandler
+  );
+
+  // Get one
+  router.get(
+    {
+      path: PACKAGE_POLICY_API_ROUTES.INFO_PATTERN,
+      validate: GetOnePackagePolicyRequestSchema,
+      options: { tags: [`access:${PLUGIN_ID}-read`] },
+    },
+    getOnePackagePolicyHandler
+  );
+
+  // Create
+  router.post(
+    {
+      path: PACKAGE_POLICY_API_ROUTES.CREATE_PATTERN,
+      validate: CreatePackagePolicyRequestSchema,
+      options: { tags: [`access:${PLUGIN_ID}-all`] },
+    },
+    createPackagePolicyHandler
+  );
+
+  // Update
+  router.put(
+    {
+      path: PACKAGE_POLICY_API_ROUTES.UPDATE_PATTERN,
+      validate: UpdatePackagePolicyRequestSchema,
+      options: { tags: [`access:${PLUGIN_ID}-all`] },
+    },
+    updatePackagePolicyHandler
+  );
+
+  // Delete
+  router.post(
+    {
+      path: PACKAGE_POLICY_API_ROUTES.DELETE_PATTERN,
+      validate: DeletePackagePoliciesRequestSchema,
+      options: { tags: [`access:${PLUGIN_ID}`] },
+    },
+    deletePackagePolicyHandler
+  );
+};
diff --git a/x-pack/plugins/ingest_manager/server/saved_objects/index.ts b/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
index eca2711363c85..50957c48f70e6 100644
--- a/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
+++ b/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
@@ -8,8 +8,8 @@ import { SavedObjectsServiceSetup, SavedObjectsType } from 'kibana/server';
 import { EncryptedSavedObjectsPluginSetup } from '../../../encrypted_saved_objects/server';
 import {
   OUTPUT_SAVED_OBJECT_TYPE,
-  AGENT_CONFIG_SAVED_OBJECT_TYPE,
-  PACKAGE_CONFIG_SAVED_OBJECT_TYPE,
+  AGENT_POLICY_SAVED_OBJECT_TYPE,
+  PACKAGE_POLICY_SAVED_OBJECT_TYPE,
   PACKAGES_SAVED_OBJECT_TYPE,
   AGENT_SAVED_OBJECT_TYPE,
   AGENT_EVENT_SAVED_OBJECT_TYPE,
@@ -17,6 +17,13 @@ import {
   ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE,
   GLOBAL_SETTINGS_SAVED_OBJECT_TYPE,
 } from '../constants';
+import {
+  migrateAgentToV7100,
+  migrateAgentEventToV7100,
+  migrateAgentPolicyToV7100,
+  migrateEnrollmentApiKeysToV7100,
+  migratePackagePolicyToV7100,
+} from './migrations/to_v7_10_0';
 
 /*
  * Saved object types and mappings
@@ -61,11 +68,11 @@ const savedObjectTypes: { [key: string]: SavedObjectsType } = {
         version: { type: 'keyword' },
         user_provided_metadata: { type: 'flattened' },
         local_metadata: { type: 'flattened' },
-        config_id: { type: 'keyword' },
+        policy_id: { type: 'keyword' },
+        policy_revision: { type: 'integer' },
         last_updated: { type: 'date' },
         last_checkin: { type: 'date' },
         last_checkin_status: { type: 'keyword' },
-        config_revision: { type: 'integer' },
         default_api_key_id: { type: 'keyword' },
         default_api_key: { type: 'binary' },
         updated_at: { type: 'date' },
@@ -73,6 +80,9 @@ const savedObjectTypes: { [key: string]: SavedObjectsType } = {
         packages: { type: 'keyword' },
       },
     },
+    migrations: {
+      '7.10.0': migrateAgentToV7100,
+    },
   },
   [AGENT_ACTION_SAVED_OBJECT_TYPE]: {
     name: AGENT_ACTION_SAVED_OBJECT_TYPE,
@@ -104,7 +114,7 @@ const savedObjectTypes: { [key: string]: SavedObjectsType } = {
         subtype: { type: 'keyword' },
         agent_id: { type: 'keyword' },
         action_id: { type: 'keyword' },
-        config_id: { type: 'keyword' },
+        policy_id: { type: 'keyword' },
         stream_id: { type: 'keyword' },
         timestamp: { type: 'date' },
         message: { type: 'text' },
@@ -112,9 +122,12 @@ const savedObjectTypes: { [key: string]: SavedObjectsType } = {
         data: { type: 'text' },
       },
     },
+    migrations: {
+      '7.10.0': migrateAgentEventToV7100,
+    },
   },
-  [AGENT_CONFIG_SAVED_OBJECT_TYPE]: {
-    name: AGENT_CONFIG_SAVED_OBJECT_TYPE,
+  [AGENT_POLICY_SAVED_OBJECT_TYPE]: {
+    name: AGENT_POLICY_SAVED_OBJECT_TYPE,
     hidden: false,
     namespaceType: 'agnostic',
     management: {
@@ -127,13 +140,16 @@ const savedObjectTypes: { [key: string]: SavedObjectsType } = {
         namespace: { type: 'keyword' },
         is_default: { type: 'boolean' },
         status: { type: 'keyword' },
-        package_configs: { type: 'keyword' },
+        package_policies: { type: 'keyword' },
         updated_at: { type: 'date' },
         updated_by: { type: 'keyword' },
         revision: { type: 'integer' },
         monitoring_enabled: { type: 'keyword', index: false },
       },
     },
+    migrations: {
+      '7.10.0': migrateAgentPolicyToV7100,
+    },
   },
   [ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE]: {
     name: ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE,
@@ -148,13 +164,16 @@ const savedObjectTypes: { [key: string]: SavedObjectsType } = {
         type: { type: 'keyword' },
         api_key: { type: 'binary' },
         api_key_id: { type: 'keyword' },
-        config_id: { type: 'keyword' },
+        policy_id: { type: 'keyword' },
         created_at: { type: 'date' },
         updated_at: { type: 'date' },
         expire_at: { type: 'date' },
         active: { type: 'boolean' },
       },
     },
+    migrations: {
+      '7.10.0': migrateEnrollmentApiKeysToV7100,
+    },
   },
   [OUTPUT_SAVED_OBJECT_TYPE]: {
     name: OUTPUT_SAVED_OBJECT_TYPE,
@@ -176,8 +195,8 @@ const savedObjectTypes: { [key: string]: SavedObjectsType } = {
       },
     },
   },
-  [PACKAGE_CONFIG_SAVED_OBJECT_TYPE]: {
-    name: PACKAGE_CONFIG_SAVED_OBJECT_TYPE,
+  [PACKAGE_POLICY_SAVED_OBJECT_TYPE]: {
+    name: PACKAGE_POLICY_SAVED_OBJECT_TYPE,
     hidden: false,
     namespaceType: 'agnostic',
     management: {
@@ -189,7 +208,7 @@ const savedObjectTypes: { [key: string]: SavedObjectsType } = {
         description: { type: 'text' },
         namespace: { type: 'keyword' },
         enabled: { type: 'boolean' },
-        config_id: { type: 'keyword' },
+        policy_id: { type: 'keyword' },
         output_id: { type: 'keyword' },
         package: {
           properties: {
@@ -231,6 +250,9 @@ const savedObjectTypes: { [key: string]: SavedObjectsType } = {
         created_by: { type: 'keyword' },
       },
     },
+    migrations: {
+      '7.10.0': migratePackagePolicyToV7100,
+    },
   },
   [PACKAGES_SAVED_OBJECT_TYPE]: {
     name: PACKAGES_SAVED_OBJECT_TYPE,
@@ -285,7 +307,7 @@ export function registerEncryptedSavedObjects(
       'name',
       'type',
       'api_key_id',
-      'config_id',
+      'policy_id',
       'created_at',
       'updated_at',
       'expire_at',
@@ -316,12 +338,11 @@ export function registerEncryptedSavedObjects(
       'version',
       'user_provided_metadata',
       'local_metadata',
-      'config_id',
+      'policy_id',
+      'policy_revision',
       'last_updated',
       'last_checkin',
       'last_checkin_status',
-      'config_revision',
-      'config_newest_revision',
       'updated_at',
       'current_error_events',
       'unenrolled_at',
diff --git a/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts b/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
new file mode 100644
index 0000000000000..f45b69eaaa79c
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
@@ -0,0 +1,72 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { SavedObjectMigrationFn } from 'kibana/server';
+import { Agent, AgentEvent, AgentPolicy, PackagePolicy, EnrollmentAPIKey } from '../../types';
+
+export const migrateAgentToV7100: SavedObjectMigrationFn<
+  Exclude<Agent, 'policy_id' | 'policy_revision'> & {
+    config_id?: string;
+    config_revision?: number | null;
+  },
+  Agent
+> = (agentDoc) => {
+  agentDoc.attributes.policy_id = agentDoc.attributes.config_id;
+  delete agentDoc.attributes.config_id;
+
+  agentDoc.attributes.policy_revision = agentDoc.attributes.config_revision;
+  delete agentDoc.attributes.config_revision;
+
+  return agentDoc;
+};
+
+export const migrateAgentEventToV7100: SavedObjectMigrationFn<
+  Exclude<AgentEvent, 'policy_id'> & {
+    config_id?: string;
+  },
+  AgentEvent
+> = (agentEventDoc) => {
+  agentEventDoc.attributes.policy_id = agentEventDoc.attributes.config_id;
+  delete agentEventDoc.attributes.config_id;
+
+  return agentEventDoc;
+};
+
+export const migrateAgentPolicyToV7100: SavedObjectMigrationFn<
+  Exclude<AgentPolicy, 'package_policies'> & {
+    package_configs: string[] | PackagePolicy[];
+  },
+  AgentPolicy
+> = (agentPolicyDoc) => {
+  agentPolicyDoc.attributes.package_policies = agentPolicyDoc.attributes.package_configs;
+  delete agentPolicyDoc.attributes.package_configs;
+
+  return agentPolicyDoc;
+};
+
+export const migrateEnrollmentApiKeysToV7100: SavedObjectMigrationFn<
+  Exclude<EnrollmentAPIKey, 'policy_id'> & {
+    config_id?: string;
+  },
+  EnrollmentAPIKey
+> = (enrollmentApiKeyDoc) => {
+  enrollmentApiKeyDoc.attributes.policy_id = enrollmentApiKeyDoc.attributes.config_id;
+  delete enrollmentApiKeyDoc.attributes.config_id;
+
+  return enrollmentApiKeyDoc;
+};
+
+export const migratePackagePolicyToV7100: SavedObjectMigrationFn<
+  Exclude<PackagePolicy, 'policy_id'> & {
+    config_id: string;
+  },
+  PackagePolicy
+> = (packagePolicyDoc) => {
+  packagePolicyDoc.attributes.policy_id = packagePolicyDoc.attributes.config_id;
+  delete packagePolicyDoc.attributes.config_id;
+
+  return packagePolicyDoc;
+};
diff --git a/x-pack/plugins/ingest_manager/server/services/agent_config.ts b/x-pack/plugins/ingest_manager/server/services/agent_config.ts
deleted file mode 100644
index 10b5d9aa0b2f8..0000000000000
--- a/x-pack/plugins/ingest_manager/server/services/agent_config.ts
+++ /dev/null
@@ -1,442 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { uniq } from 'lodash';
-import { SavedObjectsClientContract } from 'src/core/server';
-import { AuthenticatedUser } from '../../../security/server';
-import {
-  DEFAULT_AGENT_CONFIG,
-  AGENT_CONFIG_SAVED_OBJECT_TYPE,
-  AGENT_SAVED_OBJECT_TYPE,
-} from '../constants';
-import {
-  PackageConfig,
-  NewAgentConfig,
-  AgentConfig,
-  AgentConfigSOAttributes,
-  FullAgentConfig,
-  AgentConfigStatus,
-  ListWithKuery,
-} from '../types';
-import { DeleteAgentConfigResponse, storedPackageConfigsToAgentInputs } from '../../common';
-import { listAgents } from './agents';
-import { packageConfigService } from './package_config';
-import { outputService } from './output';
-import { agentConfigUpdateEventHandler } from './agent_config_update';
-
-const SAVED_OBJECT_TYPE = AGENT_CONFIG_SAVED_OBJECT_TYPE;
-
-class AgentConfigService {
-  private triggerAgentConfigUpdatedEvent = async (
-    soClient: SavedObjectsClientContract,
-    action: string,
-    agentConfigId: string
-  ) => {
-    return agentConfigUpdateEventHandler(soClient, action, agentConfigId);
-  };
-
-  private async _update(
-    soClient: SavedObjectsClientContract,
-    id: string,
-    agentConfig: Partial<AgentConfigSOAttributes>,
-    user?: AuthenticatedUser,
-    options: { bumpRevision: boolean } = { bumpRevision: true }
-  ): Promise<AgentConfig> {
-    const oldAgentConfig = await this.get(soClient, id, false);
-
-    if (!oldAgentConfig) {
-      throw new Error('Agent config not found');
-    }
-
-    if (
-      oldAgentConfig.status === AgentConfigStatus.Inactive &&
-      agentConfig.status !== AgentConfigStatus.Active
-    ) {
-      throw new Error(
-        `Agent config ${id} cannot be updated because it is ${oldAgentConfig.status}`
-      );
-    }
-
-    await soClient.update<AgentConfigSOAttributes>(SAVED_OBJECT_TYPE, id, {
-      ...agentConfig,
-      ...(options.bumpRevision ? { revision: oldAgentConfig.revision + 1 } : {}),
-      updated_at: new Date().toISOString(),
-      updated_by: user ? user.username : 'system',
-    });
-
-    return (await this.get(soClient, id)) as AgentConfig;
-  }
-
-  public async ensureDefaultAgentConfig(soClient: SavedObjectsClientContract) {
-    const configs = await soClient.find<AgentConfigSOAttributes>({
-      type: AGENT_CONFIG_SAVED_OBJECT_TYPE,
-      searchFields: ['is_default'],
-      search: 'true',
-    });
-
-    if (configs.total === 0) {
-      const newDefaultAgentConfig: NewAgentConfig = {
-        ...DEFAULT_AGENT_CONFIG,
-      };
-
-      return this.create(soClient, newDefaultAgentConfig);
-    }
-
-    return {
-      id: configs.saved_objects[0].id,
-      ...configs.saved_objects[0].attributes,
-    };
-  }
-
-  public async create(
-    soClient: SavedObjectsClientContract,
-    agentConfig: NewAgentConfig,
-    options?: { id?: string; user?: AuthenticatedUser }
-  ): Promise<AgentConfig> {
-    const newSo = await soClient.create<AgentConfigSOAttributes>(
-      SAVED_OBJECT_TYPE,
-      {
-        ...agentConfig,
-        revision: 1,
-        updated_at: new Date().toISOString(),
-        updated_by: options?.user?.username || 'system',
-      } as AgentConfig,
-      options
-    );
-
-    if (!agentConfig.is_default) {
-      await this.triggerAgentConfigUpdatedEvent(soClient, 'created', newSo.id);
-    }
-
-    return { id: newSo.id, ...newSo.attributes };
-  }
-
-  public async get(
-    soClient: SavedObjectsClientContract,
-    id: string,
-    withPackageConfigs: boolean = true
-  ): Promise<AgentConfig | null> {
-    const agentConfigSO = await soClient.get<AgentConfigSOAttributes>(SAVED_OBJECT_TYPE, id);
-    if (!agentConfigSO) {
-      return null;
-    }
-
-    if (agentConfigSO.error) {
-      throw new Error(agentConfigSO.error.message);
-    }
-
-    const agentConfig = { id: agentConfigSO.id, ...agentConfigSO.attributes };
-
-    if (withPackageConfigs) {
-      agentConfig.package_configs =
-        (await packageConfigService.getByIDs(
-          soClient,
-          (agentConfigSO.attributes.package_configs as string[]) || []
-        )) || [];
-    }
-
-    return agentConfig;
-  }
-
-  public async list(
-    soClient: SavedObjectsClientContract,
-    options: ListWithKuery & {
-      withPackageConfigs?: boolean;
-    }
-  ): Promise<{ items: AgentConfig[]; total: number; page: number; perPage: number }> {
-    const {
-      page = 1,
-      perPage = 20,
-      sortField = 'updated_at',
-      sortOrder = 'desc',
-      kuery,
-      withPackageConfigs = false,
-    } = options;
-
-    const agentConfigsSO = await soClient.find<AgentConfigSOAttributes>({
-      type: SAVED_OBJECT_TYPE,
-      sortField,
-      sortOrder,
-      page,
-      perPage,
-      // To ensure users don't need to know about SO data structure...
-      filter: kuery
-        ? kuery.replace(
-            new RegExp(`${SAVED_OBJECT_TYPE}\.`, 'g'),
-            `${SAVED_OBJECT_TYPE}.attributes.`
-          )
-        : undefined,
-    });
-
-    const agentConfigs = await Promise.all(
-      agentConfigsSO.saved_objects.map(async (agentConfigSO) => {
-        const agentConfig = {
-          id: agentConfigSO.id,
-          ...agentConfigSO.attributes,
-        };
-        if (withPackageConfigs) {
-          const agentConfigWithPackageConfigs = await this.get(
-            soClient,
-            agentConfigSO.id,
-            withPackageConfigs
-          );
-          if (agentConfigWithPackageConfigs) {
-            agentConfig.package_configs = agentConfigWithPackageConfigs.package_configs;
-          }
-        }
-        return agentConfig;
-      })
-    );
-
-    return {
-      items: agentConfigs,
-      total: agentConfigsSO.total,
-      page,
-      perPage,
-    };
-  }
-
-  public async update(
-    soClient: SavedObjectsClientContract,
-    id: string,
-    agentConfig: Partial<AgentConfig>,
-    options?: { user?: AuthenticatedUser }
-  ): Promise<AgentConfig> {
-    return this._update(soClient, id, agentConfig, options?.user);
-  }
-
-  public async copy(
-    soClient: SavedObjectsClientContract,
-    id: string,
-    newAgentConfigProps: Pick<AgentConfig, 'name' | 'description'>,
-    options?: { user?: AuthenticatedUser }
-  ): Promise<AgentConfig> {
-    // Copy base config
-    const baseAgentConfig = await this.get(soClient, id, true);
-    if (!baseAgentConfig) {
-      throw new Error('Agent config not found');
-    }
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    const { namespace, monitoring_enabled } = baseAgentConfig;
-    const newAgentConfig = await this.create(
-      soClient,
-      {
-        namespace,
-        monitoring_enabled,
-        ...newAgentConfigProps,
-      },
-      options
-    );
-
-    // Copy all package configs
-    if (baseAgentConfig.package_configs.length) {
-      const newPackageConfigs = (baseAgentConfig.package_configs as PackageConfig[]).map(
-        (packageConfig: PackageConfig) => {
-          const { id: packageConfigId, version, ...newPackageConfig } = packageConfig;
-          return newPackageConfig;
-        }
-      );
-      await packageConfigService.bulkCreate(soClient, newPackageConfigs, newAgentConfig.id, {
-        ...options,
-        bumpConfigRevision: false,
-      });
-    }
-
-    // Get updated config
-    const updatedAgentConfig = await this.get(soClient, newAgentConfig.id, true);
-    if (!updatedAgentConfig) {
-      throw new Error('Copied agent config not found');
-    }
-
-    return updatedAgentConfig;
-  }
-
-  public async bumpRevision(
-    soClient: SavedObjectsClientContract,
-    id: string,
-    options?: { user?: AuthenticatedUser }
-  ): Promise<AgentConfig> {
-    return this._update(soClient, id, {}, options?.user);
-  }
-
-  public async assignPackageConfigs(
-    soClient: SavedObjectsClientContract,
-    id: string,
-    packageConfigIds: string[],
-    options: { user?: AuthenticatedUser; bumpRevision: boolean } = { bumpRevision: true }
-  ): Promise<AgentConfig> {
-    const oldAgentConfig = await this.get(soClient, id, false);
-
-    if (!oldAgentConfig) {
-      throw new Error('Agent config not found');
-    }
-
-    return await this._update(
-      soClient,
-      id,
-      {
-        package_configs: uniq(
-          [...((oldAgentConfig.package_configs || []) as string[])].concat(packageConfigIds)
-        ),
-      },
-      options?.user,
-      { bumpRevision: options.bumpRevision }
-    );
-  }
-
-  public async unassignPackageConfigs(
-    soClient: SavedObjectsClientContract,
-    id: string,
-    packageConfigIds: string[],
-    options?: { user?: AuthenticatedUser }
-  ): Promise<AgentConfig> {
-    const oldAgentConfig = await this.get(soClient, id, false);
-
-    if (!oldAgentConfig) {
-      throw new Error('Agent config not found');
-    }
-
-    return await this._update(
-      soClient,
-      id,
-      {
-        package_configs: uniq(
-          [...((oldAgentConfig.package_configs || []) as string[])].filter(
-            (pkgConfigId) => !packageConfigIds.includes(pkgConfigId)
-          )
-        ),
-      },
-      options?.user
-    );
-  }
-
-  public async getDefaultAgentConfigId(soClient: SavedObjectsClientContract) {
-    const configs = await soClient.find({
-      type: AGENT_CONFIG_SAVED_OBJECT_TYPE,
-      searchFields: ['is_default'],
-      search: 'true',
-    });
-
-    if (configs.saved_objects.length === 0) {
-      throw new Error('No default agent config');
-    }
-
-    return configs.saved_objects[0].id;
-  }
-
-  public async delete(
-    soClient: SavedObjectsClientContract,
-    id: string
-  ): Promise<DeleteAgentConfigResponse> {
-    const config = await this.get(soClient, id, false);
-    if (!config) {
-      throw new Error('Agent configuration not found');
-    }
-
-    const { id: defaultConfigId } = await this.ensureDefaultAgentConfig(soClient);
-    if (id === defaultConfigId) {
-      throw new Error('The default agent configuration cannot be deleted');
-    }
-
-    const { total } = await listAgents(soClient, {
-      showInactive: false,
-      perPage: 0,
-      page: 1,
-      kuery: `${AGENT_SAVED_OBJECT_TYPE}.config_id:${id}`,
-    });
-
-    if (total > 0) {
-      throw new Error('Cannot delete agent config that is assigned to agent(s)');
-    }
-
-    if (config.package_configs && config.package_configs.length) {
-      await packageConfigService.delete(soClient, config.package_configs as string[], {
-        skipUnassignFromAgentConfigs: true,
-      });
-    }
-    await soClient.delete(SAVED_OBJECT_TYPE, id);
-    await this.triggerAgentConfigUpdatedEvent(soClient, 'deleted', id);
-    return {
-      id,
-      success: true,
-    };
-  }
-
-  public async getFullConfig(
-    soClient: SavedObjectsClientContract,
-    id: string,
-    options?: { standalone: boolean }
-  ): Promise<FullAgentConfig | null> {
-    let config;
-
-    try {
-      config = await this.get(soClient, id);
-    } catch (err) {
-      if (!err.isBoom || err.output.statusCode !== 404) {
-        throw err;
-      }
-    }
-
-    if (!config) {
-      return null;
-    }
-
-    const defaultOutputId = await outputService.getDefaultOutputId(soClient);
-    if (!defaultOutputId) {
-      throw new Error('Default output is not setup');
-    }
-    const defaultOutput = await outputService.get(soClient, defaultOutputId);
-
-    const agentConfig: FullAgentConfig = {
-      id: config.id,
-      outputs: {
-        // TEMPORARY as we only support a default output
-        ...[defaultOutput].reduce(
-          // eslint-disable-next-line @typescript-eslint/naming-convention
-          (outputs, { config: outputConfig, name, type, hosts, ca_sha256, api_key }) => {
-            outputs[name] = {
-              type,
-              hosts,
-              ca_sha256,
-              api_key,
-              ...outputConfig,
-            };
-
-            if (options?.standalone) {
-              delete outputs[name].api_key;
-              outputs[name].username = 'ES_USERNAME';
-              outputs[name].password = 'ES_PASSWORD';
-            }
-
-            return outputs;
-          },
-          {} as FullAgentConfig['outputs']
-        ),
-      },
-      inputs: storedPackageConfigsToAgentInputs(config.package_configs as PackageConfig[]),
-      revision: config.revision,
-      ...(config.monitoring_enabled && config.monitoring_enabled.length > 0
-        ? {
-            agent: {
-              monitoring: {
-                use_output: defaultOutput.name,
-                enabled: true,
-                logs: config.monitoring_enabled.indexOf('logs') >= 0,
-                metrics: config.monitoring_enabled.indexOf('metrics') >= 0,
-              },
-            },
-          }
-        : {
-            agent: {
-              monitoring: { enabled: false, logs: false, metrics: false },
-            },
-          }),
-    };
-
-    return agentConfig;
-  }
-}
-
-export const agentConfigService = new AgentConfigService();
diff --git a/x-pack/plugins/ingest_manager/server/services/agent_config.test.ts b/x-pack/plugins/ingest_manager/server/services/agent_policy.test.ts
similarity index 74%
rename from x-pack/plugins/ingest_manager/server/services/agent_config.test.ts
rename to x-pack/plugins/ingest_manager/server/services/agent_policy.test.ts
index 225251b061e58..dc2a89c661ac3 100644
--- a/x-pack/plugins/ingest_manager/server/services/agent_config.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agent_policy.test.ts
@@ -5,10 +5,10 @@
  */
 
 import { savedObjectsClientMock } from 'src/core/server/mocks';
-import { agentConfigService } from './agent_config';
+import { agentPolicyService } from './agent_policy';
 import { Output } from '../types';
 
-function getSavedObjectMock(configAttributes: any) {
+function getSavedObjectMock(agentPolicyAttributes: any) {
   const mock = savedObjectsClientMock.create();
 
   mock.get.mockImplementation(async (type: string, id: string) => {
@@ -16,7 +16,7 @@ function getSavedObjectMock(configAttributes: any) {
       type,
       id,
       references: [],
-      attributes: configAttributes,
+      attributes: agentPolicyAttributes,
     };
   });
 
@@ -41,16 +41,16 @@ jest.mock('./output', () => {
   };
 });
 
-describe('agent config', () => {
-  describe('getFullConfig', () => {
-    it('should return a config without monitoring if not monitoring is not enabled', async () => {
+describe('agent policy', () => {
+  describe('getFullAgentPolicy', () => {
+    it('should return a policy without monitoring if not monitoring is not enabled', async () => {
       const soClient = getSavedObjectMock({
         revision: 1,
       });
-      const config = await agentConfigService.getFullConfig(soClient, 'config');
+      const agentPolicy = await agentPolicyService.getFullAgentPolicy(soClient, 'agent-policy');
 
-      expect(config).toMatchObject({
-        id: 'config',
+      expect(agentPolicy).toMatchObject({
+        id: 'agent-policy',
         outputs: {
           default: {
             type: 'elasticsearch',
@@ -71,15 +71,15 @@ describe('agent config', () => {
       });
     });
 
-    it('should return a config with monitoring if monitoring is enabled for logs', async () => {
+    it('should return a policy with monitoring if monitoring is enabled for logs', async () => {
       const soClient = getSavedObjectMock({
         revision: 1,
         monitoring_enabled: ['logs'],
       });
-      const config = await agentConfigService.getFullConfig(soClient, 'config');
+      const agentPolicy = await agentPolicyService.getFullAgentPolicy(soClient, 'agent-policy');
 
-      expect(config).toMatchObject({
-        id: 'config',
+      expect(agentPolicy).toMatchObject({
+        id: 'agent-policy',
         outputs: {
           default: {
             type: 'elasticsearch',
@@ -101,15 +101,15 @@ describe('agent config', () => {
       });
     });
 
-    it('should return a config with monitoring if monitoring is enabled for metrics', async () => {
+    it('should return a policy with monitoring if monitoring is enabled for metrics', async () => {
       const soClient = getSavedObjectMock({
         revision: 1,
         monitoring_enabled: ['metrics'],
       });
-      const config = await agentConfigService.getFullConfig(soClient, 'config');
+      const agentPolicy = await agentPolicyService.getFullAgentPolicy(soClient, 'agent-policy');
 
-      expect(config).toMatchObject({
-        id: 'config',
+      expect(agentPolicy).toMatchObject({
+        id: 'agent-policy',
         outputs: {
           default: {
             type: 'elasticsearch',
diff --git a/x-pack/plugins/ingest_manager/server/services/agent_policy.ts b/x-pack/plugins/ingest_manager/server/services/agent_policy.ts
new file mode 100644
index 0000000000000..21bc7b021e83a
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/server/services/agent_policy.ts
@@ -0,0 +1,442 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { uniq } from 'lodash';
+import { SavedObjectsClientContract } from 'src/core/server';
+import { AuthenticatedUser } from '../../../security/server';
+import {
+  DEFAULT_AGENT_POLICY,
+  AGENT_POLICY_SAVED_OBJECT_TYPE,
+  AGENT_SAVED_OBJECT_TYPE,
+} from '../constants';
+import {
+  PackagePolicy,
+  NewAgentPolicy,
+  AgentPolicy,
+  AgentPolicySOAttributes,
+  FullAgentPolicy,
+  AgentPolicyStatus,
+  ListWithKuery,
+} from '../types';
+import { DeleteAgentPolicyResponse, storedPackagePoliciesToAgentInputs } from '../../common';
+import { listAgents } from './agents';
+import { packagePolicyService } from './package_policy';
+import { outputService } from './output';
+import { agentPolicyUpdateEventHandler } from './agent_policy_update';
+
+const SAVED_OBJECT_TYPE = AGENT_POLICY_SAVED_OBJECT_TYPE;
+
+class AgentPolicyService {
+  private triggerAgentPolicyUpdatedEvent = async (
+    soClient: SavedObjectsClientContract,
+    action: string,
+    agentPolicyId: string
+  ) => {
+    return agentPolicyUpdateEventHandler(soClient, action, agentPolicyId);
+  };
+
+  private async _update(
+    soClient: SavedObjectsClientContract,
+    id: string,
+    agentPolicy: Partial<AgentPolicySOAttributes>,
+    user?: AuthenticatedUser,
+    options: { bumpRevision: boolean } = { bumpRevision: true }
+  ): Promise<AgentPolicy> {
+    const oldAgentPolicy = await this.get(soClient, id, false);
+
+    if (!oldAgentPolicy) {
+      throw new Error('Agent policy not found');
+    }
+
+    if (
+      oldAgentPolicy.status === AgentPolicyStatus.Inactive &&
+      agentPolicy.status !== AgentPolicyStatus.Active
+    ) {
+      throw new Error(
+        `Agent policy ${id} cannot be updated because it is ${oldAgentPolicy.status}`
+      );
+    }
+
+    await soClient.update<AgentPolicySOAttributes>(SAVED_OBJECT_TYPE, id, {
+      ...agentPolicy,
+      ...(options.bumpRevision ? { revision: oldAgentPolicy.revision + 1 } : {}),
+      updated_at: new Date().toISOString(),
+      updated_by: user ? user.username : 'system',
+    });
+
+    return (await this.get(soClient, id)) as AgentPolicy;
+  }
+
+  public async ensureDefaultAgentPolicy(soClient: SavedObjectsClientContract) {
+    const agentPolicies = await soClient.find<AgentPolicySOAttributes>({
+      type: AGENT_POLICY_SAVED_OBJECT_TYPE,
+      searchFields: ['is_default'],
+      search: 'true',
+    });
+
+    if (agentPolicies.total === 0) {
+      const newDefaultAgentPolicy: NewAgentPolicy = {
+        ...DEFAULT_AGENT_POLICY,
+      };
+
+      return this.create(soClient, newDefaultAgentPolicy);
+    }
+
+    return {
+      id: agentPolicies.saved_objects[0].id,
+      ...agentPolicies.saved_objects[0].attributes,
+    };
+  }
+
+  public async create(
+    soClient: SavedObjectsClientContract,
+    agentPolicy: NewAgentPolicy,
+    options?: { id?: string; user?: AuthenticatedUser }
+  ): Promise<AgentPolicy> {
+    const newSo = await soClient.create<AgentPolicySOAttributes>(
+      SAVED_OBJECT_TYPE,
+      {
+        ...agentPolicy,
+        revision: 1,
+        updated_at: new Date().toISOString(),
+        updated_by: options?.user?.username || 'system',
+      } as AgentPolicy,
+      options
+    );
+
+    if (!agentPolicy.is_default) {
+      await this.triggerAgentPolicyUpdatedEvent(soClient, 'created', newSo.id);
+    }
+
+    return { id: newSo.id, ...newSo.attributes };
+  }
+
+  public async get(
+    soClient: SavedObjectsClientContract,
+    id: string,
+    withPackagePolicies: boolean = true
+  ): Promise<AgentPolicy | null> {
+    const agentPolicySO = await soClient.get<AgentPolicySOAttributes>(SAVED_OBJECT_TYPE, id);
+    if (!agentPolicySO) {
+      return null;
+    }
+
+    if (agentPolicySO.error) {
+      throw new Error(agentPolicySO.error.message);
+    }
+
+    const agentPolicy = { id: agentPolicySO.id, ...agentPolicySO.attributes };
+
+    if (withPackagePolicies) {
+      agentPolicy.package_policies =
+        (await packagePolicyService.getByIDs(
+          soClient,
+          (agentPolicySO.attributes.package_policies as string[]) || []
+        )) || [];
+    }
+
+    return agentPolicy;
+  }
+
+  public async list(
+    soClient: SavedObjectsClientContract,
+    options: ListWithKuery & {
+      withPackagePolicies?: boolean;
+    }
+  ): Promise<{ items: AgentPolicy[]; total: number; page: number; perPage: number }> {
+    const {
+      page = 1,
+      perPage = 20,
+      sortField = 'updated_at',
+      sortOrder = 'desc',
+      kuery,
+      withPackagePolicies = false,
+    } = options;
+
+    const agentPoliciesSO = await soClient.find<AgentPolicySOAttributes>({
+      type: SAVED_OBJECT_TYPE,
+      sortField,
+      sortOrder,
+      page,
+      perPage,
+      // To ensure users don't need to know about SO data structure...
+      filter: kuery
+        ? kuery.replace(
+            new RegExp(`${SAVED_OBJECT_TYPE}\.`, 'g'),
+            `${SAVED_OBJECT_TYPE}.attributes.`
+          )
+        : undefined,
+    });
+
+    const agentPolicies = await Promise.all(
+      agentPoliciesSO.saved_objects.map(async (agentPolicySO) => {
+        const agentPolicy = {
+          id: agentPolicySO.id,
+          ...agentPolicySO.attributes,
+        };
+        if (withPackagePolicies) {
+          const agentPolicyWithPackagePolicies = await this.get(
+            soClient,
+            agentPolicySO.id,
+            withPackagePolicies
+          );
+          if (agentPolicyWithPackagePolicies) {
+            agentPolicy.package_policies = agentPolicyWithPackagePolicies.package_policies;
+          }
+        }
+        return agentPolicy;
+      })
+    );
+
+    return {
+      items: agentPolicies,
+      total: agentPoliciesSO.total,
+      page,
+      perPage,
+    };
+  }
+
+  public async update(
+    soClient: SavedObjectsClientContract,
+    id: string,
+    agentPolicy: Partial<AgentPolicy>,
+    options?: { user?: AuthenticatedUser }
+  ): Promise<AgentPolicy> {
+    return this._update(soClient, id, agentPolicy, options?.user);
+  }
+
+  public async copy(
+    soClient: SavedObjectsClientContract,
+    id: string,
+    newAgentPolicyProps: Pick<AgentPolicy, 'name' | 'description'>,
+    options?: { user?: AuthenticatedUser }
+  ): Promise<AgentPolicy> {
+    // Copy base agent policy
+    const baseAgentPolicy = await this.get(soClient, id, true);
+    if (!baseAgentPolicy) {
+      throw new Error('Agent policy not found');
+    }
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    const { namespace, monitoring_enabled } = baseAgentPolicy;
+    const newAgentPolicy = await this.create(
+      soClient,
+      {
+        namespace,
+        monitoring_enabled,
+        ...newAgentPolicyProps,
+      },
+      options
+    );
+
+    // Copy all package policies
+    if (baseAgentPolicy.package_policies.length) {
+      const newPackagePolicies = (baseAgentPolicy.package_policies as PackagePolicy[]).map(
+        (packagePolicy: PackagePolicy) => {
+          const { id: packagePolicyId, version, ...newPackagePolicy } = packagePolicy;
+          return newPackagePolicy;
+        }
+      );
+      await packagePolicyService.bulkCreate(soClient, newPackagePolicies, newAgentPolicy.id, {
+        ...options,
+        bumpRevision: false,
+      });
+    }
+
+    // Get updated agent policy
+    const updatedAgentPolicy = await this.get(soClient, newAgentPolicy.id, true);
+    if (!updatedAgentPolicy) {
+      throw new Error('Copied agent policy not found');
+    }
+
+    return updatedAgentPolicy;
+  }
+
+  public async bumpRevision(
+    soClient: SavedObjectsClientContract,
+    id: string,
+    options?: { user?: AuthenticatedUser }
+  ): Promise<AgentPolicy> {
+    return this._update(soClient, id, {}, options?.user);
+  }
+
+  public async assignPackagePolicies(
+    soClient: SavedObjectsClientContract,
+    id: string,
+    packagePolicyIds: string[],
+    options: { user?: AuthenticatedUser; bumpRevision: boolean } = { bumpRevision: true }
+  ): Promise<AgentPolicy> {
+    const oldAgentPolicy = await this.get(soClient, id, false);
+
+    if (!oldAgentPolicy) {
+      throw new Error('Agent policy not found');
+    }
+
+    return await this._update(
+      soClient,
+      id,
+      {
+        package_policies: uniq(
+          [...((oldAgentPolicy.package_policies || []) as string[])].concat(packagePolicyIds)
+        ),
+      },
+      options?.user,
+      { bumpRevision: options.bumpRevision }
+    );
+  }
+
+  public async unassignPackagePolicies(
+    soClient: SavedObjectsClientContract,
+    id: string,
+    packagePolicyIds: string[],
+    options?: { user?: AuthenticatedUser }
+  ): Promise<AgentPolicy> {
+    const oldAgentPolicy = await this.get(soClient, id, false);
+
+    if (!oldAgentPolicy) {
+      throw new Error('Agent policy not found');
+    }
+
+    return await this._update(
+      soClient,
+      id,
+      {
+        package_policies: uniq(
+          [...((oldAgentPolicy.package_policies || []) as string[])].filter(
+            (packagePolicyId) => !packagePolicyIds.includes(packagePolicyId)
+          )
+        ),
+      },
+      options?.user
+    );
+  }
+
+  public async getDefaultAgentPolicyId(soClient: SavedObjectsClientContract) {
+    const agentPolicies = await soClient.find({
+      type: AGENT_POLICY_SAVED_OBJECT_TYPE,
+      searchFields: ['is_default'],
+      search: 'true',
+    });
+
+    if (agentPolicies.saved_objects.length === 0) {
+      throw new Error('No default agent policy');
+    }
+
+    return agentPolicies.saved_objects[0].id;
+  }
+
+  public async delete(
+    soClient: SavedObjectsClientContract,
+    id: string
+  ): Promise<DeleteAgentPolicyResponse> {
+    const agentPolicy = await this.get(soClient, id, false);
+    if (!agentPolicy) {
+      throw new Error('Agent policy not found');
+    }
+
+    const { id: defaultAgentPolicyId } = await this.ensureDefaultAgentPolicy(soClient);
+    if (id === defaultAgentPolicyId) {
+      throw new Error('The default agent policy cannot be deleted');
+    }
+
+    const { total } = await listAgents(soClient, {
+      showInactive: false,
+      perPage: 0,
+      page: 1,
+      kuery: `${AGENT_SAVED_OBJECT_TYPE}.policy_id:${id}`,
+    });
+
+    if (total > 0) {
+      throw new Error('Cannot delete agent policy that is assigned to agent(s)');
+    }
+
+    if (agentPolicy.package_policies && agentPolicy.package_policies.length) {
+      await packagePolicyService.delete(soClient, agentPolicy.package_policies as string[], {
+        skipUnassignFromAgentPolicies: true,
+      });
+    }
+    await soClient.delete(SAVED_OBJECT_TYPE, id);
+    await this.triggerAgentPolicyUpdatedEvent(soClient, 'deleted', id);
+    return {
+      id,
+      success: true,
+    };
+  }
+
+  public async getFullAgentPolicy(
+    soClient: SavedObjectsClientContract,
+    id: string,
+    options?: { standalone: boolean }
+  ): Promise<FullAgentPolicy | null> {
+    let agentPolicy;
+
+    try {
+      agentPolicy = await this.get(soClient, id);
+    } catch (err) {
+      if (!err.isBoom || err.output.statusCode !== 404) {
+        throw err;
+      }
+    }
+
+    if (!agentPolicy) {
+      return null;
+    }
+
+    const defaultOutputId = await outputService.getDefaultOutputId(soClient);
+    if (!defaultOutputId) {
+      throw new Error('Default output is not setup');
+    }
+    const defaultOutput = await outputService.get(soClient, defaultOutputId);
+
+    const fullAgentPolicy: FullAgentPolicy = {
+      id: agentPolicy.id,
+      outputs: {
+        // TEMPORARY as we only support a default output
+        ...[defaultOutput].reduce(
+          // eslint-disable-next-line @typescript-eslint/naming-convention
+          (outputs, { config: outputConfig, name, type, hosts, ca_sha256, api_key }) => {
+            outputs[name] = {
+              type,
+              hosts,
+              ca_sha256,
+              api_key,
+              ...outputConfig,
+            };
+
+            if (options?.standalone) {
+              delete outputs[name].api_key;
+              outputs[name].username = 'ES_USERNAME';
+              outputs[name].password = 'ES_PASSWORD';
+            }
+
+            return outputs;
+          },
+          {} as FullAgentPolicy['outputs']
+        ),
+      },
+      inputs: storedPackagePoliciesToAgentInputs(agentPolicy.package_policies as PackagePolicy[]),
+      revision: agentPolicy.revision,
+      ...(agentPolicy.monitoring_enabled && agentPolicy.monitoring_enabled.length > 0
+        ? {
+            agent: {
+              monitoring: {
+                use_output: defaultOutput.name,
+                enabled: true,
+                logs: agentPolicy.monitoring_enabled.indexOf('logs') >= 0,
+                metrics: agentPolicy.monitoring_enabled.indexOf('metrics') >= 0,
+              },
+            },
+          }
+        : {
+            agent: {
+              monitoring: { enabled: false, logs: false, metrics: false },
+            },
+          }),
+    };
+
+    return fullAgentPolicy;
+  }
+}
+
+export const agentPolicyService = new AgentPolicyService();
diff --git a/x-pack/plugins/ingest_manager/server/services/agent_config_update.ts b/x-pack/plugins/ingest_manager/server/services/agent_policy_update.ts
similarity index 64%
rename from x-pack/plugins/ingest_manager/server/services/agent_config_update.ts
rename to x-pack/plugins/ingest_manager/server/services/agent_policy_update.ts
index 3d40d128afda8..3c743dd957f62 100644
--- a/x-pack/plugins/ingest_manager/server/services/agent_config_update.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agent_policy_update.ts
@@ -5,14 +5,14 @@
  */
 
 import { SavedObjectsClientContract } from 'src/core/server';
-import { generateEnrollmentAPIKey, deleteEnrollmentApiKeyForConfigId } from './api_keys';
-import { unenrollForConfigId } from './agents';
+import { generateEnrollmentAPIKey, deleteEnrollmentApiKeyForAgentPolicyId } from './api_keys';
+import { unenrollForAgentPolicyId } from './agents';
 import { outputService } from './output';
 
-export async function agentConfigUpdateEventHandler(
+export async function agentPolicyUpdateEventHandler(
   soClient: SavedObjectsClientContract,
   action: string,
-  configId: string
+  agentPolicyId: string
 ) {
   const adminUser = await outputService.getAdminUser(soClient);
   // If no admin user fleet is not enabled just skip this hook
@@ -22,12 +22,12 @@ export async function agentConfigUpdateEventHandler(
 
   if (action === 'created') {
     await generateEnrollmentAPIKey(soClient, {
-      configId,
+      agentPolicyId,
     });
   }
 
   if (action === 'deleted') {
-    await unenrollForConfigId(soClient, configId);
-    await deleteEnrollmentApiKeyForConfigId(soClient, configId);
+    await unenrollForAgentPolicyId(soClient, agentPolicyId);
+    await deleteEnrollmentApiKeyForAgentPolicyId(soClient, agentPolicyId);
   }
 }
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts b/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts
index 6ea59c9a76a49..80fdc305d0ba7 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts
@@ -93,7 +93,7 @@ describe('test agent acks services', () => {
     ]);
   });
 
-  it('should update config field on the agent if a config change is acknowledged', async () => {
+  it('should update config field on the agent if a policy change is acknowledged', async () => {
     const mockSavedObjectsClient = savedObjectsClientMock.create();
     const mockStartEncryptedSOPlugin = encryptedSavedObjectsMock.createStart();
     appContextService.start(({
@@ -117,7 +117,7 @@ describe('test agent acks services', () => {
           created_at: '2020-03-14T19:45:02.620Z',
           data: JSON.stringify({
             config: {
-              id: 'config1',
+              id: 'policy1',
               revision: 4,
               settings: {
                 monitoring: {
@@ -207,7 +207,7 @@ describe('test agent acks services', () => {
       ({
         id: 'id',
         type: AGENT_TYPE_PERMANENT,
-        config_id: 'config1',
+        policy_id: 'policy1',
       } as unknown) as Agent,
       [
         {
@@ -224,10 +224,10 @@ describe('test agent acks services', () => {
     expect(mockSavedObjectsClient.bulkUpdate.mock.calls[0][0][0]).toMatchInlineSnapshot(`
       Object {
         "attributes": Object {
-          "config_revision": 4,
           "packages": Array [
             "system",
           ],
+          "policy_revision": 4,
         },
         "id": "id",
         "type": "fleet-agents",
@@ -235,7 +235,7 @@ describe('test agent acks services', () => {
     `);
   });
 
-  it('should not update config field on the agent if a config change for an old revision is acknowledged', async () => {
+  it('should not update config field on the agent if a policy change for an old revision is acknowledged', async () => {
     const mockSavedObjectsClient = savedObjectsClientMock.create();
     const mockStartEncryptedSOPlugin = encryptedSavedObjectsMock.createStart();
     appContextService.start(({
@@ -259,7 +259,7 @@ describe('test agent acks services', () => {
           created_at: '2020-03-14T19:45:02.620Z',
           data: JSON.stringify({
             config: {
-              id: 'config1',
+              id: 'policy1',
               revision: 4,
               settings: {
                 monitoring: {
@@ -349,8 +349,8 @@ describe('test agent acks services', () => {
       ({
         id: 'id',
         type: AGENT_TYPE_PERMANENT,
-        config_id: 'config1',
-        config_revision: 100,
+        policy_id: 'policy1',
+        policy_revision: 100,
       } as unknown) as Agent,
       [
         {
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/acks.ts b/x-pack/plugins/ingest_manager/server/services/agents/acks.ts
index 1dfe4e067dafe..87572ce405ee7 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/acks.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/acks.ts
@@ -18,7 +18,7 @@ import {
   AgentEventSOAttributes,
   AgentSOAttributes,
   AgentActionSOAttributes,
-  FullAgentConfig,
+  FullAgentPolicy,
 } from '../../types';
 import {
   AGENT_EVENT_SAVED_OBJECT_TYPE,
@@ -70,35 +70,35 @@ export async function acknowledgeAgentActions(
     await forceUnenrollAgent(soClient, agent.id);
   }
 
-  const config = getLatestConfigIfUpdated(agent, actions);
+  const agentPolicy = getLatestAgentPolicyIfUpdated(agent, actions);
 
   await soClient.bulkUpdate<AgentSOAttributes | AgentActionSOAttributes>([
-    ...(config ? [buildUpdateAgentConfig(agent.id, config)] : []),
+    ...(agentPolicy ? [buildUpdateAgentPolicy(agent.id, agentPolicy)] : []),
     ...buildUpdateAgentActionSentAt(actionIds),
   ]);
 
   return actions;
 }
 
-function getLatestConfigIfUpdated(agent: Agent, actions: AgentAction[]) {
-  return actions.reduce<null | FullAgentConfig>((acc, action) => {
+function getLatestAgentPolicyIfUpdated(agent: Agent, actions: AgentAction[]) {
+  return actions.reduce<null | FullAgentPolicy>((acc, action) => {
     if (action.type !== 'CONFIG_CHANGE') {
       return acc;
     }
     const data = action.data || {};
 
-    if (data?.config?.id !== agent.config_id) {
+    if (data?.config?.id !== agent.policy_id) {
       return acc;
     }
 
-    const currentRevision = (acc && acc.revision) || agent.config_revision || 0;
+    const currentRevision = (acc && acc.revision) || agent.policy_revision || 0;
 
     return data?.config?.revision > currentRevision ? data?.config : acc;
   }, null);
 }
 
-function buildUpdateAgentConfig(agentId: string, config: FullAgentConfig) {
-  const packages = config.inputs.reduce<string[]>((acc, input) => {
+function buildUpdateAgentPolicy(agentId: string, agentPolicy: FullAgentPolicy) {
+  const packages = agentPolicy.inputs.reduce<string[]>((acc, input) => {
     const packageName = input.meta?.package?.name;
     if (packageName && acc.indexOf(packageName) < 0) {
       return [packageName, ...acc];
@@ -110,7 +110,7 @@ function buildUpdateAgentConfig(agentId: string, config: FullAgentConfig) {
     type: AGENT_SAVED_OBJECT_TYPE,
     id: agentId,
     attributes: {
-      config_revision: config.revision,
+      policy_revision: agentPolicy.revision,
       packages,
     },
   };
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/checkin/index.ts b/x-pack/plugins/ingest_manager/server/services/agents/checkin/index.ts
index ece38f86b4987..78e6a11fa78a4 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/checkin/index.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/checkin/index.ts
@@ -63,7 +63,7 @@ async function processEventsForCheckin(
   const updatedErrorEvents: Array<AgentEvent | NewAgentEvent> = [...agent.current_error_events];
   for (const event of events) {
     // @ts-ignore
-    event.config_id = agent.config_id;
+    event.policy_id = agent.policy_id;
 
     if (isErrorOrState(event)) {
       // Remove any global or specific to a stream event
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts b/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
index 418b59e1ca2e9..e10d013fe84a9 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
@@ -20,16 +20,16 @@ import {
   Agent,
   AgentAction,
   AgentSOAttributes,
-  AgentConfig,
-  FullAgentConfig,
+  AgentPolicy,
+  FullAgentPolicy,
 } from '../../../types';
-import { agentConfigService } from '../../agent_config';
+import { agentPolicyService } from '../../agent_policy';
 import * as APIKeysService from '../../api_keys';
 import {
   AGENT_SAVED_OBJECT_TYPE,
   AGENT_UPDATE_ACTIONS_INTERVAL_MS,
-  AGENT_CONFIG_ROLLOUT_RATE_LIMIT_INTERVAL_MS,
-  AGENT_CONFIG_ROLLOUT_RATE_LIMIT_REQUEST_PER_INTERVAL,
+  AGENT_POLICY_ROLLOUT_RATE_LIMIT_INTERVAL_MS,
+  AGENT_POLICY_ROLLOUT_RATE_LIMIT_REQUEST_PER_INTERVAL,
 } from '../../../constants';
 import { createAgentAction, getNewActionsSince } from '../actions';
 import { appContextService } from '../../app_context';
@@ -54,14 +54,16 @@ function getInternalUserSOClient() {
   return appContextService.getInternalUserSOClient(fakeRequest);
 }
 
-function createAgentConfigSharedObservable(configId: string) {
+function createAgentPolicySharedObservable(agentPolicyId: string) {
   const internalSOClient = getInternalUserSOClient();
   return timer(0, AGENT_UPDATE_ACTIONS_INTERVAL_MS).pipe(
     switchMap(() =>
-      from(agentConfigService.get(internalSOClient, configId) as Promise<AgentConfig>)
+      from(agentPolicyService.get(internalSOClient, agentPolicyId) as Promise<AgentPolicy>)
     ),
     distinctUntilKeyChanged('revision'),
-    switchMap((data) => from(agentConfigService.getFullConfig(internalSOClient, configId))),
+    switchMap((data) =>
+      from(agentPolicyService.getFullAgentPolicy(internalSOClient, agentPolicyId))
+    ),
     shareReplay({ refCount: true, bufferSize: 1 })
   );
 }
@@ -100,50 +102,54 @@ async function getOrCreateAgentDefaultOutputAPIKey(
   return outputAPIKey.key;
 }
 
-function shouldCreateAgentConfigAction(agent: Agent, config: FullAgentConfig | null): boolean {
-  if (!config || !config.revision) {
+function shouldCreateAgentPolicyAction(agent: Agent, agentPolicy: FullAgentPolicy | null): boolean {
+  if (!agentPolicy || !agentPolicy.revision) {
     return false;
   }
-  const isAgentConfigOutdated = !agent.config_revision || agent.config_revision < config.revision;
-  if (!isAgentConfigOutdated) {
+  const isAgentPolicyOutdated =
+    !agent.policy_revision || agent.policy_revision < agentPolicy.revision;
+  if (!isAgentPolicyOutdated) {
     return false;
   }
 
   return true;
 }
 
-async function createAgentActionFromConfig(
+async function createAgentActionFromAgentPolicy(
   soClient: SavedObjectsClientContract,
   agent: Agent,
-  config: FullAgentConfig | null
+  policy: FullAgentPolicy | null
 ) {
   // Deep clone !not supporting Date, and undefined value.
-  const newConfig = JSON.parse(JSON.stringify(config));
+  const newAgentPolicy = JSON.parse(JSON.stringify(policy));
 
-  // Mutate the config to set the api token for this agent
-  newConfig.outputs.default.api_key = await getOrCreateAgentDefaultOutputAPIKey(soClient, agent);
+  // Mutate the policy to set the api token for this agent
+  newAgentPolicy.outputs.default.api_key = await getOrCreateAgentDefaultOutputAPIKey(
+    soClient,
+    agent
+  );
 
-  const configChangeAction = await createAgentAction(soClient, {
+  const policyChangeAction = await createAgentAction(soClient, {
     agent_id: agent.id,
     type: 'CONFIG_CHANGE',
-    data: { config: newConfig } as any,
+    data: { config: newAgentPolicy } as any,
     created_at: new Date().toISOString(),
     sent_at: undefined,
   });
 
-  return [configChangeAction];
+  return [policyChangeAction];
 }
 
 export function agentCheckinStateNewActionsFactory() {
   // Shared Observables
-  const agentConfigs$ = new Map<string, Observable<FullAgentConfig | null>>();
+  const agentPolicies$ = new Map<string, Observable<FullAgentPolicy | null>>();
   const newActions$ = createNewActionsSharedObservable();
   // Rx operators
   const rateLimiter = createRateLimiter(
-    appContextService.getConfig()?.fleet.agentConfigRolloutRateLimitIntervalMs ??
-      AGENT_CONFIG_ROLLOUT_RATE_LIMIT_INTERVAL_MS,
-    appContextService.getConfig()?.fleet.agentConfigRolloutRateLimitRequestPerInterval ??
-      AGENT_CONFIG_ROLLOUT_RATE_LIMIT_REQUEST_PER_INTERVAL
+    appContextService.getConfig()?.fleet.agentPolicyRolloutRateLimitIntervalMs ??
+      AGENT_POLICY_ROLLOUT_RATE_LIMIT_INTERVAL_MS,
+    appContextService.getConfig()?.fleet.agentPolicyRolloutRateLimitRequestPerInterval ??
+      AGENT_POLICY_ROLLOUT_RATE_LIMIT_REQUEST_PER_INTERVAL
   );
 
   async function subscribeToNewActions(
@@ -151,23 +157,23 @@ export function agentCheckinStateNewActionsFactory() {
     agent: Agent,
     options?: { signal: AbortSignal }
   ): Promise<AgentAction[]> {
-    if (!agent.config_id) {
-      throw new Error('Agent do not have a config');
+    if (!agent.policy_id) {
+      throw new Error('Agent does not have a policy');
     }
-    const configId = agent.config_id;
-    if (!agentConfigs$.has(configId)) {
-      agentConfigs$.set(configId, createAgentConfigSharedObservable(configId));
+    const agentPolicyId = agent.policy_id;
+    if (!agentPolicies$.has(agentPolicyId)) {
+      agentPolicies$.set(agentPolicyId, createAgentPolicySharedObservable(agentPolicyId));
     }
-    const agentConfig$ = agentConfigs$.get(configId);
-    if (!agentConfig$) {
-      throw new Error(`Invalid state no observable for config ${configId}`);
+    const agentPolicy$ = agentPolicies$.get(agentPolicyId);
+    if (!agentPolicy$) {
+      throw new Error(`Invalid state, no observable for policy ${agentPolicyId}`);
     }
 
-    const stream$ = agentConfig$.pipe(
+    const stream$ = agentPolicy$.pipe(
       timeout(appContextService.getConfig()?.fleet.pollingRequestTimeout || 0),
-      filter((config) => shouldCreateAgentConfigAction(agent, config)),
+      filter((agentPolicy) => shouldCreateAgentPolicyAction(agent, agentPolicy)),
       rateLimiter(),
-      mergeMap((config) => createAgentActionFromConfig(soClient, agent, config)),
+      mergeMap((agentPolicy) => createAgentActionFromAgentPolicy(soClient, agent, agentPolicy)),
       merge(newActions$),
       mergeMap(async (data) => {
         if (!data) {
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/enroll.ts b/x-pack/plugins/ingest_manager/server/services/agents/enroll.ts
index b63b1c13e4df9..606d5c4dcbb90 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/enroll.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/enroll.ts
@@ -16,7 +16,7 @@ import { appContextService } from '../app_context';
 export async function enroll(
   soClient: SavedObjectsClientContract,
   type: AgentType,
-  configId: string,
+  agentPolicyId: string,
   metadata?: { local: any; userProvided: any },
   sharedId?: string
 ): Promise<Agent> {
@@ -33,7 +33,7 @@ export async function enroll(
   const agentData: AgentSOAttributes = {
     shared_id: sharedId,
     active: true,
-    config_id: configId,
+    policy_id: agentPolicyId,
     type,
     enrolled_at: enrolledAt,
     user_provided_metadata: metadata?.userProvided ?? {},
@@ -64,7 +64,7 @@ export async function enroll(
     );
   }
 
-  const accessAPIKey = await APIKeyService.generateAccessApiKey(soClient, agent.id, configId);
+  const accessAPIKey = await APIKeyService.generateAccessApiKey(soClient, agent.id);
 
   await soClient.update<AgentSOAttributes>(AGENT_SAVED_OBJECT_TYPE, agent.id, {
     access_api_key_id: accessAPIKey.id,
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/reassign.ts b/x-pack/plugins/ingest_manager/server/services/agents/reassign.ts
index ecc2c987d04b6..3075e146093e3 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/reassign.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/reassign.ts
@@ -8,20 +8,20 @@ import { SavedObjectsClientContract } from 'kibana/server';
 import Boom from 'boom';
 import { AGENT_SAVED_OBJECT_TYPE } from '../../constants';
 import { AgentSOAttributes } from '../../types';
-import { agentConfigService } from '../agent_config';
+import { agentPolicyService } from '../agent_policy';
 
 export async function reassignAgent(
   soClient: SavedObjectsClientContract,
   agentId: string,
-  newConfigId: string
+  newAgentPolicyId: string
 ) {
-  const config = await agentConfigService.get(soClient, newConfigId);
-  if (!config) {
-    throw Boom.notFound(`Agent Configuration not found: ${newConfigId}`);
+  const agentPolicy = await agentPolicyService.get(soClient, newAgentPolicyId);
+  if (!agentPolicy) {
+    throw Boom.notFound(`Agent policy not found: ${newAgentPolicyId}`);
   }
 
   await soClient.update<AgentSOAttributes>(AGENT_SAVED_OBJECT_TYPE, agentId, {
-    config_id: newConfigId,
-    config_revision: null,
+    policy_id: newAgentPolicyId,
+    policy_revision: null,
   });
 }
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/status.ts b/x-pack/plugins/ingest_manager/server/services/agents/status.ts
index 86336714a511e..35033cbe86ea5 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/status.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/status.ts
@@ -21,9 +21,9 @@ export async function getAgentStatusById(
 
 export const getAgentStatus = AgentStatusKueryHelper.getAgentStatus;
 
-export async function getAgentStatusForConfig(
+export async function getAgentStatusForAgentPolicy(
   soClient: SavedObjectsClientContract,
-  configId?: string
+  agentPolicyId?: string
 ) {
   const [all, online, error, offline] = await Promise.all(
     [
@@ -36,17 +36,17 @@ export async function getAgentStatusForConfig(
         showInactive: false,
         perPage: 0,
         page: 1,
-        kuery: configId
+        kuery: agentPolicyId
           ? kuery
-            ? `(${kuery}) and (${AGENT_SAVED_OBJECT_TYPE}.config_id:"${configId}")`
-            : `${AGENT_SAVED_OBJECT_TYPE}.config_id:"${configId}"`
+            ? `(${kuery}) and (${AGENT_SAVED_OBJECT_TYPE}.policy_id:"${agentPolicyId}")`
+            : `${AGENT_SAVED_OBJECT_TYPE}.policy_id:"${agentPolicyId}"`
           : kuery,
       })
     )
   );
 
   return {
-    events: await getEventsCount(soClient, configId),
+    events: await getEventsCount(soClient, agentPolicyId),
     total: all.total,
     online: online.total,
     error: error.total,
@@ -55,11 +55,11 @@ export async function getAgentStatusForConfig(
   };
 }
 
-async function getEventsCount(soClient: SavedObjectsClientContract, configId?: string) {
+async function getEventsCount(soClient: SavedObjectsClientContract, agentPolicyId?: string) {
   const { total } = await soClient.find({
     type: AGENT_EVENT_SAVED_OBJECT_TYPE,
-    searchFields: ['config_id'],
-    search: configId,
+    searchFields: ['policy_id'],
+    search: agentPolicyId,
     perPage: 0,
     page: 1,
     sortField: 'timestamp',
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/update.ts b/x-pack/plugins/ingest_manager/server/services/agents/update.ts
index 11ad76fe81784..b85a831294b58 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/update.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/update.ts
@@ -9,12 +9,15 @@ import { listAgents } from './crud';
 import { AGENT_SAVED_OBJECT_TYPE } from '../../constants';
 import { unenrollAgent } from './unenroll';
 
-export async function unenrollForConfigId(soClient: SavedObjectsClientContract, configId: string) {
+export async function unenrollForAgentPolicyId(
+  soClient: SavedObjectsClientContract,
+  policyId: string
+) {
   let hasMore = true;
   let page = 1;
   while (hasMore) {
     const { agents } = await listAgents(soClient, {
-      kuery: `${AGENT_SAVED_OBJECT_TYPE}.config_id:"${configId}"`,
+      kuery: `${AGENT_SAVED_OBJECT_TYPE}.policy_id:"${policyId}"`,
       page: page++,
       perPage: 1000,
       showInactive: true,
diff --git a/x-pack/plugins/ingest_manager/server/services/api_keys/enrollment_api_key.ts b/x-pack/plugins/ingest_manager/server/services/api_keys/enrollment_api_key.ts
index e1266ac594164..f058166fc2a4f 100644
--- a/x-pack/plugins/ingest_manager/server/services/api_keys/enrollment_api_key.ts
+++ b/x-pack/plugins/ingest_manager/server/services/api_keys/enrollment_api_key.ts
@@ -10,7 +10,7 @@ import { SavedObjectsClientContract, SavedObject } from 'src/core/server';
 import { EnrollmentAPIKey, EnrollmentAPIKeySOAttributes } from '../../types';
 import { ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE } from '../../constants';
 import { createAPIKey, invalidateAPIKey } from './security';
-import { agentConfigService } from '../agent_config';
+import { agentPolicyService } from '../agent_policy';
 import { appContextService } from '../app_context';
 
 export async function listEnrollmentApiKeys(
@@ -75,9 +75,9 @@ export async function deleteEnrollmentApiKey(soClient: SavedObjectsClientContrac
   });
 }
 
-export async function deleteEnrollmentApiKeyForConfigId(
+export async function deleteEnrollmentApiKeyForAgentPolicyId(
   soClient: SavedObjectsClientContract,
-  configId: string
+  agentPolicyId: string
 ) {
   let hasMore = true;
   let page = 1;
@@ -85,7 +85,7 @@ export async function deleteEnrollmentApiKeyForConfigId(
     const { items } = await listEnrollmentApiKeys(soClient, {
       page: page++,
       perPage: 100,
-      kuery: `${ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE}.config_id:${configId}`,
+      kuery: `${ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE}.policy_id:${agentPolicyId}`,
     });
 
     if (items.length === 0) {
@@ -103,15 +103,16 @@ export async function generateEnrollmentAPIKey(
   data: {
     name?: string;
     expiration?: string;
-    configId?: string;
+    agentPolicyId?: string;
   }
 ) {
   const id = uuid.v4();
   const { name: providedKeyName } = data;
-  if (data.configId) {
-    await validateConfigId(soClient, data.configId);
+  if (data.agentPolicyId) {
+    await validateAgentPolicyId(soClient, data.agentPolicyId);
   }
-  const configId = data.configId ?? (await agentConfigService.getDefaultAgentConfigId(soClient));
+  const agentPolicyId =
+    data.agentPolicyId ?? (await agentPolicyService.getDefaultAgentPolicyId(soClient));
   const name = providedKeyName ? `${providedKeyName} (${id})` : id;
   const key = await createAPIKey(soClient, name, {
     // Useless role to avoid to have the privilege of the user that created the key
@@ -140,7 +141,7 @@ export async function generateEnrollmentAPIKey(
       api_key_id: key.id,
       api_key: apiKey,
       name,
-      config_id: configId,
+      policy_id: agentPolicyId,
       created_at: new Date().toISOString(),
     }
   );
@@ -148,12 +149,12 @@ export async function generateEnrollmentAPIKey(
   return getEnrollmentAPIKey(soClient, so.id);
 }
 
-async function validateConfigId(soClient: SavedObjectsClientContract, configId: string) {
+async function validateAgentPolicyId(soClient: SavedObjectsClientContract, agentPolicyId: string) {
   try {
-    await agentConfigService.get(soClient, configId);
+    await agentPolicyService.get(soClient, agentPolicyId);
   } catch (e) {
     if (e.isBoom && e.output.statusCode === 404) {
-      throw Boom.badRequest(`Agent config ${configId} does not exist`);
+      throw Boom.badRequest(`Agent policy ${agentPolicyId} does not exist`);
     }
     throw e;
   }
diff --git a/x-pack/plugins/ingest_manager/server/services/api_keys/index.ts b/x-pack/plugins/ingest_manager/server/services/api_keys/index.ts
index 9e8f1fac4e02b..2e0ccdbcfdca6 100644
--- a/x-pack/plugins/ingest_manager/server/services/api_keys/index.ts
+++ b/x-pack/plugins/ingest_manager/server/services/api_keys/index.ts
@@ -38,11 +38,7 @@ export async function generateOutputApiKey(
   return { key: `${key.id}:${key.api_key}`, id: key.id };
 }
 
-export async function generateAccessApiKey(
-  soClient: SavedObjectsClientContract,
-  agentId: string,
-  configId: string
-) {
+export async function generateAccessApiKey(soClient: SavedObjectsClientContract, agentId: string) {
   const key = await createAPIKey(soClient, agentId, {
     // Useless role to avoid to have the privilege of the user that created the key
     'fleet-apikey-access': {
diff --git a/x-pack/plugins/ingest_manager/server/services/config.ts b/x-pack/plugins/ingest_manager/server/services/config.ts
index 9043b1cc634a0..23cd38cc123ce 100644
--- a/x-pack/plugins/ingest_manager/server/services/config.ts
+++ b/x-pack/plugins/ingest_manager/server/services/config.ts
@@ -7,7 +7,7 @@ import { Observable, Subscription } from 'rxjs';
 import { IngestManagerConfigType } from '../';
 
 /**
- * Kibana config observable service, *NOT* agent config
+ * Kibana config observable service, *NOT* agent policy
  */
 class ConfigService {
   private observable: Observable<IngestManagerConfigType> | null = null;
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/agent/agent.ts b/x-pack/plugins/ingest_manager/server/services/epm/agent/agent.ts
index 88c54d213554c..eeadac6e168b1 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/agent/agent.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/agent/agent.ts
@@ -6,11 +6,11 @@
 
 import Handlebars from 'handlebars';
 import { safeLoad, safeDump } from 'js-yaml';
-import { PackageConfigConfigRecord } from '../../../../common';
+import { PackagePolicyConfigRecord } from '../../../../common';
 
 const handlebars = Handlebars.create();
 
-export function createStream(variables: PackageConfigConfigRecord, streamTemplate: string) {
+export function createStream(variables: PackagePolicyConfigRecord, streamTemplate: string) {
   const { vars, yamlValues } = buildTemplateVariables(variables, streamTemplate);
 
   const template = handlebars.compile(streamTemplate, { noEscape: true });
@@ -54,7 +54,7 @@ function replaceVariablesInYaml(yamlVariables: { [k: string]: any }, yaml: any)
   return yaml;
 }
 
-function buildTemplateVariables(variables: PackageConfigConfigRecord, streamTemplate: string) {
+function buildTemplateVariables(variables: PackagePolicyConfigRecord, streamTemplate: string) {
   const yamlValues: { [k: string]: any } = {};
   const vars = Object.entries(variables).reduce((acc, [key, recordEntry]) => {
     // support variables with . like key.patterns
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/packages/get.ts b/x-pack/plugins/ingest_manager/server/services/epm/packages/get.ts
index 7093723806ea3..1688900fc1758 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/packages/get.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/packages/get.ts
@@ -50,7 +50,7 @@ export async function getPackages(
   return packageList;
 }
 
-// Get package names for packages which cannot have more than one package config on an agent config
+// Get package names for packages which cannot have more than one package policy on an agent policy
 // Assume packages only export one config template for now
 export async function getLimitedPackages(options: {
   savedObjectsClient: SavedObjectsClientContract;
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/packages/remove.ts b/x-pack/plugins/ingest_manager/server/services/epm/packages/remove.ts
index 1e50c67d63c42..bc71ead34c3d4 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/packages/remove.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/packages/remove.ts
@@ -6,13 +6,13 @@
 
 import { SavedObjectsClientContract } from 'src/core/server';
 import Boom from 'boom';
-import { PACKAGES_SAVED_OBJECT_TYPE, PACKAGE_CONFIG_SAVED_OBJECT_TYPE } from '../../../constants';
+import { PACKAGES_SAVED_OBJECT_TYPE, PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../constants';
 import { AssetReference, AssetType, ElasticsearchAssetType } from '../../../types';
 import { CallESAsCurrentUser } from '../../../types';
 import { getInstallation, savedObjectTypes } from './index';
 import { deletePipeline } from '../elasticsearch/ingest_pipeline/';
 import { installIndexPatterns } from '../kibana/index_pattern/install';
-import { packageConfigService, appContextService } from '../..';
+import { packagePolicyService, appContextService } from '../..';
 import { splitPkgKey } from '../registry';
 
 export async function removeInstallation(options: {
@@ -28,15 +28,15 @@ export async function removeInstallation(options: {
   if (installation.removable === false)
     throw Boom.badRequest(`${pkgName} is installed by default and cannot be removed`);
 
-  const { total } = await packageConfigService.list(savedObjectsClient, {
-    kuery: `${PACKAGE_CONFIG_SAVED_OBJECT_TYPE}.package.name:${pkgName}`,
+  const { total } = await packagePolicyService.list(savedObjectsClient, {
+    kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name:${pkgName}`,
     page: 0,
     perPage: 0,
   });
 
   if (total > 0)
     throw Boom.badRequest(
-      `unable to remove package with existing package config(s) in use by agent(s)`
+      `unable to remove package with existing package policy(s) in use by agent(s)`
     );
 
   // recreate or delete index patterns when a package is uninstalled
diff --git a/x-pack/plugins/ingest_manager/server/services/index.ts b/x-pack/plugins/ingest_manager/server/services/index.ts
index f6ca9e7bbbe71..e768862d2dee1 100644
--- a/x-pack/plugins/ingest_manager/server/services/index.ts
+++ b/x-pack/plugins/ingest_manager/server/services/index.ts
@@ -61,8 +61,8 @@ export interface AgentService {
 }
 
 // Saved object services
-export { agentConfigService } from './agent_config';
-export { packageConfigService } from './package_config';
+export { agentPolicyService } from './agent_policy';
+export { packagePolicyService } from './package_policy';
 export { outputService } from './output';
 export { settingsService };
 
diff --git a/x-pack/plugins/ingest_manager/server/services/package_config.test.ts b/x-pack/plugins/ingest_manager/server/services/package_policy.test.ts
similarity index 88%
rename from x-pack/plugins/ingest_manager/server/services/package_config.test.ts
rename to x-pack/plugins/ingest_manager/server/services/package_policy.test.ts
index 28aa0d773d75b..0d89c52957632 100644
--- a/x-pack/plugins/ingest_manager/server/services/package_config.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/package_policy.test.ts
@@ -5,9 +5,9 @@
  */
 
 import { savedObjectsClientMock } from 'src/core/server/mocks';
-import { createPackageConfigMock } from '../../common/mocks';
-import { packageConfigService } from './package_config';
-import { PackageInfo, PackageConfigSOAttributes } from '../types';
+import { createPackagePolicyMock } from '../../common/mocks';
+import { packagePolicyService } from './package_policy';
+import { PackageInfo, PackagePolicySOAttributes } from '../types';
 import { SavedObjectsUpdateResponse } from 'src/core/server';
 
 async function mockedGetAssetsData(_a: any, _b: any, dataset: string) {
@@ -40,10 +40,10 @@ jest.mock('./epm/registry', () => {
   };
 });
 
-describe('Package config service', () => {
+describe('Package policy service', () => {
   describe('assignPackageStream', () => {
     it('should work with config variables from the stream', async () => {
-      const inputs = await packageConfigService.assignPackageStream(
+      const inputs = await packagePolicyService.assignPackageStream(
         ({
           datasets: [
             {
@@ -104,7 +104,7 @@ describe('Package config service', () => {
     });
 
     it('should work with config variables at the input level', async () => {
-      const inputs = await packageConfigService.assignPackageStream(
+      const inputs = await packagePolicyService.assignPackageStream(
         ({
           datasets: [
             {
@@ -173,21 +173,21 @@ describe('Package config service', () => {
         type: 'abcd',
         references: [],
         version: 'test',
-        attributes: createPackageConfigMock(),
+        attributes: createPackagePolicyMock(),
       });
       savedObjectsClient.update.mockImplementation(
         async (
           type: string,
           id: string
-        ): Promise<SavedObjectsUpdateResponse<PackageConfigSOAttributes>> => {
+        ): Promise<SavedObjectsUpdateResponse<PackagePolicySOAttributes>> => {
           throw savedObjectsClient.errors.createConflictError('abc', '123');
         }
       );
       await expect(
-        packageConfigService.update(
+        packagePolicyService.update(
           savedObjectsClient,
-          'the-package-config-id',
-          createPackageConfigMock()
+          'the-package-policy-id',
+          createPackagePolicyMock()
         )
       ).rejects.toThrow('Saved object [abc/123] conflict');
     });
diff --git a/x-pack/plugins/ingest_manager/server/services/package_config.ts b/x-pack/plugins/ingest_manager/server/services/package_policy.ts
similarity index 58%
rename from x-pack/plugins/ingest_manager/server/services/package_config.ts
rename to x-pack/plugins/ingest_manager/server/services/package_policy.ts
index 665c08316588c..b7e1806979db8 100644
--- a/x-pack/plugins/ingest_manager/server/services/package_config.ts
+++ b/x-pack/plugins/ingest_manager/server/services/package_policy.ts
@@ -6,92 +6,92 @@
 import { SavedObjectsClientContract } from 'src/core/server';
 import { AuthenticatedUser } from '../../../security/server';
 import {
-  DeletePackageConfigsResponse,
-  PackageConfigInput,
-  PackageConfigInputStream,
+  DeletePackagePoliciesResponse,
+  PackagePolicyInput,
+  PackagePolicyInputStream,
   PackageInfo,
   ListWithKuery,
-  packageToPackageConfig,
+  packageToPackagePolicy,
   isPackageLimited,
-  doesAgentConfigAlreadyIncludePackage,
+  doesAgentPolicyAlreadyIncludePackage,
 } from '../../common';
-import { PACKAGE_CONFIG_SAVED_OBJECT_TYPE } from '../constants';
+import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../constants';
 import {
-  NewPackageConfig,
-  UpdatePackageConfig,
-  PackageConfig,
-  PackageConfigSOAttributes,
+  NewPackagePolicy,
+  UpdatePackagePolicy,
+  PackagePolicy,
+  PackagePolicySOAttributes,
   RegistryPackage,
   CallESAsCurrentUser,
 } from '../types';
-import { agentConfigService } from './agent_config';
+import { agentPolicyService } from './agent_policy';
 import { outputService } from './output';
 import * as Registry from './epm/registry';
 import { getPackageInfo, getInstallation, ensureInstalledPackage } from './epm/packages';
 import { getAssetsData } from './epm/packages/assets';
 import { createStream } from './epm/agent/agent';
 
-const SAVED_OBJECT_TYPE = PACKAGE_CONFIG_SAVED_OBJECT_TYPE;
+const SAVED_OBJECT_TYPE = PACKAGE_POLICY_SAVED_OBJECT_TYPE;
 
 function getDataset(st: string) {
   return st.split('.')[1];
 }
 
-class PackageConfigService {
+class PackagePolicyService {
   public async create(
     soClient: SavedObjectsClientContract,
     callCluster: CallESAsCurrentUser,
-    packageConfig: NewPackageConfig,
-    options?: { id?: string; user?: AuthenticatedUser; bumpConfigRevision?: boolean }
-  ): Promise<PackageConfig> {
-    // Check that its agent config does not have a package config with the same name
-    const parentAgentConfig = await agentConfigService.get(soClient, packageConfig.config_id);
-    if (!parentAgentConfig) {
-      throw new Error('Agent config not found');
+    packagePolicy: NewPackagePolicy,
+    options?: { id?: string; user?: AuthenticatedUser; bumpRevision?: boolean }
+  ): Promise<PackagePolicy> {
+    // Check that its agent policy does not have a package policy with the same name
+    const parentAgentPolicy = await agentPolicyService.get(soClient, packagePolicy.policy_id);
+    if (!parentAgentPolicy) {
+      throw new Error('Agent policy not found');
     } else {
       if (
-        (parentAgentConfig.package_configs as PackageConfig[]).find(
-          (siblingPackageConfig) => siblingPackageConfig.name === packageConfig.name
+        (parentAgentPolicy.package_policies as PackagePolicy[]).find(
+          (siblingPackagePolicy) => siblingPackagePolicy.name === packagePolicy.name
         )
       ) {
-        throw new Error('There is already a package with the same name on this agent config');
+        throw new Error('There is already a package with the same name on this agent policy');
       }
     }
 
     // Make sure the associated package is installed
-    if (packageConfig.package?.name) {
+    if (packagePolicy.package?.name) {
       const [, pkgInfo] = await Promise.all([
         ensureInstalledPackage({
           savedObjectsClient: soClient,
-          pkgName: packageConfig.package.name,
+          pkgName: packagePolicy.package.name,
           callCluster,
         }),
         getPackageInfo({
           savedObjectsClient: soClient,
-          pkgName: packageConfig.package.name,
-          pkgVersion: packageConfig.package.version,
+          pkgName: packagePolicy.package.name,
+          pkgVersion: packagePolicy.package.version,
         }),
       ]);
 
-      // Check if it is a limited package, and if so, check that the corresponding agent config does not
-      // already contain a package config for this package
+      // Check if it is a limited package, and if so, check that the corresponding agent policy does not
+      // already contain a package policy for this package
       if (isPackageLimited(pkgInfo)) {
-        const agentConfig = await agentConfigService.get(soClient, packageConfig.config_id, true);
-        if (agentConfig && doesAgentConfigAlreadyIncludePackage(agentConfig, pkgInfo.name)) {
+        const agentPolicy = await agentPolicyService.get(soClient, packagePolicy.policy_id, true);
+        if (agentPolicy && doesAgentPolicyAlreadyIncludePackage(agentPolicy, pkgInfo.name)) {
           throw new Error(
-            `Unable to create package config. Package '${pkgInfo.name}' already exists on this agent config.`
+            `Unable to create package policy. Package '${pkgInfo.name}' already exists on this agent policy.`
           );
         }
       }
 
-      packageConfig.inputs = await this.assignPackageStream(pkgInfo, packageConfig.inputs);
+      packagePolicy.inputs = await this.assignPackageStream(pkgInfo, packagePolicy.inputs);
     }
 
     const isoDate = new Date().toISOString();
-    const newSo = await soClient.create<PackageConfigSOAttributes>(
+    const newSo = await soClient.create<PackagePolicySOAttributes>(
       SAVED_OBJECT_TYPE,
       {
-        ...packageConfig,
+        ...packagePolicy,
         revision: 1,
         created_at: isoDate,
         created_by: options?.user?.username ?? 'system',
@@ -101,10 +101,10 @@ class PackageConfigService {
       options
     );
 
-    // Assign it to the given agent config
-    await agentConfigService.assignPackageConfigs(soClient, packageConfig.config_id, [newSo.id], {
+    // Assign it to the given agent policy
+    await agentPolicyService.assignPackagePolicies(soClient, packagePolicy.policy_id, [newSo.id], {
       user: options?.user,
-      bumpRevision: options?.bumpConfigRevision ?? true,
+      bumpRevision: options?.bumpRevision ?? true,
     });
 
     return {
@@ -116,18 +116,18 @@ class PackageConfigService {
 
   public async bulkCreate(
     soClient: SavedObjectsClientContract,
-    packageConfigs: NewPackageConfig[],
-    configId: string,
-    options?: { user?: AuthenticatedUser; bumpConfigRevision?: boolean }
-  ): Promise<PackageConfig[]> {
+    packagePolicies: NewPackagePolicy[],
+    agentPolicyId: string,
+    options?: { user?: AuthenticatedUser; bumpRevision?: boolean }
+  ): Promise<PackagePolicy[]> {
     const isoDate = new Date().toISOString();
     // eslint-disable-next-line @typescript-eslint/naming-convention
-    const { saved_objects } = await soClient.bulkCreate<PackageConfigSOAttributes>(
-      packageConfigs.map((packageConfig) => ({
+    const { saved_objects } = await soClient.bulkCreate<PackagePolicySOAttributes>(
+      packagePolicies.map((packagePolicy) => ({
         type: SAVED_OBJECT_TYPE,
         attributes: {
-          ...packageConfig,
-          config_id: configId,
+          ...packagePolicy,
+          policy_id: agentPolicyId,
           revision: 1,
           created_at: isoDate,
           created_by: options?.user?.username ?? 'system',
@@ -140,14 +140,14 @@ class PackageConfigService {
     // Filter out invalid SOs
     const newSos = saved_objects.filter((so) => !so.error && so.attributes);
 
-    // Assign it to the given agent config
-    await agentConfigService.assignPackageConfigs(
+    // Assign it to the given agent policy
+    await agentPolicyService.assignPackagePolicies(
       soClient,
-      configId,
+      agentPolicyId,
       newSos.map((newSo) => newSo.id),
       {
         user: options?.user,
-        bumpRevision: options?.bumpConfigRevision ?? true,
+        bumpRevision: options?.bumpRevision ?? true,
       }
     );
 
@@ -161,38 +161,38 @@ class PackageConfigService {
   public async get(
     soClient: SavedObjectsClientContract,
     id: string
-  ): Promise<PackageConfig | null> {
-    const packageConfigSO = await soClient.get<PackageConfigSOAttributes>(SAVED_OBJECT_TYPE, id);
-    if (!packageConfigSO) {
+  ): Promise<PackagePolicy | null> {
+    const packagePolicySO = await soClient.get<PackagePolicySOAttributes>(SAVED_OBJECT_TYPE, id);
+    if (!packagePolicySO) {
       return null;
     }
 
-    if (packageConfigSO.error) {
-      throw new Error(packageConfigSO.error.message);
+    if (packagePolicySO.error) {
+      throw new Error(packagePolicySO.error.message);
     }
 
     return {
-      id: packageConfigSO.id,
-      version: packageConfigSO.version,
-      ...packageConfigSO.attributes,
+      id: packagePolicySO.id,
+      version: packagePolicySO.version,
+      ...packagePolicySO.attributes,
     };
   }
 
   public async getByIDs(
     soClient: SavedObjectsClientContract,
     ids: string[]
-  ): Promise<PackageConfig[] | null> {
-    const packageConfigSO = await soClient.bulkGet<PackageConfigSOAttributes>(
+  ): Promise<PackagePolicy[] | null> {
+    const packagePolicySO = await soClient.bulkGet<PackagePolicySOAttributes>(
       ids.map((id) => ({
         id,
         type: SAVED_OBJECT_TYPE,
       }))
     );
-    if (!packageConfigSO) {
+    if (!packagePolicySO) {
       return null;
     }
 
-    return packageConfigSO.saved_objects.map((so) => ({
+    return packagePolicySO.saved_objects.map((so) => ({
       id: so.id,
       version: so.version,
       ...so.attributes,
@@ -202,10 +202,10 @@ class PackageConfigService {
   public async list(
     soClient: SavedObjectsClientContract,
     options: ListWithKuery
-  ): Promise<{ items: PackageConfig[]; total: number; page: number; perPage: number }> {
+  ): Promise<{ items: PackagePolicy[]; total: number; page: number; perPage: number }> {
     const { page = 1, perPage = 20, sortField = 'updated_at', sortOrder = 'desc', kuery } = options;
 
-    const packageConfigs = await soClient.find<PackageConfigSOAttributes>({
+    const packagePolicies = await soClient.find<PackagePolicySOAttributes>({
       type: SAVED_OBJECT_TYPE,
       sortField,
       sortOrder,
@@ -221,12 +221,12 @@ class PackageConfigService {
     });
 
     return {
-      items: packageConfigs.saved_objects.map((packageConfigSO) => ({
-        id: packageConfigSO.id,
-        version: packageConfigSO.version,
-        ...packageConfigSO.attributes,
+      items: packagePolicies.saved_objects.map((packagePolicySO) => ({
+        id: packagePolicySO.id,
+        version: packagePolicySO.version,
+        ...packagePolicySO.attributes,
       })),
-      total: packageConfigs.total,
+      total: packagePolicies.total,
       page,
       perPage,
     };
@@ -235,37 +235,37 @@ class PackageConfigService {
   public async update(
     soClient: SavedObjectsClientContract,
     id: string,
-    packageConfig: UpdatePackageConfig,
+    packagePolicy: UpdatePackagePolicy,
     options?: { user?: AuthenticatedUser }
-  ): Promise<PackageConfig> {
-    const oldPackageConfig = await this.get(soClient, id);
-    const { version, ...restOfPackageConfig } = packageConfig;
+  ): Promise<PackagePolicy> {
+    const oldPackagePolicy = await this.get(soClient, id);
+    const { version, ...restOfPackagePolicy } = packagePolicy;
 
-    if (!oldPackageConfig) {
-      throw new Error('Package config not found');
+    if (!oldPackagePolicy) {
+      throw new Error('Package policy not found');
     }
 
-    // Check that its agent config does not have a package config with the same name
-    const parentAgentConfig = await agentConfigService.get(soClient, packageConfig.config_id);
-    if (!parentAgentConfig) {
-      throw new Error('Agent config not found');
+    // Check that its agent policy does not have a package policy with the same name
+    const parentAgentPolicy = await agentPolicyService.get(soClient, packagePolicy.policy_id);
+    if (!parentAgentPolicy) {
+      throw new Error('Agent policy not found');
     } else {
       if (
-        (parentAgentConfig.package_configs as PackageConfig[]).find(
-          (siblingPackageConfig) =>
-            siblingPackageConfig.id !== id && siblingPackageConfig.name === packageConfig.name
+        (parentAgentPolicy.package_policies as PackagePolicy[]).find(
+          (siblingPackagePolicy) =>
+            siblingPackagePolicy.id !== id && siblingPackagePolicy.name === packagePolicy.name
         )
       ) {
-        throw new Error('There is already a package with the same name on this agent config');
+        throw new Error('There is already a package with the same name on this agent policy');
       }
     }
 
-    await soClient.update<PackageConfigSOAttributes>(
+    await soClient.update<PackagePolicySOAttributes>(
       SAVED_OBJECT_TYPE,
       id,
       {
-        ...restOfPackageConfig,
-        revision: oldPackageConfig.revision + 1,
+        ...restOfPackagePolicy,
+        revision: oldPackagePolicy.revision + 1,
         updated_at: new Date().toISOString(),
         updated_by: options?.user?.username ?? 'system',
       },
@@ -274,32 +274,32 @@ class PackageConfigService {
       }
     );
 
-    // Bump revision of associated agent config
-    await agentConfigService.bumpRevision(soClient, packageConfig.config_id, {
+    // Bump revision of associated agent policy
+    await agentPolicyService.bumpRevision(soClient, packagePolicy.policy_id, {
       user: options?.user,
     });
 
-    return (await this.get(soClient, id)) as PackageConfig;
+    return (await this.get(soClient, id)) as PackagePolicy;
   }
 
   public async delete(
     soClient: SavedObjectsClientContract,
     ids: string[],
-    options?: { user?: AuthenticatedUser; skipUnassignFromAgentConfigs?: boolean }
-  ): Promise<DeletePackageConfigsResponse> {
-    const result: DeletePackageConfigsResponse = [];
+    options?: { user?: AuthenticatedUser; skipUnassignFromAgentPolicies?: boolean }
+  ): Promise<DeletePackagePoliciesResponse> {
+    const result: DeletePackagePoliciesResponse = [];
 
     for (const id of ids) {
       try {
-        const oldPackageConfig = await this.get(soClient, id);
-        if (!oldPackageConfig) {
-          throw new Error('Package config not found');
+        const oldPackagePolicy = await this.get(soClient, id);
+        if (!oldPackagePolicy) {
+          throw new Error('Package policy not found');
         }
-        if (!options?.skipUnassignFromAgentConfigs) {
-          await agentConfigService.unassignPackageConfigs(
+        if (!options?.skipUnassignFromAgentPolicies) {
+          await agentPolicyService.unassignPackagePolicies(
             soClient,
-            oldPackageConfig.config_id,
-            [oldPackageConfig.id],
+            oldPackagePolicy.policy_id,
+            [oldPackagePolicy.id],
             {
               user: options?.user,
             }
@@ -321,10 +321,10 @@ class PackageConfigService {
     return result;
   }
 
-  public async buildPackageConfigFromPackage(
+  public async buildPackagePolicyFromPackage(
     soClient: SavedObjectsClientContract,
     pkgName: string
-  ): Promise<NewPackageConfig | undefined> {
+  ): Promise<NewPackagePolicy | undefined> {
     const pkgInstall = await getInstallation({ savedObjectsClient: soClient, pkgName });
     if (pkgInstall) {
       const [pkgInfo, defaultOutputId] = await Promise.all([
@@ -339,15 +339,15 @@ class PackageConfigService {
         if (!defaultOutputId) {
           throw new Error('Default output is not set');
         }
-        return packageToPackageConfig(pkgInfo, '', defaultOutputId);
+        return packageToPackagePolicy(pkgInfo, '', defaultOutputId);
       }
     }
   }
 
   public async assignPackageStream(
     pkgInfo: PackageInfo,
-    inputs: PackageConfigInput[]
-  ): Promise<PackageConfigInput[]> {
+    inputs: PackagePolicyInput[]
+  ): Promise<PackagePolicyInput[]> {
     const registryPkgInfo = await Registry.fetchInfo(pkgInfo.name, pkgInfo.version);
     const inputsPromises = inputs.map((input) =>
       _assignPackageStreamToInput(registryPkgInfo, pkgInfo, input)
@@ -360,7 +360,7 @@ class PackageConfigService {
 async function _assignPackageStreamToInput(
   registryPkgInfo: RegistryPackage,
   pkgInfo: PackageInfo,
-  input: PackageConfigInput
+  input: PackagePolicyInput
 ) {
   const streamsPromises = input.streams.map((stream) =>
     _assignPackageStreamToStream(registryPkgInfo, pkgInfo, input, stream)
@@ -373,8 +373,8 @@ async function _assignPackageStreamToInput(
 async function _assignPackageStreamToStream(
   registryPkgInfo: RegistryPackage,
   pkgInfo: PackageInfo,
-  input: PackageConfigInput,
-  stream: PackageConfigInputStream
+  input: PackagePolicyInput,
+  stream: PackagePolicyInputStream
 ) {
   if (!stream.enabled) {
     return { ...stream, compiled_stream: undefined };
@@ -426,5 +426,5 @@ async function _assignPackageStreamToStream(
   return { ...stream };
 }
 
-export type PackageConfigServiceInterface = PackageConfigService;
-export const packageConfigService = new PackageConfigService();
+export type PackagePolicyServiceInterface = PackagePolicyService;
+export const packagePolicyService = new PackagePolicyService();
diff --git a/x-pack/plugins/ingest_manager/server/services/setup.ts b/x-pack/plugins/ingest_manager/server/services/setup.ts
index 4ef093d38879a..727b49cebc608 100644
--- a/x-pack/plugins/ingest_manager/server/services/setup.ts
+++ b/x-pack/plugins/ingest_manager/server/services/setup.ts
@@ -8,21 +8,21 @@ import url from 'url';
 import uuid from 'uuid';
 import { SavedObjectsClientContract } from 'src/core/server';
 import { CallESAsCurrentUser } from '../types';
-import { agentConfigService } from './agent_config';
+import { agentPolicyService } from './agent_policy';
 import { outputService } from './output';
 import { ensureInstalledDefaultPackages } from './epm/packages/install';
 import { ensureDefaultIndices } from './epm/kibana/index_pattern/install';
 import {
-  packageToPackageConfig,
-  PackageConfig,
-  AgentConfig,
+  packageToPackagePolicy,
+  PackagePolicy,
+  AgentPolicy,
   Installation,
   Output,
-  DEFAULT_AGENT_CONFIGS_PACKAGES,
+  DEFAULT_AGENT_POLICIES_PACKAGES,
   decodeCloudId,
 } from '../../common';
 import { getPackageInfo } from './epm/packages';
-import { packageConfigService } from './package_config';
+import { packagePolicyService } from './package_policy';
 import { generateEnrollmentAPIKey } from './api_keys';
 import { settingsService } from '.';
 import { appContextService } from './app_context';
@@ -51,11 +51,11 @@ export async function setupIngestManager(
     });
   }
   try {
-    const [installedPackages, defaultOutput, config] = await Promise.all([
+    const [installedPackages, defaultOutput, defaultAgentPolicy] = await Promise.all([
       // packages installed by default
       ensureInstalledDefaultPackages(soClient, callCluster),
       outputService.ensureDefaultOutput(soClient),
-      agentConfigService.ensureDefaultAgentConfig(soClient),
+      agentPolicyService.ensureDefaultAgentPolicy(soClient),
       ensureDefaultIndices(callCluster),
       settingsService.getSettings(soClient).catch((e: any) => {
         if (e.isBoom && e.output.statusCode === 404) {
@@ -86,36 +86,40 @@ export async function setupIngestManager(
     ]);
 
     // ensure default packages are added to the default conifg
-    const configWithPackageConfigs = await agentConfigService.get(soClient, config.id, true);
-    if (!configWithPackageConfigs) {
-      throw new Error('Config not found');
+    const agentPolicyWithPackagePolicies = await agentPolicyService.get(
+      soClient,
+      defaultAgentPolicy.id,
+      true
+    );
+    if (!agentPolicyWithPackagePolicies) {
+      throw new Error('Policy not found');
     }
     if (
-      configWithPackageConfigs.package_configs.length &&
-      typeof configWithPackageConfigs.package_configs[0] === 'string'
+      agentPolicyWithPackagePolicies.package_policies.length &&
+      typeof agentPolicyWithPackagePolicies.package_policies[0] === 'string'
     ) {
-      throw new Error('Config not found');
+      throw new Error('Policy not found');
     }
     for (const installedPackage of installedPackages) {
-      const packageShouldBeInstalled = DEFAULT_AGENT_CONFIGS_PACKAGES.some(
+      const packageShouldBeInstalled = DEFAULT_AGENT_POLICIES_PACKAGES.some(
         (packageName) => installedPackage.name === packageName
       );
       if (!packageShouldBeInstalled) {
         continue;
       }
 
-      const isInstalled = configWithPackageConfigs.package_configs.some(
-        (d: PackageConfig | string) => {
+      const isInstalled = agentPolicyWithPackagePolicies.package_policies.some(
+        (d: PackagePolicy | string) => {
           return typeof d !== 'string' && d.package?.name === installedPackage.name;
         }
       );
 
       if (!isInstalled) {
-        await addPackageToConfig(
+        await addPackageToAgentPolicy(
           soClient,
           callCluster,
           installedPackage,
-          configWithPackageConfigs,
+          agentPolicyWithPackagePolicies,
           defaultOutput
         );
       }
@@ -185,15 +189,15 @@ export async function setupFleet(
     fleet_enroll_password: password,
   });
 
-  const { items: agentConfigs } = await agentConfigService.list(soClient, {
+  const { items: agentPolicies } = await agentPolicyService.list(soClient, {
     perPage: 10000,
   });
 
   await Promise.all(
-    agentConfigs.map((agentConfig) => {
+    agentPolicies.map((agentPolicy) => {
       return generateEnrollmentAPIKey(soClient, {
         name: `Default`,
-        configId: agentConfig.id,
+        agentPolicyId: agentPolicy.id,
       });
     })
   );
@@ -203,11 +207,11 @@ function generateRandomPassword() {
   return Buffer.from(uuid.v4()).toString('base64');
 }
 
-async function addPackageToConfig(
+async function addPackageToAgentPolicy(
   soClient: SavedObjectsClientContract,
   callCluster: CallESAsCurrentUser,
   packageToInstall: Installation,
-  config: AgentConfig,
+  agentPolicy: AgentPolicy,
   defaultOutput: Output
 ) {
   const packageInfo = await getPackageInfo({
@@ -216,14 +220,14 @@ async function addPackageToConfig(
     pkgVersion: packageToInstall.version,
   });
 
-  const newPackageConfig = packageToPackageConfig(
+  const newPackagePolicy = packageToPackagePolicy(
     packageInfo,
-    config.id,
+    agentPolicy.id,
     defaultOutput.id,
-    config.namespace
+    agentPolicy.namespace
   );
 
-  await packageConfigService.create(soClient, callCluster, newPackageConfig, {
-    bumpConfigRevision: false,
+  await packagePolicyService.create(soClient, callCluster, newPackagePolicy, {
+    bumpRevision: false,
   });
 }
diff --git a/x-pack/plugins/ingest_manager/server/types/index.tsx b/x-pack/plugins/ingest_manager/server/types/index.tsx
index 5d0683a37dc5e..8e3219a8c08e0 100644
--- a/x-pack/plugins/ingest_manager/server/types/index.tsx
+++ b/x-pack/plugins/ingest_manager/server/types/index.tsx
@@ -17,18 +17,18 @@ export {
   AgentEventSOAttributes,
   AgentAction,
   AgentActionSOAttributes,
-  PackageConfig,
-  PackageConfigInput,
-  PackageConfigInputStream,
-  NewPackageConfig,
-  UpdatePackageConfig,
-  PackageConfigSOAttributes,
-  FullAgentConfigInput,
-  FullAgentConfig,
-  AgentConfig,
-  AgentConfigSOAttributes,
-  NewAgentConfig,
-  AgentConfigStatus,
+  PackagePolicy,
+  PackagePolicyInput,
+  PackagePolicyInputStream,
+  NewPackagePolicy,
+  UpdatePackagePolicy,
+  PackagePolicySOAttributes,
+  FullAgentPolicyInput,
+  FullAgentPolicy,
+  AgentPolicy,
+  AgentPolicySOAttributes,
+  NewAgentPolicy,
+  AgentPolicyStatus,
   DataStream,
   Output,
   NewOutput,
@@ -66,9 +66,9 @@ export {
 
 export type CallESAsCurrentUser = LegacyScopedClusterClient['callAsCurrentUser'];
 
-export type AgentConfigUpdateHandler = (
+export type AgentPolicyUpdateHandler = (
   action: 'created' | 'updated' | 'deleted',
-  agentConfigId: string
+  agentPolicyId: string
 ) => Promise<void>;
 
 export * from './models';
diff --git a/x-pack/plugins/ingest_manager/server/types/models/agent.ts b/x-pack/plugins/ingest_manager/server/types/models/agent.ts
index ea5eacc8e63d0..5ad98cfd40622 100644
--- a/x-pack/plugins/ingest_manager/server/types/models/agent.ts
+++ b/x-pack/plugins/ingest_manager/server/types/models/agent.ts
@@ -43,7 +43,7 @@ const AgentEventBase = {
   payload: schema.maybe(schema.any()),
   agent_id: schema.string(),
   action_id: schema.maybe(schema.string()),
-  config_id: schema.maybe(schema.string()),
+  policy_id: schema.maybe(schema.string()),
   stream_id: schema.maybe(schema.string()),
 };
 
diff --git a/x-pack/plugins/ingest_manager/server/types/models/agent_config.ts b/x-pack/plugins/ingest_manager/server/types/models/agent_policy.ts
similarity index 60%
rename from x-pack/plugins/ingest_manager/server/types/models/agent_config.ts
rename to x-pack/plugins/ingest_manager/server/types/models/agent_policy.ts
index a9e14301cd7c3..877d8e9e91714 100644
--- a/x-pack/plugins/ingest_manager/server/types/models/agent_config.ts
+++ b/x-pack/plugins/ingest_manager/server/types/models/agent_policy.ts
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { schema } from '@kbn/config-schema';
-import { PackageConfigSchema } from './package_config';
-import { AgentConfigStatus } from '../../../common';
+import { PackagePolicySchema } from './package_policy';
+import { AgentPolicyStatus } from '../../../common';
 
-const AgentConfigBaseSchema = {
+const AgentPolicyBaseSchema = {
   name: schema.string({ minLength: 1 }),
   namespace: schema.string({ minLength: 1 }),
   description: schema.maybe(schema.string()),
@@ -16,20 +16,20 @@ const AgentConfigBaseSchema = {
   ),
 };
 
-export const NewAgentConfigSchema = schema.object({
-  ...AgentConfigBaseSchema,
+export const NewAgentPolicySchema = schema.object({
+  ...AgentPolicyBaseSchema,
 });
 
-export const AgentConfigSchema = schema.object({
-  ...AgentConfigBaseSchema,
+export const AgentPolicySchema = schema.object({
+  ...AgentPolicyBaseSchema,
   id: schema.string(),
   status: schema.oneOf([
-    schema.literal(AgentConfigStatus.Active),
-    schema.literal(AgentConfigStatus.Inactive),
+    schema.literal(AgentPolicyStatus.Active),
+    schema.literal(AgentPolicyStatus.Inactive),
   ]),
-  package_configs: schema.oneOf([
+  package_policies: schema.oneOf([
     schema.arrayOf(schema.string()),
-    schema.arrayOf(PackageConfigSchema),
+    schema.arrayOf(PackagePolicySchema),
   ]),
   updated_at: schema.string(),
   updated_by: schema.string(),
diff --git a/x-pack/plugins/ingest_manager/server/types/models/enrollment_api_key.ts b/x-pack/plugins/ingest_manager/server/types/models/enrollment_api_key.ts
index e563b39e53f50..919204f93ff21 100644
--- a/x-pack/plugins/ingest_manager/server/types/models/enrollment_api_key.ts
+++ b/x-pack/plugins/ingest_manager/server/types/models/enrollment_api_key.ts
@@ -11,15 +11,5 @@ export const EnrollmentAPIKeySchema = schema.object({
   api_key: schema.string(),
   name: schema.maybe(schema.string()),
   active: schema.boolean(),
-  config_id: schema.maybe(schema.string()),
-});
-
-export const EnrollmentAPIKeySOAttributesSchema = schema.object({
-  api_key_id: schema.string(),
-  api_key: schema.string(),
-  name: schema.maybe(schema.string()),
-  active: schema.boolean(),
-  config_id: schema.maybe(schema.string()),
-  // ASK: Is this allowUnknown? How do we type this with config-schema?
-  // [k: string]: schema.any(), // allow to use it as saved object attributes type
+  policy_id: schema.maybe(schema.string()),
 });
diff --git a/x-pack/plugins/ingest_manager/server/types/models/index.ts b/x-pack/plugins/ingest_manager/server/types/models/index.ts
index 268e87eb529be..243a8a4e09e6e 100644
--- a/x-pack/plugins/ingest_manager/server/types/models/index.ts
+++ b/x-pack/plugins/ingest_manager/server/types/models/index.ts
@@ -3,8 +3,8 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-export * from './agent_config';
+export * from './agent_policy';
 export * from './agent';
-export * from './package_config';
+export * from './package_policy';
 export * from './output';
 export * from './enrollment_api_key';
diff --git a/x-pack/plugins/ingest_manager/server/types/models/package_config.ts b/x-pack/plugins/ingest_manager/server/types/models/package_policy.ts
similarity index 85%
rename from x-pack/plugins/ingest_manager/server/types/models/package_config.ts
rename to x-pack/plugins/ingest_manager/server/types/models/package_policy.ts
index 9b7ffb4f78175..81bfb599b4c9a 100644
--- a/x-pack/plugins/ingest_manager/server/types/models/package_config.ts
+++ b/x-pack/plugins/ingest_manager/server/types/models/package_policy.ts
@@ -13,11 +13,11 @@ const ConfigRecordSchema = schema.recordOf(
   })
 );
 
-const PackageConfigBaseSchema = {
+const PackagePolicyBaseSchema = {
   name: schema.string(),
   description: schema.maybe(schema.string()),
   namespace: schema.string({ minLength: 1 }),
-  config_id: schema.string(),
+  policy_id: schema.string(),
   enabled: schema.boolean(),
   package: schema.maybe(
     schema.object({
@@ -62,17 +62,17 @@ const PackageConfigBaseSchema = {
   ),
 };
 
-export const NewPackageConfigSchema = schema.object({
-  ...PackageConfigBaseSchema,
+export const NewPackagePolicySchema = schema.object({
+  ...PackagePolicyBaseSchema,
 });
 
-export const UpdatePackageConfigSchema = schema.object({
-  ...PackageConfigBaseSchema,
+export const UpdatePackagePolicySchema = schema.object({
+  ...PackagePolicyBaseSchema,
   version: schema.maybe(schema.string()),
 });
 
-export const PackageConfigSchema = schema.object({
-  ...PackageConfigBaseSchema,
+export const PackagePolicySchema = schema.object({
+  ...PackagePolicyBaseSchema,
   id: schema.string(),
   version: schema.maybe(schema.string()),
 });
diff --git a/x-pack/plugins/ingest_manager/server/types/rest_spec/agent.ts b/x-pack/plugins/ingest_manager/server/types/rest_spec/agent.ts
index 3e9209efcac04..3302b0ab84ba8 100644
--- a/x-pack/plugins/ingest_manager/server/types/rest_spec/agent.ts
+++ b/x-pack/plugins/ingest_manager/server/types/rest_spec/agent.ts
@@ -85,7 +85,7 @@ export const PutAgentReassignRequestSchema = {
     agentId: schema.string(),
   }),
   body: schema.object({
-    config_id: schema.string(),
+    policy_id: schema.string(),
   }),
 };
 
@@ -117,6 +117,6 @@ export const UpdateAgentRequestSchema = {
 
 export const GetAgentStatusRequestSchema = {
   query: schema.object({
-    configId: schema.maybe(schema.string()),
+    policyId: schema.maybe(schema.string()),
   }),
 };
diff --git a/x-pack/plugins/ingest_manager/server/types/rest_spec/agent_config.ts b/x-pack/plugins/ingest_manager/server/types/rest_spec/agent_policy.ts
similarity index 58%
rename from x-pack/plugins/ingest_manager/server/types/rest_spec/agent_config.ts
rename to x-pack/plugins/ingest_manager/server/types/rest_spec/agent_policy.ts
index 594bd141459c1..bb02eb50a6ad4 100644
--- a/x-pack/plugins/ingest_manager/server/types/rest_spec/agent_config.ts
+++ b/x-pack/plugins/ingest_manager/server/types/rest_spec/agent_policy.ts
@@ -4,50 +4,50 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { schema } from '@kbn/config-schema';
-import { NewAgentConfigSchema } from '../models';
+import { NewAgentPolicySchema } from '../models';
 import { ListWithKuerySchema } from './index';
 
-export const GetAgentConfigsRequestSchema = {
+export const GetAgentPoliciesRequestSchema = {
   query: ListWithKuerySchema.extends({
     full: schema.maybe(schema.boolean()),
   }),
 };
 
-export const GetOneAgentConfigRequestSchema = {
+export const GetOneAgentPolicyRequestSchema = {
   params: schema.object({
-    agentConfigId: schema.string(),
+    agentPolicyId: schema.string(),
   }),
 };
 
-export const CreateAgentConfigRequestSchema = {
-  body: NewAgentConfigSchema,
+export const CreateAgentPolicyRequestSchema = {
+  body: NewAgentPolicySchema,
   query: schema.object({
     sys_monitoring: schema.maybe(schema.boolean()),
   }),
 };
 
-export const UpdateAgentConfigRequestSchema = {
-  ...GetOneAgentConfigRequestSchema,
-  body: NewAgentConfigSchema,
+export const UpdateAgentPolicyRequestSchema = {
+  ...GetOneAgentPolicyRequestSchema,
+  body: NewAgentPolicySchema,
 };
 
-export const CopyAgentConfigRequestSchema = {
-  ...GetOneAgentConfigRequestSchema,
+export const CopyAgentPolicyRequestSchema = {
+  ...GetOneAgentPolicyRequestSchema,
   body: schema.object({
     name: schema.string({ minLength: 1 }),
     description: schema.maybe(schema.string()),
   }),
 };
 
-export const DeleteAgentConfigRequestSchema = {
+export const DeleteAgentPolicyRequestSchema = {
   body: schema.object({
-    agentConfigId: schema.string(),
+    agentPolicyId: schema.string(),
   }),
 };
 
-export const GetFullAgentConfigRequestSchema = {
+export const GetFullAgentPolicyRequestSchema = {
   params: schema.object({
-    agentConfigId: schema.string(),
+    agentPolicyId: schema.string(),
   }),
   query: schema.object({
     download: schema.maybe(schema.boolean()),
diff --git a/x-pack/plugins/ingest_manager/server/types/rest_spec/enrollment_api_key.ts b/x-pack/plugins/ingest_manager/server/types/rest_spec/enrollment_api_key.ts
index ff342bd165770..397927ae792a4 100644
--- a/x-pack/plugins/ingest_manager/server/types/rest_spec/enrollment_api_key.ts
+++ b/x-pack/plugins/ingest_manager/server/types/rest_spec/enrollment_api_key.ts
@@ -29,7 +29,7 @@ export const DeleteEnrollmentAPIKeyRequestSchema = {
 export const PostEnrollmentAPIKeyRequestSchema = {
   body: schema.object({
     name: schema.maybe(schema.string()),
-    config_id: schema.string(),
+    policy_id: schema.string(),
     expiration: schema.maybe(schema.string()),
   }),
 };
diff --git a/x-pack/plugins/ingest_manager/server/types/rest_spec/index.ts b/x-pack/plugins/ingest_manager/server/types/rest_spec/index.ts
index f3ee868f43f00..0f340b48634ea 100644
--- a/x-pack/plugins/ingest_manager/server/types/rest_spec/index.ts
+++ b/x-pack/plugins/ingest_manager/server/types/rest_spec/index.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 export * from './common';
-export * from './agent_config';
+export * from './agent_policy';
 export * from './agent';
-export * from './package_config';
+export * from './package_policy';
 export * from './epm';
 export * from './enrollment_api_key';
 export * from './install_script';
diff --git a/x-pack/plugins/ingest_manager/server/types/rest_spec/package_config.ts b/x-pack/plugins/ingest_manager/server/types/rest_spec/package_config.ts
deleted file mode 100644
index 630fb55f2654d..0000000000000
--- a/x-pack/plugins/ingest_manager/server/types/rest_spec/package_config.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { schema } from '@kbn/config-schema';
-import { NewPackageConfigSchema, UpdatePackageConfigSchema } from '../models';
-import { ListWithKuerySchema } from './index';
-
-export const GetPackageConfigsRequestSchema = {
-  query: ListWithKuerySchema,
-};
-
-export const GetOnePackageConfigRequestSchema = {
-  params: schema.object({
-    packageConfigId: schema.string(),
-  }),
-};
-
-export const CreatePackageConfigRequestSchema = {
-  body: NewPackageConfigSchema,
-};
-
-export const UpdatePackageConfigRequestSchema = {
-  ...GetOnePackageConfigRequestSchema,
-  body: UpdatePackageConfigSchema,
-};
-
-export const DeletePackageConfigsRequestSchema = {
-  body: schema.object({
-    packageConfigIds: schema.arrayOf(schema.string()),
-  }),
-};
diff --git a/x-pack/plugins/ingest_manager/server/types/rest_spec/package_policy.ts b/x-pack/plugins/ingest_manager/server/types/rest_spec/package_policy.ts
new file mode 100644
index 0000000000000..9e7d191ae35f3
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/server/types/rest_spec/package_policy.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { schema } from '@kbn/config-schema';
+import { NewPackagePolicySchema, UpdatePackagePolicySchema } from '../models';
+import { ListWithKuerySchema } from './index';
+
+export const GetPackagePoliciesRequestSchema = {
+  query: ListWithKuerySchema,
+};
+
+export const GetOnePackagePolicyRequestSchema = {
+  params: schema.object({
+    packagePolicyId: schema.string(),
+  }),
+};
+
+export const CreatePackagePolicyRequestSchema = {
+  body: NewPackagePolicySchema,
+};
+
+export const UpdatePackagePolicyRequestSchema = {
+  ...GetOnePackagePolicyRequestSchema,
+  body: UpdatePackagePolicySchema,
+};
+
+export const DeletePackagePoliciesRequestSchema = {
+  body: schema.object({
+    packagePolicyIds: schema.arrayOf(schema.string()),
+  }),
+};
diff --git a/x-pack/plugins/security_solution/common/endpoint/generate_data.ts b/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
index 09f25fc074eff..0a6473b833863 100644
--- a/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
@@ -19,11 +19,11 @@ import {
 import { factory as policyFactory } from './models/policy_config';
 import { parentEntityId } from './models/event';
 import {
-  GetAgentConfigsResponseItem,
+  GetAgentPoliciesResponseItem,
   GetPackagesResponse,
 } from '../../../ingest_manager/common/types/rest_spec';
 import {
-  AgentConfigStatus,
+  AgentPolicyStatus,
   EsAssetReference,
   InstallationStatus,
   KibanaAssetReference,
@@ -1031,9 +1031,9 @@ export class EndpointDocGenerator {
   }
 
   /**
-   * Generates an Ingest `package config` that includes the Endpoint Policy data
+   * Generates an Ingest `package policy` that includes the Endpoint Policy data
    */
-  public generatePolicyPackageConfig(): PolicyData {
+  public generatePolicyPackagePolicy(): PolicyData {
     const created = new Date(Date.now() - 8.64e7).toISOString(); // 24h ago
     return {
       id: this.seededUUIDv4(),
@@ -1043,7 +1043,7 @@ export class EndpointDocGenerator {
       created_by: 'elastic',
       updated_at: new Date().toISOString(),
       updated_by: 'elastic',
-      config_id: this.seededUUIDv4(),
+      policy_id: this.seededUUIDv4(),
       enabled: true,
       output_id: '',
       inputs: [
@@ -1076,20 +1076,20 @@ export class EndpointDocGenerator {
   }
 
   /**
-   * Generate an Agent Configuration (ingest)
+   * Generate an Agent Policy (ingest)
    */
-  public generateAgentConfig(): GetAgentConfigsResponseItem {
+  public generateAgentPolicy(): GetAgentPoliciesResponseItem {
     return {
       id: this.seededUUIDv4(),
-      name: 'Agent Config',
-      status: AgentConfigStatus.Active,
+      name: 'Agent Policy',
+      status: AgentPolicyStatus.Active,
       description: 'Some description',
       namespace: 'default',
       monitoring_enabled: ['logs', 'metrics'],
       revision: 2,
       updated_at: '2020-07-22T16:36:49.196Z',
       updated_by: 'elastic',
-      package_configs: ['852491f0-cc39-11ea-bac2-cdbf95b4b41a'],
+      package_policies: ['852491f0-cc39-11ea-bac2-cdbf95b4b41a'],
       agents: 0,
     };
   }
diff --git a/x-pack/plugins/security_solution/common/endpoint/types.ts b/x-pack/plugins/security_solution/common/endpoint/types.ts
index 2a1c95caff3a3..2b8de7ed16b08 100644
--- a/x-pack/plugins/security_solution/common/endpoint/types.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/types.ts
@@ -5,7 +5,7 @@
  */
 
 import { ApplicationStart } from 'kibana/public';
-import { NewPackageConfig, PackageConfig } from '../../../ingest_manager/common';
+import { NewPackagePolicy, PackagePolicy } from '../../../ingest_manager/common';
 import { ManifestSchema } from './schema/manifest';
 
 /**
@@ -831,14 +831,14 @@ export enum ProtectionModes {
 }
 
 /**
- * Endpoint Policy data, which extends Ingest's `PackageConfig` type
+ * Endpoint Policy data, which extends Ingest's `PackagePolicy` type
  */
-export type PolicyData = PackageConfig & NewPolicyData;
+export type PolicyData = PackagePolicy & NewPolicyData;
 
 /**
  * New policy data. Used when updating the policy record via ingest APIs
  */
-export type NewPolicyData = NewPackageConfig & {
+export type NewPolicyData = NewPackagePolicy & {
   inputs: [
     {
       type: 'endpoint';
diff --git a/x-pack/plugins/security_solution/public/common/hooks/endpoint/use_navigate_to_app_event_handler.ts b/x-pack/plugins/security_solution/public/common/hooks/endpoint/use_navigate_to_app_event_handler.ts
index cb4de29802e54..190009440529c 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/endpoint/use_navigate_to_app_event_handler.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/endpoint/use_navigate_to_app_event_handler.ts
@@ -25,8 +25,8 @@ type EventHandlerCallback = MouseEventHandler<HTMLButtonElement | HTMLAnchorElem
  *
  * @example
  *
- * const handleOnClick = useNavigateToAppEventHandler('ingestManager', {path: '#/configs'})
- * return <EuiLink onClick={handleOnClick}>See configs</EuiLink>
+ * const handleOnClick = useNavigateToAppEventHandler('ingestManager', {path: '#/policies'})
+ * return <EuiLink onClick={handleOnClick}>See policies</EuiLink>
  */
 export const useNavigateToAppEventHandler = <S = unknown>(
   /** the app id - normally the value of the `id` in that plugin's `kibana.json`  */
diff --git a/x-pack/plugins/security_solution/public/common/mock/endpoint/dependencies_start_mock.ts b/x-pack/plugins/security_solution/public/common/mock/endpoint/dependencies_start_mock.ts
index 9cf99f2442aab..5f8ab723df107 100644
--- a/x-pack/plugins/security_solution/public/common/mock/endpoint/dependencies_start_mock.ts
+++ b/x-pack/plugins/security_solution/public/common/mock/endpoint/dependencies_start_mock.ts
@@ -6,7 +6,7 @@
 
 import {
   IngestManagerStart,
-  registerPackageConfigComponent,
+  registerPackagePolicyComponent,
 } from '../../../../../ingest_manager/public';
 import {
   dataPluginMock,
@@ -61,7 +61,7 @@ export const depsStartMock: () => DepsStartMock = () => {
     data: dataMock,
     ingestManager: {
       isInitialized: () => Promise.resolve(true),
-      registerPackageConfigComponent,
+      registerPackagePolicyComponent,
     },
   };
 };
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts
index fa2dbe084c1a4..f56f28bfef39a 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts
@@ -18,11 +18,11 @@ import {
 } from './selectors';
 import { EndpointState } from '../types';
 import {
-  sendGetEndpointSpecificPackageConfigs,
+  sendGetEndpointSpecificPackagePolicies,
   sendGetEndpointSecurityPackage,
-  sendGetAgentConfigList,
+  sendGetAgentPolicyList,
 } from '../../policy/store/policy_list/services/ingest';
-import { AGENT_CONFIG_SAVED_OBJECT_TYPE } from '../../../../../../ingest_manager/common';
+import { AGENT_POLICY_SAVED_OBJECT_TYPE } from '../../../../../../ingest_manager/common';
 
 export const endpointMiddlewareFactory: ImmutableMiddlewareFactory<EndpointState> = (coreStart) => {
   return ({ getState, dispatch }) => (next) => async (action) => {
@@ -105,7 +105,7 @@ export const endpointMiddlewareFactory: ImmutableMiddlewareFactory<EndpointState
         });
 
         try {
-          const policyDataResponse: GetPolicyListResponse = await sendGetEndpointSpecificPackageConfigs(
+          const policyDataResponse: GetPolicyListResponse = await sendGetEndpointSpecificPackagePolicies(
             http,
             {
               query: {
@@ -258,21 +258,21 @@ const getNonExistingPoliciesForEndpointsList = async (
     return;
   }
 
-  // We use the Agent Config API here, instead of the Package Config, because we can't use
-  // filter by ID of the Saved Object. Agent Config, however, keeps a reference (array) of
-  // Package Ids that it uses, thus if a reference exists there, then the package config (policy)
+  // We use the Agent Policy API here, instead of the Package Policy, because we can't use
+  // filter by ID of the Saved Object. Agent Policy, however, keeps a reference (array) of
+  // Package Ids that it uses, thus if a reference exists there, then the package policy (policy)
   // exists.
   const policiesFound = (
-    await sendGetAgentConfigList(http, {
+    await sendGetAgentPolicyList(http, {
       query: {
-        kuery: `${AGENT_CONFIG_SAVED_OBJECT_TYPE}.package_configs: (${policyIdsToCheck.join(
+        kuery: `${AGENT_POLICY_SAVED_OBJECT_TYPE}.package_policies: (${policyIdsToCheck.join(
           ' or '
         )})`,
       },
     })
-  ).items.reduce<EndpointState['nonExistingPolicies']>((list, agentConfig) => {
-    (agentConfig.package_configs as string[]).forEach((packageConfig) => {
-      list[packageConfig as string] = true;
+  ).items.reduce<EndpointState['nonExistingPolicies']>((list, agentPolicy) => {
+    (agentPolicy.package_policies as string[]).forEach((packagePolicy) => {
+      list[packagePolicy as string] = true;
     });
     return list;
   }, {});
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/mock_endpoint_result_list.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/mock_endpoint_result_list.ts
index 2f0b66624f379..aa9bef7bb5417 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/mock_endpoint_result_list.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/mock_endpoint_result_list.ts
@@ -14,12 +14,12 @@ import {
 } from '../../../../../common/endpoint/types';
 import { EndpointDocGenerator } from '../../../../../common/endpoint/generate_data';
 import {
-  INGEST_API_AGENT_CONFIGS,
+  INGEST_API_AGENT_POLICIES,
   INGEST_API_EPM_PACKAGES,
-  INGEST_API_PACKAGE_CONFIGS,
+  INGEST_API_PACKAGE_POLICIES,
 } from '../../policy/store/policy_list/services/ingest';
 import {
-  GetAgentConfigsResponse,
+  GetAgentPoliciesResponse,
   GetPackagesResponse,
 } from '../../../../../../ingest_manager/common/types/rest_spec';
 import { GetPolicyListResponse } from '../../policy/types';
@@ -76,13 +76,13 @@ export const mockEndpointDetailsApiResult = (): HostInfo => {
 const endpointListApiPathHandlerMocks = ({
   endpointsResults = mockEndpointResultList({ total: 3 }).hosts,
   epmPackages = [generator.generateEpmPackage()],
-  endpointPackageConfigs = [],
+  endpointPackagePolicies = [],
   policyResponse = generator.generatePolicyResponse(),
 }: {
   /** route handlers will be setup for each individual host in this array */
   endpointsResults?: HostResultList['hosts'];
   epmPackages?: GetPackagesResponse['response'];
-  endpointPackageConfigs?: GetPolicyListResponse['items'];
+  endpointPackagePolicies?: GetPolicyListResponse['items'];
   policyResponse?: HostPolicyResponse;
 } = {}) => {
   const apiHandlers = {
@@ -105,14 +105,14 @@ const endpointListApiPathHandlerMocks = ({
     },
 
     // Do policies referenced in endpoint list exist
-    // just returns 1 single agent config that includes all of the packageConfig IDs provided
-    [INGEST_API_AGENT_CONFIGS]: (): GetAgentConfigsResponse => {
-      const agentConfig = generator.generateAgentConfig();
-      (agentConfig.package_configs as string[]).push(
-        ...endpointPackageConfigs.map((packageConfig) => packageConfig.id)
+    // just returns 1 single agent policy that includes all of the packagePolicy IDs provided
+    [INGEST_API_AGENT_POLICIES]: (): GetAgentPoliciesResponse => {
+      const agentPolicy = generator.generateAgentPolicy();
+      (agentPolicy.package_policies as string[]).push(
+        ...endpointPackagePolicies.map((packagePolicy) => packagePolicy.id)
       );
       return {
-        items: [agentConfig],
+        items: [agentPolicy],
         total: 10,
         success: true,
         perPage: 10,
@@ -125,13 +125,13 @@ const endpointListApiPathHandlerMocks = ({
       return { policy_response: policyResponse };
     },
 
-    // List of Policies (package configs) for onboarding
-    [INGEST_API_PACKAGE_CONFIGS]: (): GetPolicyListResponse => {
+    // List of Policies (package policies) for onboarding
+    [INGEST_API_PACKAGE_POLICIES]: (): GetPolicyListResponse => {
       return {
-        items: endpointPackageConfigs,
+        items: endpointPackagePolicies,
         page: 1,
         perPage: 10,
-        total: endpointPackageConfigs?.length,
+        total: endpointPackagePolicies?.length,
         success: true,
       };
     },
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_details.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_details.tsx
index bd499ee6abb24..b76b7e51b2c1b 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_details.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_details.tsx
@@ -29,7 +29,7 @@ import { LinkToApp } from '../../../../../common/components/endpoint/link_to_app
 import { getEndpointDetailsPath } from '../../../../common/routing';
 import { SecurityPageName } from '../../../../../app/types';
 import { useFormatUrl } from '../../../../../common/components/link_to';
-import { AgentDetailsReassignConfigAction } from '../../../../../../../ingest_manager/public';
+import { AgentDetailsReassignPolicyAction } from '../../../../../../../ingest_manager/public';
 import { EndpointPolicyLink } from '../components/endpoint_policy_link';
 
 const HostIds = styled(EuiListGroupItem)`
@@ -103,7 +103,7 @@ export const EndpointDetails = memo(({ details }: { details: HostMetadata }) =>
   const agentDetailsWithFlyoutPath = `${agentDetailsAppPath}${openReassignFlyoutSearch}`;
   const agentDetailsWithFlyoutUrl = `${agentDetailsUrl}${openReassignFlyoutSearch}`;
   const handleReassignEndpointsClick = useNavigateToAppEventHandler<
-    AgentDetailsReassignConfigAction
+    AgentDetailsReassignPolicyAction
   >(ingestAppId, {
     path: agentDetailsWithFlyoutPath,
     state: {
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx
index fe06bcc8131f8..a504390344e37 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx
@@ -73,7 +73,7 @@ describe('when on the list page', () => {
     beforeEach(async () => {
       setEndpointListApiMockImplementation(coreStart.http, {
         endpointsResults: [],
-        endpointPackageConfigs: mockPolicyResultList({ total: 3 }).items,
+        endpointPackagePolicies: mockPolicyResultList({ total: 3 }).items,
       });
     });
     afterEach(() => {
@@ -140,12 +140,12 @@ describe('when on the list page', () => {
           });
 
           // Make sure that the first policy id in the host result is not set as non-existent
-          const ingestPackageConfigs = mockPolicyResultList({ total: 1 }).items;
-          ingestPackageConfigs[0].id = firstPolicyID;
+          const ingestPackagePolicies = mockPolicyResultList({ total: 1 }).items;
+          ingestPackagePolicies[0].id = firstPolicyID;
 
           setEndpointListApiMockImplementation(coreStart.http, {
             endpointsResults: hostListData,
-            endpointPackageConfigs: ingestPackageConfigs,
+            endpointPackagePolicies: ingestPackagePolicies,
           });
         });
       });
@@ -332,12 +332,12 @@ describe('when on the list page', () => {
 
       agentId = hostDetails.metadata.elastic.agent.id;
 
-      const policy = docGenerator.generatePolicyPackageConfig();
+      const policy = docGenerator.generatePolicyPackagePolicy();
       policy.id = hostDetails.metadata.Endpoint.policy.applied.id;
 
       setEndpointListApiMockImplementation(coreStart.http, {
         endpointsResults: [hostDetails],
-        endpointPackageConfigs: [policy],
+        endpointPackagePolicies: [policy],
       });
 
       reactTestingLibrary.act(() => {
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx
index 611e69391ab06..8b8ac3a1d3587 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx
@@ -35,8 +35,8 @@ import { PolicyEmptyState, HostsEmptyState } from '../../../components/managemen
 import { FormattedDate } from '../../../../common/components/formatted_date';
 import { useNavigateToAppEventHandler } from '../../../../common/hooks/endpoint/use_navigate_to_app_event_handler';
 import {
-  CreatePackageConfigRouteState,
-  AgentConfigDetailsDeployAgentAction,
+  CreatePackagePolicyRouteState,
+  AgentPolicyDetailsDeployAgentAction,
 } from '../../../../../../ingest_manager/public';
 import { SecurityPageName } from '../../../../app/types';
 import { getEndpointListPath, getEndpointDetailsPath } from '../../../common/routing';
@@ -115,7 +115,7 @@ export const EndpointList = () => {
     [history, queryParams]
   );
 
-  const handleCreatePolicyClick = useNavigateToAppEventHandler<CreatePackageConfigRouteState>(
+  const handleCreatePolicyClick = useNavigateToAppEventHandler<CreatePackagePolicyRouteState>(
     'ingestManager',
     {
       path: `#/integrations${
@@ -136,9 +136,9 @@ export const EndpointList = () => {
   );
 
   const handleDeployEndpointsClick = useNavigateToAppEventHandler<
-    AgentConfigDetailsDeployAgentAction
+    AgentPolicyDetailsDeployAgentAction
   >('ingestManager', {
-    path: `#/configs/${selectedPolicyId}?openEnrollmentFlyout=true`,
+    path: `#/policies/${selectedPolicyId}?openEnrollmentFlyout=true`,
     state: {
       onDoneNavigateTo: [
         'securitySolution:administration',
@@ -150,9 +150,9 @@ export const EndpointList = () => {
   const selectionOptions = useMemo<EuiSelectableProps['options']>(() => {
     return policyItems.map((item) => {
       return {
-        key: item.config_id,
+        key: item.policy_id,
         label: item.name,
-        checked: selectedPolicyId === item.config_id ? 'on' : undefined,
+        checked: selectedPolicyId === item.policy_id ? 'on' : undefined,
       };
     });
   }, [policyItems, selectedPolicyId]);
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts
index d3ec0670d29c5..0eedecef22170 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts
@@ -36,7 +36,7 @@ describe('policy details: ', () => {
       created_by: '',
       updated_at: '',
       updated_by: '',
-      config_id: '',
+      policy_id: '',
       enabled: true,
       output_id: '',
       inputs: [
@@ -213,7 +213,7 @@ describe('policy details: ', () => {
       expect(JSON.parse(lastPutCallPayload.body as string)).toEqual({
         name: '',
         description: '',
-        config_id: '',
+        policy_id: '',
         enabled: true,
         output_id: '',
         inputs: [
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/middleware.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/middleware.ts
index 1d9e3c2198b28..250a5b25230f1 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/middleware.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/middleware.ts
@@ -14,9 +14,9 @@ import {
   getPolicyDataForUpdate,
 } from './selectors';
 import {
-  sendGetPackageConfig,
-  sendGetFleetAgentStatusForConfig,
-  sendPutPackageConfig,
+  sendGetPackagePolicy,
+  sendGetFleetAgentStatusForPolicy,
+  sendPutPackagePolicy,
 } from '../policy_list/services/ingest';
 import { NewPolicyData, PolicyData } from '../../../../../../common/endpoint/types';
 import { ImmutableMiddlewareFactory } from '../../../../../common/store';
@@ -35,7 +35,7 @@ export const policyDetailsMiddlewareFactory: ImmutableMiddlewareFactory<PolicyDe
       let policyItem: PolicyData;
 
       try {
-        policyItem = (await sendGetPackageConfig(http, id)).item;
+        policyItem = (await sendGetPackagePolicy(http, id)).item;
       } catch (error) {
         dispatch({
           type: 'serverFailedToReturnPolicyDetailsData',
@@ -53,8 +53,8 @@ export const policyDetailsMiddlewareFactory: ImmutableMiddlewareFactory<PolicyDe
 
       // Agent summary is secondary data, so its ok for it to come after the details
       // page is populated with the main content
-      if (policyItem.config_id) {
-        const { results } = await sendGetFleetAgentStatusForConfig(http, policyItem.config_id);
+      if (policyItem.policy_id) {
+        const { results } = await sendGetFleetAgentStatusForPolicy(http, policyItem.policy_id);
         dispatch({
           type: 'serverReturnedPolicyDetailsAgentSummaryData',
           payload: {
@@ -68,20 +68,20 @@ export const policyDetailsMiddlewareFactory: ImmutableMiddlewareFactory<PolicyDe
 
       let apiResponse: UpdatePolicyResponse;
       try {
-        apiResponse = await sendPutPackageConfig(http, id, updatedPolicyItem).catch(
+        apiResponse = await sendPutPackagePolicy(http, id, updatedPolicyItem).catch(
           (error: IHttpFetchError) => {
             if (!error.response || error.response.status !== 409) {
               return Promise.reject(error);
             }
             // Handle 409 error (version conflict) here, by using the latest document
-            // for the package config and adding the updated policy to it, ensuring that
+            // for the package policy and adding the updated policy to it, ensuring that
             // any recent updates to `manifest_artifacts` are retained.
-            return sendGetPackageConfig(http, id).then((packageConfig) => {
-              const latestUpdatedPolicyItem = packageConfig.item;
+            return sendGetPackagePolicy(http, id).then((packagePolicy) => {
+              const latestUpdatedPolicyItem = packagePolicy.item;
               latestUpdatedPolicyItem.inputs[0].config.policy =
                 updatedPolicyItem.inputs[0].config.policy;
 
-              return sendPutPackageConfig(
+              return sendPutPackagePolicy(
                 http,
                 id,
                 getPolicyDataForUpdate(latestUpdatedPolicyItem) as NewPolicyData
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/selectors.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/selectors.ts
index d780828fc8833..c236b2841fc85 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/selectors.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/selectors.ts
@@ -22,7 +22,7 @@ import { ManagementRoutePolicyDetailsParams } from '../../../../types';
 export const policyDetails = (state: Immutable<PolicyDetailsState>) => state.policyItem;
 
 /**
- * Given a Policy Data (package config) object, return back a new object with only the field
+ * Given a Policy Data (package policy) object, return back a new object with only the field
  * needed for an Update/Create API action
  * @param policy
  */
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/action.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/action.ts
index b04b2f085689e..562cd6807f68a 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/action.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/action.ts
@@ -33,7 +33,7 @@ interface UserClickedPolicyListDeleteButton {
 
 interface UserOpenedPolicyListDeleteModal {
   type: 'userOpenedPolicyListDeleteModal';
-  payload: { agentConfigId: string };
+  payload: { agentPolicyId: string };
 }
 
 interface ServerDeletedPolicyFailure {
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/index.test.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/index.test.ts
index 6ee6a4232f7cf..03e65bd6f43cb 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/index.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/index.test.ts
@@ -8,7 +8,7 @@ import { PolicyListState } from '../../types';
 import { Store, applyMiddleware, createStore } from 'redux';
 
 import { coreMock } from '../../../../../../../../../src/core/public/mocks';
-import { PACKAGE_CONFIG_SAVED_OBJECT_TYPE } from '../../../../../../../ingest_manager/common';
+import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../../../../../ingest_manager/common';
 
 import { policyListReducer } from './reducer';
 import { policyListMiddlewareFactory } from './middleware';
@@ -22,7 +22,7 @@ import {
 } from './selectors';
 import { DepsStartMock, depsStartMock } from '../../../../../common/mock/endpoint';
 import { setPolicyListApiMockImplementation } from './test_mock_utils';
-import { INGEST_API_PACKAGE_CONFIGS } from './services/ingest';
+import { INGEST_API_PACKAGE_POLICIES } from './services/ingest';
 import {
   createSpyMiddleware,
   MiddlewareActionSpyHelper,
@@ -167,9 +167,9 @@ describe('policy list store concerns', () => {
       },
     });
     await waitForAction('serverReturnedPolicyListData');
-    expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_CONFIGS, {
+    expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_POLICIES, {
       query: {
-        kuery: `${PACKAGE_CONFIG_SAVED_OBJECT_TYPE}.package.name: endpoint`,
+        kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name: endpoint`,
         page: 1,
         perPage: 10,
       },
@@ -190,9 +190,9 @@ describe('policy list store concerns', () => {
     it('uses pagination params from url', async () => {
       dispatchUserChangedUrl('?page_size=50&page_index=0');
       await waitForAction('serverReturnedPolicyListData');
-      expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_CONFIGS, {
+      expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_POLICIES, {
         query: {
-          kuery: `${PACKAGE_CONFIG_SAVED_OBJECT_TYPE}.package.name: endpoint`,
+          kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name: endpoint`,
           page: 1,
           perPage: 50,
         },
@@ -213,9 +213,9 @@ describe('policy list store concerns', () => {
     it('accepts only positive numbers for page_index and page_size', async () => {
       dispatchUserChangedUrl('?page_size=-50&page_index=-99');
       await waitForAction('serverReturnedPolicyListData');
-      expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_CONFIGS, {
+      expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_POLICIES, {
         query: {
-          kuery: `${PACKAGE_CONFIG_SAVED_OBJECT_TYPE}.package.name: endpoint`,
+          kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name: endpoint`,
           page: 1,
           perPage: 10,
         },
@@ -224,9 +224,9 @@ describe('policy list store concerns', () => {
     it('it ignores non-numeric values for page_index and page_size', async () => {
       dispatchUserChangedUrl('?page_size=fifty&page_index=ten');
       await waitForAction('serverReturnedPolicyListData');
-      expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_CONFIGS, {
+      expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_POLICIES, {
         query: {
-          kuery: `${PACKAGE_CONFIG_SAVED_OBJECT_TYPE}.package.name: endpoint`,
+          kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name: endpoint`,
           page: 1,
           perPage: 10,
         },
@@ -235,9 +235,9 @@ describe('policy list store concerns', () => {
     it('accepts only known values for `page_size`', async () => {
       dispatchUserChangedUrl('?page_size=300&page_index=10');
       await waitForAction('serverReturnedPolicyListData');
-      expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_CONFIGS, {
+      expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_POLICIES, {
         query: {
-          kuery: `${PACKAGE_CONFIG_SAVED_OBJECT_TYPE}.package.name: endpoint`,
+          kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name: endpoint`,
           page: 11,
           perPage: 10,
         },
@@ -264,9 +264,9 @@ describe('policy list store concerns', () => {
       expect(endpointPackageVersion(store.getState())).toEqual('0.5.0');
       fakeCoreStart.http.get.mockClear();
       dispatchUserChangedUrl('?page_size=10&page_index=11');
-      expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_CONFIGS, {
+      expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_POLICIES, {
         query: {
-          kuery: `${PACKAGE_CONFIG_SAVED_OBJECT_TYPE}.package.name: endpoint`,
+          kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name: endpoint`,
           page: 12,
           perPage: 10,
         },
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/middleware.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/middleware.ts
index 6fe555113617d..fddd242e092ad 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/middleware.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/middleware.ts
@@ -6,17 +6,17 @@
 
 import { GetPolicyListResponse, PolicyListState } from '../../types';
 import {
-  sendGetEndpointSpecificPackageConfigs,
-  sendDeletePackageConfig,
-  sendGetFleetAgentStatusForConfig,
+  sendGetEndpointSpecificPackagePolicies,
+  sendDeletePackagePolicy,
+  sendGetFleetAgentStatusForPolicy,
   sendGetEndpointSecurityPackage,
 } from './services/ingest';
 import { endpointPackageInfo, isOnPolicyListPage, urlSearchParams } from './selectors';
 import { ImmutableMiddlewareFactory } from '../../../../../common/store';
 import { initialPolicyListState } from './reducer';
 import {
-  DeletePackageConfigsResponse,
-  DeletePackageConfigsRequest,
+  DeletePackagePoliciesResponse,
+  DeletePackagePoliciesRequest,
   GetAgentStatusResponse,
 } from '../../../../../../../ingest_manager/common';
 
@@ -57,7 +57,7 @@ export const policyListMiddlewareFactory: ImmutableMiddlewareFactory<PolicyListS
       let response: GetPolicyListResponse;
 
       try {
-        response = await sendGetEndpointSpecificPackageConfigs(http, {
+        response = await sendGetEndpointSpecificPackagePolicies(http, {
           query: {
             perPage: pageSize,
             page: pageIndex + 1,
@@ -82,10 +82,10 @@ export const policyListMiddlewareFactory: ImmutableMiddlewareFactory<PolicyListS
       });
     } else if (action.type === 'userClickedPolicyListDeleteButton') {
       const { policyId } = action.payload;
-      const packageConfigIds: DeletePackageConfigsRequest['body']['packageConfigIds'] = [policyId];
-      let apiResponse: DeletePackageConfigsResponse;
+      const packagePolicyIds: DeletePackagePoliciesRequest['body']['packagePolicyIds'] = [policyId];
+      let apiResponse: DeletePackagePoliciesResponse;
       try {
-        apiResponse = await sendDeletePackageConfig(http, { body: { packageConfigIds } });
+        apiResponse = await sendDeletePackagePolicy(http, { body: { packagePolicyIds } });
       } catch (err) {
         dispatch({
           type: 'serverDeletedPolicyFailure',
@@ -102,10 +102,10 @@ export const policyListMiddlewareFactory: ImmutableMiddlewareFactory<PolicyListS
         },
       });
     } else if (action.type === 'userOpenedPolicyListDeleteModal') {
-      const { agentConfigId } = action.payload;
+      const { agentPolicyId } = action.payload;
       let apiResponse: GetAgentStatusResponse;
       try {
-        apiResponse = await sendGetFleetAgentStatusForConfig(http, agentConfigId);
+        apiResponse = await sendGetFleetAgentStatusForPolicy(http, agentPolicyId);
       } catch (err) {
         dispatch({
           type: 'serverReturnedPolicyAgentsSummaryForDeleteFailure',
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.test.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.test.ts
index 83cd8558306a0..1441aec86e12e 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.test.ts
@@ -6,12 +6,12 @@
 
 import {
   INGEST_API_EPM_PACKAGES,
-  sendGetPackageConfig,
+  sendGetPackagePolicy,
   sendGetEndpointSecurityPackage,
-  sendGetEndpointSpecificPackageConfigs,
+  sendGetEndpointSpecificPackagePolicies,
 } from './ingest';
 import { httpServiceMock } from '../../../../../../../../../../src/core/public/mocks';
-import { PACKAGE_CONFIG_SAVED_OBJECT_TYPE } from '../../../../../../../../ingest_manager/common';
+import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../../../../../../ingest_manager/common';
 import { policyListApiPathHandlers } from '../test_mock_utils';
 
 describe('ingest service', () => {
@@ -21,22 +21,22 @@ describe('ingest service', () => {
     http = httpServiceMock.createStartContract();
   });
 
-  describe('sendGetEndpointSpecificPackageConfigs()', () => {
+  describe('sendGetEndpointSpecificPackagePolicies()', () => {
     it('auto adds kuery to api request', async () => {
-      await sendGetEndpointSpecificPackageConfigs(http);
-      expect(http.get).toHaveBeenCalledWith('/api/ingest_manager/package_configs', {
+      await sendGetEndpointSpecificPackagePolicies(http);
+      expect(http.get).toHaveBeenCalledWith('/api/ingest_manager/package_policies', {
         query: {
-          kuery: `${PACKAGE_CONFIG_SAVED_OBJECT_TYPE}.package.name: endpoint`,
+          kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name: endpoint`,
         },
       });
     });
     it('supports additional KQL to be defined on input for query params', async () => {
-      await sendGetEndpointSpecificPackageConfigs(http, {
+      await sendGetEndpointSpecificPackagePolicies(http, {
         query: { kuery: 'someValueHere', page: 1, perPage: 10 },
       });
-      expect(http.get).toHaveBeenCalledWith('/api/ingest_manager/package_configs', {
+      expect(http.get).toHaveBeenCalledWith('/api/ingest_manager/package_policies', {
         query: {
-          kuery: `someValueHere and ${PACKAGE_CONFIG_SAVED_OBJECT_TYPE}.package.name: endpoint`,
+          kuery: `someValueHere and ${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name: endpoint`,
           perPage: 10,
           page: 1,
         },
@@ -44,14 +44,14 @@ describe('ingest service', () => {
     });
   });
 
-  describe('sendGetPackageConfig()', () => {
+  describe('sendGetPackagePolicy()', () => {
     it('builds correct API path', async () => {
-      await sendGetPackageConfig(http, '123');
-      expect(http.get).toHaveBeenCalledWith('/api/ingest_manager/package_configs/123', undefined);
+      await sendGetPackagePolicy(http, '123');
+      expect(http.get).toHaveBeenCalledWith('/api/ingest_manager/package_policies/123', undefined);
     });
     it('supports http options', async () => {
-      await sendGetPackageConfig(http, '123', { query: { page: 1 } });
-      expect(http.get).toHaveBeenCalledWith('/api/ingest_manager/package_configs/123', {
+      await sendGetPackagePolicy(http, '123', { query: { page: 1 } });
+      expect(http.get).toHaveBeenCalledWith('/api/ingest_manager/package_policies/123', {
         query: {
           page: 1,
         },
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.ts
index 266faf9eae32c..e3b12e06a7025 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.ts
@@ -6,127 +6,127 @@
 
 import { HttpFetchOptions, HttpStart } from 'kibana/public';
 import {
-  GetPackageConfigsRequest,
+  GetPackagePoliciesRequest,
   GetAgentStatusResponse,
-  DeletePackageConfigsResponse,
-  DeletePackageConfigsRequest,
-  PACKAGE_CONFIG_SAVED_OBJECT_TYPE,
+  DeletePackagePoliciesResponse,
+  DeletePackagePoliciesRequest,
+  PACKAGE_POLICY_SAVED_OBJECT_TYPE,
   GetPackagesResponse,
-  GetAgentConfigsRequest,
-  GetAgentConfigsResponse,
+  GetAgentPoliciesRequest,
+  GetAgentPoliciesResponse,
 } from '../../../../../../../../ingest_manager/common';
 import { GetPolicyListResponse, GetPolicyResponse, UpdatePolicyResponse } from '../../../types';
 import { NewPolicyData } from '../../../../../../../common/endpoint/types';
 
 const INGEST_API_ROOT = `/api/ingest_manager`;
-export const INGEST_API_PACKAGE_CONFIGS = `${INGEST_API_ROOT}/package_configs`;
-export const INGEST_API_AGENT_CONFIGS = `${INGEST_API_ROOT}/agent_configs`;
+export const INGEST_API_PACKAGE_POLICIES = `${INGEST_API_ROOT}/package_policies`;
+export const INGEST_API_AGENT_POLICIES = `${INGEST_API_ROOT}/agent_policies`;
 const INGEST_API_FLEET = `${INGEST_API_ROOT}/fleet`;
 const INGEST_API_FLEET_AGENT_STATUS = `${INGEST_API_FLEET}/agent-status`;
 export const INGEST_API_EPM_PACKAGES = `${INGEST_API_ROOT}/epm/packages`;
-const INGEST_API_DELETE_PACKAGE_CONFIG = `${INGEST_API_PACKAGE_CONFIGS}/delete`;
+const INGEST_API_DELETE_PACKAGE_POLICY = `${INGEST_API_PACKAGE_POLICIES}/delete`;
 
 /**
- * Retrieves a list of endpoint specific package configs (those created with a `package.name` of
+ * Retrieves a list of endpoint specific package policies (those created with a `package.name` of
  * `endpoint`) from Ingest
  * @param http
  * @param options
  */
-export const sendGetEndpointSpecificPackageConfigs = (
+export const sendGetEndpointSpecificPackagePolicies = (
   http: HttpStart,
-  options: HttpFetchOptions & Partial<GetPackageConfigsRequest> = {}
+  options: HttpFetchOptions & Partial<GetPackagePoliciesRequest> = {}
 ): Promise<GetPolicyListResponse> => {
-  return http.get<GetPolicyListResponse>(INGEST_API_PACKAGE_CONFIGS, {
+  return http.get<GetPolicyListResponse>(INGEST_API_PACKAGE_POLICIES, {
     ...options,
     query: {
       ...options.query,
       kuery: `${
         options?.query?.kuery ? `${options.query.kuery} and ` : ''
-      }${PACKAGE_CONFIG_SAVED_OBJECT_TYPE}.package.name: endpoint`,
+      }${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name: endpoint`,
     },
   });
 };
 
 /**
- * Retrieves a single package config based on ID from ingest
+ * Retrieves a single package policy based on ID from ingest
  * @param http
- * @param packageConfigId
+ * @param packagePolicyId
  * @param options
  */
-export const sendGetPackageConfig = (
+export const sendGetPackagePolicy = (
   http: HttpStart,
-  packageConfigId: string,
+  packagePolicyId: string,
   options?: HttpFetchOptions
 ) => {
-  return http.get<GetPolicyResponse>(`${INGEST_API_PACKAGE_CONFIGS}/${packageConfigId}`, options);
+  return http.get<GetPolicyResponse>(`${INGEST_API_PACKAGE_POLICIES}/${packagePolicyId}`, options);
 };
 
 /**
- * Retrieves a single package config based on ID from ingest
+ * Retrieves a single package policy based on ID from ingest
  * @param http
  * @param body
  * @param options
  */
-export const sendDeletePackageConfig = (
+export const sendDeletePackagePolicy = (
   http: HttpStart,
-  body: DeletePackageConfigsRequest,
+  body: DeletePackagePoliciesRequest,
   options?: HttpFetchOptions
 ) => {
-  return http.post<DeletePackageConfigsResponse>(INGEST_API_DELETE_PACKAGE_CONFIG, {
+  return http.post<DeletePackagePoliciesResponse>(INGEST_API_DELETE_PACKAGE_POLICY, {
     ...options,
     body: JSON.stringify(body.body),
   });
 };
 
 /**
- * Retrieve a list of Agent Configurations
+ * Retrieve a list of Agent Policies
  * @param http
  * @param options
  */
-export const sendGetAgentConfigList = (
+export const sendGetAgentPolicyList = (
   http: HttpStart,
-  options: HttpFetchOptions & GetAgentConfigsRequest
+  options: HttpFetchOptions & GetAgentPoliciesRequest
 ) => {
-  return http.get<GetAgentConfigsResponse>(INGEST_API_AGENT_CONFIGS, options);
+  return http.get<GetAgentPoliciesResponse>(INGEST_API_AGENT_POLICIES, options);
 };
 
 /**
- * Updates a package config
+ * Updates a package policy
  *
  * @param http
- * @param packageConfigId
- * @param packageConfig
+ * @param packagePolicyId
+ * @param packagePolicy
  * @param options
  */
-export const sendPutPackageConfig = (
+export const sendPutPackagePolicy = (
   http: HttpStart,
-  packageConfigId: string,
-  packageConfig: NewPolicyData,
+  packagePolicyId: string,
+  packagePolicy: NewPolicyData,
   options: Exclude<HttpFetchOptions, 'body'> = {}
 ): Promise<UpdatePolicyResponse> => {
-  return http.put(`${INGEST_API_PACKAGE_CONFIGS}/${packageConfigId}`, {
+  return http.put(`${INGEST_API_PACKAGE_POLICIES}/${packagePolicyId}`, {
     ...options,
-    body: JSON.stringify(packageConfig),
+    body: JSON.stringify(packagePolicy),
   });
 };
 
 /**
- * Get a status summary for all Agents that are currently assigned to a given agent configuration
+ * Get a status summary for all Agents that are currently assigned to a given agent policy
  *
  * @param http
- * @param configId
+ * @param policyId
  * @param options
  */
-export const sendGetFleetAgentStatusForConfig = (
+export const sendGetFleetAgentStatusForPolicy = (
   http: HttpStart,
-  /** the Agent (fleet) configuration id */
-  configId: string,
+  /** the Agent (fleet) policy id */
+  policyId: string,
   options: Exclude<HttpFetchOptions, 'query'> = {}
 ): Promise<GetAgentStatusResponse> => {
   return http.get(INGEST_API_FLEET_AGENT_STATUS, {
     ...options,
     query: {
-      configId,
+      policyId,
     },
   });
 };
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/test_mock_utils.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/test_mock_utils.ts
index 3c9d5fde9b826..5ef01c00dbf16 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/test_mock_utils.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/test_mock_utils.ts
@@ -5,7 +5,7 @@
  */
 
 import { HttpStart } from 'kibana/public';
-import { INGEST_API_EPM_PACKAGES, INGEST_API_PACKAGE_CONFIGS } from './services/ingest';
+import { INGEST_API_EPM_PACKAGES, INGEST_API_PACKAGE_POLICIES } from './services/ingest';
 import { EndpointDocGenerator } from '../../../../../../common/endpoint/generate_data';
 import { GetPolicyListResponse } from '../../types';
 import { GetPackagesResponse } from '../../../../../../../ingest_manager/common';
@@ -57,7 +57,7 @@ export const mockPolicyResultList: (options?: {
 
   const policies = [];
   for (let index = 0; index < actualCountToReturn; index++) {
-    policies.push(generator.generatePolicyPackageConfig());
+    policies.push(generator.generatePolicyPackagePolicy());
   }
   const mock: GetPolicyListResponse = {
     items: policies,
@@ -75,7 +75,7 @@ export const mockPolicyResultList: (options?: {
  */
 export const policyListApiPathHandlers = (totalPolicies: number = 1) => {
   return {
-    [INGEST_API_PACKAGE_CONFIGS]: () => {
+    [INGEST_API_PACKAGE_POLICIES]: () => {
       return mockPolicyResultList({ total: totalPolicies });
     },
     [INGEST_API_EPM_PACKAGES]: (): GetPackagesResponse => {
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/types.ts b/x-pack/plugins/security_solution/public/management/pages/policy/types.ts
index 4a870016326be..c7d426da05508 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/types.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/types.ts
@@ -14,10 +14,10 @@ import {
 import { ServerApiError } from '../../../common/types';
 import {
   GetAgentStatusResponse,
-  GetOnePackageConfigResponse,
-  GetPackageConfigsResponse,
+  GetOnePackagePolicyResponse,
+  GetPackagePoliciesResponse,
   GetPackagesResponse,
-  UpdatePackageConfigResponse,
+  UpdatePackagePolicyResponse,
 } from '../../../../../ingest_manager/common';
 
 /**
@@ -44,7 +44,7 @@ export interface PolicyListState {
   isDeleting: boolean;
   /** Deletion status */
   deleteStatus?: boolean;
-  /** A summary of stats for the agents associated with a given Fleet Agent Configuration */
+  /** A summary of stats for the agents associated with a given Fleet Agent Policy */
   agentStatusSummary?: GetAgentStatusResponse['results'];
 }
 
@@ -59,7 +59,7 @@ export interface PolicyDetailsState {
   isLoading: boolean;
   /** current location of the application */
   location?: Immutable<AppLocation>;
-  /** A summary of stats for the agents associated with a given Fleet Agent Configuration */
+  /** A summary of stats for the agents associated with a given Fleet Agent Policy */
   agentStatusSummary?: GetAgentStatusResponse['results'];
   /** Status of an update to the policy  */
   updateStatus?: {
@@ -169,14 +169,14 @@ export type KeysByValueCriteria<O, Criteria> = {
 /** Returns an array of the policy OSes that have a malware protection field */
 export type MalwareProtectionOSes = KeysByValueCriteria<UIPolicyConfig, { malware: MalwareFields }>;
 
-export interface GetPolicyListResponse extends GetPackageConfigsResponse {
+export interface GetPolicyListResponse extends GetPackagePoliciesResponse {
   items: PolicyData[];
 }
 
-export interface GetPolicyResponse extends GetOnePackageConfigResponse {
+export interface GetPolicyResponse extends GetOnePackagePolicyResponse {
   item: PolicyData;
 }
 
-export interface UpdatePolicyResponse extends UpdatePackageConfigResponse {
+export interface UpdatePolicyResponse extends UpdatePackagePolicyResponse {
   item: PolicyData;
 }
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/configure_package_config.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/configure_package_policy.tsx
similarity index 73%
rename from x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/configure_package_config.tsx
rename to x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/configure_package_policy.tsx
index 2b08bfd2b282b..b03069a739e35 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/configure_package_config.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/configure_package_policy.tsx
@@ -9,27 +9,27 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiCallOut, EuiText, EuiSpacer } from '@elastic/eui';
 import { LinkToApp } from '../../../../../common/components/endpoint/link_to_app';
 import {
-  CustomConfigurePackageConfigContent,
-  CustomConfigurePackageConfigProps,
+  CustomConfigurePackagePolicyContent,
+  CustomConfigurePackagePolicyProps,
 } from '../../../../../../../ingest_manager/public';
 import { getPolicyDetailPath } from '../../../../common/routing';
 import { MANAGEMENT_APP_ID } from '../../../../common/constants';
 import { PolicyDetailsRouteState } from '../../../../../../common/endpoint/types';
 
 /**
- * Exports Endpoint-specific package config instructions
- * for use in the Ingest app create / edit package config
+ * Exports Endpoint-specific package policy instructions
+ * for use in the Ingest app create / edit package policy
  */
-export const ConfigureEndpointPackageConfig = memo<CustomConfigurePackageConfigContent>(
+export const ConfigureEndpointPackagePolicy = memo<CustomConfigurePackagePolicyContent>(
   ({
     from,
-    packageConfigId,
-    packageConfig: { config_id: agentConfigId },
-  }: CustomConfigurePackageConfigProps) => {
+    packagePolicyId,
+    packagePolicy: { policy_id: agentPolicyId },
+  }: CustomConfigurePackagePolicyProps) => {
     let policyUrl = '';
-    if (from === 'edit' && packageConfigId) {
+    if (from === 'edit' && packagePolicyId) {
       // Cannot use formalUrl here since the code is called in Ingest, which does not use redux
-      policyUrl = getPolicyDetailPath(packageConfigId);
+      policyUrl = getPolicyDetailPath(packagePolicyId);
     }
 
     const policyDetailRouteState = useMemo((): undefined | PolicyDetailsRouteState => {
@@ -39,26 +39,26 @@ export const ConfigureEndpointPackageConfig = memo<CustomConfigurePackageConfigC
       const navigateTo: PolicyDetailsRouteState['onSaveNavigateTo'] &
         PolicyDetailsRouteState['onCancelNavigateTo'] = [
         'ingestManager',
-        { path: `#/configs/${agentConfigId}/edit-integration/${packageConfigId}` },
+        { path: `#/policies/${agentPolicyId}/edit-integration/${packagePolicyId}` },
       ];
       return {
         onSaveNavigateTo: navigateTo,
         onCancelNavigateTo: navigateTo,
       };
-    }, [agentConfigId, from, packageConfigId]);
+    }, [agentPolicyId, from, packagePolicyId]);
 
     return (
       <>
         <EuiSpacer size="m" />
         <EuiCallOut
-          data-test-subj={`endpointPackageConfig_${from === 'edit' ? 'edit' : 'create'}`}
+          data-test-subj={`endpointPackagePolicy_${from === 'edit' ? 'edit' : 'create'}`}
           iconType="iInCircle"
         >
           <EuiText size="s">
             <p>
               {from === 'edit' ? (
                 <FormattedMessage
-                  id="xpack.securitySolution.endpoint.ingestManager.editPackageConfig.endpointConfiguration"
+                  id="xpack.securitySolution.endpoint.ingestManager.editPackagePolicy.endpointConfiguration"
                   defaultMessage="Click {advancedConfigOptionsLink} to edit advanced configuration options."
                   values={{
                     advancedConfigOptionsLink: (
@@ -69,7 +69,7 @@ export const ConfigureEndpointPackageConfig = memo<CustomConfigurePackageConfigC
                         appState={policyDetailRouteState}
                       >
                         <FormattedMessage
-                          id="xpack.securitySolution.endpoint.ingestManager.editPackageConfig.endpointConfigurationLink"
+                          id="xpack.securitySolution.endpoint.ingestManager.editPackagePolicy.endpointConfigurationLink"
                           defaultMessage="here"
                         />
                       </LinkToApp>
@@ -78,8 +78,8 @@ export const ConfigureEndpointPackageConfig = memo<CustomConfigurePackageConfigC
                 />
               ) : (
                 <FormattedMessage
-                  id="xpack.securitySolution.endpoint.ingestManager.createPackageConfig.endpointConfiguration"
-                  defaultMessage="We'll save your integration with our recommended defaults. You can change this later by editing the Endpoint Security integration within your agent configuration."
+                  id="xpack.securitySolution.endpoint.ingestManager.createPackagePolicy.endpointConfiguration"
+                  defaultMessage="We'll save your integration with our recommended defaults. You can change this later by editing the Endpoint Security integration within your agent policy."
                 />
               )}
             </p>
@@ -90,4 +90,4 @@ export const ConfigureEndpointPackageConfig = memo<CustomConfigurePackageConfigC
   }
 );
 
-ConfigureEndpointPackageConfig.displayName = 'ConfigureEndpointPackageConfig';
+ConfigureEndpointPackagePolicy.displayName = 'ConfigureEndpointPackagePolicy';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx
index 318d49f5fea9f..f75d086df9eb4 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx
@@ -28,7 +28,7 @@ describe('Policy Details', () => {
   let middlewareSpy: AppContextTestRender['middlewareSpy'];
   let http: typeof coreStart.http;
   let render: (ui: Parameters<typeof mount>[0]) => ReturnType<typeof mount>;
-  let policyPackageConfig: ReturnType<typeof generator.generatePolicyPackageConfig>;
+  let policyPackagePolicy: ReturnType<typeof generator.generatePolicyPackagePolicy>;
   let policyView: ReturnType<typeof render>;
 
   beforeEach(() => {
@@ -78,8 +78,8 @@ describe('Policy Details', () => {
     let asyncActions: Promise<unknown> = Promise.resolve();
 
     beforeEach(() => {
-      policyPackageConfig = generator.generatePolicyPackageConfig();
-      policyPackageConfig.id = '1';
+      policyPackagePolicy = generator.generatePolicyPackagePolicy();
+      policyPackagePolicy.id = '1';
 
       const policyListApiHandlers = policyListApiPathHandlers();
 
@@ -87,15 +87,15 @@ describe('Policy Details', () => {
         const [path] = args;
         if (typeof path === 'string') {
           // GET datasouce
-          if (path === '/api/ingest_manager/package_configs/1') {
+          if (path === '/api/ingest_manager/package_policies/1') {
             asyncActions = asyncActions.then<unknown>(async (): Promise<unknown> => sleep());
             return Promise.resolve({
-              item: policyPackageConfig,
+              item: policyPackagePolicy,
               success: true,
             });
           }
 
-          // GET Agent status for agent config
+          // GET Agent status for agent policy
           if (path === '/api/ingest_manager/fleet/agent-status') {
             asyncActions = asyncActions.then(async () => sleep());
             return Promise.resolve({
@@ -132,7 +132,7 @@ describe('Policy Details', () => {
 
       const pageTitle = policyView.find('h1[data-test-subj="header-page-title"]');
       expect(pageTitle).toHaveLength(1);
-      expect(pageTitle.text()).toEqual(policyPackageConfig.name);
+      expect(pageTitle.text()).toEqual(policyPackagePolicy.name);
     });
     it('should navigate to list if back to link is clicked', async () => {
       policyView.update();
@@ -203,9 +203,9 @@ describe('Policy Details', () => {
           asyncActions = asyncActions.then(async () => sleep());
           const [path] = args;
           if (typeof path === 'string') {
-            if (path === '/api/ingest_manager/package_configs/1') {
+            if (path === '/api/ingest_manager/package_policies/1') {
               return Promise.resolve({
-                item: policyPackageConfig,
+                item: policyPackagePolicy,
                 success: true,
               });
             }
@@ -229,7 +229,7 @@ describe('Policy Details', () => {
         );
         expect(warningCallout).toHaveLength(1);
         expect(warningCallout.text()).toEqual(
-          'This action will update 5 hostsSaving these changes will apply updates to all endpoints assigned to this agent configuration.'
+          'This action will update 5 hostsSaving these changes will apply updates to all endpoints assigned to this agent policy.'
         );
       });
       it('should close dialog if cancel button is clicked', () => {
@@ -248,7 +248,7 @@ describe('Policy Details', () => {
 
         // API should be called
         await asyncActions;
-        expect(http.put.mock.calls[0][0]).toEqual(`/api/ingest_manager/package_configs/1`);
+        expect(http.put.mock.calls[0][0]).toEqual(`/api/ingest_manager/package_policies/1`);
         policyView.update();
 
         // Toast notification should be shown
@@ -260,7 +260,7 @@ describe('Policy Details', () => {
         });
       });
       it('should show an error notification toast if update fails', async () => {
-        policyPackageConfig.id = 'invalid';
+        policyPackagePolicy.id = 'invalid';
         modalConfirmButton.simulate('click');
 
         await asyncActions;
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.tsx
index 636c0e5e6a0c3..4135a4c595d6a 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.tsx
@@ -298,7 +298,7 @@ const ConfirmUpdate = React.memo<{
             >
               <FormattedMessage
                 id="xpack.securitySolution.endpoint.policy.details.updateConfirm.warningMessage"
-                defaultMessage="Saving these changes will apply updates to all endpoints assigned to this agent configuration."
+                defaultMessage="Saving these changes will apply updates to all endpoints assigned to this agent policy."
               />
             </EuiCallOut>
             <EuiSpacer size="xl" />
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.test.tsx
index b0139bf3ecb21..4fe7a496276f3 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.test.tsx
@@ -52,7 +52,7 @@ describe.skip('when on the policies page', () => {
         middlewareSpy
           .waitForAction('serverReturnedPolicyListData')
           .then((action) => (firstPolicyID = action.payload.policyItems[0].id)),
-        // middlewareSpy.waitForAction('serverReturnedAgentConfigListData'),
+        // middlewareSpy.waitForAction('serverReturnedAgentPolicyListData'),
       ]);
       return renderResult;
     };
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.tsx
index b97ea958fd1c2..ff9c40675def8 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.tsx
@@ -45,7 +45,7 @@ import { SecurityPageName } from '../../../../app/types';
 import { useFormatUrl } from '../../../../common/components/link_to';
 import { getPolicyDetailPath, getPoliciesPath } from '../../../common/routing';
 import { useNavigateToAppEventHandler } from '../../../../common/hooks/endpoint/use_navigate_to_app_event_handler';
-import { CreatePackageConfigRouteState } from '../../../../../../ingest_manager/public';
+import { CreatePackagePolicyRouteState } from '../../../../../../ingest_manager/public';
 import { MANAGEMENT_APP_ID } from '../../../common/constants';
 import { AdministrationListPage } from '../../../components/administration_list_page';
 
@@ -145,7 +145,7 @@ export const PolicyList = React.memo(() => {
     endpointPackageVersion,
   } = usePolicyListSelector(selector);
 
-  const handleCreatePolicyClick = useNavigateToAppEventHandler<CreatePackageConfigRouteState>(
+  const handleCreatePolicyClick = useNavigateToAppEventHandler<CreatePackagePolicyRouteState>(
     'ingestManager',
     {
       // We redirect to Ingest's Integaration page if we can't get the package version, and
@@ -221,11 +221,11 @@ export const PolicyList = React.memo(() => {
   );
 
   const handleDeleteOnClick = useCallback(
-    ({ policyId, agentConfigId }: { policyId: string; agentConfigId: string }) => {
+    ({ policyId, agentPolicyId }: { policyId: string; agentPolicyId: string }) => {
       dispatch({
         type: 'userOpenedPolicyListDeleteModal',
         payload: {
-          agentConfigId,
+          agentPolicyId,
         },
       });
       setPolicyIdToDelete(policyId);
@@ -335,27 +335,27 @@ export const PolicyList = React.memo(() => {
               return (
                 <TableRowActions
                   items={[
-                    <EuiContextMenuItem icon="link" key="agentConfigLink">
+                    <EuiContextMenuItem icon="link" key="agentPolicyLink">
                       <LinkToApp
-                        data-test-subj="agentConfigLink"
+                        data-test-subj="agentPolicyLink"
                         appId="ingestManager"
-                        appPath={`#/configs/${item.config_id}`}
-                        href={`${services.application.getUrlForApp('ingestManager')}#/configs/${
-                          item.config_id
+                        appPath={`#/policies/${item.policy_id}`}
+                        href={`${services.application.getUrlForApp('ingestManager')}#/policies/${
+                          item.policy_id
                         }`}
                       >
                         <FormattedMessage
-                          id="xpack.securitySolution.endpoint.policyList.agentConfigAction"
-                          defaultMessage="View Agent Configuration"
+                          id="xpack.securitySolution.endpoint.policyList.agentPolicyAction"
+                          defaultMessage="View Agent Policy"
                         />
                       </LinkToApp>
                     </EuiContextMenuItem>,
                     <DangerEuiContextMenuItem
                       data-test-subj="policyDeleteButton"
                       icon="trash"
-                      key="policyDeletAction"
+                      key="policyDeleteAction"
                       onClick={() => {
-                        handleDeleteOnClick({ agentConfigId: item.config_id, policyId: item.id });
+                        handleDeleteOnClick({ agentPolicyId: item.policy_id, policyId: item.id });
                       }}
                     >
                       <FormattedMessage
diff --git a/x-pack/plugins/security_solution/public/plugin.tsx b/x-pack/plugins/security_solution/public/plugin.tsx
index 98ea2efe8721e..f1a933fb34d66 100644
--- a/x-pack/plugins/security_solution/public/plugin.tsx
+++ b/x-pack/plugins/security_solution/public/plugin.tsx
@@ -43,7 +43,7 @@ import {
   APP_CASES_PATH,
   APP_PATH,
 } from '../common/constants';
-import { ConfigureEndpointPackageConfig } from './management/pages/policy/view/ingest_manager_integration/configure_package_config';
+import { ConfigureEndpointPackagePolicy } from './management/pages/policy/view/ingest_manager_integration/configure_package_policy';
 
 import { State, createStore, createInitialState } from './common/store';
 import { SecurityPageName } from './app/types';
@@ -325,9 +325,9 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
   public start(core: CoreStart, plugins: StartPlugins) {
     KibanaServices.init({ ...core, ...plugins, kibanaVersion: this.kibanaVersion });
     if (plugins.ingestManager) {
-      plugins.ingestManager.registerPackageConfigComponent(
+      plugins.ingestManager.registerPackagePolicyComponent(
         'endpoint',
-        ConfigureEndpointPackageConfig
+        ConfigureEndpointPackagePolicy
       );
     }
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts b/x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts
index f51e8c6be1040..0ec0db9f32776 100644
--- a/x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts
@@ -10,7 +10,7 @@ import {
   SavedObjectsClientContract,
 } from 'src/core/server';
 import { AgentService, IngestManagerStartContract } from '../../../ingest_manager/server';
-import { getPackageConfigCreateCallback } from './ingest_integration';
+import { getPackagePolicyCreateCallback } from './ingest_integration';
 import { ManifestManager } from './services/artifacts';
 
 export type EndpointAppContextServiceStartContract = Partial<
@@ -38,8 +38,8 @@ export class EndpointAppContextService {
 
     if (this.manifestManager && dependencies.registerIngestCallback) {
       dependencies.registerIngestCallback(
-        'packageConfigCreate',
-        getPackageConfigCreateCallback(dependencies.logger, this.manifestManager)
+        'packagePolicyCreate',
+        getPackagePolicyCreateCallback(dependencies.logger, this.manifestManager)
       );
     }
   }
diff --git a/x-pack/plugins/security_solution/server/endpoint/ingest_integration.test.ts b/x-pack/plugins/security_solution/server/endpoint/ingest_integration.test.ts
index 03999715dfc71..73f2124736a79 100644
--- a/x-pack/plugins/security_solution/server/endpoint/ingest_integration.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/ingest_integration.test.ts
@@ -5,13 +5,13 @@
  */
 
 import { loggingSystemMock } from 'src/core/server/mocks';
-import { createNewPackageConfigMock } from '../../../ingest_manager/common/mocks';
+import { createNewPackagePolicyMock } from '../../../ingest_manager/common/mocks';
 import { factory as policyConfigFactory } from '../../common/endpoint/models/policy_config';
 import {
   getManifestManagerMock,
   ManifestManagerMockType,
 } from './services/artifacts/manifest_manager/manifest_manager.mock';
-import { getPackageConfigCreateCallback } from './ingest_integration';
+import { getPackagePolicyCreateCallback } from './ingest_integration';
 
 describe('ingest_integration tests ', () => {
   describe('ingest_integration sanity checks', () => {
@@ -21,8 +21,8 @@ describe('ingest_integration tests ', () => {
         mockType: ManifestManagerMockType.InitialSystemState,
       });
 
-      const callback = getPackageConfigCreateCallback(logger, manifestManager);
-      const policyConfig = createNewPackageConfigMock(); // policy config without manifest
+      const callback = getPackagePolicyCreateCallback(logger, manifestManager);
+      const policyConfig = createNewPackagePolicyMock(); // policy config without manifest
       const newPolicyConfig = await callback(policyConfig); // policy config WITH manifest
 
       expect(newPolicyConfig.inputs[0]!.type).toEqual('endpoint');
@@ -61,8 +61,8 @@ describe('ingest_integration tests ', () => {
       manifestManager.pushArtifacts = jest.fn().mockResolvedValue([new Error('error updating')]);
       const lastComputed = await manifestManager.getLastComputedManifest();
 
-      const callback = getPackageConfigCreateCallback(logger, manifestManager);
-      const policyConfig = createNewPackageConfigMock();
+      const callback = getPackagePolicyCreateCallback(logger, manifestManager);
+      const policyConfig = createNewPackagePolicyMock();
       const newPolicyConfig = await callback(policyConfig);
 
       expect(newPolicyConfig.inputs[0]!.type).toEqual('endpoint');
@@ -81,8 +81,8 @@ describe('ingest_integration tests ', () => {
       expect(lastComputed).toEqual(null);
 
       manifestManager.buildNewManifest = jest.fn().mockRejectedValue(new Error('abcd'));
-      const callback = getPackageConfigCreateCallback(logger, manifestManager);
-      const policyConfig = createNewPackageConfigMock();
+      const callback = getPackagePolicyCreateCallback(logger, manifestManager);
+      const policyConfig = createNewPackagePolicyMock();
       const newPolicyConfig = await callback(policyConfig);
 
       expect(newPolicyConfig.inputs[0]!.type).toEqual('endpoint');
@@ -95,8 +95,8 @@ describe('ingest_integration tests ', () => {
       const lastComputed = await manifestManager.getLastComputedManifest();
 
       manifestManager.buildNewManifest = jest.fn().mockResolvedValue(lastComputed); // no diffs
-      const callback = getPackageConfigCreateCallback(logger, manifestManager);
-      const policyConfig = createNewPackageConfigMock();
+      const callback = getPackagePolicyCreateCallback(logger, manifestManager);
+      const policyConfig = createNewPackagePolicyMock();
       const newPolicyConfig = await callback(policyConfig);
 
       expect(newPolicyConfig.inputs[0]!.type).toEqual('endpoint');
diff --git a/x-pack/plugins/security_solution/server/endpoint/ingest_integration.ts b/x-pack/plugins/security_solution/server/endpoint/ingest_integration.ts
index 695267f322857..489b146daeb43 100644
--- a/x-pack/plugins/security_solution/server/endpoint/ingest_integration.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/ingest_integration.ts
@@ -5,7 +5,7 @@
  */
 
 import { Logger } from '../../../../../src/core/server';
-import { NewPackageConfig } from '../../../ingest_manager/common/types/models';
+import { NewPackagePolicy } from '../../../ingest_manager/common/types/models';
 import { factory as policyConfigFactory } from '../../common/endpoint/models/policy_config';
 import { NewPolicyData } from '../../common/endpoint/types';
 import { ManifestManager } from './services/artifacts';
@@ -67,23 +67,23 @@ const getManifest = async (logger: Logger, manifestManager: ManifestManager): Pr
 };
 
 /**
- * Callback to handle creation of PackageConfigs in Ingest Manager
+ * Callback to handle creation of PackagePolicies in Ingest Manager
  */
-export const getPackageConfigCreateCallback = (
+export const getPackagePolicyCreateCallback = (
   logger: Logger,
   manifestManager: ManifestManager
-): ((newPackageConfig: NewPackageConfig) => Promise<NewPackageConfig>) => {
-  const handlePackageConfigCreate = async (
-    newPackageConfig: NewPackageConfig
-  ): Promise<NewPackageConfig> => {
-    // We only care about Endpoint package configs
-    if (newPackageConfig.package?.name !== 'endpoint') {
-      return newPackageConfig;
+): ((newPackagePolicy: NewPackagePolicy) => Promise<NewPackagePolicy>) => {
+  const handlePackagePolicyCreate = async (
+    newPackagePolicy: NewPackagePolicy
+  ): Promise<NewPackagePolicy> => {
+    // We only care about Endpoint package policies
+    if (newPackagePolicy.package?.name !== 'endpoint') {
+      return newPackagePolicy;
     }
 
     // We cast the type here so that any changes to the Endpoint specific data
     // follow the types/schema expected
-    let updatedPackageConfig = newPackageConfig as NewPolicyData;
+    let updatedPackagePolicy = newPackagePolicy as NewPolicyData;
 
     // Get most recent manifest
     const manifest = await getManifest(logger, manifestManager);
@@ -96,8 +96,8 @@ export const getPackageConfigCreateCallback = (
 
     // Until we get the Default Policy Configuration in the Endpoint package,
     // we will add it here manually at creation time.
-    updatedPackageConfig = {
-      ...newPackageConfig,
+    updatedPackagePolicy = {
+      ...newPackagePolicy,
       inputs: [
         {
           type: 'endpoint',
@@ -115,8 +115,8 @@ export const getPackageConfigCreateCallback = (
       ],
     };
 
-    return updatedPackageConfig;
+    return updatedPackagePolicy;
   };
 
-  return handlePackageConfigCreate;
+  return handlePackagePolicyCreate;
 };
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/mocks.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/mocks.ts
index 62fff4715b562..61850bfb3bc7d 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/mocks.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/mocks.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { PackageConfig } from '../../../../../ingest_manager/common';
-import { createPackageConfigMock } from '../../../../../ingest_manager/common/mocks';
+import { PackagePolicy } from '../../../../../ingest_manager/common';
+import { createPackagePolicyMock } from '../../../../../ingest_manager/common/mocks';
 import { InternalArtifactCompleteSchema } from '../../schemas/artifacts';
 import {
   getInternalArtifactMock,
@@ -69,9 +69,9 @@ export const getEmptyMockManifest = async (opts?: { compress: boolean }) => {
   return manifest;
 };
 
-export const createPackageConfigWithInitialManifestMock = (): PackageConfig => {
-  const packageConfig = createPackageConfigMock();
-  packageConfig.inputs[0].config!.artifact_manifest = {
+export const createPackagePolicyWithInitialManifestMock = (): PackagePolicy => {
+  const packagePolicy = createPackagePolicyMock();
+  packagePolicy.inputs[0].config!.artifact_manifest = {
     value: {
       artifacts: {
         'endpoint-exceptionlist-macos-v1': {
@@ -99,12 +99,12 @@ export const createPackageConfigWithInitialManifestMock = (): PackageConfig => {
       schema_version: 'v1',
     },
   };
-  return packageConfig;
+  return packagePolicy;
 };
 
-export const createPackageConfigWithManifestMock = (): PackageConfig => {
-  const packageConfig = createPackageConfigMock();
-  packageConfig.inputs[0].config!.artifact_manifest = {
+export const createPackagePolicyWithManifestMock = (): PackagePolicy => {
+  const packagePolicy = createPackagePolicyMock();
+  packagePolicy.inputs[0].config!.artifact_manifest = {
     value: {
       artifacts: {
         'endpoint-exceptionlist-macos-v1': {
@@ -133,5 +133,5 @@ export const createPackageConfigWithManifestMock = (): PackageConfig => {
     },
   };
 
-  return packageConfig;
+  return packagePolicy;
 };
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/task.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/task.ts
index 4f2dbdf7644e2..02e57a71dcd94 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/task.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/task.ts
@@ -148,7 +148,7 @@ export class ManifestTask {
         }
       }
 
-      // Try dispatching to ingest-manager package configs
+      // Try dispatching to ingest-manager package policies
       const dispatchErrors = await manifestManager.tryDispatch(newManifest);
       if (dispatchErrors.length) {
         reportErrors(this.logger, dispatchErrors);
diff --git a/x-pack/plugins/security_solution/server/endpoint/mocks.ts b/x-pack/plugins/security_solution/server/endpoint/mocks.ts
index 9ca447d53bf45..b5f35a198fa9e 100644
--- a/x-pack/plugins/security_solution/server/endpoint/mocks.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/mocks.ts
@@ -12,7 +12,7 @@ import {
   IngestManagerStartContract,
   ExternalCallback,
 } from '../../../ingest_manager/server';
-import { createPackageConfigServiceMock } from '../../../ingest_manager/server/mocks';
+import { createPackagePolicyServiceMock } from '../../../ingest_manager/server/mocks';
 import { createMockConfig } from '../lib/detection_engine/routes/__mocks__';
 import {
   EndpointAppContextService,
@@ -96,7 +96,7 @@ export const createMockIngestManagerStartContract = (
     },
     agentService: createMockAgentService(),
     registerExternalCallback: jest.fn((...args: ExternalCallback) => {}),
-    packageConfigService: createPackageConfigServiceMock(),
+    packagePolicyService: createPackagePolicyServiceMock(),
   };
 };
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.mock.ts b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.mock.ts
index 34e18c5fe85fc..27dd38047e7c3 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.mock.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.mock.ts
@@ -6,8 +6,8 @@
 
 import { savedObjectsClientMock, loggingSystemMock } from 'src/core/server/mocks';
 import { Logger } from 'src/core/server';
-import { PackageConfigServiceInterface } from '../../../../../../ingest_manager/server';
-import { createPackageConfigServiceMock } from '../../../../../../ingest_manager/server/mocks';
+import { PackagePolicyServiceInterface } from '../../../../../../ingest_manager/server';
+import { createPackagePolicyServiceMock } from '../../../../../../ingest_manager/server/mocks';
 import { ExceptionListClient } from '../../../../../../lists/server';
 import { listMock } from '../../../../../../lists/server/mocks';
 import LRU from 'lru-cache';
@@ -15,8 +15,8 @@ import { getArtifactClientMock } from '../artifact_client.mock';
 import { getManifestClientMock } from '../manifest_client.mock';
 import { ManifestManager } from './manifest_manager';
 import {
-  createPackageConfigWithManifestMock,
-  createPackageConfigWithInitialManifestMock,
+  createPackagePolicyWithManifestMock,
+  createPackagePolicyWithInitialManifestMock,
   getMockManifest,
   getMockArtifactsWithDiff,
   getEmptyMockArtifacts,
@@ -32,7 +32,7 @@ export const getManifestManagerMock = (opts?: {
   mockType?: ManifestManagerMockType;
   cache?: LRU<string, Buffer>;
   exceptionListClient?: ExceptionListClient;
-  packageConfigService?: jest.Mocked<PackageConfigServiceInterface>;
+  packagePolicyService?: jest.Mocked<PackagePolicyServiceInterface>;
   savedObjectsClient?: ReturnType<typeof savedObjectsClientMock.create>;
 }): ManifestManager => {
   let cache = new LRU<string, Buffer>({ max: 10, maxAge: 1000 * 60 * 60 });
@@ -45,16 +45,16 @@ export const getManifestManagerMock = (opts?: {
     exceptionListClient = opts.exceptionListClient;
   }
 
-  let packageConfigService = createPackageConfigServiceMock();
-  if (opts?.packageConfigService != null) {
-    packageConfigService = opts.packageConfigService;
+  let packagePolicyService = createPackagePolicyServiceMock();
+  if (opts?.packagePolicyService != null) {
+    packagePolicyService = opts.packagePolicyService;
   }
-  packageConfigService.list = jest.fn().mockResolvedValue({
+  packagePolicyService.list = jest.fn().mockResolvedValue({
     total: 1,
     items: [
-      { version: 'policy-1-version', ...createPackageConfigWithManifestMock() },
-      { version: 'policy-2-version', ...createPackageConfigWithInitialManifestMock() },
-      { version: 'policy-3-version', ...createPackageConfigWithInitialManifestMock() },
+      { version: 'policy-1-version', ...createPackagePolicyWithManifestMock() },
+      { version: 'policy-2-version', ...createPackagePolicyWithInitialManifestMock() },
+      { version: 'policy-3-version', ...createPackagePolicyWithInitialManifestMock() },
     ],
   });
 
@@ -97,7 +97,7 @@ export const getManifestManagerMock = (opts?: {
   const manifestManager = new ManifestManagerMock({
     artifactClient: getArtifactClientMock(savedObjectsClient),
     cache,
-    packageConfigService,
+    packagePolicyService,
     exceptionListClient,
     logger: loggingSystemMock.create().get() as jest.Mocked<Logger>,
     savedObjectsClient,
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.test.ts b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.test.ts
index 8e0d55104fb7c..bb6504de6e0a4 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.test.ts
@@ -6,7 +6,7 @@
 
 import { inflateSync } from 'zlib';
 import { savedObjectsClientMock } from 'src/core/server/mocks';
-import { createPackageConfigServiceMock } from '../../../../../../ingest_manager/server/mocks';
+import { createPackagePolicyServiceMock } from '../../../../../../ingest_manager/server/mocks';
 import { ArtifactConstants, ManifestConstants, isCompleteArtifact } from '../../../lib/artifacts';
 
 import { getManifestManagerMock, ManifestManagerMockType } from './manifest_manager.mock';
@@ -92,8 +92,8 @@ describe('manifest_manager', () => {
     });
 
     test('ManifestManager cannot dispatch incomplete (uncompressed) artifact', async () => {
-      const packageConfigService = createPackageConfigServiceMock();
-      const manifestManager = getManifestManagerMock({ packageConfigService });
+      const packagePolicyService = createPackagePolicyServiceMock();
+      const manifestManager = getManifestManagerMock({ packagePolicyService });
       const oldManifest = await manifestManager.getLastComputedManifest();
       const newManifest = await manifestManager.buildNewManifest(oldManifest!);
       const dispatchErrors = await manifestManager.tryDispatch(newManifest);
@@ -102,8 +102,8 @@ describe('manifest_manager', () => {
     });
 
     test('ManifestManager can dispatch manifest', async () => {
-      const packageConfigService = createPackageConfigServiceMock();
-      const manifestManager = getManifestManagerMock({ packageConfigService });
+      const packagePolicyService = createPackagePolicyServiceMock();
+      const manifestManager = getManifestManagerMock({ packagePolicyService });
       const oldManifest = await manifestManager.getLastComputedManifest();
       const newManifest = await manifestManager.buildNewManifest(oldManifest!);
       const diffs = newManifest.diff(oldManifest!);
@@ -117,10 +117,10 @@ describe('manifest_manager', () => {
       expect(dispatchErrors).toEqual([]);
 
       // 2 policies updated... 1 is already up-to-date
-      expect(packageConfigService.update.mock.calls.length).toEqual(2);
+      expect(packagePolicyService.update.mock.calls.length).toEqual(2);
 
       expect(
-        packageConfigService.update.mock.calls[0][2].inputs[0].config!.artifact_manifest.value
+        packagePolicyService.update.mock.calls[0][2].inputs[0].config!.artifact_manifest.value
       ).toEqual({
         manifest_version: '1.0.1',
         schema_version: 'v1',
@@ -150,8 +150,8 @@ describe('manifest_manager', () => {
     });
 
     test('ManifestManager fails to dispatch on conflict', async () => {
-      const packageConfigService = createPackageConfigServiceMock();
-      const manifestManager = getManifestManagerMock({ packageConfigService });
+      const packagePolicyService = createPackagePolicyServiceMock();
+      const manifestManager = getManifestManagerMock({ packagePolicyService });
       const oldManifest = await manifestManager.getLastComputedManifest();
       const newManifest = await manifestManager.buildNewManifest(oldManifest!);
       const diffs = newManifest.diff(oldManifest!);
@@ -160,7 +160,7 @@ describe('manifest_manager', () => {
 
       newManifest.bumpSemanticVersion();
 
-      packageConfigService.update.mockRejectedValueOnce({ status: 409 });
+      packagePolicyService.update.mockRejectedValueOnce({ status: 409 });
       const dispatchErrors = await manifestManager.tryDispatch(newManifest);
       expect(dispatchErrors).toEqual([{ status: 409 }]);
     });
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.ts b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.ts
index 9d15b4464c191..70557886e57c5 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.ts
@@ -6,7 +6,7 @@
 import semver from 'semver';
 import { Logger, SavedObjectsClientContract } from 'src/core/server';
 import LRU from 'lru-cache';
-import { PackageConfigServiceInterface } from '../../../../../../ingest_manager/server';
+import { PackagePolicyServiceInterface } from '../../../../../../ingest_manager/server';
 import { ExceptionListClient } from '../../../../../../lists/server';
 import { ManifestSchemaVersion } from '../../../../../common/endpoint/schema/common';
 import { manifestDispatchSchema } from '../../../../../common/endpoint/schema/manifest';
@@ -30,7 +30,7 @@ export interface ManifestManagerContext {
   savedObjectsClient: SavedObjectsClientContract;
   artifactClient: ArtifactClient;
   exceptionListClient: ExceptionListClient;
-  packageConfigService: PackageConfigServiceInterface;
+  packagePolicyService: PackagePolicyServiceInterface;
   logger: Logger;
   cache: LRU<string, Buffer>;
 }
@@ -47,7 +47,7 @@ export interface ManifestSnapshot {
 export class ManifestManager {
   protected artifactClient: ArtifactClient;
   protected exceptionListClient: ExceptionListClient;
-  protected packageConfigService: PackageConfigServiceInterface;
+  protected packagePolicyService: PackagePolicyServiceInterface;
   protected savedObjectsClient: SavedObjectsClientContract;
   protected logger: Logger;
   protected cache: LRU<string, Buffer>;
@@ -56,7 +56,7 @@ export class ManifestManager {
   constructor(context: ManifestManagerContext) {
     this.artifactClient = context.artifactClient;
     this.exceptionListClient = context.exceptionListClient;
-    this.packageConfigService = context.packageConfigService;
+    this.packagePolicyService = context.packagePolicyService;
     this.savedObjectsClient = context.savedObjectsClient;
     this.logger = context.logger;
     this.cache = context.cache;
@@ -217,7 +217,7 @@ export class ManifestManager {
   }
 
   /**
-   * Dispatches the manifest by writing it to the endpoint package config, if different
+   * Dispatches the manifest by writing it to the endpoint package policy, if different
    * from the manifest already in the config.
    *
    * @param manifest The Manifest to dispatch.
@@ -234,39 +234,39 @@ export class ManifestManager {
     const errors: Error[] = [];
 
     while (paging) {
-      const { items, total } = await this.packageConfigService.list(this.savedObjectsClient, {
+      const { items, total } = await this.packagePolicyService.list(this.savedObjectsClient, {
         page,
         perPage: 20,
         kuery: 'ingest-package-policies.package.name:endpoint',
       });
 
-      for (const packageConfig of items) {
+      for (const packagePolicy of items) {
         // eslint-disable-next-line @typescript-eslint/naming-convention
-        const { id, revision, updated_at, updated_by, ...newPackageConfig } = packageConfig;
-        if (newPackageConfig.inputs.length > 0 && newPackageConfig.inputs[0].config !== undefined) {
-          const oldManifest = newPackageConfig.inputs[0].config.artifact_manifest ?? {
+        const { id, revision, updated_at, updated_by, ...newPackagePolicy } = packagePolicy;
+        if (newPackagePolicy.inputs.length > 0 && newPackagePolicy.inputs[0].config !== undefined) {
+          const oldManifest = newPackagePolicy.inputs[0].config.artifact_manifest ?? {
             value: {},
           };
 
           const newManifestVersion = manifest.getSemanticVersion();
           if (semver.gt(newManifestVersion, oldManifest.value.manifest_version)) {
-            newPackageConfig.inputs[0].config.artifact_manifest = {
+            newPackagePolicy.inputs[0].config.artifact_manifest = {
               value: serializedManifest,
             };
 
             try {
-              await this.packageConfigService.update(this.savedObjectsClient, id, newPackageConfig);
+              await this.packagePolicyService.update(this.savedObjectsClient, id, newPackagePolicy);
               this.logger.debug(
-                `Updated package config ${id} with manifest version ${manifest.getSemanticVersion()}`
+                `Updated package policy ${id} with manifest version ${manifest.getSemanticVersion()}`
               );
             } catch (err) {
               errors.push(err);
             }
           } else {
-            this.logger.debug(`No change in package config: ${id}`);
+            this.logger.debug(`No change in package policy: ${id}`);
           }
         } else {
-          errors.push(new Error(`Package config ${id} has no config.`));
+          errors.push(new Error(`Package Policy ${id} has no config.`));
         }
       }
       paging = (page - 1) * 20 + items.length < total;
diff --git a/x-pack/plugins/security_solution/server/plugin.ts b/x-pack/plugins/security_solution/server/plugin.ts
index f2fad16d80414..85764eaaee32d 100644
--- a/x-pack/plugins/security_solution/server/plugin.ts
+++ b/x-pack/plugins/security_solution/server/plugin.ts
@@ -285,7 +285,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
         savedObjectsClient,
         artifactClient,
         exceptionListClient,
-        packageConfigService: plugins.ingestManager!.packageConfigService,
+        packagePolicyService: plugins.ingestManager!.packagePolicyService,
         logger: this.logger,
         cache: this.exceptionsCache,
       });
diff --git a/x-pack/plugins/security_solution/server/usage/endpoints/endpoint.mocks.ts b/x-pack/plugins/security_solution/server/usage/endpoints/endpoint.mocks.ts
index d753eeee93594..d5e1d21b7772b 100644
--- a/x-pack/plugins/security_solution/server/usage/endpoints/endpoint.mocks.ts
+++ b/x-pack/plugins/security_solution/server/usage/endpoints/endpoint.mocks.ts
@@ -13,7 +13,7 @@ import { Agent } from '../../../../ingest_manager/common';
 import { FLEET_ENDPOINT_PACKAGE_CONSTANT } from './fleet_saved_objects';
 
 const testAgentId = 'testAgentId';
-const testConfigId = 'testConfigId';
+const testAgentPolicyId = 'testAgentPolicyId';
 const testHostId = 'randoHostId';
 const testHostName = 'testDesktop';
 
@@ -45,7 +45,7 @@ export const mockFleetObjectsResponse = (
       attributes: {
         active: true,
         id: testAgentId,
-        config_id: 'randoConfigId',
+        policy_id: 'randoAgentPolicyId',
         type: 'PERMANENT',
         user_provided_metadata: {},
         enrolled_at: lastCheckIn,
@@ -82,7 +82,7 @@ export const mockFleetObjectsResponse = (
       attributes: {
         active: true,
         id: 'oldTestAgentId',
-        config_id: 'randoConfigId',
+        policy_id: 'randoAgentPolicyId',
         type: 'PERMANENT',
         user_provided_metadata: {},
         enrolled_at: lastCheckIn,
@@ -250,7 +250,7 @@ export const mockFleetEventsObjectsResponse = (
             running ? 'RUNNING' : 'FAILED'
           }: `,
           payload: running ? mockPolicyPayload(policyStatus, policyMode) : undefined,
-          config_id: testConfigId,
+          policy_id: testAgentPolicyId,
         },
         references: [],
         updated_at: updatedDate,
@@ -267,7 +267,7 @@ export const mockFleetEventsObjectsResponse = (
           subtype: 'STARTING',
           message:
             'Application: endpoint-security--8.0.0[d8f7f6e8-9375-483c-b456-b479f1d7a4f2]: State changed to STARTING: Starting',
-          config_id: testConfigId,
+          policy_id: testAgentPolicyId,
         },
         references: [],
         updated_at: updatedDate,
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index e8fe926ab2a0a..db77dfa150f03 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -9129,53 +9129,53 @@
     "xpack.infra.waffle.unableToSelectMetricErrorTitle": "メトリックのオプションまたは値を選択できません",
     "xpack.infra.waffleTime.autoRefreshButtonLabel": "自動更新",
     "xpack.infra.waffleTime.stopRefreshingButtonLabel": "更新中止",
-    "xpack.ingestManager.agentConfig.confirmModalCalloutDescription": "選択されたエージェント構成{configName}が一部のエージェントで既に使用されていることをフリートが検出しました。このアクションの結果として、フリートはこの構成で使用されているすべてのエージェントに更新をデプロイします。",
-    "xpack.ingestManager.agentConfig.confirmModalCancelButtonLabel": "キャンセル",
-    "xpack.ingestManager.agentConfig.confirmModalConfirmButtonLabel": "変更を保存してデプロイ",
-    "xpack.ingestManager.agentConfig.confirmModalDescription": "このアクションは元に戻せません。続行していいですか？",
-    "xpack.ingestManager.agentConfig.confirmModalTitle": "変更を保存してデプロイ",
-    "xpack.ingestManager.agentConfig.linkedAgentCountText": "{count, plural, one {# エージェント} other {# エージェント}}",
-    "xpack.ingestManager.agentConfigActionMenu.buttonText": "アクション",
-    "xpack.ingestManager.agentConfigActionMenu.copyConfigActionText": "構成のコピー",
-    "xpack.ingestManager.agentConfigActionMenu.enrollAgentActionText": "エージェントの追加",
-    "xpack.ingestManager.agentConfigActionMenu.viewConfigText": "構成を表示",
-    "xpack.ingestManager.agentConfigForm.advancedOptionsToggleLabel": "高度なオプション",
-    "xpack.ingestManager.agentConfigForm.descriptionFieldLabel": "説明",
-    "xpack.ingestManager.agentConfigForm.descriptionFieldPlaceholder": "この構成がどのように使用されるか",
-    "xpack.ingestManager.agentConfigForm.monitoringDescription": "パフォーマンスのデバッグと追跡のために、エージェントに関するデータを収集します。",
-    "xpack.ingestManager.agentConfigForm.monitoringLabel": "アラート監視",
-    "xpack.ingestManager.agentConfigForm.monitoringLogsFieldLabel": "エージェントログを収集",
-    "xpack.ingestManager.agentConfigForm.monitoringMetricsFieldLabel": "エージェントメトリックを収集",
-    "xpack.ingestManager.agentConfigForm.nameFieldLabel": "名前",
-    "xpack.ingestManager.agentConfigForm.nameFieldPlaceholder": "名前を選択",
-    "xpack.ingestManager.agentConfigForm.nameRequiredErrorMessage": "エージェント構成名が必要です",
-    "xpack.ingestManager.agentConfigForm.namespaceFieldDescription": "この構成を使用する統合にデフォルトの名前空間を適用します。統合はその独自の名前空間を指定できます。",
-    "xpack.ingestManager.agentConfigForm.namespaceFieldLabel": "デフォルト名前空間",
-    "xpack.ingestManager.agentConfigForm.namespaceRequiredErrorMessage": "ネームスペースが必要です",
-    "xpack.ingestManager.agentConfigForm.systemMonitoringFieldLabel": "オプション",
-    "xpack.ingestManager.agentConfigForm.systemMonitoringText": "システムメトリックを収集",
-    "xpack.ingestManager.agentConfigForm.systemMonitoringTooltipText": "このオプションを有効にすると、システムメトリックと情報を収集する統合で構成をブートストラップできます。",
-    "xpack.ingestManager.agentConfigList.actionsColumnTitle": "アクション",
-    "xpack.ingestManager.agentConfigList.addButton": "エージェント構成を作成",
-    "xpack.ingestManager.agentConfigList.agentsColumnTitle": "エージェント",
-    "xpack.ingestManager.agentConfigList.clearFiltersLinkText": "フィルターを消去",
-    "xpack.ingestManager.agentConfigList.descriptionColumnTitle": "説明",
-    "xpack.ingestManager.agentConfigList.loadingAgentConfigsMessage": "エージェント構成を読み込み中...",
-    "xpack.ingestManager.agentConfigList.nameColumnTitle": "名前",
-    "xpack.ingestManager.agentConfigList.noAgentConfigsPrompt": "エージェント構成なし",
-    "xpack.ingestManager.agentConfigList.noFilteredAgentConfigsPrompt": "エージェント構成が見つかりません。 {clearFiltersLink}",
-    "xpack.ingestManager.agentConfigList.packageConfigsCountColumnTitle": "統合",
-    "xpack.ingestManager.agentConfigList.pageSubtitle": "エージェント構成を使用すると、エージェントとエージェントが収集するデータを管理できます。",
-    "xpack.ingestManager.agentConfigList.pageTitle": "エージェント構成",
-    "xpack.ingestManager.agentConfigList.reloadAgentConfigsButtonText": "再読み込み",
-    "xpack.ingestManager.agentConfigList.revisionNumber": "rev. {revNumber}",
-    "xpack.ingestManager.agentConfigList.updatedOnColumnTitle": "最終更新日:",
+    "xpack.ingestManager.agentPolicy.confirmModalCalloutDescription": "選択されたエージェント構成{policyName}が一部のエージェントで既に使用されていることをフリートが検出しました。このアクションの結果として、フリートはこの構成で使用されているすべてのエージェントに更新をデプロイします。",
+    "xpack.ingestManager.agentPolicy.confirmModalCancelButtonLabel": "キャンセル",
+    "xpack.ingestManager.agentPolicy.confirmModalConfirmButtonLabel": "変更を保存してデプロイ",
+    "xpack.ingestManager.agentPolicy.confirmModalDescription": "このアクションは元に戻せません。続行していいですか？",
+    "xpack.ingestManager.agentPolicy.confirmModalTitle": "変更を保存してデプロイ",
+    "xpack.ingestManager.agentPolicy.linkedAgentCountText": "{count, plural, one {# エージェント} other {# エージェント}}",
+    "xpack.ingestManager.agentPolicyActionMenu.buttonText": "アクション",
+    "xpack.ingestManager.agentPolicyActionMenu.copyPolicyActionText": "構成のコピー",
+    "xpack.ingestManager.agentPolicyActionMenu.enrollAgentActionText": "エージェントの追加",
+    "xpack.ingestManager.agentPolicyActionMenu.viewPolicyText": "構成を表示",
+    "xpack.ingestManager.agentPolicyForm.advancedOptionsToggleLabel": "高度なオプション",
+    "xpack.ingestManager.agentPolicyForm.descriptionFieldLabel": "説明",
+    "xpack.ingestManager.agentPolicyForm.descriptionFieldPlaceholder": "この構成がどのように使用されるか",
+    "xpack.ingestManager.agentPolicyForm.monitoringDescription": "パフォーマンスのデバッグと追跡のために、エージェントに関するデータを収集します。",
+    "xpack.ingestManager.agentPolicyForm.monitoringLabel": "アラート監視",
+    "xpack.ingestManager.agentPolicyForm.monitoringLogsFieldLabel": "エージェントログを収集",
+    "xpack.ingestManager.agentPolicyForm.monitoringMetricsFieldLabel": "エージェントメトリックを収集",
+    "xpack.ingestManager.agentPolicyForm.nameFieldLabel": "名前",
+    "xpack.ingestManager.agentPolicyForm.nameFieldPlaceholder": "名前を選択",
+    "xpack.ingestManager.agentPolicyForm.nameRequiredErrorMessage": "エージェント構成名が必要です",
+    "xpack.ingestManager.agentPolicyForm.namespaceFieldDescription": "この構成を使用する統合にデフォルトの名前空間を適用します。統合はその独自の名前空間を指定できます。",
+    "xpack.ingestManager.agentPolicyForm.namespaceFieldLabel": "デフォルト名前空間",
+    "xpack.ingestManager.agentPolicyForm.namespaceRequiredErrorMessage": "ネームスペースが必要です",
+    "xpack.ingestManager.agentPolicyForm.systemMonitoringFieldLabel": "オプション",
+    "xpack.ingestManager.agentPolicyForm.systemMonitoringText": "システムメトリックを収集",
+    "xpack.ingestManager.agentPolicyForm.systemMonitoringTooltipText": "このオプションを有効にすると、システムメトリックと情報を収集する統合で構成をブートストラップできます。",
+    "xpack.ingestManager.agentPolicyList.actionsColumnTitle": "アクション",
+    "xpack.ingestManager.agentPolicyList.addButton": "エージェント構成を作成",
+    "xpack.ingestManager.agentPolicyList.agentsColumnTitle": "エージェント",
+    "xpack.ingestManager.agentPolicyList.clearFiltersLinkText": "フィルターを消去",
+    "xpack.ingestManager.agentPolicyList.descriptionColumnTitle": "説明",
+    "xpack.ingestManager.agentPolicyList.loadingAgentPoliciesMessage": "エージェント構成を読み込み中...",
+    "xpack.ingestManager.agentPolicyList.nameColumnTitle": "名前",
+    "xpack.ingestManager.agentPolicyList.noAgentPoliciesPrompt": "エージェント構成なし",
+    "xpack.ingestManager.agentPolicyList.noFilteredAgentPoliciesPrompt": "エージェント構成が見つかりません。 {clearFiltersLink}",
+    "xpack.ingestManager.agentPolicyList.packagePoliciesCountColumnTitle": "統合",
+    "xpack.ingestManager.agentPolicyList.pageSubtitle": "エージェント構成を使用すると、エージェントとエージェントが収集するデータを管理できます。",
+    "xpack.ingestManager.agentPolicyList.pageTitle": "エージェント構成",
+    "xpack.ingestManager.agentPolicyList.reloadAgentPoliciesButtonText": "再読み込み",
+    "xpack.ingestManager.agentPolicyList.revisionNumber": "rev. {revNumber}",
+    "xpack.ingestManager.agentPolicyList.updatedOnColumnTitle": "最終更新日:",
     "xpack.ingestManager.agentDetails.actionsButton": "アクション",
-    "xpack.ingestManager.agentDetails.agentConfigurationLabel": "エージェント構成",
+    "xpack.ingestManager.agentDetails.agentPolicyLabel": "エージェント構成",
     "xpack.ingestManager.agentDetails.agentDetailsTitle": "エージェント'{id}'",
     "xpack.ingestManager.agentDetails.agentNotFoundErrorDescription": "エージェントID {agentId}が見つかりません",
     "xpack.ingestManager.agentDetails.agentNotFoundErrorTitle": "エージェントが見つかりません",
-    "xpack.ingestManager.agentDetails.configurationLabel": "構成",
+    "xpack.ingestManager.agentDetails.policyLabel": "構成",
     "xpack.ingestManager.agentDetails.hostIdLabel": "ホストID",
     "xpack.ingestManager.agentDetails.hostNameLabel": "ホスト名",
     "xpack.ingestManager.agentDetails.localMetadataSectionSubtitle": "メタデータを読み込み中",
@@ -9190,9 +9190,9 @@
     "xpack.ingestManager.agentDetails.viewAgentListTitle": "すべてのエージェントを表示",
     "xpack.ingestManager.agentEnrollment.cancelButtonLabel": "キャンセル",
     "xpack.ingestManager.agentEnrollment.continueButtonLabel": "続行",
-    "xpack.ingestManager.agentEnrollment.copyConfigurationButton": "クリップボードにコピー",
+    "xpack.ingestManager.agentEnrollment.copyPolicyButton": "クリップボードにコピー",
     "xpack.ingestManager.agentEnrollment.copyRunInstructionsButton": "クリップボードにコピー",
-    "xpack.ingestManager.agentEnrollment.downloadConfigurationButton": "構成のダウンロード",
+    "xpack.ingestManager.agentEnrollment.downloadPolicyButton": "構成のダウンロード",
     "xpack.ingestManager.agentEnrollment.downloadDescription": "ホストのコンピューターでElasticエージェントをダウンロードします。Elasticエージェントダウンロードページでは、エージェントバイナリと検証署名にアクセスできます。",
     "xpack.ingestManager.agentEnrollment.downloadLink": "elastic.co/downloadsに移動",
     "xpack.ingestManager.agentEnrollment.enrollFleetTabLabel": "フリートに登録",
@@ -9204,7 +9204,7 @@
     "xpack.ingestManager.agentEnrollment.standaloneDescription": "スタンドアロンモードで実行中のエージェントは、構成を変更したい場合には、手動で更新する必要があります。次の手順に従い、スタンドアロンモードでElasticエージェントをダウンロードし、セットアップしてください。",
     "xpack.ingestManager.agentEnrollment.stepCheckForDataDescription": "エージェントを起動した後、エージェントはデータの送信を開始します。Ingest Managerのデータセットページでは、このデータを確認できます。",
     "xpack.ingestManager.agentEnrollment.stepCheckForDataTitle": "データを確認",
-    "xpack.ingestManager.agentEnrollment.stepChooseAgentConfigTitle": "エージェント構成を選択",
+    "xpack.ingestManager.agentEnrollment.stepChooseAgentPolicyTitle": "エージェント構成を選択",
     "xpack.ingestManager.agentEnrollment.stepConfigureAgentDescription": "この構成をコピーし、Elasticエージェントがインストールされているシステムのファイル{fileName}に置きます。必ず、構成ファイルの{outputSection}セクションで{ESUsernameVariable}と{ESPasswordVariable}を修正し、実際のElasticsearch認証資格情報が使用されるようにしてください。",
     "xpack.ingestManager.agentEnrollment.stepConfigureAgentTitle": "エージェントの構成",
     "xpack.ingestManager.agentEnrollment.stepDownloadAgentTitle": "Elasticエージェントをダウンロード",
@@ -9222,7 +9222,7 @@
     "xpack.ingestManager.agentEventsList.timestampColumnTitle": "タイムスタンプ",
     "xpack.ingestManager.agentEventsList.typeColumnTitle": "タイプ",
     "xpack.ingestManager.agentEventSubtype.acknowledgedLabel": "認識",
-    "xpack.ingestManager.agentEventSubtype.configLabel": "構成",
+    "xpack.ingestManager.agentEventSubtype.policyLabel": "構成",
     "xpack.ingestManager.agentEventSubtype.dataDumpLabel": "データダンプ",
     "xpack.ingestManager.agentEventSubtype.failedLabel": "失敗",
     "xpack.ingestManager.agentEventSubtype.inProgressLabel": "進行中",
@@ -9248,8 +9248,8 @@
     "xpack.ingestManager.agentList.actionsColumnTitle": "アクション",
     "xpack.ingestManager.agentList.addButton": "エージェントの追加",
     "xpack.ingestManager.agentList.clearFiltersLinkText": "フィルターを消去",
-    "xpack.ingestManager.agentList.configColumnTitle": "エージェント構成",
-    "xpack.ingestManager.agentList.configFilterText": "エージェント構成",
+    "xpack.ingestManager.agentList.policyColumnTitle": "エージェント構成",
+    "xpack.ingestManager.agentList.policyFilterText": "エージェント構成",
     "xpack.ingestManager.agentList.enrollButton": "エージェントの追加",
     "xpack.ingestManager.agentList.hostColumnTitle": "ホスト",
     "xpack.ingestManager.agentList.lastCheckinTitle": "前回のアクティビティ",
@@ -9272,13 +9272,13 @@
     "xpack.ingestManager.agentListStatus.offlineLabel": "オフライン",
     "xpack.ingestManager.agentListStatus.onlineLabel": "オンライン",
     "xpack.ingestManager.agentListStatus.totalLabel": "エージェント",
-    "xpack.ingestManager.agentReassignConfig.cancelButtonLabel": "キャンセル",
-    "xpack.ingestManager.agentReassignConfig.configDescription": "選択したエージェント構成は、{count, plural, one {{countValue}個の統合} other {{countValue}個の統合}}のデータを収集します。",
-    "xpack.ingestManager.agentReassignConfig.continueButtonLabel": "構成を割り当て",
-    "xpack.ingestManager.agentReassignConfig.flyoutDescription": "選択したエージェントに割り当てる、新しいエージェント構成を選択します。",
-    "xpack.ingestManager.agentReassignConfig.flyoutTitle": "新しいエージェント構成を割り当て",
-    "xpack.ingestManager.agentReassignConfig.selectConfigLabel": "エージェント構成",
-    "xpack.ingestManager.agentReassignConfig.successSingleNotificationTitle": "新しいエージェント構成が再割り当てされました",
+    "xpack.ingestManager.agentReassignPolicy.cancelButtonLabel": "キャンセル",
+    "xpack.ingestManager.agentReassignPolicy.policyDescription": "選択したエージェント構成は、{count, plural, one {{countValue}個の統合} other {{countValue}個の統合}}のデータを収集します。",
+    "xpack.ingestManager.agentReassignPolicy.continueButtonLabel": "構成を割り当て",
+    "xpack.ingestManager.agentReassignPolicy.flyoutDescription": "選択したエージェントに割り当てる、新しいエージェント構成を選択します。",
+    "xpack.ingestManager.agentReassignPolicy.flyoutTitle": "新しいエージェント構成を割り当て",
+    "xpack.ingestManager.agentReassignPolicy.selectPolicyLabel": "エージェント構成",
+    "xpack.ingestManager.agentReassignPolicy.successSingleNotificationTitle": "新しいエージェント構成が再割り当てされました",
     "xpack.ingestManager.alphaMessageDescription": "Ingest Managerは本番環境用ではありません。",
     "xpack.ingestManager.alphaMessageLinkText": "詳細を参照してください。",
     "xpack.ingestManager.alphaMessageTitle": "ベータリリース",
@@ -9288,7 +9288,7 @@
     "xpack.ingestManager.alphaMessaging.forumLink": "ディスカッションフォーラム",
     "xpack.ingestManager.alphaMessaging.introText": "Ingest Managerは開発中であり、本番環境用ではありません。このベータリリースは、ユーザーがIngest Managerと新しいElasticエージェントをテストしてフィードバックを提供することを目的としています。このプラグインには、サポートSLAが適用されません。",
     "xpack.ingestManager.alphaMessging.closeFlyoutLabel": "閉じる",
-    "xpack.ingestManager.appNavigation.configurationsLinkText": "構成",
+    "xpack.ingestManager.appNavigation.policiesLinkText": "構成",
     "xpack.ingestManager.appNavigation.dataStreamsLinkText": "データセット",
     "xpack.ingestManager.appNavigation.epmLinkText": "統合",
     "xpack.ingestManager.appNavigation.fleetLinkText": "フリート",
@@ -9298,102 +9298,102 @@
     "xpack.ingestManager.appTitle": "Ingest Manager",
     "xpack.ingestManager.betaBadge.labelText": "ベータ",
     "xpack.ingestManager.betaBadge.tooltipText": "このプラグインは本番環境用ではありません。バグについてはディスカッションフォーラムで報告してください。",
-    "xpack.ingestManager.breadcrumbs.addPackageConfigPageTitle": "統合の追加",
+    "xpack.ingestManager.breadcrumbs.addPackagePolicyPageTitle": "統合の追加",
     "xpack.ingestManager.breadcrumbs.allIntegrationsPageTitle": "すべて",
     "xpack.ingestManager.breadcrumbs.appTitle": "Ingest Manager",
-    "xpack.ingestManager.breadcrumbs.configurationsPageTitle": "構成",
+    "xpack.ingestManager.breadcrumbs.policiesPageTitle": "構成",
     "xpack.ingestManager.breadcrumbs.datastreamsPageTitle": "データセット",
-    "xpack.ingestManager.breadcrumbs.editPackageConfigPageTitle": "統合の編集",
+    "xpack.ingestManager.breadcrumbs.editPackagePolicyPageTitle": "統合の編集",
     "xpack.ingestManager.breadcrumbs.fleetAgentsPageTitle": "エージェント",
     "xpack.ingestManager.breadcrumbs.fleetEnrollmentTokensPageTitle": "登録トークン",
     "xpack.ingestManager.breadcrumbs.fleetPageTitle": "フリート",
     "xpack.ingestManager.breadcrumbs.installedIntegrationsPageTitle": "インストール済み",
     "xpack.ingestManager.breadcrumbs.integrationsPageTitle": "統合",
     "xpack.ingestManager.breadcrumbs.overviewPageTitle": "概要",
-    "xpack.ingestManager.configDetails.addPackageConfigButtonText": "統合の追加",
-    "xpack.ingestManager.configDetails.configDetailsTitle": "構成「{id}」",
-    "xpack.ingestManager.configDetails.configNotFoundErrorTitle": "構成「{id}」が見つかりません",
-    "xpack.ingestManager.configDetails.packageConfigsTable.actionsColumnTitle": "アクション",
-    "xpack.ingestManager.configDetails.packageConfigsTable.deleteActionTitle": "統合の削除",
-    "xpack.ingestManager.configDetails.packageConfigsTable.descriptionColumnTitle": "説明",
-    "xpack.ingestManager.configDetails.packageConfigsTable.editActionTitle": "統合の編集",
-    "xpack.ingestManager.configDetails.packageConfigsTable.nameColumnTitle": "名前",
-    "xpack.ingestManager.configDetails.packageConfigsTable.namespaceColumnTitle": "名前空間",
-    "xpack.ingestManager.configDetails.packageConfigsTable.packageNameColumnTitle": "統合",
-    "xpack.ingestManager.configDetails.subTabs.packageConfigsTabText": "統合",
-    "xpack.ingestManager.configDetails.subTabs.settingsTabText": "設定",
-    "xpack.ingestManager.configDetails.summary.lastUpdated": "最終更新日:",
-    "xpack.ingestManager.configDetails.summary.package_configs": "統合",
-    "xpack.ingestManager.configDetails.summary.revision": "リビジョン",
-    "xpack.ingestManager.configDetails.summary.usedBy": "使用者",
-    "xpack.ingestManager.configDetails.unexceptedErrorTitle": "構成を読み込む間にエラーが発生しました",
-    "xpack.ingestManager.configDetails.viewAgentListTitle": "すべてのエージェント構成を表示",
-    "xpack.ingestManager.configDetails.yamlDownloadButtonLabel": "構成のダウンロード",
-    "xpack.ingestManager.configDetails.yamlFlyoutCloseButtonLabel": "閉じる",
-    "xpack.ingestManager.configDetails.yamlflyoutTitleWithName": "「{name}」エージェント構成の編集",
-    "xpack.ingestManager.configDetails.yamlflyoutTitleWithoutName": "エージェント構成",
-    "xpack.ingestManager.configDetailsPackageConfigs.createFirstButtonText": "統合の追加",
-    "xpack.ingestManager.configDetailsPackageConfigs.createFirstMessage": "この構成にはまだ統合がありません。",
-    "xpack.ingestManager.configDetailsPackageConfigs.createFirstTitle": "最初の統合を追加",
-    "xpack.ingestManager.configForm.deleteConfigActionText": "構成を削除",
-    "xpack.ingestManager.configForm.deleteConfigGroupDescription": "既存のデータは削除されません。",
-    "xpack.ingestManager.configForm.deleteConfigGroupTitle": "構成を削除",
-    "xpack.ingestManager.configForm.generalSettingsGroupDescription": "エージェント構成の名前と説明を選択してください。",
-    "xpack.ingestManager.configForm.generalSettingsGroupTitle": "一般設定",
-    "xpack.ingestManager.configForm.unableToDeleteDefaultConfigText": "既定の構成は削除できません。",
-    "xpack.ingestManager.copyAgentConfig.confirmModal.cancelButtonLabel": "キャンセル",
-    "xpack.ingestManager.copyAgentConfig.confirmModal.confirmButtonLabel": "構成をコピー",
-    "xpack.ingestManager.copyAgentConfig.confirmModal.copyConfigPrompt": "新しいエージェント構成の名前と説明を選択してください。",
-    "xpack.ingestManager.copyAgentConfig.confirmModal.copyConfigTitle": "「{name}」エージェント構成をコピー",
-    "xpack.ingestManager.copyAgentConfig.confirmModal.defaultNewConfigName": "{name}（コピー）",
-    "xpack.ingestManager.copyAgentConfig.confirmModal.newDescriptionLabel": "説明",
-    "xpack.ingestManager.copyAgentConfig.confirmModal.newNameLabel": "新しい構成名",
-    "xpack.ingestManager.copyAgentConfig.failureNotificationTitle": "エージェント構成「{id}」のコピーエラー",
-    "xpack.ingestManager.copyAgentConfig.fatalErrorNotificationTitle": "エージェント構成のコピーエラー",
-    "xpack.ingestManager.copyAgentConfig.successNotificationTitle": "エージェント構成がコピーされました",
-    "xpack.ingestManager.createAgentConfig.cancelButtonLabel": "キャンセル",
-    "xpack.ingestManager.createAgentConfig.errorNotificationTitle": "エージェント構成を作成できません",
-    "xpack.ingestManager.createAgentConfig.flyoutTitle": "エージェント構成を作成",
-    "xpack.ingestManager.createAgentConfig.flyoutTitleDescription": "エージェント構成は、エージェントのグループ全体にわたる設定を管理する目的で使用されます。エージェント構成に統合を追加すると、エージェントで収集するデータを指定できます。エージェント構成の編集時には、フリートを使用して、指定したエージェントのグループに更新をデプロイできます。",
-    "xpack.ingestManager.createAgentConfig.submitButtonLabel": "エージェント構成を作成",
-    "xpack.ingestManager.createAgentConfig.successNotificationTitle": "エージェント構成「{name}」を作成しました",
-    "xpack.ingestManager.createPackageConfig.addedNotificationMessage": "フリートは'{agentConfigName}'構成で使用されているすべてのエージェントに更新をデプロイします。",
-    "xpack.ingestManager.createPackageConfig.addedNotificationTitle": "正常に「{packageConfigName}」を追加しました",
-    "xpack.ingestManager.createPackageConfig.agentConfigurationNameLabel": "エージェント構成",
-    "xpack.ingestManager.createPackageConfig.cancelButton": "キャンセル",
-    "xpack.ingestManager.createPackageConfig.cancelLinkText": "キャンセル",
-    "xpack.ingestManager.createPackageConfig.errorOnSaveText": "統合構成にはエラーがあります。保存前に修正してください。",
-    "xpack.ingestManager.createPackageConfig.pageDescriptionfromConfig": "選択したエージェント構成の統合を構成します。",
-    "xpack.ingestManager.createPackageConfig.pageDescriptionfromPackage": "次の手順に従い、この統合をエージェント構成に追加します。",
-    "xpack.ingestManager.createPackageConfig.pageTitle": "統合の追加",
-    "xpack.ingestManager.createPackageConfig.pageTitleWithPackageName": "{packageName}統合の追加",
-    "xpack.ingestManager.createPackageConfig.saveButton": "統合の保存",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.advancedOptionsToggleLinkText": "高度なオプション",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.errorCountText": "{count, plural, one {件のエラー} other {件のエラー}}",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.hideStreamsAriaLabel": "{type}入力を非表示",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.inputSettingsDescription": "次の設定は以下のすべての入力に適用されます。",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.inputSettingsTitle": "設定",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.inputVarFieldOptionalLabel": "オプション",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.integrationSettingsSectionDescription": "この統合の使用方法を識別できるように、名前と説明を選択してください。",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.integrationSettingsSectionTitle": "統合設定",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.noConfigOptionsMessage": "構成するものがありません",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.packageConfigDescriptionInputLabel": "説明",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.packageConfigNameInputLabel": "統合名",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.packageConfigNamespaceInputLabel": "名前空間",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.showStreamsAriaLabel": "{type}入力を表示",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.toggleAdvancedOptionsButtonText": "高度なオプション",
-    "xpack.ingestManager.createPackageConfig.stepConfigurePackageConfigTitle": "統合の構成",
-    "xpack.ingestManager.createPackageConfig.stepSelectAgentConfigTitle": "エージェント構成を選択する",
-    "xpack.ingestManager.createPackageConfig.StepSelectConfig.addButton": "新しいエージェント構成",
-    "xpack.ingestManager.createPackageConfig.StepSelectConfig.agentConfigAgentsCountText": "{count, plural, one {# エージェント} other {# エージェント}}",
-    "xpack.ingestManager.createPackageConfig.StepSelectConfig.errorLoadingAgentConfigsTitle": "エージェント構成の読み込みエラー",
-    "xpack.ingestManager.createPackageConfig.StepSelectConfig.errorLoadingPackageTitle": "パッケージ情報の読み込みエラー",
-    "xpack.ingestManager.createPackageConfig.StepSelectConfig.errorLoadingSelectedAgentConfigTitle": "選択したエージェント構成の読み込みエラー",
-    "xpack.ingestManager.createPackageConfig.stepSelectPackage.errorLoadingConfigTitle": "エージェント構成情報の読み込みエラー",
-    "xpack.ingestManager.createPackageConfig.stepSelectPackage.errorLoadingPackagesTitle": "統合の読み込みエラー",
-    "xpack.ingestManager.createPackageConfig.stepSelectPackage.errorLoadingSelectedPackageTitle": "選択した統合の読み込みエラー",
-    "xpack.ingestManager.createPackageConfig.stepSelectPackage.filterPackagesInputPlaceholder": "統合を検索",
-    "xpack.ingestManager.createPackageConfig.stepSelectPackageTitle": "統合を選択",
+    "xpack.ingestManager.policyDetails.addPackagePolicyButtonText": "統合の追加",
+    "xpack.ingestManager.policyDetails.policyDetailsTitle": "構成「{id}」",
+    "xpack.ingestManager.policyDetails.policyNotFoundErrorTitle": "構成「{id}」が見つかりません",
+    "xpack.ingestManager.policyDetails.packagePoliciesTable.actionsColumnTitle": "アクション",
+    "xpack.ingestManager.policyDetails.packagePoliciesTable.deleteActionTitle": "統合の削除",
+    "xpack.ingestManager.policyDetails.packagePoliciesTable.descriptionColumnTitle": "説明",
+    "xpack.ingestManager.policyDetails.packagePoliciesTable.editActionTitle": "統合の編集",
+    "xpack.ingestManager.policyDetails.packagePoliciesTable.nameColumnTitle": "名前",
+    "xpack.ingestManager.policyDetails.packagePoliciesTable.namespaceColumnTitle": "名前空間",
+    "xpack.ingestManager.policyDetails.packagePoliciesTable.packageNameColumnTitle": "統合",
+    "xpack.ingestManager.policyDetails.subTabs.packagePoliciesTabText": "統合",
+    "xpack.ingestManager.policyDetails.subTabs.settingsTabText": "設定",
+    "xpack.ingestManager.policyDetails.summary.lastUpdated": "最終更新日:",
+    "xpack.ingestManager.policyDetails.summary.integrations": "統合",
+    "xpack.ingestManager.policyDetails.summary.revision": "リビジョン",
+    "xpack.ingestManager.policyDetails.summary.usedBy": "使用者",
+    "xpack.ingestManager.policyDetails.unexceptedErrorTitle": "構成を読み込む間にエラーが発生しました",
+    "xpack.ingestManager.policyDetails.viewAgentListTitle": "すべてのエージェント構成を表示",
+    "xpack.ingestManager.policyDetails.yamlDownloadButtonLabel": "構成のダウンロード",
+    "xpack.ingestManager.policyDetails.yamlFlyoutCloseButtonLabel": "閉じる",
+    "xpack.ingestManager.policyDetails.yamlflyoutTitleWithName": "「{name}」エージェント構成の編集",
+    "xpack.ingestManager.policyDetails.yamlflyoutTitleWithoutName": "エージェント構成",
+    "xpack.ingestManager.policyDetailsPackagePolicies.createFirstButtonText": "統合の追加",
+    "xpack.ingestManager.policyDetailsPackagePolicies.createFirstMessage": "この構成にはまだ統合がありません。",
+    "xpack.ingestManager.policyDetailsPackagePolicies.createFirstTitle": "最初の統合を追加",
+    "xpack.ingestManager.policyForm.deletePolicyActionText": "構成を削除",
+    "xpack.ingestManager.policyForm.deletePolicyGroupDescription": "既存のデータは削除されません。",
+    "xpack.ingestManager.policyForm.deletePolicyGroupTitle": "構成を削除",
+    "xpack.ingestManager.policyForm.generalSettingsGroupDescription": "エージェント構成の名前と説明を選択してください。",
+    "xpack.ingestManager.policyForm.generalSettingsGroupTitle": "一般設定",
+    "xpack.ingestManager.policyForm.unableToDeleteDefaultPolicyText": "既定の構成は削除できません。",
+    "xpack.ingestManager.copyAgentPolicy.confirmModal.cancelButtonLabel": "キャンセル",
+    "xpack.ingestManager.copyAgentPolicy.confirmModal.confirmButtonLabel": "構成をコピー",
+    "xpack.ingestManager.copyAgentPolicy.confirmModal.copyPolicyPrompt": "新しいエージェント構成の名前と説明を選択してください。",
+    "xpack.ingestManager.copyAgentPolicy.confirmModal.copyPolicyTitle": "「{name}」エージェント構成をコピー",
+    "xpack.ingestManager.copyAgentPolicy.confirmModal.defaultNewPolicyName": "{name}（コピー）",
+    "xpack.ingestManager.copyAgentPolicy.confirmModal.newDescriptionLabel": "説明",
+    "xpack.ingestManager.copyAgentPolicy.confirmModal.newNameLabel": "新しい構成名",
+    "xpack.ingestManager.copyAgentPolicy.failureNotificationTitle": "エージェント構成「{id}」のコピーエラー",
+    "xpack.ingestManager.copyAgentPolicy.fatalErrorNotificationTitle": "エージェント構成のコピーエラー",
+    "xpack.ingestManager.copyAgentPolicy.successNotificationTitle": "エージェント構成がコピーされました",
+    "xpack.ingestManager.createAgentPolicy.cancelButtonLabel": "キャンセル",
+    "xpack.ingestManager.createAgentPolicy.errorNotificationTitle": "エージェント構成を作成できません",
+    "xpack.ingestManager.createAgentPolicy.flyoutTitle": "エージェント構成を作成",
+    "xpack.ingestManager.createAgentPolicy.flyoutTitleDescription": "エージェント構成は、エージェントのグループ全体にわたる設定を管理する目的で使用されます。エージェント構成に統合を追加すると、エージェントで収集するデータを指定できます。エージェント構成の編集時には、フリートを使用して、指定したエージェントのグループに更新をデプロイできます。",
+    "xpack.ingestManager.createAgentPolicy.submitButtonLabel": "エージェント構成を作成",
+    "xpack.ingestManager.createAgentPolicy.successNotificationTitle": "エージェント構成「{name}」を作成しました",
+    "xpack.ingestManager.createPackagePolicy.addedNotificationMessage": "フリートは'{agentPolicyName}'構成で使用されているすべてのエージェントに更新をデプロイします。",
+    "xpack.ingestManager.createPackagePolicy.addedNotificationTitle": "正常に「{packagePolicyName}」を追加しました",
+    "xpack.ingestManager.createPackagePolicy.agentPolicyNameLabel": "エージェント構成",
+    "xpack.ingestManager.createPackagePolicy.cancelButton": "キャンセル",
+    "xpack.ingestManager.createPackagePolicy.cancelLinkText": "キャンセル",
+    "xpack.ingestManager.createPackagePolicy.errorOnSaveText": "統合構成にはエラーがあります。保存前に修正してください。",
+    "xpack.ingestManager.createPackagePolicy.pageDescriptionfromPolicy": "選択したエージェント構成の統合を構成します。",
+    "xpack.ingestManager.createPackagePolicy.pageDescriptionfromPackage": "次の手順に従い、この統合をエージェント構成に追加します。",
+    "xpack.ingestManager.createPackagePolicy.pageTitle": "統合の追加",
+    "xpack.ingestManager.createPackagePolicy.pageTitleWithPackageName": "{packageName}統合の追加",
+    "xpack.ingestManager.createPackagePolicy.saveButton": "統合の保存",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.advancedOptionsToggleLinkText": "高度なオプション",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.errorCountText": "{count, plural, one {件のエラー} other {件のエラー}}",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.hideStreamsAriaLabel": "{type}入力を非表示",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.inputSettingsDescription": "次の設定は以下のすべての入力に適用されます。",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.inputSettingsTitle": "設定",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.inputVarFieldOptionalLabel": "オプション",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.integrationSettingsSectionDescription": "この統合の使用方法を識別できるように、名前と説明を選択してください。",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.integrationSettingsSectionTitle": "統合設定",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.noPolicyOptionsMessage": "構成するものがありません",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.packagePolicyDescriptionInputLabel": "説明",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.packagePolicyNameInputLabel": "統合名",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.packagePolicyNamespaceInputLabel": "名前空間",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.showStreamsAriaLabel": "{type}入力を表示",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.toggleAdvancedOptionsButtonText": "高度なオプション",
+    "xpack.ingestManager.createPackagePolicy.stepConfigurePackagePolicyTitle": "統合の構成",
+    "xpack.ingestManager.createPackagePolicy.stepSelectAgentPolicyTitle": "エージェント構成を選択する",
+    "xpack.ingestManager.createPackagePolicy.StepSelectPolicy.addButton": "新しいエージェント構成",
+    "xpack.ingestManager.createPackagePolicy.StepSelectPolicy.agentPolicyAgentsCountText": "{count, plural, one {# エージェント} other {# エージェント}}",
+    "xpack.ingestManager.createPackagePolicy.StepSelectPolicy.errorLoadingAgentPoliciesTitle": "エージェント構成の読み込みエラー",
+    "xpack.ingestManager.createPackagePolicy.StepSelectPolicy.errorLoadingPackageTitle": "パッケージ情報の読み込みエラー",
+    "xpack.ingestManager.createPackagePolicy.StepSelectPolicy.errorLoadingSelectedAgentPolicyTitle": "選択したエージェント構成の読み込みエラー",
+    "xpack.ingestManager.createPackagePolicy.stepSelectPackage.errorLoadingPolicyTitle": "エージェント構成情報の読み込みエラー",
+    "xpack.ingestManager.createPackagePolicy.stepSelectPackage.errorLoadingPackagesTitle": "統合の読み込みエラー",
+    "xpack.ingestManager.createPackagePolicy.stepSelectPackage.errorLoadingSelectedPackageTitle": "選択した統合の読み込みエラー",
+    "xpack.ingestManager.createPackagePolicy.stepSelectPackage.filterPackagesInputPlaceholder": "統合を検索",
+    "xpack.ingestManager.createPackagePolicy.stepSelectPackageTitle": "統合を選択",
     "xpack.ingestManager.dataStreamList.actionsColumnTitle": "アクション",
     "xpack.ingestManager.dataStreamList.datasetColumnTitle": "データセット",
     "xpack.ingestManager.dataStreamList.integrationColumnTitle": "統合",
@@ -9412,73 +9412,73 @@
     "xpack.ingestManager.dataStreamList.viewDashboardsActionText": "ダッシュボードを表示",
     "xpack.ingestManager.dataStreamList.viewDashboardsPanelTitle": "ダッシュボードを表示",
     "xpack.ingestManager.defaultSearchPlaceholderText": "検索",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.affectedAgentsMessage": "{agentsCount, plural, one {# エージェントは} other {# エージェントは}}このエージェント構成に割り当てられました。この構成を削除する前に、これらのエージェントの割り当てを解除します。",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.affectedAgentsTitle": "使用中の構成",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.cancelButtonLabel": "キャンセル",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.confirmButtonLabel": "構成を削除",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.deleteConfigTitle": "このエージェント構成を削除しますか？",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.irreversibleMessage": "この操作は元に戻すことができません。",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.loadingAgentsCountMessage": "影響があるエージェントの数を確認中...",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.loadingButtonLabel": "読み込み中...",
-    "xpack.ingestManager.deleteAgentConfig.failureSingleNotificationTitle": "エージェント構成「{id}」の削除エラー",
-    "xpack.ingestManager.deleteAgentConfig.fatalErrorNotificationTitle": "エージェント構成の削除エラー",
-    "xpack.ingestManager.deleteAgentConfig.successSingleNotificationTitle": "エージェント構成「{id}」を削除しました",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.affectedAgentsMessage": "{agentConfigName} が一部のエージェントですでに使用されていることをフリートが検出しました。",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.affectedAgentsTitle": "このアクションは {agentsCount} {agentsCount, plural, one {# エージェント} other {# エージェント}}に影響します",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.cancelButtonLabel": "キャンセル",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.confirmButtonLabel": "{agentConfigsCount, plural, one {個の統合} other {個の統合}}を削除",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.deleteMultipleTitle": "{count, plural, one {個の統合} other {個の統合}}を削除しますか?",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.generalMessage": "このアクションは元に戻せません。続行していいですか？",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.loadingAgentsCountMessage": "影響があるエージェントを確認中...",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.loadingButtonLabel": "読み込み中...",
-    "xpack.ingestManager.deletePackageConfig.failureMultipleNotificationTitle": "{count}個の統合の削除エラー",
-    "xpack.ingestManager.deletePackageConfig.failureSingleNotificationTitle": "統合「{id}」の削除エラー",
-    "xpack.ingestManager.deletePackageConfig.fatalErrorNotificationTitle": "統合の削除エラー",
-    "xpack.ingestManager.deletePackageConfig.successMultipleNotificationTitle": "{count}個の統合を削除しました",
-    "xpack.ingestManager.deletePackageConfig.successSingleNotificationTitle": "統合「{id}」を削除しました",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.affectedAgentsMessage": "{agentsCount, plural, one {# エージェントは} other {# エージェントは}}このエージェント構成に割り当てられました。この構成を削除する前に、これらのエージェントの割り当てを解除します。",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.affectedAgentsTitle": "使用中の構成",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.cancelButtonLabel": "キャンセル",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.confirmButtonLabel": "構成を削除",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.deletePolicyTitle": "このエージェント構成を削除しますか？",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.irreversibleMessage": "この操作は元に戻すことができません。",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.loadingAgentsCountMessage": "影響があるエージェントの数を確認中...",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.loadingButtonLabel": "読み込み中...",
+    "xpack.ingestManager.deleteAgentPolicy.failureSingleNotificationTitle": "エージェント構成「{id}」の削除エラー",
+    "xpack.ingestManager.deleteAgentPolicy.fatalErrorNotificationTitle": "エージェント構成の削除エラー",
+    "xpack.ingestManager.deleteAgentPolicy.successSingleNotificationTitle": "エージェント構成「{id}」を削除しました",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.affectedAgentsMessage": "{agentPolicyName} が一部のエージェントですでに使用されていることをフリートが検出しました。",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.affectedAgentsTitle": "このアクションは {agentsCount} {agentsCount, plural, one {# エージェント} other {# エージェント}}に影響します",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.cancelButtonLabel": "キャンセル",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.confirmButtonLabel": "{agentPoliciesCount, plural, one {個の統合} other {個の統合}}を削除",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.deleteMultipleTitle": "{count, plural, one {個の統合} other {個の統合}}を削除しますか?",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.generalMessage": "このアクションは元に戻せません。続行していいですか？",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.loadingAgentsCountMessage": "影響があるエージェントを確認中...",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.loadingButtonLabel": "読み込み中...",
+    "xpack.ingestManager.deletePackagePolicy.failureMultipleNotificationTitle": "{count}個の統合の削除エラー",
+    "xpack.ingestManager.deletePackagePolicy.failureSingleNotificationTitle": "統合「{id}」の削除エラー",
+    "xpack.ingestManager.deletePackagePolicy.fatalErrorNotificationTitle": "統合の削除エラー",
+    "xpack.ingestManager.deletePackagePolicy.successMultipleNotificationTitle": "{count}個の統合を削除しました",
+    "xpack.ingestManager.deletePackagePolicy.successSingleNotificationTitle": "統合「{id}」を削除しました",
     "xpack.ingestManager.disabledSecurityDescription": "Elastic Fleet を使用するには、Kibana と Elasticsearch でセキュリティを有効にする必要があります。",
     "xpack.ingestManager.disabledSecurityTitle": "セキュリティが有効ではありません",
-    "xpack.ingestManager.editAgentConfig.cancelButtonText": "キャンセル",
-    "xpack.ingestManager.editAgentConfig.errorNotificationTitle": "エージェント構成を作成できません",
-    "xpack.ingestManager.editAgentConfig.saveButtonText": "変更を保存",
-    "xpack.ingestManager.editAgentConfig.savingButtonText": "保存中…",
-    "xpack.ingestManager.editAgentConfig.successNotificationTitle": "正常に'{name}'設定を更新しました",
-    "xpack.ingestManager.editAgentConfig.unsavedChangesText": "保存されていない変更があります",
-    "xpack.ingestManager.editPackageConfig.cancelButton": "キャンセル",
-    "xpack.ingestManager.editPackageConfig.errorLoadingDataMessage": "この統合情報の読み込みエラーが発生しました",
-    "xpack.ingestManager.editPackageConfig.errorLoadingDataTitle": "データの読み込み中にエラーが発生",
-    "xpack.ingestManager.editPackageConfig.failedConflictNotificationMessage": "データが最新ではありません。最新の構成を取得するには、ページを更新してください。",
-    "xpack.ingestManager.editPackageConfig.failedNotificationTitle": "「{packageConfigName}」の更新エラー",
-    "xpack.ingestManager.editPackageConfig.pageDescription": "統合設定を修正し、選択したエージェント構成に変更をデプロイします。",
-    "xpack.ingestManager.editPackageConfig.pageTitle": "統合の編集",
-    "xpack.ingestManager.editPackageConfig.pageTitleWithPackageName": "{packageName}統合の編集",
-    "xpack.ingestManager.editPackageConfig.saveButton": "統合の保存",
-    "xpack.ingestManager.editPackageConfig.updatedNotificationMessage": "フリートは'{agentConfigName}'構成で使用されているすべてのエージェントに更新をデプロイします。",
-    "xpack.ingestManager.editPackageConfig.updatedNotificationTitle": "正常に「{packageConfigName}」を更新しました",
+    "xpack.ingestManager.editAgentPolicy.cancelButtonText": "キャンセル",
+    "xpack.ingestManager.editAgentPolicy.errorNotificationTitle": "エージェント構成を作成できません",
+    "xpack.ingestManager.editAgentPolicy.saveButtonText": "変更を保存",
+    "xpack.ingestManager.editAgentPolicy.savingButtonText": "保存中…",
+    "xpack.ingestManager.editAgentPolicy.successNotificationTitle": "正常に'{name}'設定を更新しました",
+    "xpack.ingestManager.editAgentPolicy.unsavedChangesText": "保存されていない変更があります",
+    "xpack.ingestManager.editPackagePolicy.cancelButton": "キャンセル",
+    "xpack.ingestManager.editPackagePolicy.errorLoadingDataMessage": "この統合情報の読み込みエラーが発生しました",
+    "xpack.ingestManager.editPackagePolicy.errorLoadingDataTitle": "データの読み込み中にエラーが発生",
+    "xpack.ingestManager.editPackagePolicy.failedConflictNotificationMessage": "データが最新ではありません。最新の構成を取得するには、ページを更新してください。",
+    "xpack.ingestManager.editPackagePolicy.failedNotificationTitle": "「{packagePolicyName}」の更新エラー",
+    "xpack.ingestManager.editPackagePolicy.pageDescription": "統合設定を修正し、選択したエージェント構成に変更をデプロイします。",
+    "xpack.ingestManager.editPackagePolicy.pageTitle": "統合の編集",
+    "xpack.ingestManager.editPackagePolicy.pageTitleWithPackageName": "{packageName}統合の編集",
+    "xpack.ingestManager.editPackagePolicy.saveButton": "統合の保存",
+    "xpack.ingestManager.editPackagePolicy.updatedNotificationMessage": "フリートは'{agentPolicyName}'構成で使用されているすべてのエージェントに更新をデプロイします。",
+    "xpack.ingestManager.editPackagePolicy.updatedNotificationTitle": "正常に「{packagePolicyName}」を更新しました",
     "xpack.ingestManager.enrollemntAPIKeyList.emptyMessage": "登録トークンが見つかりません。",
     "xpack.ingestManager.enrollemntAPIKeyList.loadingTokensMessage": "登録トークンを読み込んでいます...",
-    "xpack.ingestManager.enrollmentStepAgentConfig.configSelectAriaLabel": "エージェント構成",
-    "xpack.ingestManager.enrollmentStepAgentConfig.configSelectLabel": "エージェント構成",
-    "xpack.ingestManager.enrollmentStepAgentConfig.enrollmentTokenSelectLabel": "登録トークン",
-    "xpack.ingestManager.enrollmentStepAgentConfig.showAuthenticationSettingsButton": "認証設定",
+    "xpack.ingestManager.enrollmentStepAgentPolicy.policySelectAriaLabel": "エージェント構成",
+    "xpack.ingestManager.enrollmentStepAgentPolicy.policySelectLabel": "エージェント構成",
+    "xpack.ingestManager.enrollmentStepAgentPolicy.enrollmentTokenSelectLabel": "登録トークン",
+    "xpack.ingestManager.enrollmentStepAgentPolicy.showAuthenticationSettingsButton": "認証設定",
     "xpack.ingestManager.enrollmentTokenDeleteModal.cancelButton": "キャンセル",
     "xpack.ingestManager.enrollmentTokenDeleteModal.deleteButton": "削除",
     "xpack.ingestManager.enrollmentTokenDeleteModal.description": "{keyName}を削除してよろしいですか？",
     "xpack.ingestManager.enrollmentTokenDeleteModal.title": "登録トークンを削除",
     "xpack.ingestManager.enrollmentTokensList.actionsTitle": "アクション",
     "xpack.ingestManager.enrollmentTokensList.activeTitle": "アクティブ",
-    "xpack.ingestManager.enrollmentTokensList.configTitle": "エージェント構成",
+    "xpack.ingestManager.enrollmentTokensList.policyTitle": "エージェント構成",
     "xpack.ingestManager.enrollmentTokensList.createdAtTitle": "作成日時",
     "xpack.ingestManager.enrollmentTokensList.nameTitle": "名前",
     "xpack.ingestManager.enrollmentTokensList.newKeyButton": "新しい登録トークン",
     "xpack.ingestManager.enrollmentTokensList.pageDescription": "これは、エージェントを登録するために使用できる登録トークンのリストです。",
     "xpack.ingestManager.enrollmentTokensList.secretTitle": "シークレット",
-    "xpack.ingestManager.epm.addPackageConfigButtonText": "{packageName}の追加",
+    "xpack.ingestManager.epm.addPackagePolicyButtonText": "{packageName}の追加",
     "xpack.ingestManager.epm.browseAllButtonText": "すべての統合を参照",
     "xpack.ingestManager.epm.illustrationAltText": "統合の例",
     "xpack.ingestManager.epm.loadingIntegrationErrorTitle": "統合詳細の読み込みエラー",
     "xpack.ingestManager.epm.packageDetailsNav.overviewLinkText": "概要",
-    "xpack.ingestManager.epm.packageDetailsNav.packageConfigsLinkText": "使用",
+    "xpack.ingestManager.epm.packageDetailsNav.packagePoliciesLinkText": "使用",
     "xpack.ingestManager.epm.packageDetailsNav.settingsLinkText": "設定",
     "xpack.ingestManager.epm.pageSubtitle": "一般的なアプリやサービスの統合を参照する",
     "xpack.ingestManager.epm.pageTitle": "統合",
@@ -9557,7 +9557,7 @@
     "xpack.ingestManager.metadataForm.submitButtonText": "追加",
     "xpack.ingestManager.metadataForm.valueLabel": "値",
     "xpack.ingestManager.newEnrollmentKey.cancelButtonLabel": "キャンセル",
-    "xpack.ingestManager.newEnrollmentKey.configLabel": "構成",
+    "xpack.ingestManager.newEnrollmentKey.policyLabel": "構成",
     "xpack.ingestManager.newEnrollmentKey.flyoutTitle": "新しい登録トークンを作成",
     "xpack.ingestManager.newEnrollmentKey.keyCreatedToasts": "登録トークンが作成されました。",
     "xpack.ingestManager.newEnrollmentKey.nameLabel": "名前",
@@ -9568,17 +9568,17 @@
     "xpack.ingestManager.overviewAgentErrorTitle": "エラー",
     "xpack.ingestManager.overviewAgentOfflineTitle": "オフライン",
     "xpack.ingestManager.overviewAgentTotalTitle": "合計エージェント数",
-    "xpack.ingestManager.overviewConfigTotalTitle": "合計利用可能数",
+    "xpack.ingestManager.overviewPolicyTotalTitle": "合計利用可能数",
     "xpack.ingestManager.overviewDatastreamNamespacesTitle": "名前空間",
     "xpack.ingestManager.overviewDatastreamSizeTitle": "合計サイズ",
     "xpack.ingestManager.overviewDatastreamTotalTitle": "データセット",
     "xpack.ingestManager.overviewIntegrationsInstalledTitle": "インストール済み",
     "xpack.ingestManager.overviewIntegrationsTotalTitle": "合計利用可能数",
     "xpack.ingestManager.overviewIntegrationsUpdatesAvailableTitle": "更新が可能です",
-    "xpack.ingestManager.overviewPackageConfigTitle": "構成された統合",
-    "xpack.ingestManager.overviewPageConfigurationsPanelAction": "構成を表示",
-    "xpack.ingestManager.overviewPageConfigurationsPanelTitle": "エージェント構成",
-    "xpack.ingestManager.overviewPageConfigurationsPanelTooltip": "エージェント構成を使用すると、エージェントが収集するデータを管理できます。",
+    "xpack.ingestManager.overviewPackagePolicyTitle": "構成された統合",
+    "xpack.ingestManager.overviewPagePoliciesPanelAction": "構成を表示",
+    "xpack.ingestManager.overviewPagePoliciesPanelTitle": "エージェント構成",
+    "xpack.ingestManager.overviewPagePoliciesPanelTooltip": "エージェント構成を使用すると、エージェントが収集するデータを管理できます。",
     "xpack.ingestManager.overviewPageDataStreamsPanelAction": "データセットを表示",
     "xpack.ingestManager.overviewPageDataStreamsPanelTitle": "データセット",
     "xpack.ingestManager.overviewPageDataStreamsPanelTooltip": "エージェントが収集するデータはさまざまなデータセットに整理されます。",
@@ -9591,11 +9591,11 @@
     "xpack.ingestManager.overviewPageIntegrationsPanelTooltip": "Elastic Stackの統合を参照し、インストールします。統合をエージェント構成に追加し、データの送信を開始します。",
     "xpack.ingestManager.overviewPageSubtitle": "Elasticエージェントおよびエージェント構成の集中管理。",
     "xpack.ingestManager.overviewPageTitle": "Ingest Manager",
-    "xpack.ingestManager.packageConfigValidation.invalidArrayErrorMessage": "無効なフォーマット",
-    "xpack.ingestManager.packageConfigValidation.invalidYamlFormatErrorMessage": "YAML形式が無効です",
-    "xpack.ingestManager.packageConfigValidation.nameRequiredErrorMessage": "名前が必要です",
-    "xpack.ingestManager.packageConfigValidation.namespaceRequiredErrorMessage": "ネームスペースが必要です",
-    "xpack.ingestManager.packageConfigValidation.requiredErrorMessage": "{fieldName}が必要です",
+    "xpack.ingestManager.packagePolicyValidation.invalidArrayErrorMessage": "無効なフォーマット",
+    "xpack.ingestManager.packagePolicyValidation.invalidYamlFormatErrorMessage": "YAML形式が無効です",
+    "xpack.ingestManager.packagePolicyValidation.nameRequiredErrorMessage": "名前が必要です",
+    "xpack.ingestManager.packagePolicyValidation.namespaceRequiredErrorMessage": "ネームスペースが必要です",
+    "xpack.ingestManager.packagePolicyValidation.requiredErrorMessage": "{fieldName}が必要です",
     "xpack.ingestManager.permissionDeniedErrorMessage": "Ingest Managerにアクセスする権限がありません。Ingest Managerには{roleName}権限が必要です。",
     "xpack.ingestManager.permissionDeniedErrorTitle": "パーミッションが拒否されました",
     "xpack.ingestManager.permissionsRequestErrorMessageDescription": "Ingest Managerアクセス権の確認中に問題が発生しました",
@@ -16248,7 +16248,7 @@
     "xpack.securitySolution.endpoint.list.stepOneTitle": "ホストの保護で使用するポリシーを選択",
     "xpack.securitySolution.endpoint.list.stepTwo": "開始するために必要なコマンドが提供されます。",
     "xpack.securitySolution.endpoint.list.stepTwoTitle": "Ingest Manager経由でEndpoint Securityによって有効にされたエージェントを登録",
-    "xpack.securitySolution.endpoint.ingestManager.createPackageConfig.endpointConfiguration": "このエージェント構成を使用するすべてのエージェントは基本ポリシーを使用します。セキュリティアプリでこのポリシーを変更できます。Fleetはこれらの変更をエージェントにデプロイします。",
+    "xpack.securitySolution.endpoint.ingestManager.createPackagePolicy.endpointConfiguration": "このエージェント構成を使用するすべてのエージェントは基本ポリシーを使用します。セキュリティアプリでこのポリシーを変更できます。Fleetはこれらの変更をエージェントにデプロイします。",
     "xpack.securitySolution.endpoint.ingestToastMessage": "Ingest Managerが設定中に失敗しました。",
     "xpack.securitySolution.endpoint.ingestToastTitle": "アプリを初期化できませんでした",
     "xpack.securitySolution.endpoint.policy.details.backToListTitle": "ポリシーリストに戻る",
@@ -16297,7 +16297,7 @@
     "xpack.securitySolution.endpoint.policyDetailType": "タイプ",
     "xpack.securitySolution.endpoint.policyList.actionButtonText": "Endpoint Securityを追加",
     "xpack.securitySolution.endpoint.policyList.actionMenu": "開く",
-    "xpack.securitySolution.endpoint.policyList.agentConfigAction": "エージェント構成を表示",
+    "xpack.securitySolution.endpoint.policyList.agentPolicyAction": "エージェント構成を表示",
     "xpack.securitySolution.endpoint.policyList.createdAt": "作成日時",
     "xpack.securitySolution.endpoint.policyList.createdBy": "作成者",
     "xpack.securitySolution.endpoint.policyList.createNewButton": "新しいポリシーを作成",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index d11ffde56f37f..c8b8fbeaa723e 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -9132,53 +9132,53 @@
     "xpack.infra.waffle.unableToSelectMetricErrorTitle": "无法选择指标选项或指标值。",
     "xpack.infra.waffleTime.autoRefreshButtonLabel": "自动刷新",
     "xpack.infra.waffleTime.stopRefreshingButtonLabel": "停止刷新",
-    "xpack.ingestManager.agentConfig.confirmModalCalloutDescription": "Fleet 检测到所选代理配置 {configName} 已由您的部分代理使用。由于此操作，Fleet 会将更新部署到使用此配置的所有代理。",
-    "xpack.ingestManager.agentConfig.confirmModalCancelButtonLabel": "取消",
-    "xpack.ingestManager.agentConfig.confirmModalConfirmButtonLabel": "保存并部署更改",
-    "xpack.ingestManager.agentConfig.confirmModalDescription": "此操作无法撤消。是否确定要继续？",
-    "xpack.ingestManager.agentConfig.confirmModalTitle": "保存并部署更改",
-    "xpack.ingestManager.agentConfig.linkedAgentCountText": "{count, plural, one {# 个代理} other {# 个代理}}",
-    "xpack.ingestManager.agentConfigActionMenu.buttonText": "操作",
-    "xpack.ingestManager.agentConfigActionMenu.copyConfigActionText": "复制配置",
-    "xpack.ingestManager.agentConfigActionMenu.enrollAgentActionText": "添加代理",
-    "xpack.ingestManager.agentConfigActionMenu.viewConfigText": "查看配置",
-    "xpack.ingestManager.agentConfigForm.advancedOptionsToggleLabel": "高级选项",
-    "xpack.ingestManager.agentConfigForm.descriptionFieldLabel": "描述",
-    "xpack.ingestManager.agentConfigForm.descriptionFieldPlaceholder": "此配置将如何使用？",
-    "xpack.ingestManager.agentConfigForm.monitoringDescription": "收集有关代理的数据，以排查和跟踪性能。",
-    "xpack.ingestManager.agentConfigForm.monitoringLabel": "代理监测",
-    "xpack.ingestManager.agentConfigForm.monitoringLogsFieldLabel": "收集代理日志",
-    "xpack.ingestManager.agentConfigForm.monitoringMetricsFieldLabel": "收集代理指标",
-    "xpack.ingestManager.agentConfigForm.nameFieldLabel": "名称",
-    "xpack.ingestManager.agentConfigForm.nameFieldPlaceholder": "选择名称",
-    "xpack.ingestManager.agentConfigForm.nameRequiredErrorMessage": "“代理配置名称”必填",
-    "xpack.ingestManager.agentConfigForm.namespaceFieldDescription": "将默认命名空间应用于使用此配置的集成。集成可以指定自己的命名空间。",
-    "xpack.ingestManager.agentConfigForm.namespaceFieldLabel": "默认命名空间",
-    "xpack.ingestManager.agentConfigForm.namespaceRequiredErrorMessage": "命名空间必填",
-    "xpack.ingestManager.agentConfigForm.systemMonitoringFieldLabel": "可选",
-    "xpack.ingestManager.agentConfigForm.systemMonitoringText": "收集系统指标",
-    "xpack.ingestManager.agentConfigForm.systemMonitoringTooltipText": "启用此选项可使用收集系统指标和信息的集成启动您的配置。",
-    "xpack.ingestManager.agentConfigList.actionsColumnTitle": "操作",
-    "xpack.ingestManager.agentConfigList.addButton": "创建代理配置",
-    "xpack.ingestManager.agentConfigList.agentsColumnTitle": "代理",
-    "xpack.ingestManager.agentConfigList.clearFiltersLinkText": "清除筛选",
-    "xpack.ingestManager.agentConfigList.descriptionColumnTitle": "描述",
-    "xpack.ingestManager.agentConfigList.loadingAgentConfigsMessage": "正在加载代理配置……",
-    "xpack.ingestManager.agentConfigList.nameColumnTitle": "名称",
-    "xpack.ingestManager.agentConfigList.noAgentConfigsPrompt": "无代理配置",
-    "xpack.ingestManager.agentConfigList.noFilteredAgentConfigsPrompt": "找不到代理配置。{clearFiltersLink}",
-    "xpack.ingestManager.agentConfigList.packageConfigsCountColumnTitle": "集成",
-    "xpack.ingestManager.agentConfigList.pageSubtitle": "使用代理配置管理代理和它们收集的数据。",
-    "xpack.ingestManager.agentConfigList.pageTitle": "代理配置",
-    "xpack.ingestManager.agentConfigList.reloadAgentConfigsButtonText": "重新加载",
-    "xpack.ingestManager.agentConfigList.revisionNumber": "修订 {revNumber}",
-    "xpack.ingestManager.agentConfigList.updatedOnColumnTitle": "最后更新时间",
+    "xpack.ingestManager.agentPolicy.confirmModalCalloutDescription": "Fleet 检测到所选代理配置 {policyName} 已由您的部分代理使用。由于此操作，Fleet 会将更新部署到使用此配置的所有代理。",
+    "xpack.ingestManager.agentPolicy.confirmModalCancelButtonLabel": "取消",
+    "xpack.ingestManager.agentPolicy.confirmModalConfirmButtonLabel": "保存并部署更改",
+    "xpack.ingestManager.agentPolicy.confirmModalDescription": "此操作无法撤消。是否确定要继续？",
+    "xpack.ingestManager.agentPolicy.confirmModalTitle": "保存并部署更改",
+    "xpack.ingestManager.agentPolicy.linkedAgentCountText": "{count, plural, one {# 个代理} other {# 个代理}}",
+    "xpack.ingestManager.agentPolicyActionMenu.buttonText": "操作",
+    "xpack.ingestManager.agentPolicyActionMenu.copyPolicyActionText": "复制配置",
+    "xpack.ingestManager.agentPolicyActionMenu.enrollAgentActionText": "添加代理",
+    "xpack.ingestManager.agentPolicyActionMenu.viewPolicyText": "查看配置",
+    "xpack.ingestManager.agentPolicyForm.advancedOptionsToggleLabel": "高级选项",
+    "xpack.ingestManager.agentPolicyForm.descriptionFieldLabel": "描述",
+    "xpack.ingestManager.agentPolicyForm.descriptionFieldPlaceholder": "此配置将如何使用？",
+    "xpack.ingestManager.agentPolicyForm.monitoringDescription": "收集有关代理的数据，以排查和跟踪性能。",
+    "xpack.ingestManager.agentPolicyForm.monitoringLabel": "代理监测",
+    "xpack.ingestManager.agentPolicyForm.monitoringLogsFieldLabel": "收集代理日志",
+    "xpack.ingestManager.agentPolicyForm.monitoringMetricsFieldLabel": "收集代理指标",
+    "xpack.ingestManager.agentPolicyForm.nameFieldLabel": "名称",
+    "xpack.ingestManager.agentPolicyForm.nameFieldPlaceholder": "选择名称",
+    "xpack.ingestManager.agentPolicyForm.nameRequiredErrorMessage": "“代理配置名称”必填",
+    "xpack.ingestManager.agentPolicyForm.namespaceFieldDescription": "将默认命名空间应用于使用此配置的集成。集成可以指定自己的命名空间。",
+    "xpack.ingestManager.agentPolicyForm.namespaceFieldLabel": "默认命名空间",
+    "xpack.ingestManager.agentPolicyForm.namespaceRequiredErrorMessage": "命名空间必填",
+    "xpack.ingestManager.agentPolicyForm.systemMonitoringFieldLabel": "可选",
+    "xpack.ingestManager.agentPolicyForm.systemMonitoringText": "收集系统指标",
+    "xpack.ingestManager.agentPolicyForm.systemMonitoringTooltipText": "启用此选项可使用收集系统指标和信息的集成启动您的配置。",
+    "xpack.ingestManager.agentPolicyList.actionsColumnTitle": "操作",
+    "xpack.ingestManager.agentPolicyList.addButton": "创建代理配置",
+    "xpack.ingestManager.agentPolicyList.agentsColumnTitle": "代理",
+    "xpack.ingestManager.agentPolicyList.clearFiltersLinkText": "清除筛选",
+    "xpack.ingestManager.agentPolicyList.descriptionColumnTitle": "描述",
+    "xpack.ingestManager.agentPolicyList.loadingAgentPoliciesMessage": "正在加载代理配置……",
+    "xpack.ingestManager.agentPolicyList.nameColumnTitle": "名称",
+    "xpack.ingestManager.agentPolicyList.noAgentPoliciesPrompt": "无代理配置",
+    "xpack.ingestManager.agentPolicyList.noFilteredAgentPoliciesPrompt": "找不到代理配置。{clearFiltersLink}",
+    "xpack.ingestManager.agentPolicyList.packagePoliciesCountColumnTitle": "集成",
+    "xpack.ingestManager.agentPolicyList.pageSubtitle": "使用代理配置管理代理和它们收集的数据。",
+    "xpack.ingestManager.agentPolicyList.pageTitle": "代理配置",
+    "xpack.ingestManager.agentPolicyList.reloadAgentPoliciesButtonText": "重新加载",
+    "xpack.ingestManager.agentPolicyList.revisionNumber": "修订 {revNumber}",
+    "xpack.ingestManager.agentPolicyList.updatedOnColumnTitle": "最后更新时间",
     "xpack.ingestManager.agentDetails.actionsButton": "操作",
-    "xpack.ingestManager.agentDetails.agentConfigurationLabel": "代理配置",
+    "xpack.ingestManager.agentDetails.agentPolicyLabel": "代理配置",
     "xpack.ingestManager.agentDetails.agentDetailsTitle": "代理“{id}”",
     "xpack.ingestManager.agentDetails.agentNotFoundErrorDescription": "找不到代理 ID {agentId}",
     "xpack.ingestManager.agentDetails.agentNotFoundErrorTitle": "未找到代理",
-    "xpack.ingestManager.agentDetails.configurationLabel": "配置",
+    "xpack.ingestManager.agentDetails.policyLabel": "配置",
     "xpack.ingestManager.agentDetails.hostIdLabel": "主机 ID",
     "xpack.ingestManager.agentDetails.hostNameLabel": "主机名",
     "xpack.ingestManager.agentDetails.localMetadataSectionSubtitle": "本地元数据",
@@ -9193,9 +9193,9 @@
     "xpack.ingestManager.agentDetails.viewAgentListTitle": "查看所有代理",
     "xpack.ingestManager.agentEnrollment.cancelButtonLabel": "取消",
     "xpack.ingestManager.agentEnrollment.continueButtonLabel": "继续",
-    "xpack.ingestManager.agentEnrollment.copyConfigurationButton": "复制到剪贴板",
+    "xpack.ingestManager.agentEnrollment.copyPolicyButton": "复制到剪贴板",
     "xpack.ingestManager.agentEnrollment.copyRunInstructionsButton": "复制到剪贴板",
-    "xpack.ingestManager.agentEnrollment.downloadConfigurationButton": "下载配置",
+    "xpack.ingestManager.agentEnrollment.downloadPolicyButton": "下载配置",
     "xpack.ingestManager.agentEnrollment.downloadDescription": "在主机计算机上下载 Elastic 代理。可以从 Elastic 代理下载页面访问代理二进制文件及其验证签名。",
     "xpack.ingestManager.agentEnrollment.downloadLink": "前往 elastic.co/downloads",
     "xpack.ingestManager.agentEnrollment.enrollFleetTabLabel": "注册到 Fleet",
@@ -9207,7 +9207,7 @@
     "xpack.ingestManager.agentEnrollment.standaloneDescription": "如果希望对以独立模式运行的代理进行配置更改，则需要手动更新。按照下面的说明下载并设置独立模式的 Elastic 代理。",
     "xpack.ingestManager.agentEnrollment.stepCheckForDataDescription": "启动代理后，代理应开始发送数据。您可以在采集管理器的数据集页面查看此数据。",
     "xpack.ingestManager.agentEnrollment.stepCheckForDataTitle": "检查数据",
-    "xpack.ingestManager.agentEnrollment.stepChooseAgentConfigTitle": "选择代理配置",
+    "xpack.ingestManager.agentEnrollment.stepChooseAgentPolicyTitle": "选择代理配置",
     "xpack.ingestManager.agentEnrollment.stepConfigureAgentDescription": "在安装 Elastic 代理的系统上复制此配置并将其放入名为 {fileName} 的文件中。切勿忘记修改配置文件中 {outputSection} 部分的{ESUsernameVariable} 和 {ESPasswordVariable}，以便其使用您的实际 Elasticsearch 凭据。",
     "xpack.ingestManager.agentEnrollment.stepConfigureAgentTitle": "配置代理",
     "xpack.ingestManager.agentEnrollment.stepDownloadAgentTitle": "下载 Elastic 代理",
@@ -9225,7 +9225,7 @@
     "xpack.ingestManager.agentEventsList.timestampColumnTitle": "时间戳",
     "xpack.ingestManager.agentEventsList.typeColumnTitle": "类型",
     "xpack.ingestManager.agentEventSubtype.acknowledgedLabel": "已确认",
-    "xpack.ingestManager.agentEventSubtype.configLabel": "配置",
+    "xpack.ingestManager.agentEventSubtype.policyLabel": "配置",
     "xpack.ingestManager.agentEventSubtype.dataDumpLabel": "数据转储",
     "xpack.ingestManager.agentEventSubtype.failedLabel": "失败",
     "xpack.ingestManager.agentEventSubtype.inProgressLabel": "进行中",
@@ -9251,8 +9251,8 @@
     "xpack.ingestManager.agentList.actionsColumnTitle": "操作",
     "xpack.ingestManager.agentList.addButton": "添加代理",
     "xpack.ingestManager.agentList.clearFiltersLinkText": "清除筛选",
-    "xpack.ingestManager.agentList.configColumnTitle": "代理配置",
-    "xpack.ingestManager.agentList.configFilterText": "代理配置",
+    "xpack.ingestManager.agentList.policyColumnTitle": "代理配置",
+    "xpack.ingestManager.agentList.policyFilterText": "代理配置",
     "xpack.ingestManager.agentList.enrollButton": "添加代理",
     "xpack.ingestManager.agentList.hostColumnTitle": "主机",
     "xpack.ingestManager.agentList.lastCheckinTitle": "上次活动",
@@ -9275,13 +9275,13 @@
     "xpack.ingestManager.agentListStatus.offlineLabel": "脱机",
     "xpack.ingestManager.agentListStatus.onlineLabel": "联机",
     "xpack.ingestManager.agentListStatus.totalLabel": "代理",
-    "xpack.ingestManager.agentReassignConfig.cancelButtonLabel": "取消",
-    "xpack.ingestManager.agentReassignConfig.configDescription": "选定代理配置将收集 {count, plural, one {{countValue} 个集成} other {{countValue} 个集成}}的数据：",
-    "xpack.ingestManager.agentReassignConfig.continueButtonLabel": "分配配置",
-    "xpack.ingestManager.agentReassignConfig.flyoutDescription": "选择要为选定代理分配的新代理配置。",
-    "xpack.ingestManager.agentReassignConfig.flyoutTitle": "分配新代理配置",
-    "xpack.ingestManager.agentReassignConfig.selectConfigLabel": "代理配置",
-    "xpack.ingestManager.agentReassignConfig.successSingleNotificationTitle": "代理配置已重新分配",
+    "xpack.ingestManager.agentReassignPolicy.cancelButtonLabel": "取消",
+    "xpack.ingestManager.agentReassignPolicy.policyDescription": "选定代理配置将收集 {count, plural, one {{countValue} 个集成} other {{countValue} 个集成}}的数据：",
+    "xpack.ingestManager.agentReassignPolicy.continueButtonLabel": "分配配置",
+    "xpack.ingestManager.agentReassignPolicy.flyoutDescription": "选择要为选定代理分配的新代理配置。",
+    "xpack.ingestManager.agentReassignPolicy.flyoutTitle": "分配新代理配置",
+    "xpack.ingestManager.agentReassignPolicy.selectPolicyLabel": "代理配置",
+    "xpack.ingestManager.agentReassignPolicy.successSingleNotificationTitle": "代理配置已重新分配",
     "xpack.ingestManager.alphaMessageDescription": "不推荐在生产环境中使用采集管理器。",
     "xpack.ingestManager.alphaMessageLinkText": "查看更多详情。",
     "xpack.ingestManager.alphaMessageTitle": "公测版",
@@ -9291,7 +9291,7 @@
     "xpack.ingestManager.alphaMessaging.forumLink": "讨论论坛",
     "xpack.ingestManager.alphaMessaging.introText": "采集管理器仍处于开发状态，不适用于生产环境。此公测版用于用户测试采集管理器和新 Elastic 代理并提供相关反馈。此插件不受支持 SLA 的约束。",
     "xpack.ingestManager.alphaMessging.closeFlyoutLabel": "关闭",
-    "xpack.ingestManager.appNavigation.configurationsLinkText": "配置",
+    "xpack.ingestManager.appNavigation.policiesLinkText": "配置",
     "xpack.ingestManager.appNavigation.dataStreamsLinkText": "数据集",
     "xpack.ingestManager.appNavigation.epmLinkText": "集成",
     "xpack.ingestManager.appNavigation.fleetLinkText": "Fleet",
@@ -9301,102 +9301,102 @@
     "xpack.ingestManager.appTitle": "Ingest Manager",
     "xpack.ingestManager.betaBadge.labelText": "公测版",
     "xpack.ingestManager.betaBadge.tooltipText": "不推荐在生产环境中使用此插件。请在我们讨论论坛中报告错误。",
-    "xpack.ingestManager.breadcrumbs.addPackageConfigPageTitle": "添加集成",
+    "xpack.ingestManager.breadcrumbs.addPackagePolicyPageTitle": "添加集成",
     "xpack.ingestManager.breadcrumbs.allIntegrationsPageTitle": "全部",
     "xpack.ingestManager.breadcrumbs.appTitle": "采集管理器",
-    "xpack.ingestManager.breadcrumbs.configurationsPageTitle": "配置",
+    "xpack.ingestManager.breadcrumbs.policiesPageTitle": "配置",
     "xpack.ingestManager.breadcrumbs.datastreamsPageTitle": "数据集",
-    "xpack.ingestManager.breadcrumbs.editPackageConfigPageTitle": "编辑集成",
+    "xpack.ingestManager.breadcrumbs.editPackagePolicyPageTitle": "编辑集成",
     "xpack.ingestManager.breadcrumbs.fleetAgentsPageTitle": "代理",
     "xpack.ingestManager.breadcrumbs.fleetEnrollmentTokensPageTitle": "注册令牌",
     "xpack.ingestManager.breadcrumbs.fleetPageTitle": "Fleet",
     "xpack.ingestManager.breadcrumbs.installedIntegrationsPageTitle": "已安装",
     "xpack.ingestManager.breadcrumbs.integrationsPageTitle": "集成",
     "xpack.ingestManager.breadcrumbs.overviewPageTitle": "概览",
-    "xpack.ingestManager.configDetails.addPackageConfigButtonText": "添加集成",
-    "xpack.ingestManager.configDetails.configDetailsTitle": "配置“{id}”",
-    "xpack.ingestManager.configDetails.configNotFoundErrorTitle": "未找到配置“{id}”",
-    "xpack.ingestManager.configDetails.packageConfigsTable.actionsColumnTitle": "操作",
-    "xpack.ingestManager.configDetails.packageConfigsTable.deleteActionTitle": "删除集成",
-    "xpack.ingestManager.configDetails.packageConfigsTable.descriptionColumnTitle": "描述",
-    "xpack.ingestManager.configDetails.packageConfigsTable.editActionTitle": "编辑集成",
-    "xpack.ingestManager.configDetails.packageConfigsTable.nameColumnTitle": "名称",
-    "xpack.ingestManager.configDetails.packageConfigsTable.namespaceColumnTitle": "命名空间",
-    "xpack.ingestManager.configDetails.packageConfigsTable.packageNameColumnTitle": "集成",
-    "xpack.ingestManager.configDetails.subTabs.packageConfigsTabText": "集成",
-    "xpack.ingestManager.configDetails.subTabs.settingsTabText": "设置",
-    "xpack.ingestManager.configDetails.summary.lastUpdated": "最后更新时间",
-    "xpack.ingestManager.configDetails.summary.package_configs": "集成",
-    "xpack.ingestManager.configDetails.summary.revision": "修订",
-    "xpack.ingestManager.configDetails.summary.usedBy": "使用者",
-    "xpack.ingestManager.configDetails.unexceptedErrorTitle": "加载配置时发生错误",
-    "xpack.ingestManager.configDetails.viewAgentListTitle": "查看所有代理配置",
-    "xpack.ingestManager.configDetails.yamlDownloadButtonLabel": "下载配置",
-    "xpack.ingestManager.configDetails.yamlFlyoutCloseButtonLabel": "关闭",
-    "xpack.ingestManager.configDetails.yamlflyoutTitleWithName": "“{name}”代理配置",
-    "xpack.ingestManager.configDetails.yamlflyoutTitleWithoutName": "代理配置",
-    "xpack.ingestManager.configDetailsPackageConfigs.createFirstButtonText": "添加集成",
-    "xpack.ingestManager.configDetailsPackageConfigs.createFirstMessage": "此配置尚未有任何集成。",
-    "xpack.ingestManager.configDetailsPackageConfigs.createFirstTitle": "添加您的首个集成",
-    "xpack.ingestManager.configForm.deleteConfigActionText": "删除配置",
-    "xpack.ingestManager.configForm.deleteConfigGroupDescription": "将不会删除现有数据。",
-    "xpack.ingestManager.configForm.deleteConfigGroupTitle": "删除配置",
-    "xpack.ingestManager.configForm.generalSettingsGroupDescription": "为您的代理配置选择名称和描述。",
-    "xpack.ingestManager.configForm.generalSettingsGroupTitle": "常规设置",
-    "xpack.ingestManager.configForm.unableToDeleteDefaultConfigText": "无法删除默认配置",
-    "xpack.ingestManager.copyAgentConfig.confirmModal.cancelButtonLabel": "取消",
-    "xpack.ingestManager.copyAgentConfig.confirmModal.confirmButtonLabel": "复制配置",
-    "xpack.ingestManager.copyAgentConfig.confirmModal.copyConfigPrompt": "为您的新代理配置选择名称和描述。",
-    "xpack.ingestManager.copyAgentConfig.confirmModal.copyConfigTitle": "复制“{name}”代理配置",
-    "xpack.ingestManager.copyAgentConfig.confirmModal.defaultNewConfigName": "{name}（副本）",
-    "xpack.ingestManager.copyAgentConfig.confirmModal.newDescriptionLabel": "描述",
-    "xpack.ingestManager.copyAgentConfig.confirmModal.newNameLabel": "新配置名称",
-    "xpack.ingestManager.copyAgentConfig.failureNotificationTitle": "复制代理配置“{id}”时出错",
-    "xpack.ingestManager.copyAgentConfig.fatalErrorNotificationTitle": "复制代理配置时出错",
-    "xpack.ingestManager.copyAgentConfig.successNotificationTitle": "代理配置已复制",
-    "xpack.ingestManager.createAgentConfig.cancelButtonLabel": "取消",
-    "xpack.ingestManager.createAgentConfig.errorNotificationTitle": "无法创建代理配置",
-    "xpack.ingestManager.createAgentConfig.flyoutTitle": "创建代理配置",
-    "xpack.ingestManager.createAgentConfig.flyoutTitleDescription": "代理配置用于管理整个代理组的设置。您可以将集成添加到代理配置以指定代理收集的数据。编辑代理配置时，可以使用 Fleet 将更新部署到指定的代理组。",
-    "xpack.ingestManager.createAgentConfig.submitButtonLabel": "创建代理配置",
-    "xpack.ingestManager.createAgentConfig.successNotificationTitle": "代理配置“{name}”已创建",
-    "xpack.ingestManager.createPackageConfig.addedNotificationMessage": "Fleet 会将更新部署到所有使用配置“{agentConfigName}”的代理",
-    "xpack.ingestManager.createPackageConfig.addedNotificationTitle": "已成功添加“{packageConfigName}”",
-    "xpack.ingestManager.createPackageConfig.agentConfigurationNameLabel": "代理配置",
-    "xpack.ingestManager.createPackageConfig.cancelButton": "取消",
-    "xpack.ingestManager.createPackageConfig.cancelLinkText": "取消",
-    "xpack.ingestManager.createPackageConfig.errorOnSaveText": "您的集成配置有错误。请在保存前进行修复。",
-    "xpack.ingestManager.createPackageConfig.pageDescriptionfromConfig": "配置选定代理配置的集成。",
-    "xpack.ingestManager.createPackageConfig.pageDescriptionfromPackage": "按照下面的说明将此集成添加到代理配置。",
-    "xpack.ingestManager.createPackageConfig.pageTitle": "添加集成",
-    "xpack.ingestManager.createPackageConfig.pageTitleWithPackageName": "添加 {packageName} 集成",
-    "xpack.ingestManager.createPackageConfig.saveButton": "保存集成",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.advancedOptionsToggleLinkText": "高级选项",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.errorCountText": "{count, plural, one {# 个错误} other {# 个错误}}",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.hideStreamsAriaLabel": "隐藏 {type} 输入",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.inputSettingsDescription": "以下设置适用于下面的所有输入。",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.inputSettingsTitle": "设置",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.inputVarFieldOptionalLabel": "可选",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.integrationSettingsSectionDescription": "选择有助于确定如何使用此集成的名称和描述。",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.integrationSettingsSectionTitle": "集成设置",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.noConfigOptionsMessage": "没有可配置的内容",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.packageConfigDescriptionInputLabel": "描述",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.packageConfigNameInputLabel": "集成名称",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.packageConfigNamespaceInputLabel": "命名空间",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.showStreamsAriaLabel": "显示 {type} 输入",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.toggleAdvancedOptionsButtonText": "高级选项",
-    "xpack.ingestManager.createPackageConfig.stepConfigurePackageConfigTitle": "配置集成",
-    "xpack.ingestManager.createPackageConfig.stepSelectAgentConfigTitle": "选择代理配置",
-    "xpack.ingestManager.createPackageConfig.StepSelectConfig.addButton": "新建代理配置",
-    "xpack.ingestManager.createPackageConfig.StepSelectConfig.agentConfigAgentsCountText": "{count, plural, one {# 个代理} other {# 个代理}}",
-    "xpack.ingestManager.createPackageConfig.StepSelectConfig.errorLoadingAgentConfigsTitle": "加载代理配置时出错",
-    "xpack.ingestManager.createPackageConfig.StepSelectConfig.errorLoadingPackageTitle": "加载软件包信息时出错",
-    "xpack.ingestManager.createPackageConfig.StepSelectConfig.errorLoadingSelectedAgentConfigTitle": "加载选定代理配置时出错",
-    "xpack.ingestManager.createPackageConfig.stepSelectPackage.errorLoadingConfigTitle": "加载代理配置信息时出错",
-    "xpack.ingestManager.createPackageConfig.stepSelectPackage.errorLoadingPackagesTitle": "加载集成时出错",
-    "xpack.ingestManager.createPackageConfig.stepSelectPackage.errorLoadingSelectedPackageTitle": "加载选定集成时出错",
-    "xpack.ingestManager.createPackageConfig.stepSelectPackage.filterPackagesInputPlaceholder": "搜索集成",
-    "xpack.ingestManager.createPackageConfig.stepSelectPackageTitle": "选择集成",
+    "xpack.ingestManager.policyDetails.addPackagePolicyButtonText": "添加集成",
+    "xpack.ingestManager.policyDetails.policyDetailsTitle": "配置“{id}”",
+    "xpack.ingestManager.policyDetails.policyNotFoundErrorTitle": "未找到配置“{id}”",
+    "xpack.ingestManager.policyDetails.packagePoliciesTable.actionsColumnTitle": "操作",
+    "xpack.ingestManager.policyDetails.packagePoliciesTable.deleteActionTitle": "删除集成",
+    "xpack.ingestManager.policyDetails.packagePoliciesTable.descriptionColumnTitle": "描述",
+    "xpack.ingestManager.policyDetails.packagePoliciesTable.editActionTitle": "编辑集成",
+    "xpack.ingestManager.policyDetails.packagePoliciesTable.nameColumnTitle": "名称",
+    "xpack.ingestManager.policyDetails.packagePoliciesTable.namespaceColumnTitle": "命名空间",
+    "xpack.ingestManager.policyDetails.packagePoliciesTable.packageNameColumnTitle": "集成",
+    "xpack.ingestManager.policyDetails.subTabs.packagePoliciesTabText": "集成",
+    "xpack.ingestManager.policyDetails.subTabs.settingsTabText": "设置",
+    "xpack.ingestManager.policyDetails.summary.lastUpdated": "最后更新时间",
+    "xpack.ingestManager.policyDetails.summary.integrations": "集成",
+    "xpack.ingestManager.policyDetails.summary.revision": "修订",
+    "xpack.ingestManager.policyDetails.summary.usedBy": "使用者",
+    "xpack.ingestManager.policyDetails.unexceptedErrorTitle": "加载配置时发生错误",
+    "xpack.ingestManager.policyDetails.viewAgentListTitle": "查看所有代理配置",
+    "xpack.ingestManager.policyDetails.yamlDownloadButtonLabel": "下载配置",
+    "xpack.ingestManager.policyDetails.yamlFlyoutCloseButtonLabel": "关闭",
+    "xpack.ingestManager.policyDetails.yamlflyoutTitleWithName": "“{name}”代理配置",
+    "xpack.ingestManager.policyDetails.yamlflyoutTitleWithoutName": "代理配置",
+    "xpack.ingestManager.policyDetailsPackagePolicies.createFirstButtonText": "添加集成",
+    "xpack.ingestManager.policyDetailsPackagePolicies.createFirstMessage": "此配置尚未有任何集成。",
+    "xpack.ingestManager.policyDetailsPackagePolicies.createFirstTitle": "添加您的首个集成",
+    "xpack.ingestManager.policyForm.deletePolicyActionText": "删除配置",
+    "xpack.ingestManager.policyForm.deletePolicyGroupDescription": "将不会删除现有数据。",
+    "xpack.ingestManager.policyForm.deletePolicyGroupTitle": "删除配置",
+    "xpack.ingestManager.policyForm.generalSettingsGroupDescription": "为您的代理配置选择名称和描述。",
+    "xpack.ingestManager.policyForm.generalSettingsGroupTitle": "常规设置",
+    "xpack.ingestManager.policyForm.unableToDeleteDefaultPolicyText": "无法删除默认配置",
+    "xpack.ingestManager.copyAgentPolicy.confirmModal.cancelButtonLabel": "取消",
+    "xpack.ingestManager.copyAgentPolicy.confirmModal.confirmButtonLabel": "复制配置",
+    "xpack.ingestManager.copyAgentPolicy.confirmModal.copyPolicyPrompt": "为您的新代理配置选择名称和描述。",
+    "xpack.ingestManager.copyAgentPolicy.confirmModal.copyPolicyTitle": "复制“{name}”代理配置",
+    "xpack.ingestManager.copyAgentPolicy.confirmModal.defaultNewPolicyName": "{name}（副本）",
+    "xpack.ingestManager.copyAgentPolicy.confirmModal.newDescriptionLabel": "描述",
+    "xpack.ingestManager.copyAgentPolicy.confirmModal.newNameLabel": "新配置名称",
+    "xpack.ingestManager.copyAgentPolicy.failureNotificationTitle": "复制代理配置“{id}”时出错",
+    "xpack.ingestManager.copyAgentPolicy.fatalErrorNotificationTitle": "复制代理配置时出错",
+    "xpack.ingestManager.copyAgentPolicy.successNotificationTitle": "代理配置已复制",
+    "xpack.ingestManager.createAgentPolicy.cancelButtonLabel": "取消",
+    "xpack.ingestManager.createAgentPolicy.errorNotificationTitle": "无法创建代理配置",
+    "xpack.ingestManager.createAgentPolicy.flyoutTitle": "创建代理配置",
+    "xpack.ingestManager.createAgentPolicy.flyoutTitleDescription": "代理配置用于管理整个代理组的设置。您可以将集成添加到代理配置以指定代理收集的数据。编辑代理配置时，可以使用 Fleet 将更新部署到指定的代理组。",
+    "xpack.ingestManager.createAgentPolicy.submitButtonLabel": "创建代理配置",
+    "xpack.ingestManager.createAgentPolicy.successNotificationTitle": "代理配置“{name}”已创建",
+    "xpack.ingestManager.createPackagePolicy.addedNotificationMessage": "Fleet 会将更新部署到所有使用配置“{agentPolicyName}”的代理",
+    "xpack.ingestManager.createPackagePolicy.addedNotificationTitle": "已成功添加“{packagePolicyName}”",
+    "xpack.ingestManager.createPackagePolicy.agentPolicyNameLabel": "代理配置",
+    "xpack.ingestManager.createPackagePolicy.cancelButton": "取消",
+    "xpack.ingestManager.createPackagePolicy.cancelLinkText": "取消",
+    "xpack.ingestManager.createPackagePolicy.errorOnSaveText": "您的集成配置有错误。请在保存前进行修复。",
+    "xpack.ingestManager.createPackagePolicy.pageDescriptionfromPolicy": "配置选定代理配置的集成。",
+    "xpack.ingestManager.createPackagePolicy.pageDescriptionfromPackage": "按照下面的说明将此集成添加到代理配置。",
+    "xpack.ingestManager.createPackagePolicy.pageTitle": "添加集成",
+    "xpack.ingestManager.createPackagePolicy.pageTitleWithPackageName": "添加 {packageName} 集成",
+    "xpack.ingestManager.createPackagePolicy.saveButton": "保存集成",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.advancedOptionsToggleLinkText": "高级选项",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.errorCountText": "{count, plural, one {# 个错误} other {# 个错误}}",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.hideStreamsAriaLabel": "隐藏 {type} 输入",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.inputSettingsDescription": "以下设置适用于下面的所有输入。",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.inputSettingsTitle": "设置",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.inputVarFieldOptionalLabel": "可选",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.integrationSettingsSectionDescription": "选择有助于确定如何使用此集成的名称和描述。",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.integrationSettingsSectionTitle": "集成设置",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.noPolicyOptionsMessage": "没有可配置的内容",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.packagePolicyDescriptionInputLabel": "描述",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.packagePolicyNameInputLabel": "集成名称",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.packagePolicyNamespaceInputLabel": "命名空间",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.showStreamsAriaLabel": "显示 {type} 输入",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.toggleAdvancedOptionsButtonText": "高级选项",
+    "xpack.ingestManager.createPackagePolicy.stepConfigurePackagePolicyTitle": "配置集成",
+    "xpack.ingestManager.createPackagePolicy.stepSelectAgentPolicyTitle": "选择代理配置",
+    "xpack.ingestManager.createPackagePolicy.StepSelectPolicy.addButton": "新建代理配置",
+    "xpack.ingestManager.createPackagePolicy.StepSelectPolicy.agentPolicyAgentsCountText": "{count, plural, one {# 个代理} other {# 个代理}}",
+    "xpack.ingestManager.createPackagePolicy.StepSelectPolicy.errorLoadingAgentPoliciesTitle": "加载代理配置时出错",
+    "xpack.ingestManager.createPackagePolicy.StepSelectPolicy.errorLoadingPackageTitle": "加载软件包信息时出错",
+    "xpack.ingestManager.createPackagePolicy.StepSelectPolicy.errorLoadingSelectedAgentPolicyTitle": "加载选定代理配置时出错",
+    "xpack.ingestManager.createPackagePolicy.stepSelectPackage.errorLoadingPolicyTitle": "加载代理配置信息时出错",
+    "xpack.ingestManager.createPackagePolicy.stepSelectPackage.errorLoadingPackagesTitle": "加载集成时出错",
+    "xpack.ingestManager.createPackagePolicy.stepSelectPackage.errorLoadingSelectedPackageTitle": "加载选定集成时出错",
+    "xpack.ingestManager.createPackagePolicy.stepSelectPackage.filterPackagesInputPlaceholder": "搜索集成",
+    "xpack.ingestManager.createPackagePolicy.stepSelectPackageTitle": "选择集成",
     "xpack.ingestManager.dataStreamList.actionsColumnTitle": "操作",
     "xpack.ingestManager.dataStreamList.datasetColumnTitle": "数据集",
     "xpack.ingestManager.dataStreamList.integrationColumnTitle": "集成",
@@ -9415,73 +9415,73 @@
     "xpack.ingestManager.dataStreamList.viewDashboardsActionText": "查看仪表板",
     "xpack.ingestManager.dataStreamList.viewDashboardsPanelTitle": "查看仪表板",
     "xpack.ingestManager.defaultSearchPlaceholderText": "搜索",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.affectedAgentsMessage": "{agentsCount, plural, one {# 个代理} other {# 个代理}}已分配给此代理配置。在删除此配置之前请取消分配这些代理。",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.affectedAgentsTitle": "配置已被用",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.cancelButtonLabel": "取消",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.confirmButtonLabel": "删除配置",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.deleteConfigTitle": "删除此代理配置？",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.irreversibleMessage": "此操作无法撤消。",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.loadingAgentsCountMessage": "正在检查受影响代理数量……",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.loadingButtonLabel": "正在加载……",
-    "xpack.ingestManager.deleteAgentConfig.failureSingleNotificationTitle": "删除代理配置“{id}”时出错",
-    "xpack.ingestManager.deleteAgentConfig.fatalErrorNotificationTitle": "删除代理配置时出错",
-    "xpack.ingestManager.deleteAgentConfig.successSingleNotificationTitle": "已删除代理配置“{id}”",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.affectedAgentsMessage": "Fleet 已检测到 {agentConfigName} 已由您的部分代理使用。",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.affectedAgentsTitle": "此操作将影响 {agentsCount} 个{agentsCount, plural, one {代理} other {代理}}。",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.cancelButtonLabel": "取消",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.confirmButtonLabel": "删除{agentConfigsCount, plural, one {集成} other {集成}}",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.deleteMultipleTitle": "删除{count, plural, one {集成} other {# 个集成}}？",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.generalMessage": "此操作无法撤消。是否确定要继续？",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.loadingAgentsCountMessage": "正在检查受影响的代理……",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.loadingButtonLabel": "正在加载……",
-    "xpack.ingestManager.deletePackageConfig.failureMultipleNotificationTitle": "删除 {count} 个集成时出错",
-    "xpack.ingestManager.deletePackageConfig.failureSingleNotificationTitle": "删除集成“{id}”时出错",
-    "xpack.ingestManager.deletePackageConfig.fatalErrorNotificationTitle": "删除集成时出错",
-    "xpack.ingestManager.deletePackageConfig.successMultipleNotificationTitle": "已删除 {count} 个集成",
-    "xpack.ingestManager.deletePackageConfig.successSingleNotificationTitle": "已删除集成“{id}”",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.affectedAgentsMessage": "{agentsCount, plural, one {# 个代理} other {# 个代理}}已分配给此代理配置。在删除此配置之前请取消分配这些代理。",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.affectedAgentsTitle": "配置已被用",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.cancelButtonLabel": "取消",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.confirmButtonLabel": "删除配置",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.deletePolicyTitle": "删除此代理配置？",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.irreversibleMessage": "此操作无法撤消。",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.loadingAgentsCountMessage": "正在检查受影响代理数量……",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.loadingButtonLabel": "正在加载……",
+    "xpack.ingestManager.deleteAgentPolicy.failureSingleNotificationTitle": "删除代理配置“{id}”时出错",
+    "xpack.ingestManager.deleteAgentPolicy.fatalErrorNotificationTitle": "删除代理配置时出错",
+    "xpack.ingestManager.deleteAgentPolicy.successSingleNotificationTitle": "已删除代理配置“{id}”",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.affectedAgentsMessage": "Fleet 已检测到 {agentPolicyName} 已由您的部分代理使用。",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.affectedAgentsTitle": "此操作将影响 {agentsCount} 个{agentsCount, plural, one {代理} other {代理}}。",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.cancelButtonLabel": "取消",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.confirmButtonLabel": "删除{agentPoliciesCount, plural, one {集成} other {集成}}",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.deleteMultipleTitle": "删除{count, plural, one {集成} other {# 个集成}}？",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.generalMessage": "此操作无法撤消。是否确定要继续？",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.loadingAgentsCountMessage": "正在检查受影响的代理……",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.loadingButtonLabel": "正在加载……",
+    "xpack.ingestManager.deletePackagePolicy.failureMultipleNotificationTitle": "删除 {count} 个集成时出错",
+    "xpack.ingestManager.deletePackagePolicy.failureSingleNotificationTitle": "删除集成“{id}”时出错",
+    "xpack.ingestManager.deletePackagePolicy.fatalErrorNotificationTitle": "删除集成时出错",
+    "xpack.ingestManager.deletePackagePolicy.successMultipleNotificationTitle": "已删除 {count} 个集成",
+    "xpack.ingestManager.deletePackagePolicy.successSingleNotificationTitle": "已删除集成“{id}”",
     "xpack.ingestManager.disabledSecurityDescription": "必须在 Kibana 和 Elasticsearch 启用安全性，才能使用 Elastic Fleet。",
     "xpack.ingestManager.disabledSecurityTitle": "安全性未启用",
-    "xpack.ingestManager.editAgentConfig.cancelButtonText": "取消",
-    "xpack.ingestManager.editAgentConfig.errorNotificationTitle": "无法更新代理配置",
-    "xpack.ingestManager.editAgentConfig.saveButtonText": "保存更改",
-    "xpack.ingestManager.editAgentConfig.savingButtonText": "正在保存……",
-    "xpack.ingestManager.editAgentConfig.successNotificationTitle": "已成功更新“{name}”设置",
-    "xpack.ingestManager.editAgentConfig.unsavedChangesText": "您有未保存更改",
-    "xpack.ingestManager.editPackageConfig.cancelButton": "取消",
-    "xpack.ingestManager.editPackageConfig.errorLoadingDataMessage": "加载此集成信息时出错",
-    "xpack.ingestManager.editPackageConfig.errorLoadingDataTitle": "加载数据时出错",
-    "xpack.ingestManager.editPackageConfig.failedConflictNotificationMessage": "数据已过时。刷新页面以获取最新的配置。",
-    "xpack.ingestManager.editPackageConfig.failedNotificationTitle": "更新“{packageConfigName}”时出错",
-    "xpack.ingestManager.editPackageConfig.pageDescription": "修改集成设置并将更改部署到选定代理配置。",
-    "xpack.ingestManager.editPackageConfig.pageTitle": "编辑集成",
-    "xpack.ingestManager.editPackageConfig.pageTitleWithPackageName": "编辑 {packageName} 集成",
-    "xpack.ingestManager.editPackageConfig.saveButton": "保存集成",
-    "xpack.ingestManager.editPackageConfig.updatedNotificationMessage": "Fleet 会将更新部署到所有使用配置“{agentConfigName}”的代理",
-    "xpack.ingestManager.editPackageConfig.updatedNotificationTitle": "已成功更新“{packageConfigName}”",
+    "xpack.ingestManager.editAgentPolicy.cancelButtonText": "取消",
+    "xpack.ingestManager.editAgentPolicy.errorNotificationTitle": "无法更新代理配置",
+    "xpack.ingestManager.editAgentPolicy.saveButtonText": "保存更改",
+    "xpack.ingestManager.editAgentPolicy.savingButtonText": "正在保存……",
+    "xpack.ingestManager.editAgentPolicy.successNotificationTitle": "已成功更新“{name}”设置",
+    "xpack.ingestManager.editAgentPolicy.unsavedChangesText": "您有未保存更改",
+    "xpack.ingestManager.editPackagePolicy.cancelButton": "取消",
+    "xpack.ingestManager.editPackagePolicy.errorLoadingDataMessage": "加载此集成信息时出错",
+    "xpack.ingestManager.editPackagePolicy.errorLoadingDataTitle": "加载数据时出错",
+    "xpack.ingestManager.editPackagePolicy.failedConflictNotificationMessage": "数据已过时。刷新页面以获取最新的配置。",
+    "xpack.ingestManager.editPackagePolicy.failedNotificationTitle": "更新“{packagePolicyName}”时出错",
+    "xpack.ingestManager.editPackagePolicy.pageDescription": "修改集成设置并将更改部署到选定代理配置。",
+    "xpack.ingestManager.editPackagePolicy.pageTitle": "编辑集成",
+    "xpack.ingestManager.editPackagePolicy.pageTitleWithPackageName": "编辑 {packageName} 集成",
+    "xpack.ingestManager.editPackagePolicy.saveButton": "保存集成",
+    "xpack.ingestManager.editPackagePolicy.updatedNotificationMessage": "Fleet 会将更新部署到所有使用配置“{agentPolicyName}”的代理",
+    "xpack.ingestManager.editPackagePolicy.updatedNotificationTitle": "已成功更新“{packagePolicyName}”",
     "xpack.ingestManager.enrollemntAPIKeyList.emptyMessage": "未找到任何注册令牌。",
     "xpack.ingestManager.enrollemntAPIKeyList.loadingTokensMessage": "正在加载注册令牌......",
-    "xpack.ingestManager.enrollmentStepAgentConfig.configSelectAriaLabel": "代理配置",
-    "xpack.ingestManager.enrollmentStepAgentConfig.configSelectLabel": "代理配置",
-    "xpack.ingestManager.enrollmentStepAgentConfig.enrollmentTokenSelectLabel": "注册令牌",
-    "xpack.ingestManager.enrollmentStepAgentConfig.showAuthenticationSettingsButton": "身份验证设置",
+    "xpack.ingestManager.enrollmentStepAgentPolicy.policySelectAriaLabel": "代理配置",
+    "xpack.ingestManager.enrollmentStepAgentPolicy.policySelectLabel": "代理配置",
+    "xpack.ingestManager.enrollmentStepAgentPolicy.enrollmentTokenSelectLabel": "注册令牌",
+    "xpack.ingestManager.enrollmentStepAgentPolicy.showAuthenticationSettingsButton": "身份验证设置",
     "xpack.ingestManager.enrollmentTokenDeleteModal.cancelButton": "取消",
     "xpack.ingestManager.enrollmentTokenDeleteModal.deleteButton": "删除",
     "xpack.ingestManager.enrollmentTokenDeleteModal.description": "确定要删除 {keyName}。",
     "xpack.ingestManager.enrollmentTokenDeleteModal.title": "删除注册令牌",
     "xpack.ingestManager.enrollmentTokensList.actionsTitle": "操作",
     "xpack.ingestManager.enrollmentTokensList.activeTitle": "活动",
-    "xpack.ingestManager.enrollmentTokensList.configTitle": "代理配置",
+    "xpack.ingestManager.enrollmentTokensList.policyTitle": "代理配置",
     "xpack.ingestManager.enrollmentTokensList.createdAtTitle": "创建日期",
     "xpack.ingestManager.enrollmentTokensList.nameTitle": "名称",
     "xpack.ingestManager.enrollmentTokensList.newKeyButton": "新建注册令牌",
     "xpack.ingestManager.enrollmentTokensList.pageDescription": "这是可用于注册代理的注册令牌列表。",
     "xpack.ingestManager.enrollmentTokensList.secretTitle": "密钥",
-    "xpack.ingestManager.epm.addPackageConfigButtonText": "添加 {packageName}",
+    "xpack.ingestManager.epm.addPackagePolicyButtonText": "添加 {packageName}",
     "xpack.ingestManager.epm.browseAllButtonText": "浏览所有集成",
     "xpack.ingestManager.epm.illustrationAltText": "集成的图示",
     "xpack.ingestManager.epm.loadingIntegrationErrorTitle": "加载集成详情时出错",
     "xpack.ingestManager.epm.packageDetailsNav.overviewLinkText": "概览",
-    "xpack.ingestManager.epm.packageDetailsNav.packageConfigsLinkText": "使用情况",
+    "xpack.ingestManager.epm.packageDetailsNav.packagePoliciesLinkText": "使用情况",
     "xpack.ingestManager.epm.packageDetailsNav.settingsLinkText": "设置",
     "xpack.ingestManager.epm.pageSubtitle": "浏览集成以了解热门应用和服务。",
     "xpack.ingestManager.epm.pageTitle": "集成",
@@ -9560,7 +9560,7 @@
     "xpack.ingestManager.metadataForm.submitButtonText": "添加",
     "xpack.ingestManager.metadataForm.valueLabel": "值",
     "xpack.ingestManager.newEnrollmentKey.cancelButtonLabel": "取消",
-    "xpack.ingestManager.newEnrollmentKey.configLabel": "配置",
+    "xpack.ingestManager.newEnrollmentKey.policyLabel": "配置",
     "xpack.ingestManager.newEnrollmentKey.flyoutTitle": "创建新的注册令牌",
     "xpack.ingestManager.newEnrollmentKey.keyCreatedToasts": "注册令牌已创建。",
     "xpack.ingestManager.newEnrollmentKey.nameLabel": "名称",
@@ -9571,17 +9571,17 @@
     "xpack.ingestManager.overviewAgentErrorTitle": "错误",
     "xpack.ingestManager.overviewAgentOfflineTitle": "脱机",
     "xpack.ingestManager.overviewAgentTotalTitle": "代理总数",
-    "xpack.ingestManager.overviewConfigTotalTitle": "可用总计",
+    "xpack.ingestManager.overviewPolicyTotalTitle": "可用总计",
     "xpack.ingestManager.overviewDatastreamNamespacesTitle": "命名空间",
     "xpack.ingestManager.overviewDatastreamSizeTitle": "总大小",
     "xpack.ingestManager.overviewDatastreamTotalTitle": "数据集",
     "xpack.ingestManager.overviewIntegrationsInstalledTitle": "安装时间",
     "xpack.ingestManager.overviewIntegrationsTotalTitle": "可用总计",
     "xpack.ingestManager.overviewIntegrationsUpdatesAvailableTitle": "可用更新",
-    "xpack.ingestManager.overviewPackageConfigTitle": "已配置集成",
-    "xpack.ingestManager.overviewPageConfigurationsPanelAction": "查看配置",
-    "xpack.ingestManager.overviewPageConfigurationsPanelTitle": "代理配置",
-    "xpack.ingestManager.overviewPageConfigurationsPanelTooltip": "使用代理配置控制您的代理收集的数据。",
+    "xpack.ingestManager.overviewPackagePolicyTitle": "已配置集成",
+    "xpack.ingestManager.overviewPagePoliciesPanelAction": "查看配置",
+    "xpack.ingestManager.overviewPagePoliciesPanelTitle": "代理配置",
+    "xpack.ingestManager.overviewPagePoliciesPanelTooltip": "使用代理配置控制您的代理收集的数据。",
     "xpack.ingestManager.overviewPageDataStreamsPanelAction": "查看数据集",
     "xpack.ingestManager.overviewPageDataStreamsPanelTitle": "数据集",
     "xpack.ingestManager.overviewPageDataStreamsPanelTooltip": "您的代理收集的数据组织到各种数据集中。",
@@ -9594,11 +9594,11 @@
     "xpack.ingestManager.overviewPageIntegrationsPanelTooltip": "浏览并安装 Elastic Stack 的集成。将集成添加到您的代理配置以开始发送数据。",
     "xpack.ingestManager.overviewPageSubtitle": "Elastic 代理和代理配置的集中管理。",
     "xpack.ingestManager.overviewPageTitle": "Ingest Manager",
-    "xpack.ingestManager.packageConfigValidation.invalidArrayErrorMessage": "格式无效",
-    "xpack.ingestManager.packageConfigValidation.invalidYamlFormatErrorMessage": "YAML 格式无效",
-    "xpack.ingestManager.packageConfigValidation.nameRequiredErrorMessage": "“名称”必填",
-    "xpack.ingestManager.packageConfigValidation.namespaceRequiredErrorMessage": "命名空间必填",
-    "xpack.ingestManager.packageConfigValidation.requiredErrorMessage": "“{fieldName}”必填",
+    "xpack.ingestManager.packagePolicyValidation.invalidArrayErrorMessage": "格式无效",
+    "xpack.ingestManager.packagePolicyValidation.invalidYamlFormatErrorMessage": "YAML 格式无效",
+    "xpack.ingestManager.packagePolicyValidation.nameRequiredErrorMessage": "“名称”必填",
+    "xpack.ingestManager.packagePolicyValidation.namespaceRequiredErrorMessage": "命名空间必填",
+    "xpack.ingestManager.packagePolicyValidation.requiredErrorMessage": "“{fieldName}”必填",
     "xpack.ingestManager.permissionDeniedErrorMessage": "您无权访问 Ingest Manager。Ingest Manager 需要{roleName}权限。",
     "xpack.ingestManager.permissionDeniedErrorTitle": "权限被拒绝",
     "xpack.ingestManager.permissionsRequestErrorMessageDescription": "检查 Ingest Manager 权限时出现问题",
@@ -16254,7 +16254,7 @@
     "xpack.securitySolution.endpoint.list.stepOneTitle": "选择要用于保护主机的策略",
     "xpack.securitySolution.endpoint.list.stepTwo": "为了让您入门，将会为您提供必要的命令。",
     "xpack.securitySolution.endpoint.list.stepTwoTitle": "通过采集管理器注册启用 Endpoint Security 的代理",
-    "xpack.securitySolution.endpoint.ingestManager.createPackageConfig.endpointConfiguration": "使用此代理配置的任何代理都会使用基本策略。可以在 Security 应用中对此策略进行更改，Fleet 会将这些更改部署到代理。",
+    "xpack.securitySolution.endpoint.ingestManager.createPackagePolicy.endpointConfiguration": "使用此代理配置的任何代理都会使用基本策略。可以在 Security 应用中对此策略进行更改，Fleet 会将这些更改部署到代理。",
     "xpack.securitySolution.endpoint.ingestToastMessage": "采集管理器在其设置期间失败。",
     "xpack.securitySolution.endpoint.ingestToastTitle": "应用无法初始化",
     "xpack.securitySolution.endpoint.policy.details.backToListTitle": "返回到策略列表",
@@ -16304,7 +16304,7 @@
     "xpack.securitySolution.endpoint.policyDetailType": "类型",
     "xpack.securitySolution.endpoint.policyList.actionButtonText": "添加 Endpoint Security",
     "xpack.securitySolution.endpoint.policyList.actionMenu": "打开",
-    "xpack.securitySolution.endpoint.policyList.agentConfigAction": "查看代理配置",
+    "xpack.securitySolution.endpoint.policyList.agentPolicyAction": "查看代理配置",
     "xpack.securitySolution.endpoint.policyList.createdAt": "创建日期",
     "xpack.securitySolution.endpoint.policyList.createdBy": "创建者",
     "xpack.securitySolution.endpoint.policyList.createNewButton": "创建新策略",
diff --git a/x-pack/test/functional/es_archives/endpoint/artifacts/api_feature/data.json b/x-pack/test/functional/es_archives/endpoint/artifacts/api_feature/data.json
index 3af1070597671..2a62886cf3c9a 100644
--- a/x-pack/test/functional/es_archives/endpoint/artifacts/api_feature/data.json
+++ b/x-pack/test/functional/es_archives/endpoint/artifacts/api_feature/data.json
@@ -167,7 +167,7 @@
       "fleet-agents": {
         "access_api_key_id": "8ZnT7HIBwLFvkUEPQaT3",
         "active": true,
-        "config_id": "2dd2a110-b6f6-11ea-a66d-63cf082a3b58",
+        "policy_id": "2dd2a110-b6f6-11ea-a66d-63cf082a3b58",
         "enrolled_at": "2020-06-25T18:52:47.290Z",
         "local_metadata": {
           "os": "macos"
@@ -180,7 +180,10 @@
       "references": [
       ],
       "type": "fleet-agents",
-      "updated_at": "2020-06-25T18:52:48.464Z"
+      "updated_at": "2020-06-25T18:52:48.464Z",
+      "migrationVersion": {
+        "fleet-agents": "7.10.0"
+      }
     }
   }
 }
@@ -195,14 +198,17 @@
         "active": true,
         "api_key": "8ZnT7HIBwLFvkUEPQaT3",
         "api_key_id": "8ZnT7HIBwLFvkUEPQaT3",
-        "config_id": "2dd2a110-b6f6-11ea-a66d-63cf082a3b58",
+        "policy_id": "2dd2a110-b6f6-11ea-a66d-63cf082a3b58",
         "created_at": "2020-06-25T17:25:30.065Z",
         "name": "Default (93aa98c8-d650-422e-aa7b-663dae3dff83)"
       },
       "references": [
       ],
       "type": "fleet-enrollment-api-keys",
-      "updated_at": "2020-06-25T17:25:30.114Z"
+      "updated_at": "2020-06-25T17:25:30.114Z",
+      "migrationVersion": {
+        "fleet-enrollment-api-keys": "7.10.0"
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/x-pack/test/functional/es_archives/fleet/agents/data.json b/x-pack/test/functional/es_archives/fleet/agents/data.json
index c94b87f6ad1ec..12d646de85ec3 100644
--- a/x-pack/test/functional/es_archives/fleet/agents/data.json
+++ b/x-pack/test/functional/es_archives/fleet/agents/data.json
@@ -9,10 +9,13 @@
         "access_api_key_id": "api-key-2",
         "active": true,
         "shared_id": "agent1_filebeat",
-        "config_id": "config1",
+        "policy_id": "policy1",
         "type": "PERMANENT",
         "local_metadata": {},
         "user_provided_metadata": {}
+      },
+      "migrationVersion": {
+        "fleet-agents": "7.10.0"
       }
     }
   }
@@ -32,6 +35,9 @@
         "type": "PERMANENT",
         "local_metadata": {},
         "user_provided_metadata": {}
+      },
+      "migrationVersion": {
+        "fleet-agents": "7.10.0"
       }
     }
   }
@@ -51,6 +57,9 @@
         "type": "PERMANENT",
         "local_metadata": {},
         "user_provided_metadata": {}
+      },
+      "migrationVersion": {
+        "fleet-agents": "7.10.0"
       }
     }
   }
@@ -70,6 +79,9 @@
         "type": "PERMANENT",
         "local_metadata": {},
         "user_provided_metadata": {}
+      },
+      "migrationVersion": {
+        "fleet-agents": "7.10.0"
       }
     }
   }
@@ -85,11 +97,14 @@
         "created_at" : "2019-10-10T16:31:12.518Z",
         "name": "FleetEnrollmentKey:1",
         "api_key_id" : "key",
-        "config_id" : "policy:1",
+        "policy_id" : "policy1",
         "active" : true
       },
       "type" : "fleet-enrollment-api-keys",
-      "references": []
+      "references": [],
+      "migrationVersion": {
+        "fleet-enrollment-api-keys": "7.10.0"
+      }
     }
   }
 }
@@ -108,6 +123,9 @@
         "message": "State changed from STOPPED to STARTED",
         "payload": "{\"previous_state\": \"STOPPED\"}",
         "timestamp": "2019-09-20T17:30:22.950Z"
+      },
+      "migrationVersion": {
+        "fleet-agent-events": "7.10.0"
       }
     }
   }
@@ -203,16 +221,16 @@
 {
   "type": "doc",
   "value": {
-    "id": "ingest-agent-policies:config1",
+    "id": "ingest-agent-policies:policy1",
     "index": ".kibana",
     "source": {
       "type": "ingest-agent-policies",
       "ingest-agent-policies": {
-        "name": "Test config",
+        "name": "Test policy",
         "namespace": "default",
-        "description": "Config 1",
+        "description": "Policy 1",
         "status": "active",
-        "package_configs": [],
+        "package_policies": [],
         "is_default": true,
         "monitoring_enabled": [
           "logs",
@@ -221,6 +239,9 @@
         "revision": 2,
         "updated_at": "2020-05-07T19:34:42.533Z",
         "updated_by": "system"
+      },
+      "migrationVersion": {
+        "ingest-agent-policies": "7.10.0"
       }
     }
   }
diff --git a/x-pack/test/functional/es_archives/fleet/agents/mappings.json b/x-pack/test/functional/es_archives/fleet/agents/mappings.json
index 12d3be3e2a971..936b34f2d8654 100644
--- a/x-pack/test/functional/es_archives/fleet/agents/mappings.json
+++ b/x-pack/test/functional/es_archives/fleet/agents/mappings.json
@@ -1561,7 +1561,7 @@
             "agent_id": {
               "type": "keyword"
             },
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
             "data": {
@@ -1595,13 +1595,10 @@
             "active": {
               "type": "boolean"
             },
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
-            "config_newest_revision": {
-              "type": "integer"
-            },
-            "config_revision": {
+            "policy_revision": {
               "type": "integer"
             },
             "current_error_events": {
@@ -1653,7 +1650,7 @@
             "api_key_id": {
               "type": "keyword"
             },
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
             "created_at": {
@@ -1799,7 +1796,7 @@
         },
         "ingest-agent-policies": {
           "properties": {
-            "package_configs": {
+            "package_policies": {
               "type": "keyword"
             },
             "description": {
@@ -1836,7 +1833,7 @@
         },
         "ingest-package-policies": {
           "properties": {
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
             "created_at": {
diff --git a/x-pack/test/functional/es_archives/lists/mappings.json b/x-pack/test/functional/es_archives/lists/mappings.json
index ba4e1b276d45e..73cb3ead0356a 100644
--- a/x-pack/test/functional/es_archives/lists/mappings.json
+++ b/x-pack/test/functional/es_archives/lists/mappings.json
@@ -958,7 +958,7 @@
             "agent_id": {
               "type": "keyword"
             },
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
             "data": {
@@ -992,10 +992,10 @@
             "active": {
               "type": "boolean"
             },
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
-            "config_revision": {
+            "policy_revision": {
               "type": "integer"
             },
             "current_error_events": {
@@ -1060,7 +1060,7 @@
             "api_key_id": {
               "type": "keyword"
             },
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
             "created_at": {
@@ -1228,7 +1228,7 @@
             "namespace": {
               "type": "keyword"
             },
-            "package_configs": {
+            "package_policies": {
               "type": "keyword"
             },
             "revision": {
@@ -1276,7 +1276,7 @@
         },
         "ingest-package-policies": {
           "properties": {
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
             "created_at": {
diff --git a/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json b/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json
index 2380154277e55..da74f0a1f74be 100644
--- a/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json
+++ b/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json
@@ -966,7 +966,7 @@
             "agent_id": {
               "type": "keyword"
             },
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
             "data": {
@@ -1000,10 +1000,10 @@
             "active": {
               "type": "boolean"
             },
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
-            "config_revision": {
+            "policy_revision": {
               "type": "integer"
             },
             "current_error_events": {
@@ -1068,7 +1068,7 @@
             "api_key_id": {
               "type": "keyword"
             },
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
             "created_at": {
@@ -1166,7 +1166,7 @@
             "namespace": {
               "type": "keyword"
             },
-            "package_configs": {
+            "package_policies": {
               "type": "keyword"
             },
             "revision": {
@@ -1214,7 +1214,7 @@
         },
         "ingest-package-policies": {
           "properties": {
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
             "created_at": {
diff --git a/x-pack/test/ingest_manager_api_integration/apis/agent_config/agent_config.ts b/x-pack/test/ingest_manager_api_integration/apis/agent_policy/agent_policy.ts
similarity index 71%
rename from x-pack/test/ingest_manager_api_integration/apis/agent_config/agent_config.ts
rename to x-pack/test/ingest_manager_api_integration/apis/agent_policy/agent_policy.ts
index 6526dc63e212c..5253b19b24d65 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/agent_config/agent_config.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/agent_policy/agent_policy.ts
@@ -11,11 +11,11 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
-  describe('ingest_manager_agent_configs', () => {
-    describe('POST /api/ingest_manager/agent_configs', () => {
+  describe('ingest_manager_agent_policies', () => {
+    describe('POST /api/ingest_manager/agent_policies', () => {
       it('should work with valid values', async () => {
         const { body: apiResponse } = await supertest
-          .post(`/api/ingest_manager/agent_configs`)
+          .post(`/api/ingest_manager/agent_policies`)
           .set('kbn-xsrf', 'xxxx')
           .send({
             name: 'TEST',
@@ -28,7 +28,7 @@ export default function ({ getService }: FtrProviderContext) {
 
       it('should return a 400 with an invalid namespace', async () => {
         await supertest
-          .post(`/api/ingest_manager/agent_configs`)
+          .post(`/api/ingest_manager/agent_policies`)
           .set('kbn-xsrf', 'xxxx')
           .send({
             name: 'TEST',
@@ -38,7 +38,7 @@ export default function ({ getService }: FtrProviderContext) {
       });
     });
 
-    describe('POST /api/ingest_manager/agent_configs/{agentConfigId}/copy', () => {
+    describe('POST /api/ingest_manager/agent_policies/{agentPolicyId}/copy', () => {
       before(async () => {
         await esArchiver.loadIfNeeded('fleet/agents');
       });
@@ -46,40 +46,40 @@ export default function ({ getService }: FtrProviderContext) {
         await esArchiver.unload('fleet/agents');
       });
 
-      const TEST_CONFIG_ID = 'config1';
+      const TEST_POLICY_ID = 'policy1';
 
       it('should work with valid values', async () => {
         const {
           body: { success, item },
         } = await supertest
-          .post(`/api/ingest_manager/agent_configs/${TEST_CONFIG_ID}/copy`)
+          .post(`/api/ingest_manager/agent_policies/${TEST_POLICY_ID}/copy`)
           .set('kbn-xsrf', 'xxxx')
           .send({
-            name: 'Copied config',
+            name: 'Copied policy',
             description: 'Test',
           })
           .expect(200);
         // eslint-disable-next-line @typescript-eslint/naming-convention
-        const { id, updated_at, ...newConfig } = item;
+        const { id, updated_at, ...newPolicy } = item;
 
         expect(success).to.be(true);
-        expect(newConfig).to.eql({
-          name: 'Copied config',
+        expect(newPolicy).to.eql({
+          name: 'Copied policy',
           description: 'Test',
           namespace: 'default',
           monitoring_enabled: ['logs', 'metrics'],
           revision: 1,
           updated_by: 'elastic',
-          package_configs: [],
+          package_policies: [],
         });
       });
 
-      it('should return a 500 with invalid source config', async () => {
+      it('should return a 500 with invalid source policy', async () => {
         await supertest
-          .post(`/api/ingest_manager/agent_configs/INVALID_CONFIG_ID/copy`)
+          .post(`/api/ingest_manager/agent_policies/INVALID_POLICY_ID/copy`)
           .set('kbn-xsrf', 'xxxx')
           .send({
-            name: 'Copied config',
+            name: 'Copied policy',
             description: '',
           })
           .expect(500);
@@ -87,7 +87,7 @@ export default function ({ getService }: FtrProviderContext) {
 
       it('should return a 400 with invalid payload', async () => {
         await supertest
-          .post(`/api/ingest_manager/agent_configs/${TEST_CONFIG_ID}/copy`)
+          .post(`/api/ingest_manager/agent_policies/${TEST_POLICY_ID}/copy`)
           .set('kbn-xsrf', 'xxxx')
           .send({})
           .expect(400);
@@ -95,7 +95,7 @@ export default function ({ getService }: FtrProviderContext) {
 
       it('should return a 400 with invalid name', async () => {
         await supertest
-          .post(`/api/ingest_manager/agent_configs/${TEST_CONFIG_ID}/copy`)
+          .post(`/api/ingest_manager/agent_policies/${TEST_POLICY_ID}/copy`)
           .set('kbn-xsrf', 'xxxx')
           .send({
             name: '',
diff --git a/x-pack/test/ingest_manager_api_integration/apis/agent_config/index.js b/x-pack/test/ingest_manager_api_integration/apis/agent_policy/index.js
similarity index 86%
rename from x-pack/test/ingest_manager_api_integration/apis/agent_config/index.js
rename to x-pack/test/ingest_manager_api_integration/apis/agent_policy/index.js
index 1671c423c03c0..a513e7991fa74 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/agent_config/index.js
+++ b/x-pack/test/ingest_manager_api_integration/apis/agent_policy/index.js
@@ -6,6 +6,6 @@
 
 export default function loadTests({ loadTestFile }) {
   describe('Ingest Manager Endpoints', () => {
-    loadTestFile(require.resolve('./agent_config'));
+    loadTestFile(require.resolve('./agent_policy'));
   });
 }
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/complete_flow.ts b/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/complete_flow.ts
index 8d7472f0ecd8b..2d14a7a10e668 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/complete_flow.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/complete_flow.ts
@@ -79,8 +79,8 @@ export default function (providerContext: FtrProviderContext) {
       expect(checkinApiResponse.success).to.eql(true);
       expect(checkinApiResponse.actions).length(1);
       expect(checkinApiResponse.actions[0].type).be('CONFIG_CHANGE');
-      const configChangeAction = checkinApiResponse.actions[0];
-      const defaultOutputApiKey = configChangeAction.data.config.outputs.default.api_key;
+      const policyChangeAction = checkinApiResponse.actions[0];
+      const defaultOutputApiKey = policyChangeAction.data.config.outputs.default.api_key;
 
       // Ack actions
       const { body: ackApiResponse } = await supertestWithoutAuth
@@ -94,7 +94,7 @@ export default function (providerContext: FtrProviderContext) {
               type: 'ACTION_RESULT',
               subtype: 'ACKNOWLEDGED',
               timestamp: '2019-01-04T14:32:03.36764-05:00',
-              action_id: configChangeAction.id,
+              action_id: policyChangeAction.id,
               agent_id: enrollmentResponse.item.id,
               message: 'hello',
               payload: 'payload',
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/enroll.ts b/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/enroll.ts
index ef9f2b2e61500..ce356dbd081c8 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/enroll.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/enroll.ts
@@ -137,7 +137,7 @@ export default function (providerContext: FtrProviderContext) {
         })
         .expect(200);
       expect(apiResponse.success).to.eql(true);
-      expect(apiResponse.item).to.have.keys('id', 'active', 'access_api_key', 'type', 'config_id');
+      expect(apiResponse.item).to.have.keys('id', 'active', 'access_api_key', 'type', 'policy_id');
     });
 
     it('when enrolling an agent it should generate an access api key with limited privileges', async () => {
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fleet/enrollment_api_keys/crud.ts b/x-pack/test/ingest_manager_api_integration/apis/fleet/enrollment_api_keys/crud.ts
index bc9182627326b..275462072919b 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/fleet/enrollment_api_keys/crud.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/fleet/enrollment_api_keys/crud.ts
@@ -59,7 +59,7 @@ export default function (providerContext: FtrProviderContext) {
           .post(`/api/ingest_manager/fleet/enrollment-api-keys`)
           .set('kbn-xsrf', 'xxx')
           .send({
-            config_id: 'config1',
+            policy_id: 'policy1',
           })
           .expect(200);
         keyId = apiResponse.item.id;
@@ -94,27 +94,27 @@ export default function (providerContext: FtrProviderContext) {
           .expect(400);
       });
 
-      it('should not allow to create an enrollment api key for a non existing agent config', async () => {
+      it('should not allow to create an enrollment api key for a non existing agent policy', async () => {
         await supertest
           .post(`/api/ingest_manager/fleet/enrollment-api-keys`)
           .set('kbn-xsrf', 'xxx')
           .send({
-            config_id: 'idonotexistsconfig',
+            policy_id: 'idonotexistspolicy',
           })
           .expect(400);
       });
 
-      it('should allow to create an enrollment api key with an agent config', async () => {
+      it('should allow to create an enrollment api key with an agent policy', async () => {
         const { body: apiResponse } = await supertest
           .post(`/api/ingest_manager/fleet/enrollment-api-keys`)
           .set('kbn-xsrf', 'xxx')
           .send({
-            config_id: 'config1',
+            policy_id: 'policy1',
           })
           .expect(200);
 
         expect(apiResponse.success).to.eql(true);
-        expect(apiResponse.item).to.have.keys('id', 'api_key', 'api_key_id', 'name', 'config_id');
+        expect(apiResponse.item).to.have.keys('id', 'api_key', 'api_key_id', 'name', 'policy_id');
       });
 
       it('should create an ES ApiKey with limited privileges', async () => {
@@ -122,7 +122,7 @@ export default function (providerContext: FtrProviderContext) {
           .post(`/api/ingest_manager/fleet/enrollment-api-keys`)
           .set('kbn-xsrf', 'xxx')
           .send({
-            config_id: 'config1',
+            policy_id: 'policy1',
           })
           .expect(200);
         expect(apiResponse.success).to.eql(true);
diff --git a/x-pack/test/ingest_manager_api_integration/apis/index.js b/x-pack/test/ingest_manager_api_integration/apis/index.js
index 948f953ebe3f5..fac8a26fd6aec 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/index.js
+++ b/x-pack/test/ingest_manager_api_integration/apis/index.js
@@ -15,11 +15,12 @@ export default function ({ loadTestFile }) {
     // EPM
     loadTestFile(require.resolve('./epm/index'));
 
-    // Package configs
-    loadTestFile(require.resolve('./package_config/create'));
-    loadTestFile(require.resolve('./package_config/update'));
-    loadTestFile(require.resolve('./package_config/get'));
-    // Agent config
-    loadTestFile(require.resolve('./agent_config/index'));
+    // Package policies
+    loadTestFile(require.resolve('./package_policy/create'));
+    loadTestFile(require.resolve('./package_policy/update'));
+    loadTestFile(require.resolve('./package_policy/get'));
+
+    // Agent policies
+    loadTestFile(require.resolve('./agent_policy/index'));
   });
 }
diff --git a/x-pack/test/ingest_manager_api_integration/apis/package_config/create.ts b/x-pack/test/ingest_manager_api_integration/apis/package_policy/create.ts
similarity index 81%
rename from x-pack/test/ingest_manager_api_integration/apis/package_config/create.ts
rename to x-pack/test/ingest_manager_api_integration/apis/package_policy/create.ts
index a2c2b99364d50..2043faa07b1e1 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/package_config/create.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/package_policy/create.ts
@@ -18,30 +18,30 @@ export default function ({ getService }: FtrProviderContext) {
   // because `this` has to point to the Mocha context
   // see https://mochajs.org/#arrow-functions
 
-  describe('Package Config - create', async function () {
-    let agentConfigId: string;
+  describe('Package Policy - create', async function () {
+    let agentPolicyId: string;
 
     before(async function () {
-      const { body: agentConfigResponse } = await supertest
-        .post(`/api/ingest_manager/agent_configs`)
+      const { body: agentPolicyResponse } = await supertest
+        .post(`/api/ingest_manager/agent_policies`)
         .set('kbn-xsrf', 'xxxx')
         .send({
-          name: 'Test config',
+          name: 'Test policy',
           namespace: 'default',
         });
-      agentConfigId = agentConfigResponse.item.id;
+      agentPolicyId = agentPolicyResponse.item.id;
     });
 
     it('should work with valid values', async function () {
       if (server.enabled) {
         const { body: apiResponse } = await supertest
-          .post(`/api/ingest_manager/package_configs`)
+          .post(`/api/ingest_manager/package_policies`)
           .set('kbn-xsrf', 'xxxx')
           .send({
             name: 'filetest-1',
             description: '',
             namespace: 'default',
-            config_id: agentConfigId,
+            policy_id: agentPolicyId,
             enabled: true,
             output_id: '',
             inputs: [],
@@ -62,13 +62,13 @@ export default function ({ getService }: FtrProviderContext) {
     it('should return a 400 with an invalid namespace', async function () {
       if (server.enabled) {
         await supertest
-          .post(`/api/ingest_manager/package_configs`)
+          .post(`/api/ingest_manager/package_policies`)
           .set('kbn-xsrf', 'xxxx')
           .send({
             name: 'filetest-1',
             description: '',
             namespace: '',
-            config_id: agentConfigId,
+            policy_id: agentPolicyId,
             enabled: true,
             output_id: '',
             inputs: [],
@@ -84,16 +84,16 @@ export default function ({ getService }: FtrProviderContext) {
       }
     });
 
-    it('should not allow multiple limited packages on the same agent config', async function () {
+    it('should not allow multiple limited packages on the same agent policy', async function () {
       if (server.enabled) {
         await supertest
-          .post(`/api/ingest_manager/package_configs`)
+          .post(`/api/ingest_manager/package_policies`)
           .set('kbn-xsrf', 'xxxx')
           .send({
             name: 'endpoint-1',
             description: '',
             namespace: 'default',
-            config_id: agentConfigId,
+            policy_id: agentPolicyId,
             enabled: true,
             output_id: '',
             inputs: [],
@@ -105,13 +105,13 @@ export default function ({ getService }: FtrProviderContext) {
           })
           .expect(200);
         await supertest
-          .post(`/api/ingest_manager/package_configs`)
+          .post(`/api/ingest_manager/package_policies`)
           .set('kbn-xsrf', 'xxxx')
           .send({
             name: 'endpoint-2',
             description: '',
             namespace: 'default',
-            config_id: agentConfigId,
+            policy_id: agentPolicyId,
             enabled: true,
             output_id: '',
             inputs: [],
@@ -127,16 +127,16 @@ export default function ({ getService }: FtrProviderContext) {
       }
     });
 
-    it('should return a 500 if there is another package config with the same name', async function () {
+    it('should return a 500 if there is another package policy with the same name', async function () {
       if (server.enabled) {
         await supertest
-          .post(`/api/ingest_manager/package_configs`)
+          .post(`/api/ingest_manager/package_policies`)
           .set('kbn-xsrf', 'xxxx')
           .send({
             name: 'same-name-test-1',
             description: '',
             namespace: 'default',
-            config_id: agentConfigId,
+            policy_id: agentPolicyId,
             enabled: true,
             output_id: '',
             inputs: [],
@@ -148,13 +148,13 @@ export default function ({ getService }: FtrProviderContext) {
           })
           .expect(200);
         await supertest
-          .post(`/api/ingest_manager/package_configs`)
+          .post(`/api/ingest_manager/package_policies`)
           .set('kbn-xsrf', 'xxxx')
           .send({
             name: 'same-name-test-1',
             description: '',
             namespace: 'default',
-            config_id: agentConfigId,
+            policy_id: agentPolicyId,
             enabled: true,
             output_id: '',
             inputs: [],
diff --git a/x-pack/test/ingest_manager_api_integration/apis/package_config/get.ts b/x-pack/test/ingest_manager_api_integration/apis/package_policy/get.ts
similarity index 68%
rename from x-pack/test/ingest_manager_api_integration/apis/package_config/get.ts
rename to x-pack/test/ingest_manager_api_integration/apis/package_policy/get.ts
index 94b7543d982ad..756eaa8ea49ba 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/package_config/get.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/package_policy/get.ts
@@ -18,32 +18,32 @@ export default function (providerContext: FtrProviderContext) {
   // because `this` has to point to the Mocha context
   // see https://mochajs.org/#arrow-functions
 
-  describe('Package Config - get by id', async function () {
+  describe('Package Policy - get by id', async function () {
     skipIfNoDockerRegistry(providerContext);
-    let agentConfigId: string;
-    let packageConfigId: string;
+    let agentPolicyId: string;
+    let packagePolicyId: string;
 
     before(async function () {
       if (!server.enabled) {
         return;
       }
-      const { body: agentConfigResponse } = await supertest
-        .post(`/api/ingest_manager/agent_configs`)
+      const { body: agentPolicyResponse } = await supertest
+        .post(`/api/ingest_manager/agent_policies`)
         .set('kbn-xsrf', 'xxxx')
         .send({
-          name: 'Test config',
+          name: 'Test policy',
           namespace: 'default',
         });
-      agentConfigId = agentConfigResponse.item.id;
+      agentPolicyId = agentPolicyResponse.item.id;
 
-      const { body: packageConfigResponse } = await supertest
-        .post(`/api/ingest_manager/package_configs`)
+      const { body: packagePolicyResponse } = await supertest
+        .post(`/api/ingest_manager/package_policies`)
         .set('kbn-xsrf', 'xxxx')
         .send({
           name: 'filetest-1',
           description: '',
           namespace: 'default',
-          config_id: agentConfigId,
+          policy_id: agentPolicyId,
           enabled: true,
           output_id: '',
           inputs: [],
@@ -53,7 +53,7 @@ export default function (providerContext: FtrProviderContext) {
             version: '0.1.0',
           },
         });
-      packageConfigId = packageConfigResponse.item.id;
+      packagePolicyId = packagePolicyResponse.item.id;
     });
 
     after(async function () {
@@ -62,28 +62,28 @@ export default function (providerContext: FtrProviderContext) {
       }
 
       await supertest
-        .post(`/api/ingest_manager/agent_configs/delete`)
+        .post(`/api/ingest_manager/agent_policies/delete`)
         .set('kbn-xsrf', 'xxxx')
-        .send({ agentConfigId })
+        .send({ agentPolicyId })
         .expect(200);
 
       await supertest
-        .post(`/api/ingest_manager/package_configs/delete`)
+        .post(`/api/ingest_manager/package_policies/delete`)
         .set('kbn-xsrf', 'xxxx')
-        .send({ packageConfigIds: [packageConfigId] })
+        .send({ packagePolicyIds: [packagePolicyId] })
         .expect(200);
     });
 
     it('should succeed with a valid id', async function () {
       const { body: apiResponse } = await supertest
-        .get(`/api/ingest_manager/package_configs/${packageConfigId}`)
+        .get(`/api/ingest_manager/package_policies/${packagePolicyId}`)
         .expect(200);
 
       expect(apiResponse.success).to.be(true);
     });
 
     it('should return a 404 with an invalid id', async function () {
-      await supertest.get(`/api/ingest_manager/package_configs/IS_NOT_PRESENT`).expect(404);
+      await supertest.get(`/api/ingest_manager/package_policies/IS_NOT_PRESENT`).expect(404);
     });
   });
 }
diff --git a/x-pack/test/ingest_manager_api_integration/apis/package_config/update.ts b/x-pack/test/ingest_manager_api_integration/apis/package_policy/update.ts
similarity index 72%
rename from x-pack/test/ingest_manager_api_integration/apis/package_config/update.ts
rename to x-pack/test/ingest_manager_api_integration/apis/package_policy/update.ts
index 7b0ad4f524bad..e74d88f3538e4 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/package_config/update.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/package_policy/update.ts
@@ -18,33 +18,33 @@ export default function (providerContext: FtrProviderContext) {
   // because `this` has to point to the Mocha context
   // see https://mochajs.org/#arrow-functions
 
-  describe('Package Config - update', async function () {
+  describe('Package Policy - update', async function () {
     skipIfNoDockerRegistry(providerContext);
-    let agentConfigId: string;
-    let packageConfigId: string;
-    let packageConfigId2: string;
+    let agentPolicyId: string;
+    let packagePolicyId: string;
+    let packagePolicyId2: string;
 
     before(async function () {
       if (!server.enabled) {
         return;
       }
-      const { body: agentConfigResponse } = await supertest
-        .post(`/api/ingest_manager/agent_configs`)
+      const { body: agentPolicyResponse } = await supertest
+        .post(`/api/ingest_manager/agent_policies`)
         .set('kbn-xsrf', 'xxxx')
         .send({
-          name: 'Test config',
+          name: 'Test policy',
           namespace: 'default',
         });
-      agentConfigId = agentConfigResponse.item.id;
+      agentPolicyId = agentPolicyResponse.item.id;
 
-      const { body: packageConfigResponse } = await supertest
-        .post(`/api/ingest_manager/package_configs`)
+      const { body: packagePolicyResponse } = await supertest
+        .post(`/api/ingest_manager/package_policies`)
         .set('kbn-xsrf', 'xxxx')
         .send({
           name: 'filetest-1',
           description: '',
           namespace: 'default',
-          config_id: agentConfigId,
+          policy_id: agentPolicyId,
           enabled: true,
           output_id: '',
           inputs: [],
@@ -54,16 +54,16 @@ export default function (providerContext: FtrProviderContext) {
             version: '0.1.0',
           },
         });
-      packageConfigId = packageConfigResponse.item.id;
+      packagePolicyId = packagePolicyResponse.item.id;
 
-      const { body: packageConfigResponse2 } = await supertest
-        .post(`/api/ingest_manager/package_configs`)
+      const { body: packagePolicyResponse2 } = await supertest
+        .post(`/api/ingest_manager/package_policies`)
         .set('kbn-xsrf', 'xxxx')
         .send({
           name: 'filetest-2',
           description: '',
           namespace: 'default',
-          config_id: agentConfigId,
+          policy_id: agentPolicyId,
           enabled: true,
           output_id: '',
           inputs: [],
@@ -73,18 +73,18 @@ export default function (providerContext: FtrProviderContext) {
             version: '0.1.0',
           },
         });
-      packageConfigId2 = packageConfigResponse2.item.id;
+      packagePolicyId2 = packagePolicyResponse2.item.id;
     });
 
     it('should work with valid values', async function () {
       const { body: apiResponse } = await supertest
-        .put(`/api/ingest_manager/package_configs/${packageConfigId}`)
+        .put(`/api/ingest_manager/package_policies/${packagePolicyId}`)
         .set('kbn-xsrf', 'xxxx')
         .send({
           name: 'filetest-1',
           description: '',
           namespace: 'updated_namespace',
-          config_id: agentConfigId,
+          policy_id: agentPolicyId,
           enabled: true,
           output_id: '',
           inputs: [],
@@ -99,15 +99,15 @@ export default function (providerContext: FtrProviderContext) {
       expect(apiResponse.success).to.be(true);
     });
 
-    it('should return a 500 if there is another package config with the same name', async function () {
+    it('should return a 500 if there is another package policy with the same name', async function () {
       await supertest
-        .put(`/api/ingest_manager/package_configs/${packageConfigId2}`)
+        .put(`/api/ingest_manager/package_policies/${packagePolicyId2}`)
         .set('kbn-xsrf', 'xxxx')
         .send({
           name: 'filetest-1',
           description: '',
           namespace: 'updated_namespace',
-          config_id: agentConfigId,
+          policy_id: agentPolicyId,
           enabled: true,
           output_id: '',
           inputs: [],
diff --git a/x-pack/test/security_solution_cypress/es_archives/export_rule/mappings.json b/x-pack/test/security_solution_cypress/es_archives/export_rule/mappings.json
index 249b03981386d..5eec03ca3d11a 100644
--- a/x-pack/test/security_solution_cypress/es_archives/export_rule/mappings.json
+++ b/x-pack/test/security_solution_cypress/es_archives/export_rule/mappings.json
@@ -970,7 +970,7 @@
             "agent_id": {
               "type": "keyword"
             },
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
             "data": {
@@ -1004,7 +1004,7 @@
             "active": {
               "type": "boolean"
             },
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
             "config_revision": {
@@ -1072,7 +1072,7 @@
             "api_key_id": {
               "type": "keyword"
             },
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
             "created_at": {
@@ -1240,7 +1240,7 @@
             "namespace": {
               "type": "keyword"
             },
-            "package_configs": {
+            "package_policies": {
               "type": "keyword"
             },
             "revision": {
@@ -1288,7 +1288,7 @@
         },
         "ingest-package-policies": {
           "properties": {
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
             "created_at": {
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts
index 1843fca29758a..6268f55c5518c 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts
@@ -125,7 +125,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
         });
 
         // The integration does not work properly yet.  Skipping this test for now.
-        it.skip('navigates to ingest fleet when the Reassign Configuration link is clicked', async () => {
+        it.skip('navigates to ingest fleet when the Reassign Policy link is clicked', async () => {
           await (await testSubjects.find('hostnameCellLink')).click();
           await (await testSubjects.find('endpointDetailsLinkToIngest')).click();
           await testSubjects.existOrFail('fleetAgentListTable');
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
index 9efba2b595bde..3e04a507d3810 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
@@ -14,7 +14,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
     'endpoint',
     'policy',
     'endpointPageUtils',
-    'ingestManagerCreatePackageConfig',
+    'ingestManagerCreatePackagePolicy',
   ]);
   const testSubjects = getService('testSubjects');
   const policyTestResources = getService('policyTestResources');
@@ -27,7 +27,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         await pageObjects.policy.navigateToPolicyDetails('invalid-id');
         await testSubjects.existOrFail('policyDetailsIdNotFoundMessage');
         expect(await testSubjects.getVisibleText('policyDetailsIdNotFoundMessage')).to.equal(
-          'Package config invalid-id not found'
+          'Package policy invalid-id not found'
         );
       });
     });
@@ -37,7 +37,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       before(async () => {
         policyInfo = await policyTestResources.createPolicy();
-        await pageObjects.policy.navigateToPolicyDetails(policyInfo.packageConfig.id);
+        await pageObjects.policy.navigateToPolicyDetails(policyInfo.packagePolicy.id);
       });
 
       after(async () => {
@@ -48,7 +48,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       it('should display policy view', async () => {
         expect(await testSubjects.getVisibleText('header-page-title')).to.equal(
-          policyInfo.packageConfig.name
+          policyInfo.packagePolicy.name
         );
       });
     });
@@ -58,7 +58,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       beforeEach(async () => {
         policyInfo = await policyTestResources.createPolicy();
-        await pageObjects.policy.navigateToPolicyDetails(policyInfo.packageConfig.id);
+        await pageObjects.policy.navigateToPolicyDetails(policyInfo.packagePolicy.id);
       });
 
       afterEach(async () => {
@@ -73,7 +73,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
         await testSubjects.existOrFail('policyDetailsSuccessMessage');
         expect(await testSubjects.getVisibleText('policyDetailsSuccessMessage')).to.equal(
-          `Integration ${policyInfo.packageConfig.name} has been updated.`
+          `Integration ${policyInfo.packagePolicy.name} has been updated.`
         );
       });
       it('should persist update on the screen', async () => {
@@ -82,15 +82,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
         await testSubjects.existOrFail('policyDetailsSuccessMessage');
         await pageObjects.endpoint.navigateToEndpointList();
-        await pageObjects.policy.navigateToPolicyDetails(policyInfo.packageConfig.id);
+        await pageObjects.policy.navigateToPolicyDetails(policyInfo.packagePolicy.id);
 
         expect(await (await testSubjects.find('policyWindowsEvent_process')).isSelected()).to.equal(
           false
         );
       });
-      it('should have updated policy data in overall agent configuration', async () => {
+      it('should have updated policy data in overall Agent Policy', async () => {
         // This test ensures that updates made to the Endpoint Policy are carried all the way through
-        // to the generated Agent Configuration that is dispatch down to the Elastic Agent.
+        // to the generated Agent Policy that is dispatch down to the Elastic Agent.
 
         await Promise.all([
           pageObjects.endpointPageUtils.clickOnEuiCheckbox('policyWindowsEvent_file'),
@@ -100,14 +100,14 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         await pageObjects.policy.confirmAndSave();
         await testSubjects.existOrFail('policyDetailsSuccessMessage');
 
-        const agentFullConfig = await policyTestResources.getFullAgentConfig(
-          policyInfo.agentConfig.id
+        const agentFullPolicy = await policyTestResources.getFullAgentPolicy(
+          policyInfo.agentPolicy.id
         );
 
-        expect(agentFullConfig).to.eql({
+        expect(agentFullPolicy).to.eql({
           inputs: [
             {
-              id: policyInfo.packageConfig.id,
+              id: policyInfo.packagePolicy.id,
               data_stream: { namespace: 'default' },
               name: 'Protect East Coast',
               meta: {
@@ -145,9 +145,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
                 },
                 // The manifest version could have changed when the Policy was updated because the
                 // policy details page ensures that a save action applies the udpated policy on top
-                // of the latest Package Config. So we just ignore the check against this value by
-                // forcing it to be the same as the value returned in the full agent config.
-                manifest_version: agentFullConfig.inputs[0].artifact_manifest.manifest_version,
+                // of the latest Package Policy. So we just ignore the check against this value by
+                // forcing it to be the same as the value returned in the full agent policy.
+                manifest_version: agentFullPolicy.inputs[0].artifact_manifest.manifest_version,
                 schema_version: 'v1',
               },
               policy: {
@@ -179,7 +179,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
               use_output: 'default',
             },
           ],
-          id: policyInfo.agentConfig.id,
+          id: policyInfo.agentPolicy.id,
           outputs: {
             default: {
               hosts: ['http://localhost:9200'],
@@ -197,14 +197,14 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         });
       });
     });
-    describe('when on Ingest Configurations Edit Package Config page', async () => {
+    describe('when on Ingest Policy Edit Package Policy page', async () => {
       let policyInfo: PolicyTestResourceInfo;
       beforeEach(async () => {
         // Create a policy and navigate to Ingest app
         policyInfo = await policyTestResources.createPolicy();
-        await pageObjects.ingestManagerCreatePackageConfig.navigateToAgentConfigEditPackageConfig(
-          policyInfo.agentConfig.id,
-          policyInfo.packageConfig.id
+        await pageObjects.ingestManagerCreatePackagePolicy.navigateToAgentPolicyEditPackagePolicy(
+          policyInfo.agentPolicy.id,
+          policyInfo.packagePolicy.id
         );
       });
       afterEach(async () => {
@@ -227,12 +227,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         await pageObjects.policy.confirmAndSave();
 
         await testSubjects.existOrFail('policyDetailsSuccessMessage');
-        await pageObjects.ingestManagerCreatePackageConfig.ensureOnEditPageOrFail();
+        await pageObjects.ingestManagerCreatePackagePolicy.ensureOnEditPageOrFail();
       });
-      it('should navigate back to Ingest Configuration Edit package page on click of cancel button', async () => {
+      it('should navigate back to Ingest Policy Edit package page on click of cancel button', async () => {
         await (await testSubjects.find('editLinkToPolicyDetails')).click();
         await (await pageObjects.policy.findCancelButton()).click();
-        await pageObjects.ingestManagerCreatePackageConfig.ensureOnEditPageOrFail();
+        await pageObjects.ingestManagerCreatePackagePolicy.ensureOnEditPageOrFail();
       });
     });
   });
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_list.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_list.ts
index cf93ca1b68991..49a7a2155a700 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_list.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_list.ts
@@ -13,7 +13,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
     'endpoint',
     'policy',
     'endpointPageUtils',
-    'ingestManagerCreatePackageConfig',
+    'ingestManagerCreatePackagePolicy',
   ]);
   const testSubjects = getService('testSubjects');
   const policyTestResources = getService('policyTestResources');
@@ -78,7 +78,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
           'Protect East Coastrev. 1',
           'elastic',
           'elastic',
-          `v${policyInfo.packageConfig.package?.version}`,
+          `v${policyInfo.packagePolicy.package?.version}`,
           '',
         ]);
         [policyRow[2], policyRow[4]].forEach((relativeDate) => {
@@ -86,11 +86,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         });
       });
 
-      it('should show agent config action as a link', async () => {
+      it('should show agent policy action as a link', async () => {
         await (await pageObjects.policy.findFirstActionsButton()).click();
-        const agentConfigLink = await testSubjects.find('agentConfigLink');
-        expect(await agentConfigLink.getAttribute('href')).to.match(
-          new RegExp(`\/ingestManager#\/configs\/${policyInfo.agentConfig.id}$`)
+        const agentPolicyLink = await testSubjects.find('agentPolicyLink');
+        expect(await agentPolicyLink.getAttribute('href')).to.match(
+          new RegExp(`\/ingestManager#\/policies\/${policyInfo.agentPolicy.id}$`)
         );
         // Close action menu
         await (await pageObjects.policy.findFirstActionsButton()).click();
@@ -111,47 +111,47 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         await (await pageObjects.policy.findHeaderCreateNewButton()).click();
       });
 
-      it('should redirect to ingest management integrations add package config', async () => {
-        await pageObjects.ingestManagerCreatePackageConfig.ensureOnCreatePageOrFail();
+      it('should redirect to ingest management integrations add package policy', async () => {
+        await pageObjects.ingestManagerCreatePackagePolicy.ensureOnCreatePageOrFail();
       });
 
       it('should redirect user back to Policy List if Cancel button is clicked', async () => {
-        await (await pageObjects.ingestManagerCreatePackageConfig.findCancelButton()).click();
+        await (await pageObjects.ingestManagerCreatePackagePolicy.findCancelButton()).click();
         await pageObjects.policy.ensureIsOnPolicyPage();
       });
 
       it('should redirect user back to Policy List if Back link is clicked', async () => {
-        await (await pageObjects.ingestManagerCreatePackageConfig.findBackLink()).click();
+        await (await pageObjects.ingestManagerCreatePackagePolicy.findBackLink()).click();
         await pageObjects.policy.ensureIsOnPolicyPage();
       });
 
       it('should display custom endpoint configuration message', async () => {
-        await pageObjects.ingestManagerCreatePackageConfig.selectAgentConfig();
-        const endpointConfig = await pageObjects.policy.findPackageConfigEndpointCustomConfiguration();
+        await pageObjects.ingestManagerCreatePackagePolicy.selectAgentPolicy();
+        const endpointConfig = await pageObjects.policy.findPackagePolicyEndpointCustomConfiguration();
         expect(endpointConfig).not.to.be(undefined);
       });
 
-      it('should have empty value for package configuration name', async () => {
-        await pageObjects.ingestManagerCreatePackageConfig.selectAgentConfig();
-        expect(await pageObjects.ingestManagerCreatePackageConfig.getPackageConfigName()).to.be('');
+      it('should have empty value for package policy name', async () => {
+        await pageObjects.ingestManagerCreatePackagePolicy.selectAgentPolicy();
+        expect(await pageObjects.ingestManagerCreatePackagePolicy.getPackagePolicyName()).to.be('');
       });
 
       it('should redirect user back to Policy List after a successful save', async () => {
         const newPolicyName = `endpoint policy ${Date.now()}`;
-        await pageObjects.ingestManagerCreatePackageConfig.selectAgentConfig();
-        await pageObjects.ingestManagerCreatePackageConfig.setPackageConfigName(newPolicyName);
-        await (await pageObjects.ingestManagerCreatePackageConfig.findDSaveButton()).click();
-        await pageObjects.ingestManagerCreatePackageConfig.waitForSaveSuccessNotification();
+        await pageObjects.ingestManagerCreatePackagePolicy.selectAgentPolicy();
+        await pageObjects.ingestManagerCreatePackagePolicy.setPackagePolicyName(newPolicyName);
+        await (await pageObjects.ingestManagerCreatePackagePolicy.findDSaveButton()).click();
+        await pageObjects.ingestManagerCreatePackagePolicy.waitForSaveSuccessNotification();
         await pageObjects.policy.ensureIsOnPolicyPage();
         await policyTestResources.deletePolicyByName(newPolicyName);
       });
     });
 
     describe('and user clicks on page header create button', () => {
-      it('should direct users to the ingest management integrations add package config', async () => {
+      it('should direct users to the ingest management integrations add package policy', async () => {
         await pageObjects.policy.navigateToPolicyList();
         await (await pageObjects.policy.findOnboardingStartButton()).click();
-        await pageObjects.ingestManagerCreatePackageConfig.ensureOnCreatePageOrFail();
+        await pageObjects.ingestManagerCreatePackagePolicy.ensureOnCreatePageOrFail();
       });
     });
   });
diff --git a/x-pack/test/security_solution_endpoint/page_objects/index.ts b/x-pack/test/security_solution_endpoint/page_objects/index.ts
index 05762ba887c6f..39a9e7009c385 100644
--- a/x-pack/test/security_solution_endpoint/page_objects/index.ts
+++ b/x-pack/test/security_solution_endpoint/page_objects/index.ts
@@ -9,7 +9,7 @@ import { EndpointPageProvider } from './endpoint_page';
 import { EndpointPolicyPageProvider } from './policy_page';
 import { TrustedAppsPageProvider } from './trusted_apps_page';
 import { EndpointPageUtils } from './page_utils';
-import { IngestManagerCreatePackageConfig } from './ingest_manager_create_package_config_page';
+import { IngestManagerCreatePackagePolicy } from './ingest_manager_create_package_policy_page';
 
 export const pageObjects = {
   ...xpackFunctionalPageObjects,
@@ -17,5 +17,5 @@ export const pageObjects = {
   policy: EndpointPolicyPageProvider,
   trustedApps: TrustedAppsPageProvider,
   endpointPageUtils: EndpointPageUtils,
-  ingestManagerCreatePackageConfig: IngestManagerCreatePackageConfig,
+  ingestManagerCreatePackagePolicy: IngestManagerCreatePackagePolicy,
 };
diff --git a/x-pack/test/security_solution_endpoint/page_objects/ingest_manager_create_package_config_page.ts b/x-pack/test/security_solution_endpoint/page_objects/ingest_manager_create_package_policy_page.ts
similarity index 56%
rename from x-pack/test/security_solution_endpoint/page_objects/ingest_manager_create_package_config_page.ts
rename to x-pack/test/security_solution_endpoint/page_objects/ingest_manager_create_package_policy_page.ts
index dfdb528b7362c..13b1f8c9d9842 100644
--- a/x-pack/test/security_solution_endpoint/page_objects/ingest_manager_create_package_config_page.ts
+++ b/x-pack/test/security_solution_endpoint/page_objects/ingest_manager_create_package_policy_page.ts
@@ -6,7 +6,7 @@
 
 import { FtrProviderContext } from '../ftr_provider_context';
 
-export function IngestManagerCreatePackageConfig({
+export function IngestManagerCreatePackagePolicy({
   getService,
   getPageObjects,
 }: FtrProviderContext) {
@@ -16,90 +16,90 @@ export function IngestManagerCreatePackageConfig({
 
   return {
     /**
-     * Validates that the page shown is the Package Config Create Page
+     * Validates that the page shown is the Package Policy Create Page
      */
     async ensureOnCreatePageOrFail() {
-      await testSubjects.existOrFail('createPackageConfig_header');
+      await testSubjects.existOrFail('createPackagePolicy_header');
     },
 
     /**
      * Finds and returns the Cancel button on the sticky bottom bar
      */
     async findCancelButton() {
-      return await testSubjects.find('createPackageConfigCancelButton');
+      return await testSubjects.find('createPackagePolicyCancelButton');
     },
 
     /**
      * Finds and returns the Cancel back link at the top of the create page
      */
     async findBackLink() {
-      return await testSubjects.find('createPackageConfig_cancelBackLink');
+      return await testSubjects.find('createPackagePolicy_cancelBackLink');
     },
 
     /**
      * Finds and returns the save button on the sticky bottom bar
      */
     async findDSaveButton() {
-      return await testSubjects.find('createPackageConfigSaveButton');
+      return await testSubjects.find('createPackagePolicySaveButton');
     },
 
     /**
-     * Selects an agent configuration on the form
+     * Selects an agent policy on the form
      * @param name
-     * Visual name of the configuration. if one is not provided, the first agent
-     * configuration on the list will be chosen
+     * Visual name of the policy. if one is not provided, the first agent
+     * policy on the list will be chosen
      */
-    async selectAgentConfig(name?: string) {
+    async selectAgentPolicy(name?: string) {
       // if we have a name, then find the button with that `title` set.
       if (name) {
         await (
-          await find.byCssSelector(`[data-test-subj="agentConfigItem"][title="${name}"]`)
+          await find.byCssSelector(`[data-test-subj="agentPolicyItem"][title="${name}"]`)
         ).click();
       }
-      // Else, just select the first agent configuration that is present
+      // Else, just select the first agent policy that is present
       else {
-        await (await testSubjects.find('agentConfigItem')).click();
+        await (await testSubjects.find('agentPolicyItem')).click();
       }
     },
 
     /**
-     * Returns the package config name currently populated on the input field
+     * Returns the package Policy name currently populated on the input field
      */
-    async getPackageConfigName() {
-      return testSubjects.getAttribute('packageConfigNameInput', 'value');
+    async getPackagePolicyName() {
+      return testSubjects.getAttribute('packagePolicyNameInput', 'value');
     },
 
     /**
-     * Set the name of the package config on the input field
+     * Set the name of the package Policy on the input field
      * @param name
      */
-    async setPackageConfigName(name: string) {
+    async setPackagePolicyName(name: string) {
       // Because of the bottom sticky bar, we need to scroll section 2 into view
       // so that `setValue()` enters the data on the input field.
       await testSubjects.scrollIntoView('dataCollectionSetupStep');
-      await testSubjects.setValue('packageConfigNameInput', name);
+      await testSubjects.setValue('packagePolicyNameInput', name);
     },
 
     /**
      * Waits for the save Notification toast to be visible
      */
     async waitForSaveSuccessNotification() {
-      await testSubjects.existOrFail('packageConfigCreateSuccessToast');
+      await testSubjects.existOrFail('packagePolicyCreateSuccessToast');
     },
 
     /**
-     * Validates that the page shown is the Package Config Edit Page
+     * Validates that the page shown is the Package Policy Edit Page
      */
     async ensureOnEditPageOrFail() {
-      await testSubjects.existOrFail('editPackageConfig_header');
+      await testSubjects.existOrFail('editPackagePolicy_header');
     },
 
     /**
-     * Navigates to the Ingest Agent configuration Edit Package Config page
+     * Navigates to the Ingest Agent configuration Edit Package Policy page
      */
-    async navigateToAgentConfigEditPackageConfig(agentConfigId: string, packageConfigId: string) {
+    async navigateToAgentPolicyEditPackagePolicy(agentPolicyId: string, packagePolicyId: string) {
       await pageObjects.common.navigateToApp('ingestManager', {
-        hash: `/configs/${agentConfigId}/edit-integration/${packageConfigId}`,
+        hash: `/policies/${agentPolicyId}/edit-integration/${packagePolicyId}`,
       });
       await this.ensureOnEditPageOrFail();
     },
diff --git a/x-pack/test/security_solution_endpoint/page_objects/policy_page.ts b/x-pack/test/security_solution_endpoint/page_objects/policy_page.ts
index 8ee42d4026381..9c1fa0c6e86b2 100644
--- a/x-pack/test/security_solution_endpoint/page_objects/policy_page.ts
+++ b/x-pack/test/security_solution_endpoint/page_objects/policy_page.ts
@@ -106,12 +106,12 @@ export function EndpointPolicyPageProvider({ getService, getPageObjects }: FtrPr
     },
 
     /**
-     * Used when looking a the Ingest create/edit package config pages. Finds the endpoint
+     * Used when looking a the Ingest create/edit package policy pages. Finds the endpoint
      * custom configuaration component
      * @param onEditPage
      */
-    async findPackageConfigEndpointCustomConfiguration(onEditPage: boolean = false) {
-      return await testSubjects.find(`endpointPackageConfig_${onEditPage ? 'edit' : 'create'}`);
+    async findPackagePolicyEndpointCustomConfiguration(onEditPage: boolean = false) {
+      return await testSubjects.find(`endpointPackagePolicy_${onEditPage ? 'edit' : 'create'}`);
     },
 
     /**
diff --git a/x-pack/test/security_solution_endpoint/services/endpoint_policy.ts b/x-pack/test/security_solution_endpoint/services/endpoint_policy.ts
index df7d117e91dcb..349aa0bc3a9ea 100644
--- a/x-pack/test/security_solution_endpoint/services/endpoint_policy.ts
+++ b/x-pack/test/security_solution_endpoint/services/endpoint_policy.ts
@@ -5,25 +5,25 @@
  */
 import { FtrProviderContext } from '../ftr_provider_context';
 import {
-  CreateAgentConfigRequest,
-  CreateAgentConfigResponse,
-  CreatePackageConfigRequest,
-  CreatePackageConfigResponse,
-  PACKAGE_CONFIG_SAVED_OBJECT_TYPE,
-  DeleteAgentConfigRequest,
-  DeletePackageConfigsRequest,
-  GetPackageConfigsResponse,
-  GetFullAgentConfigResponse,
+  CreateAgentPolicyRequest,
+  CreateAgentPolicyResponse,
+  CreatePackagePolicyRequest,
+  CreatePackagePolicyResponse,
+  PACKAGE_POLICY_SAVED_OBJECT_TYPE,
+  DeleteAgentPolicyRequest,
+  DeletePackagePoliciesRequest,
+  GetPackagePoliciesResponse,
+  GetFullAgentPolicyResponse,
   GetPackagesResponse,
 } from '../../../plugins/ingest_manager/common';
 import { factory as policyConfigFactory } from '../../../plugins/security_solution/common/endpoint/models/policy_config';
 import { Immutable } from '../../../plugins/security_solution/common/endpoint/types';
 
 const INGEST_API_ROOT = '/api/ingest_manager';
-const INGEST_API_AGENT_CONFIGS = `${INGEST_API_ROOT}/agent_configs`;
-const INGEST_API_AGENT_CONFIGS_DELETE = `${INGEST_API_AGENT_CONFIGS}/delete`;
-const INGEST_API_PACKAGE_CONFIGS = `${INGEST_API_ROOT}/package_configs`;
-const INGEST_API_PACKAGE_CONFIGS_DELETE = `${INGEST_API_PACKAGE_CONFIGS}/delete`;
+const INGEST_API_AGENT_POLICIES = `${INGEST_API_ROOT}/agent_policies`;
+const INGEST_API_AGENT_POLICIES_DELETE = `${INGEST_API_AGENT_POLICIES}/delete`;
+const INGEST_API_PACKAGE_POLICIES = `${INGEST_API_ROOT}/package_policies`;
+const INGEST_API_PACKAGE_POLICIES_DELETE = `${INGEST_API_PACKAGE_POLICIES}/delete`;
 const INGEST_API_EPM_PACKAGES = `${INGEST_API_ROOT}/epm/packages`;
 
 const SECURITY_PACKAGES_ROUTE = `${INGEST_API_EPM_PACKAGES}?category=security`;
@@ -32,17 +32,17 @@ const SECURITY_PACKAGES_ROUTE = `${INGEST_API_EPM_PACKAGES}?category=security`;
  * Holds information about the test resources created to support an Endpoint Policy
  */
 export interface PolicyTestResourceInfo {
-  /** The Ingest agent configuration created */
-  agentConfig: Immutable<CreateAgentConfigResponse['item']>;
-  /** The Ingest Package Config created and added to agent configuration.
+  /** The Ingest agent policy created */
+  agentPolicy: Immutable<CreateAgentPolicyResponse['item']>;
+  /** The Ingest Package Policy created and added to agent policy.
    * This is where Endpoint Policy is stored.
    */
-  packageConfig: Immutable<CreatePackageConfigResponse['item']>;
+  packagePolicy: Immutable<CreatePackagePolicyResponse['item']>;
   /**
    * Information about the endpoint package
    */
   packageInfo: Immutable<GetPackagesResponse['response'][0]>;
-  /** will clean up (delete) the objects created (agent config + Package Config) */
+  /** will clean up (delete) the objects created (Agent Policy + Package Policy) */
   cleanup: () => Promise<void>;
 }
 
@@ -64,7 +64,7 @@ export function EndpointPolicyTestResourcesProvider({ getService }: FtrProviderC
     // EPM does not currently have an API to get the "lastest" information for a page given its name,
     // so we'll retrieve a list of packages for a category of Security, and will then find the
     // endpoint package info. in the list. The request is kicked off here, but handled below after
-    // agent config creation so that they can be executed concurrently
+    // Agent Policy creation so that they can be executed concurrently
     let apiRequest: Promise<GetPackagesResponse['response'][0] | undefined>;
 
     return () => {
@@ -107,57 +107,57 @@ export function EndpointPolicyTestResourcesProvider({ getService }: FtrProviderC
 
   return {
     /**
-     * Retrieves the full Agent configuration, which mirrors what the Elastic Agent would get
+     * Retrieves the full Agent policy, which mirrors what the Elastic Agent would get
      * once they checkin.
      */
-    async getFullAgentConfig(agentConfigId: string): Promise<GetFullAgentConfigResponse['item']> {
-      let fullAgentConfig: GetFullAgentConfigResponse['item'];
+    async getFullAgentPolicy(agentPolicyId: string): Promise<GetFullAgentPolicyResponse['item']> {
+      let fullAgentPolicy: GetFullAgentPolicyResponse['item'];
       try {
-        const apiResponse: { body: GetFullAgentConfigResponse } = await supertest
-          .get(`${INGEST_API_AGENT_CONFIGS}/${agentConfigId}/full`)
+        const apiResponse: { body: GetFullAgentPolicyResponse } = await supertest
+          .get(`${INGEST_API_AGENT_POLICIES}/${agentPolicyId}/full`)
           .expect(200);
 
-        fullAgentConfig = apiResponse.body.item;
+        fullAgentPolicy = apiResponse.body.item;
       } catch (error) {
-        return logSupertestApiErrorAndThrow('Unable to get full Agent Configuration', error);
+        return logSupertestApiErrorAndThrow('Unable to get full Agent policy', error);
       }
 
-      return fullAgentConfig!;
+      return fullAgentPolicy!;
     },
 
     /**
-     * Creates an Ingest Agent Configuration and adds to it the Endpoint Package Config that
+     * Creates an Ingest Agent policy and adds to it the Endpoint Package Policy that
      * stores the Policy configuration data
      */
     async createPolicy(): Promise<PolicyTestResourceInfo> {
-      // create agent config
-      let agentConfig: CreateAgentConfigResponse['item'];
+      // create Agent Policy
+      let agentPolicy: CreateAgentPolicyResponse['item'];
       try {
-        const newAgentconfigData: CreateAgentConfigRequest['body'] = {
+        const newAgentPolicyData: CreateAgentPolicyRequest['body'] = {
           name: 'East Coast',
           description: 'East Coast call center',
           namespace: 'default',
         };
-        const { body: createResponse }: { body: CreateAgentConfigResponse } = await supertest
-          .post(INGEST_API_AGENT_CONFIGS)
+        const { body: createResponse }: { body: CreateAgentPolicyResponse } = await supertest
+          .post(INGEST_API_AGENT_POLICIES)
           .set('kbn-xsrf', 'xxx')
-          .send(newAgentconfigData)
+          .send(newAgentPolicyData)
           .expect(200);
-        agentConfig = createResponse.item;
+        agentPolicy = createResponse.item;
       } catch (error) {
-        return logSupertestApiErrorAndThrow(`Unable to create Agent Config via Ingest!`, error);
+        return logSupertestApiErrorAndThrow(`Unable to create Agent Policy via Ingest!`, error);
       }
 
       // Retrieve the Endpoint package information
       const endpointPackageInfo = await retrieveEndpointPackageInfo();
 
-      // create Package Config and associated it to agent config
-      let packageConfig: CreatePackageConfigResponse['item'];
+      // create Package Policy and associated it to Agent Policy
+      let packagePolicy: CreatePackagePolicyResponse['item'];
       try {
-        const newPackageConfigData: CreatePackageConfigRequest['body'] = {
+        const newPackagePolicyData: CreatePackagePolicyRequest['body'] = {
           name: 'Protect East Coast',
           description: 'Protect the worlds data - but in the East Coast',
-          config_id: agentConfig!.id,
+          policy_id: agentPolicy!.id,
           enabled: true,
           output_id: '',
           inputs: [
@@ -181,94 +181,94 @@ export function EndpointPolicyTestResourcesProvider({ getService }: FtrProviderC
         };
         const {
           body: createResponse,
-        }: { body: CreatePackageConfigResponse } = await supertest
-          .post(INGEST_API_PACKAGE_CONFIGS)
+        }: { body: CreatePackagePolicyResponse } = await supertest
+          .post(INGEST_API_PACKAGE_POLICIES)
           .set('kbn-xsrf', 'xxx')
-          .send(newPackageConfigData)
+          .send(newPackagePolicyData)
           .expect(200);
-        packageConfig = createResponse.item;
+        packagePolicy = createResponse.item;
       } catch (error) {
-        return logSupertestApiErrorAndThrow(`Unable to create Package Config via Ingest!`, error);
+        return logSupertestApiErrorAndThrow(`Unable to create Package Policy via Ingest!`, error);
       }
 
       return {
-        agentConfig,
-        packageConfig,
+        agentPolicy,
+        packagePolicy,
         packageInfo: endpointPackageInfo!,
         async cleanup() {
-          // Delete Package Config
+          // Delete Package Policy
           try {
-            const deletePackageConfigData: DeletePackageConfigsRequest['body'] = {
-              packageConfigIds: [packageConfig.id],
+            const deletePackagePolicyData: DeletePackagePoliciesRequest['body'] = {
+              packagePolicyIds: [packagePolicy.id],
             };
             await supertest
-              .post(INGEST_API_PACKAGE_CONFIGS_DELETE)
+              .post(INGEST_API_PACKAGE_POLICIES_DELETE)
               .set('kbn-xsrf', 'xxx')
-              .send(deletePackageConfigData)
+              .send(deletePackagePolicyData)
               .expect(200);
           } catch (error) {
-            logSupertestApiErrorAndThrow('Unable to delete Package Config via Ingest!', error);
+            logSupertestApiErrorAndThrow('Unable to delete Package Policy via Ingest!', error);
           }
 
-          // Delete Agent config
+          // Delete Agent Policy
           try {
-            const deleteAgentConfigData: DeleteAgentConfigRequest['body'] = {
-              agentConfigId: agentConfig.id,
+            const deleteAgentPolicyData: DeleteAgentPolicyRequest['body'] = {
+              agentPolicyId: agentPolicy.id,
             };
             await supertest
-              .post(INGEST_API_AGENT_CONFIGS_DELETE)
+              .post(INGEST_API_AGENT_POLICIES_DELETE)
               .set('kbn-xsrf', 'xxx')
-              .send(deleteAgentConfigData)
+              .send(deleteAgentPolicyData)
               .expect(200);
           } catch (error) {
-            logSupertestApiErrorAndThrow('Unable to delete Agent Config via Ingest!', error);
+            logSupertestApiErrorAndThrow('Unable to delete Agent Policy via Ingest!', error);
           }
         },
       };
     },
 
     /**
-     * Deletes a policy (Package Config) by using the policy name
+     * Deletes a policy (Package Policy) by using the policy name
      * @param name
      */
     async deletePolicyByName(name: string) {
-      let packageConfigList: GetPackageConfigsResponse['items'];
+      let packagePolicyList: GetPackagePoliciesResponse['items'];
       try {
         const {
-          body: packageConfigsResponse,
-        }: { body: GetPackageConfigsResponse } = await supertest
-          .get(INGEST_API_PACKAGE_CONFIGS)
+          body: packagePoliciesResponse,
+        }: { body: GetPackagePoliciesResponse } = await supertest
+          .get(INGEST_API_PACKAGE_POLICIES)
           .set('kbn-xsrf', 'xxx')
-          .query({ kuery: `${PACKAGE_CONFIG_SAVED_OBJECT_TYPE}.name: ${name}` })
+          .query({ kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.name: ${name}` })
           .send()
           .expect(200);
-        packageConfigList = packageConfigsResponse.items;
+        packagePolicyList = packagePoliciesResponse.items;
       } catch (error) {
         return logSupertestApiErrorAndThrow(
-          `Unable to get list of Package Configs with name=${name}`,
+          `Unable to get list of Package Policies with name=${name}`,
           error
         );
       }
 
-      if (packageConfigList.length === 0) {
+      if (packagePolicyList.length === 0) {
         throw new Error(`Policy named '${name}' was not found!`);
       }
 
-      if (packageConfigList.length > 1) {
-        throw new Error(`Found ${packageConfigList.length} Policies - was expecting only one!`);
+      if (packagePolicyList.length > 1) {
+        throw new Error(`Found ${packagePolicyList.length} Policies - was expecting only one!`);
       }
 
       try {
-        const deletePackageConfigData: DeletePackageConfigsRequest['body'] = {
-          packageConfigIds: [packageConfigList[0].id],
+        const deletePackagePolicyData: DeletePackagePoliciesRequest['body'] = {
+          packagePolicyIds: [packagePolicyList[0].id],
         };
         await supertest
-          .post(INGEST_API_PACKAGE_CONFIGS_DELETE)
+          .post(INGEST_API_PACKAGE_POLICIES_DELETE)
           .set('kbn-xsrf', 'xxx')
-          .send(deletePackageConfigData)
+          .send(deletePackagePolicyData)
           .expect(200);
       } catch (error) {
-        logSupertestApiErrorAndThrow('Unable to delete Package Config via Ingest!', error);
+        logSupertestApiErrorAndThrow('Unable to delete Package Policy via Ingest!', error);
       }
     },
   };

From e48a5672c07eed9e1e15c032b8950013e6b8f95a Mon Sep 17 00:00:00 2001
From: Tim Sullivan <tsullivan@users.noreply.github.com>
Date: Wed, 19 Aug 2020 13:52:43 -0700
Subject: [PATCH 43/85] [Reporting/JobListing] fix user ID for non-security in
 queries (#75365)

* [Reporting/JobListing] fix user ID for non-security in queries

* fix tests

* add fn api test

* fix ci

* revert TS exploration
---
 .../reporting/server/lib/enqueue_job.ts       |  10 +-
 .../reporting/server/lib/store/report.ts      |   4 +-
 .../reporting/server/lib/store/store.test.ts  |  24 ++--
 .../reporting/server/lib/store/store.ts       |  10 +-
 .../lib/authorized_user_pre_routing.test.ts   |   8 +-
 .../routes/lib/authorized_user_pre_routing.ts |   6 +-
 .../reporting/server/routes/lib/get_user.ts   |   2 +-
 .../server/routes/lib/job_response_handler.ts |   6 +-
 .../reporting/server/routes/lib/jobs_query.ts |  17 +--
 .../reporting/server/routes/types.d.ts        |   5 +-
 x-pack/plugins/reporting/server/types.ts      |   4 +-
 x-pack/scripts/functional_tests.js            |   3 +-
 ...ig.js => reporting_and_security.config.ts} |   5 +-
 .../constants.ts                              |   0
 .../csv_job_params.ts                         |   0
 .../csv_saved_search.ts                       |   0
 .../index.ts                                  |   0
 .../network_policy.ts                         |   0
 .../usage.ts                                  |   0
 .../reporting_without_security.config.ts      |  45 +++++++
 .../reporting_without_security/index.ts       |  15 +++
 .../reporting_without_security/job_apis.ts    | 126 ++++++++++++++++++
 .../reporting_api_integration/services.ts     |   1 +
 23 files changed, 242 insertions(+), 49 deletions(-)
 rename x-pack/test/reporting_api_integration/{config.js => reporting_and_security.config.ts} (90%)
 rename x-pack/test/reporting_api_integration/{reporting => reporting_and_security}/constants.ts (100%)
 rename x-pack/test/reporting_api_integration/{reporting => reporting_and_security}/csv_job_params.ts (100%)
 rename x-pack/test/reporting_api_integration/{reporting => reporting_and_security}/csv_saved_search.ts (100%)
 rename x-pack/test/reporting_api_integration/{reporting => reporting_and_security}/index.ts (100%)
 rename x-pack/test/reporting_api_integration/{reporting => reporting_and_security}/network_policy.ts (100%)
 rename x-pack/test/reporting_api_integration/{reporting => reporting_and_security}/usage.ts (100%)
 create mode 100644 x-pack/test/reporting_api_integration/reporting_without_security.config.ts
 create mode 100644 x-pack/test/reporting_api_integration/reporting_without_security/index.ts
 create mode 100644 x-pack/test/reporting_api_integration/reporting_without_security/job_apis.ts

diff --git a/x-pack/plugins/reporting/server/lib/enqueue_job.ts b/x-pack/plugins/reporting/server/lib/enqueue_job.ts
index 31960c782b7b9..3e3aef92c55a3 100644
--- a/x-pack/plugins/reporting/server/lib/enqueue_job.ts
+++ b/x-pack/plugins/reporting/server/lib/enqueue_job.ts
@@ -6,15 +6,14 @@
 
 import { KibanaRequest, RequestHandlerContext } from 'src/core/server';
 import { ReportingCore } from '../';
-import { AuthenticatedUser } from '../../../security/server';
-import { CreateJobBaseParams, CreateJobFn } from '../types';
+import { CreateJobBaseParams, CreateJobFn, ReportingUser } from '../types';
 import { LevelLogger } from './';
 import { Report } from './store';
 
 export type EnqueueJobFn = (
   exportTypeId: string,
   jobParams: CreateJobBaseParams,
-  user: AuthenticatedUser | null,
+  user: ReportingUser,
   context: RequestHandlerContext,
   request: KibanaRequest
 ) => Promise<Report>;
@@ -28,13 +27,12 @@ export function enqueueJobFactory(
   return async function enqueueJob(
     exportTypeId: string,
     jobParams: CreateJobBaseParams,
-    user: AuthenticatedUser | null,
+    user: ReportingUser,
     context: RequestHandlerContext,
     request: KibanaRequest
   ) {
     type ScheduleTaskFnType = CreateJobFn<CreateJobBaseParams>;
 
-    const username: string | null = user ? user.username : null;
     const exportType = reporting.getExportTypesRegistry().getById(exportTypeId);
 
     if (exportType == null) {
@@ -50,7 +48,7 @@ export function enqueueJobFactory(
     const payload = await scheduleTask(jobParams, context, request);
 
     // store the pending report, puts it in the Reporting Management UI table
-    const report = await store.addReport(exportType.jobType, username, payload);
+    const report = await store.addReport(exportType.jobType, user, payload);
 
     logger.info(`Scheduled ${exportType.name} report: ${report._id}`);
 
diff --git a/x-pack/plugins/reporting/server/lib/store/report.ts b/x-pack/plugins/reporting/server/lib/store/report.ts
index 5ff71ae7a7182..5c9b9ced7cce7 100644
--- a/x-pack/plugins/reporting/server/lib/store/report.ts
+++ b/x-pack/plugins/reporting/server/lib/store/report.ts
@@ -18,7 +18,7 @@ interface ReportingDocument {
   _seq_no: unknown;
   _primary_term: unknown;
   jobtype: string;
-  created_by: string | null;
+  created_by: string | false;
   payload: {
     headers: string; // encrypted headers
     objectType: string;
@@ -53,7 +53,7 @@ export class Report implements Partial<ReportingDocument> {
 
   public readonly jobtype: string;
   public readonly created_at?: string;
-  public readonly created_by?: string | null;
+  public readonly created_by?: string | false;
   public readonly payload: {
     headers: string; // encrypted headers
     objectType: string;
diff --git a/x-pack/plugins/reporting/server/lib/store/store.test.ts b/x-pack/plugins/reporting/server/lib/store/store.test.ts
index c66e2dd7742c4..e6c4eb7346460 100644
--- a/x-pack/plugins/reporting/server/lib/store/store.test.ts
+++ b/x-pack/plugins/reporting/server/lib/store/store.test.ts
@@ -53,7 +53,9 @@ describe('ReportingStore', () => {
         headers: 'rp_headers_1',
         objectType: 'testOt',
       };
-      await expect(store.addReport(reportType, 'username1', reportPayload)).resolves.toMatchObject({
+      await expect(
+        store.addReport(reportType, { username: 'username1' }, reportPayload)
+      ).resolves.toMatchObject({
         _primary_term: undefined,
         _seq_no: undefined,
         attempts: 0,
@@ -84,9 +86,9 @@ describe('ReportingStore', () => {
         headers: 'rp_headers_2',
         objectType: 'testOt',
       };
-      expect(store.addReport(reportType, 'user1', reportPayload)).rejects.toMatchInlineSnapshot(
-        `[Error: Invalid index interval: centurially]`
-      );
+      expect(
+        store.addReport(reportType, { username: 'user1' }, reportPayload)
+      ).rejects.toMatchInlineSnapshot(`[Error: Invalid index interval: centurially]`);
     });
 
     it('handles error creating the index', async () => {
@@ -102,7 +104,7 @@ describe('ReportingStore', () => {
         objectType: 'testOt',
       };
       await expect(
-        store.addReport(reportType, 'user1', reportPayload)
+        store.addReport(reportType, { username: 'user1' }, reportPayload)
       ).rejects.toMatchInlineSnapshot(`[Error: horrible error]`);
     });
 
@@ -125,7 +127,7 @@ describe('ReportingStore', () => {
         objectType: 'testOt',
       };
       await expect(
-        store.addReport(reportType, 'user1', reportPayload)
+        store.addReport(reportType, { username: 'user1' }, reportPayload)
       ).rejects.toMatchInlineSnapshot(`[Error: devastating error]`);
     });
 
@@ -143,7 +145,9 @@ describe('ReportingStore', () => {
         headers: 'rp_headers_5',
         objectType: 'testOt',
       };
-      await expect(store.addReport(reportType, 'user1', reportPayload)).resolves.toMatchObject({
+      await expect(
+        store.addReport(reportType, { username: 'user1' }, reportPayload)
+      ).resolves.toMatchObject({
         _primary_term: undefined,
         _seq_no: undefined,
         attempts: 0,
@@ -160,7 +164,7 @@ describe('ReportingStore', () => {
       });
     });
 
-    it('allows username string to be `null`', async () => {
+    it('allows username string to be `false`', async () => {
       // setup
       callClusterStub.withArgs('indices.exists').resolves(false);
       callClusterStub
@@ -174,13 +178,13 @@ describe('ReportingStore', () => {
         headers: 'rp_test_headers',
         objectType: 'testOt',
       };
-      await expect(store.addReport(reportType, null, reportPayload)).resolves.toMatchObject({
+      await expect(store.addReport(reportType, false, reportPayload)).resolves.toMatchObject({
         _primary_term: undefined,
         _seq_no: undefined,
         attempts: 0,
         browser_type: undefined,
         completed_at: undefined,
-        created_by: null,
+        created_by: false,
         jobtype: 'unknowntype',
         max_attempts: undefined,
         payload: {},
diff --git a/x-pack/plugins/reporting/server/lib/store/store.ts b/x-pack/plugins/reporting/server/lib/store/store.ts
index 12cff0e973ed6..88f6fa418a1b3 100644
--- a/x-pack/plugins/reporting/server/lib/store/store.ts
+++ b/x-pack/plugins/reporting/server/lib/store/store.ts
@@ -7,7 +7,11 @@
 import { ElasticsearchServiceSetup } from 'src/core/server';
 import { LevelLogger, statuses } from '../';
 import { ReportingCore } from '../../';
-import { CreateJobBaseParams, CreateJobBaseParamsEncryptedFields } from '../../types';
+import {
+  CreateJobBaseParams,
+  CreateJobBaseParamsEncryptedFields,
+  ReportingUser,
+} from '../../types';
 import { indexTimestamp } from './index_timestamp';
 import { mapping } from './mapping';
 import { Report } from './report';
@@ -140,7 +144,7 @@ export class ReportingStore {
 
   public async addReport(
     type: string,
-    username: string | null,
+    user: ReportingUser,
     payload: CreateJobBaseParams & CreateJobBaseParamsEncryptedFields
   ): Promise<Report> {
     const timestamp = indexTimestamp(this.indexInterval);
@@ -151,7 +155,7 @@ export class ReportingStore {
       _index: index,
       payload,
       jobtype: type,
-      created_by: username,
+      created_by: user ? user.username : false,
       ...this.jobSettings,
     });
 
diff --git a/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.test.ts b/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.test.ts
index f4591f8436bd2..50780a577af02 100644
--- a/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.test.ts
+++ b/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.test.ts
@@ -46,7 +46,7 @@ describe('authorized_user_pre_routing', function () {
     mockCore = await createMockReportingCore(mockReportingConfig);
   });
 
-  it('should return from handler with a "null" user when security plugin is not found', async function () {
+  it('should return from handler with a "false" user when security plugin is not found', async function () {
     mockCore.getPluginSetupDeps = () =>
       (({
         // @ts-ignore
@@ -58,7 +58,7 @@ describe('authorized_user_pre_routing', function () {
 
     let handlerCalled = false;
     authorizedUserPreRouting((user: unknown) => {
-      expect(user).toBe(null); // verify the user is a null value
+      expect(user).toBe(false); // verify the user is a false value
       handlerCalled = true;
       return Promise.resolve({ status: 200, options: {} });
     })(getMockContext(), getMockRequest(), mockResponseFactory);
@@ -66,7 +66,7 @@ describe('authorized_user_pre_routing', function () {
     expect(handlerCalled).toBe(true);
   });
 
-  it('should return from handler with a "null" user when security is disabled', async function () {
+  it('should return from handler with a "false" user when security is disabled', async function () {
     mockCore.getPluginSetupDeps = () =>
       (({
         // @ts-ignore
@@ -82,7 +82,7 @@ describe('authorized_user_pre_routing', function () {
 
     let handlerCalled = false;
     authorizedUserPreRouting((user: unknown) => {
-      expect(user).toBe(null); // verify the user is a null value
+      expect(user).toBe(false); // verify the user is a false value
       handlerCalled = true;
       return Promise.resolve({ status: 200, options: {} });
     })(getMockContext(), getMockRequest(), mockResponseFactory);
diff --git a/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.ts b/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.ts
index e2f393aad57d2..4d57bc154444e 100644
--- a/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.ts
+++ b/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.ts
@@ -9,11 +9,11 @@ import { AuthenticatedUser } from '../../../../security/server';
 import { ReportingCore } from '../../core';
 import { getUserFactory } from './get_user';
 
-type ReportingUser = AuthenticatedUser | null;
 const superuserRole = 'superuser';
 
+type ReportingRequestUser = AuthenticatedUser | false;
 export type RequestHandlerUser<P, Q, B> = RequestHandler<P, Q, B> extends (...a: infer U) => infer R
-  ? (user: ReportingUser, ...a: U) => R
+  ? (user: ReportingRequestUser, ...a: U) => R
   : never;
 
 export const authorizedUserPreRoutingFactory = function authorizedUserPreRoutingFn(
@@ -23,7 +23,7 @@ export const authorizedUserPreRoutingFactory = function authorizedUserPreRouting
   const getUser = getUserFactory(setupDeps.security);
   return <P, Q, B>(handler: RequestHandlerUser<P, Q, B>): RequestHandler<P, Q, B, RouteMethod> => {
     return (context, req, res) => {
-      let user: ReportingUser = null;
+      let user: ReportingRequestUser = false;
       if (setupDeps.security && setupDeps.security.license.isEnabled()) {
         // find the authenticated user, or null if security is not enabled
         user = getUser(req);
diff --git a/x-pack/plugins/reporting/server/routes/lib/get_user.ts b/x-pack/plugins/reporting/server/routes/lib/get_user.ts
index fd56e8cfc28c7..ee6ad6ad7d671 100644
--- a/x-pack/plugins/reporting/server/routes/lib/get_user.ts
+++ b/x-pack/plugins/reporting/server/routes/lib/get_user.ts
@@ -9,6 +9,6 @@ import { SecurityPluginSetup } from '../../../../security/server';
 
 export function getUserFactory(security?: SecurityPluginSetup) {
   return (request: KibanaRequest) => {
-    return security?.authc.getCurrentUser(request) ?? null;
+    return security?.authc.getCurrentUser(request) ?? false;
   };
 }
diff --git a/x-pack/plugins/reporting/server/routes/lib/job_response_handler.ts b/x-pack/plugins/reporting/server/routes/lib/job_response_handler.ts
index df346c8b9b832..aec1eee0eee14 100644
--- a/x-pack/plugins/reporting/server/routes/lib/job_response_handler.ts
+++ b/x-pack/plugins/reporting/server/routes/lib/job_response_handler.ts
@@ -6,8 +6,8 @@
 
 import { kibanaResponseFactory } from 'kibana/server';
 import { ReportingCore } from '../../';
-import { AuthenticatedUser } from '../../../../security/server';
 import { WHITELISTED_JOB_CONTENT_TYPES } from '../../../common/constants';
+import { ReportingUser } from '../../types';
 import { getDocumentPayloadFactory } from './get_document_payload';
 import { jobsQueryFactory } from './jobs_query';
 
@@ -27,7 +27,7 @@ export function downloadJobResponseHandlerFactory(reporting: ReportingCore) {
   return async function jobResponseHandler(
     res: typeof kibanaResponseFactory,
     validJobTypes: string[],
-    user: AuthenticatedUser | null,
+    user: ReportingUser,
     params: JobResponseHandlerParams,
     opts: JobResponseHandlerOpts = {}
   ) {
@@ -71,7 +71,7 @@ export function deleteJobResponseHandlerFactory(reporting: ReportingCore) {
   return async function deleteJobResponseHander(
     res: typeof kibanaResponseFactory,
     validJobTypes: string[],
-    user: AuthenticatedUser | null,
+    user: ReportingUser,
     params: JobResponseHandlerParams
   ) {
     const { docId } = params;
diff --git a/x-pack/plugins/reporting/server/routes/lib/jobs_query.ts b/x-pack/plugins/reporting/server/routes/lib/jobs_query.ts
index f3955b4871b31..b01c880abe820 100644
--- a/x-pack/plugins/reporting/server/routes/lib/jobs_query.ts
+++ b/x-pack/plugins/reporting/server/routes/lib/jobs_query.ts
@@ -8,12 +8,12 @@ import { i18n } from '@kbn/i18n';
 import { errors as elasticsearchErrors } from 'elasticsearch';
 import { get } from 'lodash';
 import { ReportingCore } from '../../';
-import { AuthenticatedUser } from '../../../../security/server';
-import { JobSource } from '../../types';
+import { JobSource, ReportingUser } from '../../types';
 
 const esErrors = elasticsearchErrors as Record<string, any>;
 const defaultSize = 10;
 
+// TODO: use SearchRequest from elasticsearch-client
 interface QueryBody {
   size?: number;
   from?: number;
@@ -35,11 +35,12 @@ interface GetOpts {
   includeContent?: boolean;
 }
 
+// TODO: use SearchResult from elasticsearch-client
 interface CountAggResult {
   count: number;
 }
 
-const getUsername = (user: AuthenticatedUser | null) => (user ? user.username : false);
+const getUsername = (user: ReportingUser) => (user ? user.username : false);
 
 export function jobsQueryFactory(reportingCore: ReportingCore) {
   const { elasticsearch } = reportingCore.getPluginSetupDeps();
@@ -80,7 +81,7 @@ export function jobsQueryFactory(reportingCore: ReportingCore) {
   return {
     list(
       jobTypes: string[],
-      user: AuthenticatedUser | null,
+      user: ReportingUser,
       page = 0,
       size = defaultSize,
       jobIds: string[] | null
@@ -109,7 +110,7 @@ export function jobsQueryFactory(reportingCore: ReportingCore) {
       return getHits(execQuery('search', body));
     },
 
-    count(jobTypes: string[], user: AuthenticatedUser | null) {
+    count(jobTypes: string[], user: ReportingUser) {
       const username = getUsername(user);
       const body: QueryBody = {
         query: {
@@ -129,11 +130,7 @@ export function jobsQueryFactory(reportingCore: ReportingCore) {
       });
     },
 
-    get(
-      user: AuthenticatedUser | null,
-      id: string,
-      opts: GetOpts = {}
-    ): Promise<JobSource<unknown> | void> {
+    get(user: ReportingUser, id: string, opts: GetOpts = {}): Promise<JobSource<unknown> | void> {
       if (!id) return Promise.resolve();
       const username = getUsername(user);
 
diff --git a/x-pack/plugins/reporting/server/routes/types.d.ts b/x-pack/plugins/reporting/server/routes/types.d.ts
index c92c9fb7eef74..ab1dd841bbbc2 100644
--- a/x-pack/plugins/reporting/server/routes/types.d.ts
+++ b/x-pack/plugins/reporting/server/routes/types.d.ts
@@ -5,11 +5,10 @@
  */
 
 import { KibanaRequest, KibanaResponseFactory, RequestHandlerContext } from 'src/core/server';
-import { AuthenticatedUser } from '../../../security/server';
-import { CreateJobBaseParams, ScheduledTaskParams } from '../types';
+import { CreateJobBaseParams, ReportingUser, ScheduledTaskParams } from '../types';
 
 export type HandlerFunction = (
-  user: AuthenticatedUser | null,
+  user: ReportingUser,
   exportType: string,
   jobParams: CreateJobBaseParams,
   context: RequestHandlerContext,
diff --git a/x-pack/plugins/reporting/server/types.ts b/x-pack/plugins/reporting/server/types.ts
index c9649cb6e558b..542c9cdb3f677 100644
--- a/x-pack/plugins/reporting/server/types.ts
+++ b/x-pack/plugins/reporting/server/types.ts
@@ -11,7 +11,7 @@ import { DataPluginStart } from 'src/plugins/data/server/plugin';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { CancellationToken } from '../../../plugins/reporting/common';
 import { LicensingPluginSetup } from '../../licensing/server';
-import { SecurityPluginSetup } from '../../security/server';
+import { AuthenticatedUser, SecurityPluginSetup } from '../../security/server';
 import { JobStatus } from '../common/types';
 import { ReportingConfigType } from './config';
 import { ReportingCore } from './core';
@@ -164,6 +164,8 @@ export type ReportingSetup = object;
  * Internal Types
  */
 
+export type ReportingUser = { username: AuthenticatedUser['username'] } | false;
+
 export type CaptureConfig = ReportingConfigType['capture'];
 export type ScrollConfig = ReportingConfigType['csv']['scroll'];
 
diff --git a/x-pack/scripts/functional_tests.js b/x-pack/scripts/functional_tests.js
index a6550bef46d4a..f79e2c3b34497 100644
--- a/x-pack/scripts/functional_tests.js
+++ b/x-pack/scripts/functional_tests.js
@@ -58,7 +58,8 @@ const onlyNotInCoverageTests = [
   require.resolve('../test/licensing_plugin/config.public.ts'),
   require.resolve('../test/licensing_plugin/config.legacy.ts'),
   require.resolve('../test/endpoint_api_integration_no_ingest/config.ts'),
-  require.resolve('../test/reporting_api_integration/config.js'),
+  require.resolve('../test/reporting_api_integration/reporting_and_security.config.ts'),
+  require.resolve('../test/reporting_api_integration/reporting_without_security.config.ts'),
   require.resolve('../test/security_solution_endpoint_api_int/config.ts'),
   require.resolve('../test/ingest_manager_api_integration/config.ts'),
 ];
diff --git a/x-pack/test/reporting_api_integration/config.js b/x-pack/test/reporting_api_integration/reporting_and_security.config.ts
similarity index 90%
rename from x-pack/test/reporting_api_integration/config.js
rename to x-pack/test/reporting_api_integration/reporting_and_security.config.ts
index 930c90da5637c..dc5aaba69604f 100644
--- a/x-pack/test/reporting_api_integration/config.js
+++ b/x-pack/test/reporting_api_integration/reporting_and_security.config.ts
@@ -5,10 +5,11 @@
  */
 
 import { esTestConfig, kbnTestConfig, kibanaServerTestUser } from '@kbn/test';
+import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
 import { format as formatUrl } from 'url';
 import { ReportingAPIProvider } from './services';
 
-export default async function ({ readConfigFile }) {
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
   const apiConfig = await readConfigFile(require.resolve('../api_integration/config'));
   const functionalConfig = await readConfigFile(require.resolve('../functional/config')); // Reporting API tests need a fully working UI
 
@@ -23,7 +24,7 @@ export default async function ({ readConfigFile }) {
   return {
     servers: apiConfig.get('servers'),
     junit: { reportName: 'X-Pack Reporting API Integration Tests' },
-    testFiles: [require.resolve('./reporting')],
+    testFiles: [require.resolve('./reporting_and_security')],
     services: {
       ...apiConfig.get('services'),
       reportingAPI: ReportingAPIProvider,
diff --git a/x-pack/test/reporting_api_integration/reporting/constants.ts b/x-pack/test/reporting_api_integration/reporting_and_security/constants.ts
similarity index 100%
rename from x-pack/test/reporting_api_integration/reporting/constants.ts
rename to x-pack/test/reporting_api_integration/reporting_and_security/constants.ts
diff --git a/x-pack/test/reporting_api_integration/reporting/csv_job_params.ts b/x-pack/test/reporting_api_integration/reporting_and_security/csv_job_params.ts
similarity index 100%
rename from x-pack/test/reporting_api_integration/reporting/csv_job_params.ts
rename to x-pack/test/reporting_api_integration/reporting_and_security/csv_job_params.ts
diff --git a/x-pack/test/reporting_api_integration/reporting/csv_saved_search.ts b/x-pack/test/reporting_api_integration/reporting_and_security/csv_saved_search.ts
similarity index 100%
rename from x-pack/test/reporting_api_integration/reporting/csv_saved_search.ts
rename to x-pack/test/reporting_api_integration/reporting_and_security/csv_saved_search.ts
diff --git a/x-pack/test/reporting_api_integration/reporting/index.ts b/x-pack/test/reporting_api_integration/reporting_and_security/index.ts
similarity index 100%
rename from x-pack/test/reporting_api_integration/reporting/index.ts
rename to x-pack/test/reporting_api_integration/reporting_and_security/index.ts
diff --git a/x-pack/test/reporting_api_integration/reporting/network_policy.ts b/x-pack/test/reporting_api_integration/reporting_and_security/network_policy.ts
similarity index 100%
rename from x-pack/test/reporting_api_integration/reporting/network_policy.ts
rename to x-pack/test/reporting_api_integration/reporting_and_security/network_policy.ts
diff --git a/x-pack/test/reporting_api_integration/reporting/usage.ts b/x-pack/test/reporting_api_integration/reporting_and_security/usage.ts
similarity index 100%
rename from x-pack/test/reporting_api_integration/reporting/usage.ts
rename to x-pack/test/reporting_api_integration/reporting_and_security/usage.ts
diff --git a/x-pack/test/reporting_api_integration/reporting_without_security.config.ts b/x-pack/test/reporting_api_integration/reporting_without_security.config.ts
new file mode 100644
index 0000000000000..b040040fc5114
--- /dev/null
+++ b/x-pack/test/reporting_api_integration/reporting_without_security.config.ts
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { esTestConfig, kbnTestConfig } from '@kbn/test';
+import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+import { format as formatUrl } from 'url';
+import { ReportingAPIProvider } from './services';
+
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const apiConfig = await readConfigFile(require.resolve('../api_integration/config'));
+
+  return {
+    servers: apiConfig.get('servers'),
+    junit: { reportName: 'X-Pack Reporting Without Security API Integration Tests' },
+    testFiles: [require.resolve('./reporting_without_security')],
+    services: {
+      ...apiConfig.get('services'),
+      reportingAPI: ReportingAPIProvider,
+    },
+    esArchiver: apiConfig.get('esArchiver'),
+    esTestCluster: {
+      ...apiConfig.get('esTestCluster'),
+      serverArgs: [
+        ...apiConfig.get('esTestCluster.serverArgs'),
+        'node.name=UnsecuredClusterNode01',
+        'xpack.security.enabled=false',
+      ],
+    },
+    kbnTestServer: {
+      ...apiConfig.get('kbnTestServer'),
+      serverArgs: [
+        `--elasticsearch.hosts=${formatUrl(esTestConfig.getUrlParts())}`,
+        `--logging.json=false`,
+        `--server.maxPayloadBytes=1679958`,
+        `--server.port=${kbnTestConfig.getPort()}`,
+        `--xpack.reporting.capture.maxAttempts=1`,
+        `--xpack.reporting.csv.maxSizeBytes=2850`,
+        `--xpack.security.enabled=false`,
+      ],
+    },
+  };
+}
diff --git a/x-pack/test/reporting_api_integration/reporting_without_security/index.ts b/x-pack/test/reporting_api_integration/reporting_without_security/index.ts
new file mode 100644
index 0000000000000..09351a2c9907a
--- /dev/null
+++ b/x-pack/test/reporting_api_integration/reporting_without_security/index.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { FtrProviderContext } from '../ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default function ({ loadTestFile }: FtrProviderContext) {
+  describe('Reporting APIs', function () {
+    this.tags('ciGroup2');
+    loadTestFile(require.resolve('./job_apis'));
+  });
+}
diff --git a/x-pack/test/reporting_api_integration/reporting_without_security/job_apis.ts b/x-pack/test/reporting_api_integration/reporting_without_security/job_apis.ts
new file mode 100644
index 0000000000000..ab26f27076ebb
--- /dev/null
+++ b/x-pack/test/reporting_api_integration/reporting_without_security/job_apis.ts
@@ -0,0 +1,126 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import { forOwn } from 'lodash';
+import { JOB_PARAMS_RISON } from '../fixtures';
+import { FtrProviderContext } from '../ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default function ({ getService }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const supertestNoAuth = getService('supertestWithoutAuth');
+  const reportingAPI = getService('reportingAPI');
+
+  describe('Job Listing APIs, Without Security', () => {
+    before(async () => {
+      await esArchiver.load('reporting/logs');
+      await esArchiver.load('logstash_functional');
+    });
+
+    after(async () => {
+      await esArchiver.unload('reporting/logs');
+      await esArchiver.unload('logstash_functional');
+    });
+
+    afterEach(async () => {
+      await reportingAPI.deleteAllReports();
+    });
+
+    it('Posted CSV job is visible in the job count', async () => {
+      const { status: resStatus, text: resText } = await supertestNoAuth
+        .post(`/api/reporting/generate/csv`)
+        .set('kbn-xsrf', 'xxx')
+        .send({ jobParams: JOB_PARAMS_RISON });
+
+      expect(resStatus).to.be(200);
+
+      const { job: resJob } = JSON.parse(resText);
+      const expectedResJob: Record<string, any> = {
+        attempts: 0,
+        created_by: false,
+        jobtype: 'csv',
+        max_attempts: 1,
+        priority: 10,
+        status: 'pending',
+        timeout: 120000,
+        browser_type: 'chromium', // TODO: remove this field from the API response
+        // TODO: remove the payload field from the api respones
+      };
+      forOwn(expectedResJob, (value: any, key: string) => {
+        expect(resJob[key]).to.eql(value, key);
+      });
+
+      // call the job count api
+      const { text: countText } = await supertestNoAuth
+        .get(`/api/reporting/jobs/count`)
+        .set('kbn-xsrf', 'xxx');
+
+      const countResult = JSON.parse(countText);
+      expect(countResult).to.be(1);
+    });
+
+    it('Posted CSV job is visible in the status check', async () => {
+      const { status: resStatus, text: resText } = await supertestNoAuth
+        .post(`/api/reporting/generate/csv`)
+        .set('kbn-xsrf', 'xxx')
+        .send({ jobParams: JOB_PARAMS_RISON });
+
+      expect(resStatus).to.be(200);
+
+      const { job: resJob } = JSON.parse(resText);
+      // call the single job listing api (status check)
+      const { text: listText } = await supertestNoAuth
+        .get(`/api/reporting/jobs/list?page=0&ids=${resJob.id}`)
+        .set('kbn-xsrf', 'xxx');
+
+      const listingJobs = JSON.parse(listText);
+      const expectedListJob: Record<string, any> = {
+        attempts: 0,
+        created_by: false,
+        jobtype: 'csv',
+        timeout: 120000,
+        browser_type: 'chromium',
+      };
+      forOwn(expectedListJob, (value: any, key: string) => {
+        expect(listingJobs[0]._source[key]).to.eql(value, key);
+      });
+
+      expect(listingJobs.length).to.be(1);
+      expect(listingJobs[0]._id).to.be(resJob.id);
+    });
+
+    it('Posted CSV job is visible in the first page of jobs listing', async () => {
+      const { status: resStatus, text: resText } = await supertestNoAuth
+        .post(`/api/reporting/generate/csv`)
+        .set('kbn-xsrf', 'xxx')
+        .send({ jobParams: JOB_PARAMS_RISON });
+
+      expect(resStatus).to.be(200);
+
+      const { job: resJob } = JSON.parse(resText);
+      // call the ALL job listing api
+      const { text: listText } = await supertestNoAuth
+        .get(`/api/reporting/jobs/list?page=0`)
+        .set('kbn-xsrf', 'xxx');
+
+      const listingJobs = JSON.parse(listText);
+      const expectedListJob: Record<string, any> = {
+        attempts: 0,
+        created_by: false,
+        jobtype: 'csv',
+        timeout: 120000,
+        browser_type: 'chromium',
+      };
+      forOwn(expectedListJob, (value: any, key: string) => {
+        expect(listingJobs[0]._source[key]).to.eql(value, key);
+      });
+
+      expect(listingJobs.length).to.be(1);
+      expect(listingJobs[0]._id).to.be(resJob.id);
+    });
+  });
+}
diff --git a/x-pack/test/reporting_api_integration/services.ts b/x-pack/test/reporting_api_integration/services.ts
index f98d8246fc01e..e61e6483855af 100644
--- a/x-pack/test/reporting_api_integration/services.ts
+++ b/x-pack/test/reporting_api_integration/services.ts
@@ -186,6 +186,7 @@ export function ReportingAPIProvider({ getService }: FtrProviderContext) {
 
 export const services = {
   ...xpackServices,
+  supertestWithoutAuth: apiIntegrationServices.supertestWithoutAuth,
   usageAPI: apiIntegrationServices.usageAPI,
   reportingAPI: ReportingAPIProvider,
 };

From 51a80c61a0e57c0257f9948cb84f0b6af12a748f Mon Sep 17 00:00:00 2001
From: Josh Dover <me@joshdover.com>
Date: Wed, 19 Aug 2020 15:41:12 -0600
Subject: [PATCH 44/85] Add support for reading request ID from X-Opaque-Id
 header (#71019)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 ...ana-plugin-core-server.kibanarequest.id.md | 18 ++++
 ...kibana-plugin-core-server.kibanarequest.md |  1 +
 docs/setup/settings.asciidoc                  |  6 ++
 packages/kbn-config-schema/src/index.ts       |  7 ++
 packages/kbn-config-schema/src/types/index.ts |  1 +
 .../src/types/ip_type.test.ts                 | 71 +++++++++++++++
 .../kbn-config-schema/src/types/ip_type.ts    | 46 ++++++++++
 .../client/cluster_client.test.ts             | 54 ++++++++++-
 .../elasticsearch/client/cluster_client.ts    | 14 +--
 .../legacy/cluster_client.test.ts             | 16 +++-
 .../elasticsearch/legacy/cluster_client.ts    | 15 ++--
 .../__snapshots__/http_config.test.ts.snap    |  4 +
 .../http/cookie_session_storage.test.ts       |  4 +
 src/core/server/http/http_config.test.ts      | 57 ++++++++++++
 src/core/server/http/http_config.ts           | 15 ++++
 src/core/server/http/http_server.mocks.ts     | 13 ++-
 src/core/server/http/http_server.test.ts      |  6 +-
 src/core/server/http/http_server.ts           | 25 +++++-
 src/core/server/http/http_tools.test.ts       | 89 ++++++++++++++++++-
 src/core/server/http/http_tools.ts            | 10 +++
 src/core/server/http/index.ts                 |  1 +
 .../integration_tests/core_services.test.ts   | 10 ++-
 .../lifecycle_handlers.test.ts                |  4 +
 .../http/integration_tests/request.test.ts    | 20 +++++
 .../server/http/lifecycle_handlers.test.ts    | 15 ++--
 src/core/server/http/router/index.ts          |  4 +-
 src/core/server/http/router/request.test.ts   | 33 +++++++
 src/core/server/http/router/request.ts        | 35 +++++++-
 src/core/server/http/test_utils.ts            |  4 +
 src/core/server/server.api.md                 |  1 +
 .../lib/__tests__/replace_injected_vars.js    |  1 +
 .../server/alerts_client_factory.test.ts      |  1 +
 .../server/client/audit_trail_client.test.ts  | 15 +++-
 .../server/client/audit_trail_client.ts       |  1 +
 x-pack/plugins/audit_trail/server/types.ts    |  1 +
 .../server/export_types/csv/execute_job.ts    |  1 +
 36 files changed, 578 insertions(+), 41 deletions(-)
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.kibanarequest.id.md
 create mode 100644 packages/kbn-config-schema/src/types/ip_type.test.ts
 create mode 100644 packages/kbn-config-schema/src/types/ip_type.ts

diff --git a/docs/development/core/server/kibana-plugin-core-server.kibanarequest.id.md b/docs/development/core/server/kibana-plugin-core-server.kibanarequest.id.md
new file mode 100644
index 0000000000000..8cad5972cc164
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.kibanarequest.id.md
@@ -0,0 +1,18 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [KibanaRequest](./kibana-plugin-core-server.kibanarequest.md) &gt; [id](./kibana-plugin-core-server.kibanarequest.id.md)
+
+## KibanaRequest.id property
+
+A identifier to identify this request.
+
+<b>Signature:</b>
+
+```typescript
+readonly id: string;
+```
+
+## Remarks
+
+Depending on the user's configuration, this value may be sourced from the incoming request's `X-Opaque-Id` header which is not guaranteed to be unique per request.
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.kibanarequest.md b/docs/development/core/server/kibana-plugin-core-server.kibanarequest.md
index 3e6fba835c396..05e408ab49995 100644
--- a/docs/development/core/server/kibana-plugin-core-server.kibanarequest.md
+++ b/docs/development/core/server/kibana-plugin-core-server.kibanarequest.md
@@ -26,6 +26,7 @@ export declare class KibanaRequest<Params = unknown, Query = unknown, Body = unk
 |  [body](./kibana-plugin-core-server.kibanarequest.body.md) |  | <code>Body</code> |  |
 |  [events](./kibana-plugin-core-server.kibanarequest.events.md) |  | <code>KibanaRequestEvents</code> | Request events [KibanaRequestEvents](./kibana-plugin-core-server.kibanarequestevents.md) |
 |  [headers](./kibana-plugin-core-server.kibanarequest.headers.md) |  | <code>Headers</code> | Readonly copy of incoming request headers. |
+|  [id](./kibana-plugin-core-server.kibanarequest.id.md) |  | <code>string</code> | A identifier to identify this request. |
 |  [isSystemRequest](./kibana-plugin-core-server.kibanarequest.issystemrequest.md) |  | <code>boolean</code> | Whether or not the request is a "system request" rather than an application-level request. Can be set on the client using the <code>HttpFetchOptions#asSystemRequest</code> option. |
 |  [params](./kibana-plugin-core-server.kibanarequest.params.md) |  | <code>Params</code> |  |
 |  [query](./kibana-plugin-core-server.kibanarequest.query.md) |  | <code>Query</code> |  |
diff --git a/docs/setup/settings.asciidoc b/docs/setup/settings.asciidoc
index 01a9e96484965..018cc656362b8 100644
--- a/docs/setup/settings.asciidoc
+++ b/docs/setup/settings.asciidoc
@@ -476,6 +476,12 @@ identifies this {kib} instance. *Default: `"your-hostname"`*
  | {kib} is served by a back end server. This
 setting specifies the port to use. *Default: `5601`*
 
+| `server.requestId.allowFromAnyIp:`
+ | Sets whether or not the X-Opaque-Id header should be trusted from any IP address for identifying requests in logs and forwarded to Elasticsearch.
+
+| `server.requestId.ipAllowlist:`
+ | A list of IPv4 and IPv6 address which the `X-Opaque-Id` header should be trusted from. Normally this would be set to the IP addresses of the load balancers or reverse-proxy that end users use to access Kibana. If any are set, `server.requestId.allowFromAnyIp` must also be set to `false.`
+
 | `server.rewriteBasePath:`
  | Specifies whether {kib} should
 rewrite requests that are prefixed with `server.basePath` or require that they
diff --git a/packages/kbn-config-schema/src/index.ts b/packages/kbn-config-schema/src/index.ts
index 2319fe4395e3f..78b70743a2703 100644
--- a/packages/kbn-config-schema/src/index.ts
+++ b/packages/kbn-config-schema/src/index.ts
@@ -34,6 +34,8 @@ import {
   ConditionalTypeValue,
   DurationOptions,
   DurationType,
+  IpOptions,
+  IpType,
   LiteralType,
   MapOfOptions,
   MapOfType,
@@ -107,6 +109,10 @@ function never(): Type<never> {
   return new NeverType();
 }
 
+function ip(options?: IpOptions): Type<string> {
+  return new IpType(options);
+}
+
 /**
  * Create an optional type
  */
@@ -207,6 +213,7 @@ export const schema = {
   conditional,
   contextRef,
   duration,
+  ip,
   literal,
   mapOf,
   maybe,
diff --git a/packages/kbn-config-schema/src/types/index.ts b/packages/kbn-config-schema/src/types/index.ts
index c7900e1923e78..27be0a5060b42 100644
--- a/packages/kbn-config-schema/src/types/index.ts
+++ b/packages/kbn-config-schema/src/types/index.ts
@@ -36,3 +36,4 @@ export { StringOptions, StringType } from './string_type';
 export { UnionType } from './union_type';
 export { URIOptions, URIType } from './uri_type';
 export { NeverType } from './never_type';
+export { IpType, IpOptions } from './ip_type';
diff --git a/packages/kbn-config-schema/src/types/ip_type.test.ts b/packages/kbn-config-schema/src/types/ip_type.test.ts
new file mode 100644
index 0000000000000..2db3069f5d715
--- /dev/null
+++ b/packages/kbn-config-schema/src/types/ip_type.test.ts
@@ -0,0 +1,71 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { schema } from '..';
+
+const { ip } = schema;
+
+describe('ip validation', () => {
+  test('accepts ipv4', () => {
+    expect(ip().validate('1.1.1.1')).toEqual('1.1.1.1');
+  });
+  test('accepts ipv6', () => {
+    expect(ip().validate('1200:0000:AB00:1234:0000:2552:7777:1313')).toEqual(
+      '1200:0000:AB00:1234:0000:2552:7777:1313'
+    );
+  });
+  test('rejects ipv6 when not specified', () => {
+    expect(() =>
+      ip({ versions: ['ipv4'] }).validate('1200:0000:AB00:1234:0000:2552:7777:1313')
+    ).toThrowErrorMatchingInlineSnapshot(`"value must be a valid ipv4 address"`);
+  });
+  test('rejects ipv4 when not specified', () => {
+    expect(() => ip({ versions: ['ipv6'] }).validate('1.1.1.1')).toThrowErrorMatchingInlineSnapshot(
+      `"value must be a valid ipv6 address"`
+    );
+  });
+  test('rejects invalid ip addresses', () => {
+    expect(() => ip().validate('1.1.1.1/24')).toThrowErrorMatchingInlineSnapshot(
+      `"value must be a valid ipv4 or ipv6 address"`
+    );
+    expect(() => ip().validate('99999.1.1.1')).toThrowErrorMatchingInlineSnapshot(
+      `"value must be a valid ipv4 or ipv6 address"`
+    );
+    expect(() =>
+      ip().validate('ZZZZ:0000:AB00:1234:0000:2552:7777:1313')
+    ).toThrowErrorMatchingInlineSnapshot(`"value must be a valid ipv4 or ipv6 address"`);
+    expect(() => ip().validate('blah 1234')).toThrowErrorMatchingInlineSnapshot(
+      `"value must be a valid ipv4 or ipv6 address"`
+    );
+  });
+});
+
+test('returns error when not string', () => {
+  expect(() => ip().validate(123)).toThrowErrorMatchingInlineSnapshot(
+    `"expected value of type [string] but got [number]"`
+  );
+
+  expect(() => ip().validate([1, 2, 3])).toThrowErrorMatchingInlineSnapshot(
+    `"expected value of type [string] but got [Array]"`
+  );
+
+  expect(() => ip().validate(/abc/)).toThrowErrorMatchingInlineSnapshot(
+    `"expected value of type [string] but got [RegExp]"`
+  );
+});
diff --git a/packages/kbn-config-schema/src/types/ip_type.ts b/packages/kbn-config-schema/src/types/ip_type.ts
new file mode 100644
index 0000000000000..2bc1a8ea3b211
--- /dev/null
+++ b/packages/kbn-config-schema/src/types/ip_type.ts
@@ -0,0 +1,46 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import typeDetect from 'type-detect';
+import { internals } from '../internals';
+import { Type, TypeOptions } from './type';
+
+export type IpVersion = 'ipv4' | 'ipv6';
+export type IpOptions = TypeOptions<string> & {
+  /**
+   * IP versions to accept, defaults to ['ipv4', 'ipv6'].
+   */
+  versions: IpVersion[];
+};
+
+export class IpType extends Type<string> {
+  constructor(options: IpOptions = { versions: ['ipv4', 'ipv6'] }) {
+    const schema = internals.string().ip({ version: options.versions, cidr: 'forbidden' });
+    super(schema, options);
+  }
+
+  protected handleError(type: string, { value, version }: Record<string, any>) {
+    switch (type) {
+      case 'string.base':
+        return `expected value of type [string] but got [${typeDetect(value)}]`;
+      case 'string.ipVersion':
+        return `value must be a valid ${version.join(' or ')} address`;
+    }
+  }
+}
diff --git a/src/core/server/elasticsearch/client/cluster_client.test.ts b/src/core/server/elasticsearch/client/cluster_client.test.ts
index 85517b80745f1..121ef3aa42d51 100644
--- a/src/core/server/elasticsearch/client/cluster_client.test.ts
+++ b/src/core/server/elasticsearch/client/cluster_client.test.ts
@@ -96,7 +96,7 @@ describe('ClusterClient', () => {
       expect(scopedClusterClient.asCurrentUser).toBe(scopedClient.child.mock.results[0].value);
     });
 
-    it('returns a distinct  scoped cluster client on each call', () => {
+    it('returns a distinct scoped cluster client on each call', () => {
       const clusterClient = new ClusterClient(createConfig(), logger, getAuthHeaders);
       const request = httpServerMock.createKibanaRequest();
 
@@ -127,7 +127,7 @@ describe('ClusterClient', () => {
 
       expect(scopedClient.child).toHaveBeenCalledTimes(1);
       expect(scopedClient.child).toHaveBeenCalledWith({
-        headers: { foo: 'bar' },
+        headers: { foo: 'bar', 'x-opaque-id': expect.any(String) },
       });
     });
 
@@ -147,7 +147,7 @@ describe('ClusterClient', () => {
 
       expect(scopedClient.child).toHaveBeenCalledTimes(1);
       expect(scopedClient.child).toHaveBeenCalledWith({
-        headers: { authorization: 'auth' },
+        headers: { authorization: 'auth', 'x-opaque-id': expect.any(String) },
       });
     });
 
@@ -171,7 +171,7 @@ describe('ClusterClient', () => {
 
       expect(scopedClient.child).toHaveBeenCalledTimes(1);
       expect(scopedClient.child).toHaveBeenCalledWith({
-        headers: { authorization: 'auth' },
+        headers: { authorization: 'auth', 'x-opaque-id': expect.any(String) },
       });
     });
 
@@ -195,6 +195,26 @@ describe('ClusterClient', () => {
         headers: {
           foo: 'bar',
           hello: 'dolly',
+          'x-opaque-id': expect.any(String),
+        },
+      });
+    });
+
+    it('adds the x-opaque-id header based on the request id', () => {
+      const config = createConfig();
+      getAuthHeaders.mockReturnValue({});
+
+      const clusterClient = new ClusterClient(config, logger, getAuthHeaders);
+      const request = httpServerMock.createKibanaRequest({
+        kibanaRequestState: { requestId: 'my-fake-id' },
+      });
+
+      clusterClient.asScoped(request);
+
+      expect(scopedClient.child).toHaveBeenCalledTimes(1);
+      expect(scopedClient.child).toHaveBeenCalledWith({
+        headers: {
+          'x-opaque-id': 'my-fake-id',
         },
       });
     });
@@ -221,6 +241,7 @@ describe('ClusterClient', () => {
         headers: {
           foo: 'auth',
           hello: 'dolly',
+          'x-opaque-id': expect.any(String),
         },
       });
     });
@@ -247,6 +268,31 @@ describe('ClusterClient', () => {
         headers: {
           foo: 'request',
           hello: 'dolly',
+          'x-opaque-id': expect.any(String),
+        },
+      });
+    });
+
+    it('respect the precedence of x-opaque-id header over config headers', () => {
+      const config = createConfig({
+        customHeaders: {
+          'x-opaque-id': 'from config',
+        },
+      });
+      getAuthHeaders.mockReturnValue({});
+
+      const clusterClient = new ClusterClient(config, logger, getAuthHeaders);
+      const request = httpServerMock.createKibanaRequest({
+        headers: { foo: 'request' },
+        kibanaRequestState: { requestId: 'from request' },
+      });
+
+      clusterClient.asScoped(request);
+
+      expect(scopedClient.child).toHaveBeenCalledTimes(1);
+      expect(scopedClient.child).toHaveBeenCalledWith({
+        headers: {
+          'x-opaque-id': 'from request',
         },
       });
     });
diff --git a/src/core/server/elasticsearch/client/cluster_client.ts b/src/core/server/elasticsearch/client/cluster_client.ts
index d9a0e6fe3f238..ffe0c10321fff 100644
--- a/src/core/server/elasticsearch/client/cluster_client.ts
+++ b/src/core/server/elasticsearch/client/cluster_client.ts
@@ -19,7 +19,7 @@
 
 import { Client } from '@elastic/elasticsearch';
 import { Logger } from '../../logging';
-import { GetAuthHeaders, isRealRequest, Headers } from '../../http';
+import { GetAuthHeaders, Headers, isKibanaRequest, isRealRequest } from '../../http';
 import { ensureRawRequest, filterHeaders } from '../../http/router';
 import { ScopeableRequest } from '../types';
 import { ElasticsearchClient } from './types';
@@ -95,12 +95,14 @@ export class ClusterClient implements ICustomClusterClient {
   private getScopedHeaders(request: ScopeableRequest): Headers {
     let scopedHeaders: Headers;
     if (isRealRequest(request)) {
-      const authHeaders = this.getAuthHeaders(request);
       const requestHeaders = ensureRawRequest(request).headers;
-      scopedHeaders = filterHeaders(
-        { ...requestHeaders, ...authHeaders },
-        this.config.requestHeadersWhitelist
-      );
+      const requestIdHeaders = isKibanaRequest(request) ? { 'x-opaque-id': request.id } : {};
+      const authHeaders = this.getAuthHeaders(request);
+
+      scopedHeaders = filterHeaders({ ...requestHeaders, ...requestIdHeaders, ...authHeaders }, [
+        'x-opaque-id',
+        ...this.config.requestHeadersWhitelist,
+      ]);
     } else {
       scopedHeaders = filterHeaders(request?.headers ?? {}, this.config.requestHeadersWhitelist);
     }
diff --git a/src/core/server/elasticsearch/legacy/cluster_client.test.ts b/src/core/server/elasticsearch/legacy/cluster_client.test.ts
index fd57d06e61eee..73d941053e84b 100644
--- a/src/core/server/elasticsearch/legacy/cluster_client.test.ts
+++ b/src/core/server/elasticsearch/legacy/cluster_client.test.ts
@@ -349,6 +349,20 @@ describe('#asScoped', () => {
     );
   });
 
+  test('passes x-opaque-id header with request id', () => {
+    clusterClient.asScoped(
+      httpServerMock.createKibanaRequest({ kibanaRequestState: { requestId: 'alpha' } })
+    );
+
+    expect(MockScopedClusterClient).toHaveBeenCalledTimes(1);
+    expect(MockScopedClusterClient).toHaveBeenCalledWith(
+      expect.any(Function),
+      expect.any(Function),
+      { 'x-opaque-id': 'alpha' },
+      expect.any(Object)
+    );
+  });
+
   test('both scoped and internal API caller fail if cluster client is closed', async () => {
     clusterClient.asScoped(
       httpServerMock.createRawRequest({ headers: { zero: '0', one: '1', two: '2', three: '3' } })
@@ -482,7 +496,7 @@ describe('#asScoped', () => {
       expect(MockScopedClusterClient).toHaveBeenCalledWith(
         expect.any(Function),
         expect.any(Function),
-        {},
+        expect.objectContaining({ 'x-opaque-id': expect.any(String) }),
         auditor
       );
     });
diff --git a/src/core/server/elasticsearch/legacy/cluster_client.ts b/src/core/server/elasticsearch/legacy/cluster_client.ts
index f8b2d39a4251c..81cbb5a10d7c6 100644
--- a/src/core/server/elasticsearch/legacy/cluster_client.ts
+++ b/src/core/server/elasticsearch/legacy/cluster_client.ts
@@ -20,7 +20,7 @@ import { Client } from 'elasticsearch';
 import { get } from 'lodash';
 
 import { LegacyElasticsearchErrorHelpers } from './errors';
-import { GetAuthHeaders, isRealRequest, KibanaRequest } from '../../http';
+import { GetAuthHeaders, KibanaRequest, isKibanaRequest, isRealRequest } from '../../http';
 import { AuditorFactory } from '../../audit_trail';
 import { filterHeaders, ensureRawRequest } from '../../http/router';
 import { Logger } from '../../logging';
@@ -207,7 +207,10 @@ export class LegacyClusterClient implements ILegacyClusterClient {
     return new LegacyScopedClusterClient(
       this.callAsInternalUser,
       this.callAsCurrentUser,
-      filterHeaders(this.getHeaders(request), this.config.requestHeadersWhitelist),
+      filterHeaders(this.getHeaders(request), [
+        'x-opaque-id',
+        ...this.config.requestHeadersWhitelist,
+      ]),
       this.getScopedAuditor(request)
     );
   }
@@ -215,8 +218,7 @@ export class LegacyClusterClient implements ILegacyClusterClient {
   private getScopedAuditor(request?: ScopeableRequest) {
     // TODO: support alternative credential owners from outside of Request context in #39430
     if (request && isRealRequest(request)) {
-      const kibanaRequest =
-        request instanceof KibanaRequest ? request : KibanaRequest.from(request);
+      const kibanaRequest = isKibanaRequest(request) ? request : KibanaRequest.from(request);
       const auditorFactory = this.getAuditorFactory();
       return auditorFactory.asScoped(kibanaRequest);
     }
@@ -256,8 +258,9 @@ export class LegacyClusterClient implements ILegacyClusterClient {
       return request && request.headers ? request.headers : {};
     }
     const authHeaders = this.getAuthHeaders(request);
-    const headers = ensureRawRequest(request).headers;
+    const requestHeaders = ensureRawRequest(request).headers;
+    const requestIdHeaders = isKibanaRequest(request) ? { 'x-opaque-id': request.id } : {};
 
-    return { ...headers, ...authHeaders };
+    return { ...requestHeaders, ...requestIdHeaders, ...authHeaders };
   }
 }
diff --git a/src/core/server/http/__snapshots__/http_config.test.ts.snap b/src/core/server/http/__snapshots__/http_config.test.ts.snap
index d48ead3cec8e1..e9b818fe859ec 100644
--- a/src/core/server/http/__snapshots__/http_config.test.ts.snap
+++ b/src/core/server/http/__snapshots__/http_config.test.ts.snap
@@ -39,6 +39,10 @@ Object {
   },
   "name": "kibana-hostname",
   "port": 5601,
+  "requestId": Object {
+    "allowFromAnyIp": false,
+    "ipAllowlist": Array [],
+  },
   "rewriteBasePath": false,
   "socketTimeout": 120000,
   "ssl": Object {
diff --git a/src/core/server/http/cookie_session_storage.test.ts b/src/core/server/http/cookie_session_storage.test.ts
index 1fb2b5693bb61..8e5dec7d4eadd 100644
--- a/src/core/server/http/cookie_session_storage.test.ts
+++ b/src/core/server/http/cookie_session_storage.test.ts
@@ -63,6 +63,10 @@ configService.atPath.mockReturnValue(
       whitelist: [],
     },
     customResponseHeaders: {},
+    requestId: {
+      allowFromAnyIp: true,
+      ipAllowlist: [],
+    },
   } as any)
 );
 
diff --git a/src/core/server/http/http_config.test.ts b/src/core/server/http/http_config.test.ts
index 0698f118be03f..58e6699582e13 100644
--- a/src/core/server/http/http_config.test.ts
+++ b/src/core/server/http/http_config.test.ts
@@ -54,6 +54,63 @@ test('throws if invalid hostname', () => {
   expect(() => httpSchema.validate(obj)).toThrowErrorMatchingSnapshot();
 });
 
+describe('requestId', () => {
+  test('accepts valid ip addresses', () => {
+    const {
+      requestId: { ipAllowlist },
+    } = config.schema.validate({
+      requestId: {
+        allowFromAnyIp: false,
+        ipAllowlist: ['0.0.0.0', '123.123.123.123', '1200:0000:AB00:1234:0000:2552:7777:1313'],
+      },
+    });
+    expect(ipAllowlist).toMatchInlineSnapshot(`
+      Array [
+        "0.0.0.0",
+        "123.123.123.123",
+        "1200:0000:AB00:1234:0000:2552:7777:1313",
+      ]
+    `);
+  });
+
+  test('rejects invalid ip addresses', () => {
+    expect(() => {
+      config.schema.validate({
+        requestId: {
+          allowFromAnyIp: false,
+          ipAllowlist: ['1200:0000:AB00:1234:O000:2552:7777:1313', '[2001:db8:0:1]:80'],
+        },
+      });
+    }).toThrowErrorMatchingInlineSnapshot(
+      `"[requestId.ipAllowlist.0]: value must be a valid ipv4 or ipv6 address"`
+    );
+  });
+
+  test('rejects if allowFromAnyIp is `true` and `ipAllowlist` is non-empty', () => {
+    expect(() => {
+      config.schema.validate({
+        requestId: {
+          allowFromAnyIp: true,
+          ipAllowlist: ['0.0.0.0', '123.123.123.123', '1200:0000:AB00:1234:0000:2552:7777:1313'],
+        },
+      });
+    }).toThrowErrorMatchingInlineSnapshot(
+      `"[requestId]: allowFromAnyIp must be set to 'false' if any values are specified in ipAllowlist"`
+    );
+
+    expect(() => {
+      config.schema.validate({
+        requestId: {
+          allowFromAnyIp: true,
+          ipAllowlist: ['0.0.0.0', '123.123.123.123', '1200:0000:AB00:1234:0000:2552:7777:1313'],
+        },
+      });
+    }).toThrowErrorMatchingInlineSnapshot(
+      `"[requestId]: allowFromAnyIp must be set to 'false' if any values are specified in ipAllowlist"`
+    );
+  });
+});
+
 test('can specify max payload as string', () => {
   const obj = {
     maxPayload: '2mb',
diff --git a/src/core/server/http/http_config.ts b/src/core/server/http/http_config.ts
index e74f6d32e92b0..7d41b4ea9e915 100644
--- a/src/core/server/http/http_config.ts
+++ b/src/core/server/http/http_config.ts
@@ -87,6 +87,19 @@ export const config = {
           { defaultValue: [] }
         ),
       }),
+      requestId: schema.object(
+        {
+          allowFromAnyIp: schema.boolean({ defaultValue: false }),
+          ipAllowlist: schema.arrayOf(schema.ip(), { defaultValue: [] }),
+        },
+        {
+          validate(value) {
+            if (value.allowFromAnyIp === true && value.ipAllowlist?.length > 0) {
+              return `allowFromAnyIp must be set to 'false' if any values are specified in ipAllowlist`;
+            }
+          },
+        }
+      ),
     },
     {
       validate: (rawConfig) => {
@@ -130,6 +143,7 @@ export class HttpConfig {
   public compression: { enabled: boolean; referrerWhitelist?: string[] };
   public csp: ICspConfig;
   public xsrf: { disableProtection: boolean; whitelist: string[] };
+  public requestId: { allowFromAnyIp: boolean; ipAllowlist: string[] };
 
   /**
    * @internal
@@ -158,6 +172,7 @@ export class HttpConfig {
     this.compression = rawHttpConfig.compression;
     this.csp = new CspConfig(rawCspConfig);
     this.xsrf = rawHttpConfig.xsrf;
+    this.requestId = rawHttpConfig.requestId;
   }
 }
 
diff --git a/src/core/server/http/http_server.mocks.ts b/src/core/server/http/http_server.mocks.ts
index ba6662db3655e..6d096b76263b5 100644
--- a/src/core/server/http/http_server.mocks.ts
+++ b/src/core/server/http/http_server.mocks.ts
@@ -29,7 +29,8 @@ import {
   RouteMethod,
   KibanaResponseFactory,
   RouteValidationSpec,
-  KibanaRouteState,
+  KibanaRouteOptions,
+  KibanaRequestState,
 } from './router';
 import { OnPreResponseToolkit } from './lifecycle/on_pre_response';
 import { OnPostAuthToolkit } from './lifecycle/on_post_auth';
@@ -45,7 +46,8 @@ interface RequestFixtureOptions<P = any, Q = any, B = any> {
   method?: RouteMethod;
   socket?: Socket;
   routeTags?: string[];
-  kibanaRouteState?: KibanaRouteState;
+  kibanaRouteOptions?: KibanaRouteOptions;
+  kibanaRequestState?: KibanaRequestState;
   routeAuthRequired?: false;
   validation?: {
     params?: RouteValidationSpec<P>;
@@ -65,13 +67,15 @@ function createKibanaRequestMock<P = any, Q = any, B = any>({
   routeTags,
   routeAuthRequired,
   validation = {},
-  kibanaRouteState = { xsrfRequired: true },
+  kibanaRouteOptions = { xsrfRequired: true },
+  kibanaRequestState = { requestId: '123' },
   auth = { isAuthenticated: true },
 }: RequestFixtureOptions<P, Q, B> = {}) {
   const queryString = stringify(query, { sort: false });
 
   return KibanaRequest.from<P, Q, B>(
     createRawRequestMock({
+      app: kibanaRequestState,
       auth,
       headers,
       params,
@@ -86,7 +90,7 @@ function createKibanaRequestMock<P = any, Q = any, B = any>({
         search: queryString ? `?${queryString}` : queryString,
       },
       route: {
-        settings: { tags: routeTags, auth: routeAuthRequired, app: kibanaRouteState },
+        settings: { tags: routeTags, auth: routeAuthRequired, app: kibanaRouteOptions },
       },
       raw: {
         req: {
@@ -133,6 +137,7 @@ function createRawRequestMock(customization: DeepPartial<Request> = {}) {
       raw: {
         req: {
           url: '/',
+          socket: {},
         },
       },
     },
diff --git a/src/core/server/http/http_server.test.ts b/src/core/server/http/http_server.test.ts
index abe70e003732b..7507a08dd150a 100644
--- a/src/core/server/http/http_server.test.ts
+++ b/src/core/server/http/http_server.test.ts
@@ -68,7 +68,11 @@ beforeEach(() => {
     port: 10002,
     ssl: { enabled: false },
     compression: { enabled: true },
-  } as HttpConfig;
+    requestId: {
+      allowFromAnyIp: true,
+      ipAllowlist: [],
+    },
+  } as any;
 
   configWithSSL = {
     ...config,
diff --git a/src/core/server/http/http_server.ts b/src/core/server/http/http_server.ts
index 99ab0ef16c2f9..7609f23fe0c51 100644
--- a/src/core/server/http/http_server.ts
+++ b/src/core/server/http/http_server.ts
@@ -22,13 +22,19 @@ import url from 'url';
 
 import { Logger, LoggerFactory } from '../logging';
 import { HttpConfig } from './http_config';
-import { createServer, getListenerOptions, getServerOptions } from './http_tools';
+import { createServer, getListenerOptions, getServerOptions, getRequestId } from './http_tools';
 import { adoptToHapiAuthFormat, AuthenticationHandler } from './lifecycle/auth';
 import { adoptToHapiOnPreAuth, OnPreAuthHandler } from './lifecycle/on_pre_auth';
 import { adoptToHapiOnPostAuthFormat, OnPostAuthHandler } from './lifecycle/on_post_auth';
 import { adoptToHapiOnRequest, OnPreRoutingHandler } from './lifecycle/on_pre_routing';
 import { adoptToHapiOnPreResponseFormat, OnPreResponseHandler } from './lifecycle/on_pre_response';
-import { IRouter, RouteConfigOptions, KibanaRouteState, isSafeMethod } from './router';
+import {
+  IRouter,
+  RouteConfigOptions,
+  KibanaRouteOptions,
+  KibanaRequestState,
+  isSafeMethod,
+} from './router';
 import {
   SessionStorageCookieOptions,
   createCookieSessionStorageFactory,
@@ -115,6 +121,7 @@ export class HttpServer {
     const basePathService = new BasePath(config.basePath);
     this.setupBasePathRewrite(config, basePathService);
     this.setupConditionalCompression(config);
+    this.setupRequestStateAssignment(config);
 
     return {
       registerRouter: this.registerRouter.bind(this),
@@ -164,7 +171,7 @@ export class HttpServer {
         const { authRequired, tags, body = {}, timeout } = route.options;
         const { accepts: allow, maxBytes, output, parse } = body;
 
-        const kibanaRouteState: KibanaRouteState = {
+        const kibanaRouteOptions: KibanaRouteOptions = {
           xsrfRequired: route.options.xsrfRequired ?? !isSafeMethod(route.method),
         };
 
@@ -180,7 +187,7 @@ export class HttpServer {
           path: route.path,
           options: {
             auth: this.getAuthOption(authRequired),
-            app: kibanaRouteState,
+            app: kibanaRouteOptions,
             ext: {
               onPreAuth: {
                 method: (request, h) => {
@@ -303,6 +310,16 @@ export class HttpServer {
     }
   }
 
+  private setupRequestStateAssignment(config: HttpConfig) {
+    this.server!.ext('onRequest', (request, responseToolkit) => {
+      request.app = {
+        ...(request.app ?? {}),
+        requestId: getRequestId(request, config.requestId),
+      } as KibanaRequestState;
+      return responseToolkit.continue;
+    });
+  }
+
   private registerOnPreAuth(fn: OnPreAuthHandler) {
     if (this.server === undefined) {
       throw new Error('Server is not created yet');
diff --git a/src/core/server/http/http_tools.test.ts b/src/core/server/http/http_tools.test.ts
index f09d862f9edac..bdeca3a87799a 100644
--- a/src/core/server/http/http_tools.test.ts
+++ b/src/core/server/http/http_tools.test.ts
@@ -26,11 +26,20 @@ jest.mock('fs', () => {
   };
 });
 
+jest.mock('uuid', () => ({
+  v4: jest.fn().mockReturnValue('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'),
+}));
+
 import supertest from 'supertest';
 import { Request, ResponseToolkit } from 'hapi';
 import Joi from 'joi';
 
-import { defaultValidationErrorHandler, HapiValidationError, getServerOptions } from './http_tools';
+import {
+  defaultValidationErrorHandler,
+  HapiValidationError,
+  getServerOptions,
+  getRequestId,
+} from './http_tools';
 import { HttpServer } from './http_server';
 import { HttpConfig, config } from './http_config';
 import { Router } from './router';
@@ -94,7 +103,11 @@ describe('timeouts', () => {
       maxPayload: new ByteSizeValue(1024),
       ssl: {},
       compression: { enabled: true },
-    } as HttpConfig);
+      requestId: {
+        allowFromAnyIp: true,
+        ipAllowlist: [],
+      },
+    } as any);
     registerRouter(router);
 
     await server.start();
@@ -173,3 +186,75 @@ describe('getServerOptions', () => {
     `);
   });
 });
+
+describe('getRequestId', () => {
+  describe('when allowFromAnyIp is true', () => {
+    it('generates a UUID if no x-opaque-id header is present', () => {
+      const request = {
+        headers: {},
+        raw: { req: { socket: { remoteAddress: '1.1.1.1' } } },
+      } as any;
+      expect(getRequestId(request, { allowFromAnyIp: true, ipAllowlist: [] })).toEqual(
+        'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
+      );
+    });
+
+    it('uses x-opaque-id header value if present', () => {
+      const request = {
+        headers: {
+          'x-opaque-id': 'id from header',
+          raw: { req: { socket: { remoteAddress: '1.1.1.1' } } },
+        },
+      } as any;
+      expect(getRequestId(request, { allowFromAnyIp: true, ipAllowlist: [] })).toEqual(
+        'id from header'
+      );
+    });
+  });
+
+  describe('when allowFromAnyIp is false', () => {
+    describe('and ipAllowlist is empty', () => {
+      it('generates a UUID even if x-opaque-id header is present', () => {
+        const request = {
+          headers: { 'x-opaque-id': 'id from header' },
+          raw: { req: { socket: { remoteAddress: '1.1.1.1' } } },
+        } as any;
+        expect(getRequestId(request, { allowFromAnyIp: false, ipAllowlist: [] })).toEqual(
+          'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
+        );
+      });
+    });
+
+    describe('and ipAllowlist is not empty', () => {
+      it('uses x-opaque-id header if request comes from trusted IP address', () => {
+        const request = {
+          headers: { 'x-opaque-id': 'id from header' },
+          raw: { req: { socket: { remoteAddress: '1.1.1.1' } } },
+        } as any;
+        expect(getRequestId(request, { allowFromAnyIp: false, ipAllowlist: ['1.1.1.1'] })).toEqual(
+          'id from header'
+        );
+      });
+
+      it('generates a UUID if request comes from untrusted IP address', () => {
+        const request = {
+          headers: { 'x-opaque-id': 'id from header' },
+          raw: { req: { socket: { remoteAddress: '5.5.5.5' } } },
+        } as any;
+        expect(getRequestId(request, { allowFromAnyIp: false, ipAllowlist: ['1.1.1.1'] })).toEqual(
+          'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
+        );
+      });
+
+      it('generates UUID if request comes from trusted IP address but no x-opaque-id header is present', () => {
+        const request = {
+          headers: {},
+          raw: { req: { socket: { remoteAddress: '1.1.1.1' } } },
+        } as any;
+        expect(getRequestId(request, { allowFromAnyIp: false, ipAllowlist: ['1.1.1.1'] })).toEqual(
+          'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
+        );
+      });
+    });
+  });
+});
diff --git a/src/core/server/http/http_tools.ts b/src/core/server/http/http_tools.ts
index 4e47cf492e287..71900ab982f3d 100644
--- a/src/core/server/http/http_tools.ts
+++ b/src/core/server/http/http_tools.ts
@@ -21,6 +21,7 @@ import { Lifecycle, Request, ResponseToolkit, Server, ServerOptions, Util } from
 import Hoek from 'hoek';
 import { ServerOptions as TLSOptions } from 'https';
 import { ValidationError } from 'joi';
+import uuid from 'uuid';
 import { HttpConfig } from './http_config';
 import { validateObject } from './prototype_pollution';
 
@@ -169,3 +170,12 @@ export function defaultValidationErrorHandler(
 
   throw err;
 }
+
+export function getRequestId(request: Request, options: HttpConfig['requestId']): string {
+  return options.allowFromAnyIp ||
+    // socket may be undefined in integration tests that connect via the http listener directly
+    (request.raw.req.socket?.remoteAddress &&
+      options.ipAllowlist.includes(request.raw.req.socket.remoteAddress))
+    ? request.headers['x-opaque-id'] ?? uuid.v4()
+    : uuid.v4();
+}
diff --git a/src/core/server/http/index.ts b/src/core/server/http/index.ts
index e91f7d9375842..7513e60966085 100644
--- a/src/core/server/http/index.ts
+++ b/src/core/server/http/index.ts
@@ -24,6 +24,7 @@ export { AuthStatus, GetAuthState, IsAuthenticated } from './auth_state_storage'
 export {
   CustomHttpResponseOptions,
   IKibanaSocket,
+  isKibanaRequest,
   isRealRequest,
   Headers,
   HttpResponseOptions,
diff --git a/src/core/server/http/integration_tests/core_services.test.ts b/src/core/server/http/integration_tests/core_services.test.ts
index 6a00db5a6cc4a..2b9193a280aec 100644
--- a/src/core/server/http/integration_tests/core_services.test.ts
+++ b/src/core/server/http/integration_tests/core_services.test.ts
@@ -406,7 +406,10 @@ describe('http service', () => {
       // client contains authHeaders for BWC with legacy platform.
       const [client] = MockLegacyScopedClusterClient.mock.calls;
       const [, , clientHeaders] = client;
-      expect(clientHeaders).toEqual(authHeaders);
+      expect(clientHeaders).toEqual({
+        ...authHeaders,
+        'x-opaque-id': expect.any(String),
+      });
     });
 
     it('passes request authorization header to Elasticsearch if registerAuth was not set', async () => {
@@ -430,7 +433,10 @@ describe('http service', () => {
 
       const [client] = MockLegacyScopedClusterClient.mock.calls;
       const [, , clientHeaders] = client;
-      expect(clientHeaders).toEqual({ authorization: authorizationHeader });
+      expect(clientHeaders).toEqual({
+        authorization: authorizationHeader,
+        'x-opaque-id': expect.any(String),
+      });
     });
 
     it('forwards 401 errors returned from elasticsearch', async () => {
diff --git a/src/core/server/http/integration_tests/lifecycle_handlers.test.ts b/src/core/server/http/integration_tests/lifecycle_handlers.test.ts
index e23426e630455..a1401ba73813b 100644
--- a/src/core/server/http/integration_tests/lifecycle_handlers.test.ts
+++ b/src/core/server/http/integration_tests/lifecycle_handlers.test.ts
@@ -62,6 +62,10 @@ describe('core lifecycle handlers', () => {
           'some-header': 'some-value',
         },
         xsrf: { disableProtection: false, whitelist: [whitelistedTestPath] },
+        requestId: {
+          allowFromAnyIp: true,
+          ipAllowlist: [],
+        },
       } as any)
     );
     server = createHttpServer({ configService });
diff --git a/src/core/server/http/integration_tests/request.test.ts b/src/core/server/http/integration_tests/request.test.ts
index 3a7335583296e..0727ff848c189 100644
--- a/src/core/server/http/integration_tests/request.test.ts
+++ b/src/core/server/http/integration_tests/request.test.ts
@@ -288,4 +288,24 @@ describe('KibanaRequest', () => {
       });
     });
   });
+
+  describe('request id', () => {
+    it('accepts x-opaque-id header case-insensitively', async () => {
+      const { server: innerServer, createRouter } = await server.setup(setupDeps);
+      const router = createRouter('/');
+      router.get({ path: '/', validate: false }, async (context, req, res) => {
+        return res.ok({ body: { requestId: req.id } });
+      });
+      await server.start();
+
+      const st = supertest(innerServer.listener);
+
+      const resp1 = await st.get('/').set({ 'x-opaque-id': 'alpha' }).expect(200);
+      expect(resp1.body).toEqual({ requestId: 'alpha' });
+      const resp2 = await st.get('/').set({ 'X-Opaque-Id': 'beta' }).expect(200);
+      expect(resp2.body).toEqual({ requestId: 'beta' });
+      const resp3 = await st.get('/').set({ 'X-OPAQUE-ID': 'gamma' }).expect(200);
+      expect(resp3.body).toEqual({ requestId: 'gamma' });
+    });
+  });
 });
diff --git a/src/core/server/http/lifecycle_handlers.test.ts b/src/core/server/http/lifecycle_handlers.test.ts
index a80e432e0d4cb..fdcf2a173b906 100644
--- a/src/core/server/http/lifecycle_handlers.test.ts
+++ b/src/core/server/http/lifecycle_handlers.test.ts
@@ -24,7 +24,7 @@ import {
 } from './lifecycle_handlers';
 import { httpServerMock } from './http_server.mocks';
 import { HttpConfig } from './http_config';
-import { KibanaRequest, RouteMethod, KibanaRouteState } from './router';
+import { KibanaRequest, RouteMethod, KibanaRouteOptions } from './router';
 
 const createConfig = (partial: Partial<HttpConfig>): HttpConfig => partial as HttpConfig;
 
@@ -32,14 +32,19 @@ const forgeRequest = ({
   headers = {},
   path = '/',
   method = 'get',
-  kibanaRouteState,
+  kibanaRouteOptions,
 }: Partial<{
   headers: Record<string, string>;
   path: string;
   method: RouteMethod;
-  kibanaRouteState: KibanaRouteState;
+  kibanaRouteOptions: KibanaRouteOptions;
 }>): KibanaRequest => {
-  return httpServerMock.createKibanaRequest({ headers, path, method, kibanaRouteState });
+  return httpServerMock.createKibanaRequest({
+    headers,
+    path,
+    method,
+    kibanaRouteOptions,
+  });
 };
 
 describe('xsrf post-auth handler', () => {
@@ -154,7 +159,7 @@ describe('xsrf post-auth handler', () => {
         method: 'post',
         headers: {},
         path: '/some-path',
-        kibanaRouteState: {
+        kibanaRouteOptions: {
           xsrfRequired: false,
         },
       });
diff --git a/src/core/server/http/router/index.ts b/src/core/server/http/router/index.ts
index 83ceff4a25d86..e09833ef6b2da 100644
--- a/src/core/server/http/router/index.ts
+++ b/src/core/server/http/router/index.ts
@@ -24,7 +24,9 @@ export {
   KibanaRequestEvents,
   KibanaRequestRoute,
   KibanaRequestRouteOptions,
-  KibanaRouteState,
+  KibanaRouteOptions,
+  KibanaRequestState,
+  isKibanaRequest,
   isRealRequest,
   LegacyRequest,
   ensureRawRequest,
diff --git a/src/core/server/http/router/request.test.ts b/src/core/server/http/router/request.test.ts
index fb999dc60e39c..e741121f3d70c 100644
--- a/src/core/server/http/router/request.test.ts
+++ b/src/core/server/http/router/request.test.ts
@@ -16,12 +16,45 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
+jest.mock('uuid', () => ({
+  v4: jest.fn().mockReturnValue('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'),
+}));
+
 import { RouteOptions } from 'hapi';
 import { KibanaRequest } from './request';
 import { httpServerMock } from '../http_server.mocks';
 import { schema } from '@kbn/config-schema';
 
 describe('KibanaRequest', () => {
+  describe('id property', () => {
+    it('uses the request.app.requestId property if present', () => {
+      const request = httpServerMock.createRawRequest({
+        app: { requestId: 'fakeId' },
+      });
+      const kibanaRequest = KibanaRequest.from(request);
+      expect(kibanaRequest.id).toEqual('fakeId');
+    });
+
+    it('generates a new UUID if request.app property is not present', () => {
+      // Undefined app property
+      const request = httpServerMock.createRawRequest({
+        app: undefined,
+      });
+      const kibanaRequest = KibanaRequest.from(request);
+      expect(kibanaRequest.id).toEqual('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx');
+    });
+
+    it('generates a new UUID if request.app.requestId property is not present', () => {
+      // Undefined app.requestId property
+      const request = httpServerMock.createRawRequest({
+        app: {},
+      });
+      const kibanaRequest = KibanaRequest.from(request);
+      expect(kibanaRequest.id).toEqual('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx');
+    });
+  });
+
   describe('get all headers', () => {
     it('returns all headers', () => {
       const request = httpServerMock.createRawRequest({
diff --git a/src/core/server/http/router/request.ts b/src/core/server/http/router/request.ts
index 278bc222b754b..76f8761a7e998 100644
--- a/src/core/server/http/router/request.ts
+++ b/src/core/server/http/router/request.ts
@@ -18,7 +18,8 @@
  */
 
 import { Url } from 'url';
-import { Request, ApplicationState } from 'hapi';
+import uuid from 'uuid';
+import { Request, RouteOptionsApp, ApplicationState } from 'hapi';
 import { Observable, fromEvent, merge } from 'rxjs';
 import { shareReplay, first, takeUntil } from 'rxjs/operators';
 import { RecursiveReadonly } from '@kbn/utility-types';
@@ -34,9 +35,17 @@ const requestSymbol = Symbol('request');
 /**
  * @internal
  */
-export interface KibanaRouteState extends ApplicationState {
+export interface KibanaRouteOptions extends RouteOptionsApp {
   xsrfRequired: boolean;
 }
+
+/**
+ * @internal
+ */
+export interface KibanaRequestState extends ApplicationState {
+  requestId: string;
+}
+
 /**
  * Route options: If 'GET' or 'OPTIONS' method, body options won't be returned.
  * @public
@@ -134,6 +143,15 @@ export class KibanaRequest<
 
     return { query, params, body };
   }
+  /**
+   * A identifier to identify this request.
+   *
+   * @remarks
+   * Depending on the user's configuration, this value may be sourced from the
+   * incoming request's `X-Opaque-Id` header which is not guaranteed to be unique
+   * per request.
+   */
+  public readonly id: string;
   /** a WHATWG URL standard object. */
   public readonly url: Url;
   /** matched route details */
@@ -171,6 +189,11 @@ export class KibanaRequest<
     // until that time we have to expose all the headers
     private readonly withoutSecretHeaders: boolean
   ) {
+    // The `requestId` property will not be populated for requests that are 'faked' by internal systems that leverage
+    // KibanaRequest in conjunction with scoped Elaticcsearch and SavedObjectsClient in order to pass credentials.
+    // In these cases, the id defaults to a newly generated UUID.
+    this.id = (request.app as KibanaRequestState | undefined)?.requestId ?? uuid.v4();
+
     this.url = request.url;
     this.headers = deepFreeze({ ...request.headers });
     this.isSystemRequest =
@@ -220,7 +243,7 @@ export class KibanaRequest<
     const options = ({
       authRequired: this.getAuthRequired(request),
       // some places in LP call KibanaRequest.from(request) manually. remove fallback to true before v8
-      xsrfRequired: (request.route.settings.app as KibanaRouteState)?.xsrfRequired ?? true,
+      xsrfRequired: (request.route.settings.app as KibanaRouteOptions)?.xsrfRequired ?? true,
       tags: request.route.settings.tags || [],
       timeout: {
         payload: payloadTimeout,
@@ -276,7 +299,11 @@ export class KibanaRequest<
 export const ensureRawRequest = (request: KibanaRequest | LegacyRequest) =>
   isKibanaRequest(request) ? request[requestSymbol] : request;
 
-function isKibanaRequest(request: unknown): request is KibanaRequest {
+/**
+ * Checks if an incoming request is a {@link KibanaRequest}
+ * @internal
+ */
+export function isKibanaRequest(request: unknown): request is KibanaRequest {
   return request instanceof KibanaRequest;
 }
 
diff --git a/src/core/server/http/test_utils.ts b/src/core/server/http/test_utils.ts
index bda66e1de8168..c3afae108027e 100644
--- a/src/core/server/http/test_utils.ts
+++ b/src/core/server/http/test_utils.ts
@@ -46,6 +46,10 @@ configService.atPath.mockReturnValue(
       whitelist: [],
     },
     customResponseHeaders: {},
+    requestId: {
+      allowFromAnyIp: true,
+      ipAllowlist: [],
+    },
   } as any)
 );
 
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index 01558c1460f1b..ff178e236a12f 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -1059,6 +1059,7 @@ export class KibanaRequest<Params = unknown, Query = unknown, Body = unknown, Me
     // @internal
     static from<P, Q, B>(req: Request, routeSchemas?: RouteValidator<P, Q, B> | RouteValidatorFullConfig<P, Q, B>, withoutSecretHeaders?: boolean): KibanaRequest<P, Q, B, any>;
     readonly headers: Headers;
+    readonly id: string;
     readonly isSystemRequest: boolean;
     // (undocumented)
     readonly params: Params;
diff --git a/x-pack/legacy/plugins/xpack_main/server/lib/__tests__/replace_injected_vars.js b/x-pack/legacy/plugins/xpack_main/server/lib/__tests__/replace_injected_vars.js
index f2dda63e689b9..ce6e20bd874b2 100644
--- a/x-pack/legacy/plugins/xpack_main/server/lib/__tests__/replace_injected_vars.js
+++ b/x-pack/legacy/plugins/xpack_main/server/lib/__tests__/replace_injected_vars.js
@@ -14,6 +14,7 @@ const buildRequest = (path = '/app/kibana') => {
   const get = sinon.stub();
 
   return {
+    app: {},
     path,
     route: { settings: {} },
     headers: {},
diff --git a/x-pack/plugins/alerts/server/alerts_client_factory.test.ts b/x-pack/plugins/alerts/server/alerts_client_factory.test.ts
index a5eb371633f1e..99e81344715a5 100644
--- a/x-pack/plugins/alerts/server/alerts_client_factory.test.ts
+++ b/x-pack/plugins/alerts/server/alerts_client_factory.test.ts
@@ -46,6 +46,7 @@ const alertsClientFactoryParams: jest.Mocked<AlertsClientFactoryOpts> = {
   eventLog: eventLogMock.createStart(),
 };
 const fakeRequest = ({
+  app: {},
   headers: {},
   getBasePath: () => '',
   path: '/',
diff --git a/x-pack/plugins/audit_trail/server/client/audit_trail_client.test.ts b/x-pack/plugins/audit_trail/server/client/audit_trail_client.test.ts
index cdc0aa4cfd7e7..45a192e40c87b 100644
--- a/x-pack/plugins/audit_trail/server/client/audit_trail_client.test.ts
+++ b/x-pack/plugins/audit_trail/server/client/audit_trail_client.test.ts
@@ -23,7 +23,11 @@ describe('AuditTrailClient', () => {
 
   beforeEach(() => {
     event$ = new Subject();
-    client = new AuditTrailClient(httpServerMock.createKibanaRequest(), event$, deps);
+    client = new AuditTrailClient(
+      httpServerMock.createKibanaRequest({ kibanaRequestState: { requestId: 'request id alpha' } }),
+      event$,
+      deps
+    );
   });
 
   afterEach(() => {
@@ -40,6 +44,15 @@ describe('AuditTrailClient', () => {
       client.add({ message: 'message', type: 'type' });
     });
 
+    it('populates requestId', (done) => {
+      client.withAuditScope('scope_name');
+      event$.subscribe((event) => {
+        expect(event.requestId).toBe('request id alpha');
+        done();
+      });
+      client.add({ message: 'message', type: 'type' });
+    });
+
     it('throws an exception if tries to re-write a scope', () => {
       client.withAuditScope('scope_name');
       expect(() => client.withAuditScope('another_scope_name')).toThrowErrorMatchingInlineSnapshot(
diff --git a/x-pack/plugins/audit_trail/server/client/audit_trail_client.ts b/x-pack/plugins/audit_trail/server/client/audit_trail_client.ts
index f12977cddaf0b..e5022234af9d7 100644
--- a/x-pack/plugins/audit_trail/server/client/audit_trail_client.ts
+++ b/x-pack/plugins/audit_trail/server/client/audit_trail_client.ts
@@ -41,6 +41,7 @@ export class AuditTrailClient implements Auditor {
       user: user?.username,
       space: spaceId,
       scope: this.scope,
+      requestId: this.request.id,
     });
   }
 }
diff --git a/x-pack/plugins/audit_trail/server/types.ts b/x-pack/plugins/audit_trail/server/types.ts
index d0eb0e7eaa981..1b7afb09f0629 100644
--- a/x-pack/plugins/audit_trail/server/types.ts
+++ b/x-pack/plugins/audit_trail/server/types.ts
@@ -13,4 +13,5 @@ export interface AuditEvent {
   scope?: string;
   user?: string;
   space?: string;
+  requestId?: string;
 }
diff --git a/x-pack/plugins/reporting/server/export_types/csv/execute_job.ts b/x-pack/plugins/reporting/server/export_types/csv/execute_job.ts
index 802f4a81777c5..b56a08b86b0cd 100644
--- a/x-pack/plugins/reporting/server/export_types/csv/execute_job.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv/execute_job.ts
@@ -50,6 +50,7 @@ const getRequest = async (headers: string | undefined, crypto: Crypto, logger: L
     path: '/',
     route: { settings: {} },
     url: { href: '/' },
+    app: {},
     raw: { req: { url: '/' } },
   } as Hapi.Request);
 };

From f286f8f6e1031e6ab1c0069c33ce7a8da69ac0ab Mon Sep 17 00:00:00 2001
From: Kevin Logan <56395104+kevinlog@users.noreply.github.com>
Date: Wed, 19 Aug 2020 19:52:56 -0400
Subject: [PATCH 45/85] [SECURITY_SOLUTION] Task/add auto refresh to endpoint
 list (#74856)

---
 .../components/endpoint/route_capture.tsx     |   8 +-
 .../public/management/common/constants.ts     |   4 +
 .../pages/endpoint_hosts/store/action.ts      |  16 ++-
 .../pages/endpoint_hosts/store/index.test.ts  |   3 +
 .../endpoint_hosts/store/middleware.test.ts   |  33 +++++
 .../pages/endpoint_hosts/store/middleware.ts  | 133 ++++++++++--------
 .../pages/endpoint_hosts/store/reducer.ts     |   9 ++
 .../pages/endpoint_hosts/store/selectors.ts   |   4 +
 .../management/pages/endpoint_hosts/types.ts  |   4 +
 .../pages/endpoint_hosts/view/index.test.tsx  | 120 +++++++++++-----
 .../pages/endpoint_hosts/view/index.tsx       |  58 +++++++-
 .../apps/endpoint/endpoint_list.ts            | 110 +++++++++------
 .../page_objects/endpoint_page.ts             |   4 +-
 13 files changed, 355 insertions(+), 151 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/common/components/endpoint/route_capture.tsx b/x-pack/plugins/security_solution/public/common/components/endpoint/route_capture.tsx
index 7340d639070ab..cfc8847b0bef6 100644
--- a/x-pack/plugins/security_solution/public/common/components/endpoint/route_capture.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/endpoint/route_capture.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { memo } from 'react';
+import React, { memo, useEffect } from 'react';
 import { useLocation } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
 import { AppLocation } from '../../../../common/endpoint/types';
@@ -17,7 +17,11 @@ import { AppAction } from '../../store/actions';
 export const RouteCapture = memo(({ children }) => {
   const location: AppLocation = useLocation();
   const dispatch: (action: AppAction) => unknown = useDispatch();
-  dispatch({ type: 'userChangedUrl', payload: location });
+
+  useEffect(() => {
+    dispatch({ type: 'userChangedUrl', payload: location });
+  });
+
   return <>{children}</>;
 });
 
diff --git a/x-pack/plugins/security_solution/public/management/common/constants.ts b/x-pack/plugins/security_solution/public/management/common/constants.ts
index 39d42114f9939..06f0f09bcf54d 100644
--- a/x-pack/plugins/security_solution/public/management/common/constants.ts
+++ b/x-pack/plugins/security_solution/public/management/common/constants.ts
@@ -24,3 +24,7 @@ export const MANAGEMENT_STORE_POLICY_LIST_NAMESPACE = 'policyList';
 export const MANAGEMENT_STORE_POLICY_DETAILS_NAMESPACE = 'policyDetails';
 /** Namespace within the Management state where endpoint-host state is maintained */
 export const MANAGEMENT_STORE_ENDPOINTS_NAMESPACE = 'endpoints';
+
+// --[ DEFAULTS ]---------------------------------------------------------------------------
+/** The default polling interval to start all polling pages */
+export const DEFAULT_POLL_INTERVAL = 10000;
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts
index 2e188af41d2d7..5f36af2a2d8ea 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts
@@ -86,6 +86,18 @@ interface ServerReturnedEndpointExistValue {
   payload: boolean;
 }
 
+interface UserUpdatedEndpointListRefreshOptions {
+  type: 'userUpdatedEndpointListRefreshOptions';
+  payload: {
+    isAutoRefreshEnabled?: boolean;
+    autoRefreshInterval?: number;
+  };
+}
+
+interface AppRequestedEndpointList {
+  type: 'appRequestedEndpointList';
+}
+
 export type EndpointAction =
   | ServerReturnedEndpointList
   | ServerFailedToReturnEndpointList
@@ -100,4 +112,6 @@ export type EndpointAction =
   | ServerReturnedEndpointExistValue
   | ServerCancelledPolicyItemsLoading
   | ServerReturnedEndpointPackageInfo
-  | ServerReturnedEndpointNonExistingPolicies;
+  | AppRequestedEndpointList
+  | ServerReturnedEndpointNonExistingPolicies
+  | UserUpdatedEndpointListRefreshOptions;
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/index.test.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/index.test.ts
index b3ab3443809c8..3a095644b3b41 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/index.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/index.test.ts
@@ -10,6 +10,7 @@ import { listData } from './selectors';
 import { mockEndpointResultList } from './mock_endpoint_result_list';
 import { EndpointAction } from './action';
 import { endpointListReducer } from './reducer';
+import { DEFAULT_POLL_INTERVAL } from '../../../common/constants';
 
 describe('EndpointList store concerns', () => {
   let store: Store<EndpointState>;
@@ -52,6 +53,8 @@ describe('EndpointList store concerns', () => {
         endpointPackageInfo: undefined,
         nonExistingPolicies: {},
         endpointsExist: true,
+        isAutoRefreshEnabled: true,
+        autoRefreshInterval: DEFAULT_POLL_INTERVAL,
       });
     });
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.test.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.test.ts
index 77ade5bcc6971..15e89f9771382 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.test.ts
@@ -23,6 +23,11 @@ import { endpointListReducer } from './reducer';
 import { endpointMiddlewareFactory } from './middleware';
 import { getEndpointListPath } from '../../../common/routing';
 
+jest.mock('../../policy/store/policy_list/services/ingest', () => ({
+  sendGetEndpointSecurityPackage: () => Promise.resolve({}),
+  sendGetAgentConfigList: () => Promise.resolve({ items: [] }),
+}));
+
 describe('endpoint list middleware', () => {
   let fakeCoreStart: jest.Mocked<CoreStart>;
   let depsStart: DepsStartMock;
@@ -71,4 +76,32 @@ describe('endpoint list middleware', () => {
     });
     expect(listData(getState())).toEqual(apiResponse.hosts);
   });
+
+  it('handles `appRequestedEndpointList`', async () => {
+    const apiResponse = getEndpointListApiResponse();
+    fakeHttpServices.post.mockResolvedValue(apiResponse);
+    expect(fakeHttpServices.post).not.toHaveBeenCalled();
+
+    // First change the URL
+    dispatch({
+      type: 'userChangedUrl',
+      payload: {
+        ...history.location,
+        pathname: getEndpointListPath({ name: 'endpointList' }),
+      },
+    });
+    await waitForAction('serverReturnedEndpointList');
+
+    // Then request the Endpoint List
+    dispatch({
+      type: 'appRequestedEndpointList',
+    });
+    await waitForAction('serverReturnedEndpointList');
+    expect(fakeHttpServices.post).toHaveBeenCalledWith('/api/endpoint/metadata', {
+      body: JSON.stringify({
+        paging_properties: [{ page_index: '0' }, { page_size: '10' }],
+      }),
+    });
+    expect(listData(getState())).toEqual(apiResponse.hosts);
+  });
 });
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts
index f56f28bfef39a..2650aa4865228 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts
@@ -25,31 +25,31 @@ import {
 import { AGENT_POLICY_SAVED_OBJECT_TYPE } from '../../../../../../ingest_manager/common';
 
 export const endpointMiddlewareFactory: ImmutableMiddlewareFactory<EndpointState> = (coreStart) => {
+  // eslint-disable-next-line complexity
   return ({ getState, dispatch }) => (next) => async (action) => {
     next(action);
-    const state = getState();
 
     // Endpoint list
     if (
-      action.type === 'userChangedUrl' &&
-      isOnEndpointPage(state) &&
-      hasSelectedEndpoint(state) !== true
+      (action.type === 'userChangedUrl' || action.type === 'appRequestedEndpointList') &&
+      isOnEndpointPage(getState()) &&
+      hasSelectedEndpoint(getState()) !== true
     ) {
-      if (!endpointPackageInfo(state)) {
-        sendGetEndpointSecurityPackage(coreStart.http)
-          .then((packageInfo) => {
-            dispatch({
-              type: 'serverReturnedEndpointPackageInfo',
-              payload: packageInfo,
-            });
-          })
-          .catch((error) => {
-            // eslint-disable-next-line no-console
-            console.error(error);
+      if (!endpointPackageInfo(getState())) {
+        try {
+          const packageInfo = await sendGetEndpointSecurityPackage(coreStart.http);
+          dispatch({
+            type: 'serverReturnedEndpointPackageInfo',
+            payload: packageInfo,
           });
+        } catch (error) {
+          // Ignore Errors, since this should not hinder the user's ability to use the UI
+          // eslint-disable-next-line no-console
+          console.error(error);
+        }
       }
 
-      const { page_index: pageIndex, page_size: pageSize } = uiQueryParams(state);
+      const { page_index: pageIndex, page_size: pageSize } = uiQueryParams(getState());
       let endpointResponse;
 
       try {
@@ -65,22 +65,23 @@ export const endpointMiddlewareFactory: ImmutableMiddlewareFactory<EndpointState
           payload: endpointResponse,
         });
 
-        getNonExistingPoliciesForEndpointsList(
-          coreStart.http,
-          endpointResponse.hosts,
-          nonExistingPolicies(state)
-        )
-          .then((missingPolicies) => {
-            if (missingPolicies !== undefined) {
-              dispatch({
-                type: 'serverReturnedEndpointNonExistingPolicies',
-                payload: missingPolicies,
-              });
-            }
-          })
+        try {
+          const missingPolicies = await getNonExistingPoliciesForEndpointsList(
+            coreStart.http,
+            endpointResponse.hosts,
+            nonExistingPolicies(getState())
+          );
+          if (missingPolicies !== undefined) {
+            dispatch({
+              type: 'serverReturnedEndpointNonExistingPolicies',
+              payload: missingPolicies,
+            });
+          }
+        } catch (error) {
           // Ignore Errors, since this should not hinder the user's ability to use the UI
           // eslint-disable-next-line no-console
-          .catch((error) => console.error(error));
+          console.error(error);
+        }
       } catch (error) {
         dispatch({
           type: 'serverFailedToReturnEndpointList',
@@ -132,18 +133,23 @@ export const endpointMiddlewareFactory: ImmutableMiddlewareFactory<EndpointState
         dispatch({
           type: 'serverCancelledPolicyItemsLoading',
         });
+
+        dispatch({
+          type: 'serverReturnedEndpointExistValue',
+          payload: true,
+        });
       }
     }
 
     // Endpoint Details
-    if (action.type === 'userChangedUrl' && hasSelectedEndpoint(state) === true) {
+    if (action.type === 'userChangedUrl' && hasSelectedEndpoint(getState()) === true) {
       dispatch({
         type: 'serverCancelledPolicyItemsLoading',
       });
 
       // If user navigated directly to a endpoint details page, load the endpoint list
-      if (listData(state).length === 0) {
-        const { page_index: pageIndex, page_size: pageSize } = uiQueryParams(state);
+      if (listData(getState()).length === 0) {
+        const { page_index: pageIndex, page_size: pageSize } = uiQueryParams(getState());
         try {
           const response = await coreStart.http.post('/api/endpoint/metadata', {
             body: JSON.stringify({
@@ -156,22 +162,23 @@ export const endpointMiddlewareFactory: ImmutableMiddlewareFactory<EndpointState
             payload: response,
           });
 
-          getNonExistingPoliciesForEndpointsList(
-            coreStart.http,
-            response.hosts,
-            nonExistingPolicies(state)
-          )
-            .then((missingPolicies) => {
-              if (missingPolicies !== undefined) {
-                dispatch({
-                  type: 'serverReturnedEndpointNonExistingPolicies',
-                  payload: missingPolicies,
-                });
-              }
-            })
+          try {
+            const missingPolicies = await getNonExistingPoliciesForEndpointsList(
+              coreStart.http,
+              response.hosts,
+              nonExistingPolicies(getState())
+            );
+            if (missingPolicies !== undefined) {
+              dispatch({
+                type: 'serverReturnedEndpointNonExistingPolicies',
+                payload: missingPolicies,
+              });
+            }
+          } catch (error) {
             // Ignore Errors, since this should not hinder the user's ability to use the UI
             // eslint-disable-next-line no-console
-            .catch((error) => console.error(error));
+            console.error(error);
+          }
         } catch (error) {
           dispatch({
             type: 'serverFailedToReturnEndpointList',
@@ -185,7 +192,7 @@ export const endpointMiddlewareFactory: ImmutableMiddlewareFactory<EndpointState
       }
 
       // call the endpoint details api
-      const { selected_endpoint: selectedEndpoint } = uiQueryParams(state);
+      const { selected_endpoint: selectedEndpoint } = uiQueryParams(getState());
       try {
         const response = await coreStart.http.get<HostInfo>(
           `/api/endpoint/metadata/${selectedEndpoint}`
@@ -194,22 +201,24 @@ export const endpointMiddlewareFactory: ImmutableMiddlewareFactory<EndpointState
           type: 'serverReturnedEndpointDetails',
           payload: response,
         });
-        getNonExistingPoliciesForEndpointsList(
-          coreStart.http,
-          [response],
-          nonExistingPolicies(state)
-        )
-          .then((missingPolicies) => {
-            if (missingPolicies !== undefined) {
-              dispatch({
-                type: 'serverReturnedEndpointNonExistingPolicies',
-                payload: missingPolicies,
-              });
-            }
-          })
+
+        try {
+          const missingPolicies = await getNonExistingPoliciesForEndpointsList(
+            coreStart.http,
+            [response],
+            nonExistingPolicies(getState())
+          );
+          if (missingPolicies !== undefined) {
+            dispatch({
+              type: 'serverReturnedEndpointNonExistingPolicies',
+              payload: missingPolicies,
+            });
+          }
+        } catch (error) {
           // Ignore Errors, since this should not hinder the user's ability to use the UI
           // eslint-disable-next-line no-console
-          .catch((error) => console.error(error));
+          console.error(error);
+        }
       } catch (error) {
         dispatch({
           type: 'serverFailedToReturnEndpointDetails',
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/reducer.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/reducer.ts
index d4fe3310eac0a..060321fa40401 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/reducer.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/reducer.ts
@@ -9,6 +9,7 @@ import { EndpointState } from '../types';
 import { AppAction } from '../../../../common/store/actions';
 import { ImmutableReducer } from '../../../../common/store';
 import { Immutable } from '../../../../../common/endpoint/types';
+import { DEFAULT_POLL_INTERVAL } from '../../../common/constants';
 
 export const initialEndpointListState: Immutable<EndpointState> = {
   hosts: [],
@@ -30,6 +31,8 @@ export const initialEndpointListState: Immutable<EndpointState> = {
   endpointPackageInfo: undefined,
   nonExistingPolicies: {},
   endpointsExist: true,
+  isAutoRefreshEnabled: true,
+  autoRefreshInterval: DEFAULT_POLL_INTERVAL,
 };
 
 /* eslint-disable-next-line complexity */
@@ -131,6 +134,12 @@ export const endpointListReducer: ImmutableReducer<EndpointState, AppAction> = (
       ...state,
       endpointsExist: action.payload,
     };
+  } else if (action.type === 'userUpdatedEndpointListRefreshOptions') {
+    return {
+      ...state,
+      isAutoRefreshEnabled: action.payload.isAutoRefreshEnabled ?? state.isAutoRefreshEnabled,
+      autoRefreshInterval: action.payload.autoRefreshInterval ?? state.autoRefreshInterval,
+    };
   } else if (action.type === 'userChangedUrl') {
     const newState: Immutable<EndpointState> = {
       ...state,
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/selectors.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/selectors.ts
index 2c6fc6d5a75e1..68ba71b7bbc94 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/selectors.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/selectors.ts
@@ -45,6 +45,10 @@ export const selectedPolicyId = (state: Immutable<EndpointState>) => state.selec
 
 export const endpointPackageInfo = (state: Immutable<EndpointState>) => state.endpointPackageInfo;
 
+export const isAutoRefreshEnabled = (state: Immutable<EndpointState>) => state.isAutoRefreshEnabled;
+
+export const autoRefreshInterval = (state: Immutable<EndpointState>) => state.autoRefreshInterval;
+
 export const endpointPackageVersion = createSelector(
   endpointPackageInfo,
   (info) => info?.version ?? undefined
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts
index 7e75285560bd3..5a6a1af7bd7e8 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts
@@ -54,6 +54,10 @@ export interface EndpointState {
   nonExistingPolicies: Record<string, boolean>;
   /** Tracks whether hosts exist and helps control if onboarding should be visible */
   endpointsExist: boolean;
+  /** Is auto-refresh enabled */
+  isAutoRefreshEnabled: boolean;
+  /** The current auto refresh interval for data in ms */
+  autoRefreshInterval: number;
 }
 
 /**
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx
index a504390344e37..5ab9df79ee14b 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx
@@ -149,6 +149,9 @@ describe('when on the list page', () => {
           });
         });
       });
+      afterEach(() => {
+        jest.clearAllMocks();
+      });
 
       it('should display rows in the table', async () => {
         const renderResult = render();
@@ -243,10 +246,85 @@ describe('when on the list page', () => {
     });
   });
 
+  describe('when polling on Endpoint List', () => {
+    beforeEach(async () => {
+      await reactTestingLibrary.act(() => {
+        const hostListData = mockEndpointResultList({ total: 4 }).hosts;
+
+        setEndpointListApiMockImplementation(coreStart.http, {
+          endpointsResults: hostListData,
+        });
+
+        const pollInterval = 10;
+        store.dispatch({
+          type: 'userUpdatedEndpointListRefreshOptions',
+          payload: {
+            autoRefreshInterval: pollInterval,
+          },
+        });
+      });
+    });
+    afterEach(() => {
+      jest.clearAllMocks();
+    });
+
+    it('should update data after some time', async () => {
+      let renderResult = render();
+      await reactTestingLibrary.act(async () => {
+        await middlewareSpy.waitForAction('serverReturnedEndpointList');
+      });
+      const total = await renderResult.findAllByTestId('endpointListTableTotal');
+      expect(total[0].textContent).toEqual('4 Hosts');
+
+      setEndpointListApiMockImplementation(coreStart.http, {
+        endpointsResults: mockEndpointResultList({ total: 1 }).hosts,
+      });
+
+      await reactTestingLibrary.act(async () => {
+        await middlewareSpy.waitForAction('appRequestedEndpointList');
+        await middlewareSpy.waitForAction('serverReturnedEndpointList');
+      });
+
+      renderResult = render();
+
+      const updatedTotal = await renderResult.findAllByTestId('endpointListTableTotal');
+      expect(updatedTotal[0].textContent).toEqual('1 Host');
+    });
+  });
+
   describe('when there is a selected host in the url', () => {
     let hostDetails: HostInfo;
     let agentId: string;
     let renderAndWaitForData: () => Promise<ReturnType<AppContextTestRender['render']>>;
+    const mockEndpointListApi = (mockedPolicyResponse?: HostPolicyResponse) => {
+      const {
+        // eslint-disable-next-line @typescript-eslint/naming-convention
+        host_status,
+        metadata: { host, ...details },
+      } = mockEndpointDetailsApiResult();
+
+      hostDetails = {
+        host_status,
+        metadata: {
+          ...details,
+          host: {
+            ...host,
+            id: '1',
+          },
+        },
+      };
+
+      agentId = hostDetails.metadata.elastic.agent.id;
+
+      const policy = docGenerator.generatePolicyPackagePolicy();
+      policy.id = hostDetails.metadata.Endpoint.policy.applied.id;
+
+      setEndpointListApiMockImplementation(coreStart.http, {
+        endpointsResults: [hostDetails],
+        endpointPackagePolicies: [policy],
+        policyResponse: mockedPolicyResponse,
+      });
+    };
 
     const createPolicyResponse = (
       overallStatus: HostPolicyResponseActionStatus = HostPolicyResponseActionStatus.success
@@ -313,32 +391,7 @@ describe('when on the list page', () => {
     };
 
     beforeEach(async () => {
-      const {
-        // eslint-disable-next-line @typescript-eslint/naming-convention
-        host_status,
-        metadata: { host, ...details },
-      } = mockEndpointDetailsApiResult();
-
-      hostDetails = {
-        host_status,
-        metadata: {
-          ...details,
-          host: {
-            ...host,
-            id: '1',
-          },
-        },
-      };
-
-      agentId = hostDetails.metadata.elastic.agent.id;
-
-      const policy = docGenerator.generatePolicyPackagePolicy();
-      policy.id = hostDetails.metadata.Endpoint.policy.applied.id;
-
-      setEndpointListApiMockImplementation(coreStart.http, {
-        endpointsResults: [hostDetails],
-        endpointPackagePolicies: [policy],
-      });
+      mockEndpointListApi();
 
       reactTestingLibrary.act(() => {
         history.push('/endpoints?selected_endpoint=1');
@@ -407,9 +460,6 @@ describe('when on the list page', () => {
 
     it('should display Success overall policy status', async () => {
       const renderResult = await renderAndWaitForData();
-      reactTestingLibrary.act(() => {
-        dispatchServerReturnedEndpointPolicyResponse(HostPolicyResponseActionStatus.success);
-      });
       const policyStatusLink = await renderResult.findByTestId('policyStatusValue');
       expect(policyStatusLink.textContent).toEqual('Success');
 
@@ -420,10 +470,8 @@ describe('when on the list page', () => {
     });
 
     it('should display Warning overall policy status', async () => {
+      mockEndpointListApi(createPolicyResponse(HostPolicyResponseActionStatus.warning));
       const renderResult = await renderAndWaitForData();
-      reactTestingLibrary.act(() => {
-        dispatchServerReturnedEndpointPolicyResponse(HostPolicyResponseActionStatus.warning);
-      });
       const policyStatusLink = await renderResult.findByTestId('policyStatusValue');
       expect(policyStatusLink.textContent).toEqual('Warning');
 
@@ -434,10 +482,8 @@ describe('when on the list page', () => {
     });
 
     it('should display Failed overall policy status', async () => {
+      mockEndpointListApi(createPolicyResponse(HostPolicyResponseActionStatus.failure));
       const renderResult = await renderAndWaitForData();
-      reactTestingLibrary.act(() => {
-        dispatchServerReturnedEndpointPolicyResponse(HostPolicyResponseActionStatus.failure);
-      });
       const policyStatusLink = await renderResult.findByTestId('policyStatusValue');
       expect(policyStatusLink.textContent).toEqual('Failed');
 
@@ -448,10 +494,8 @@ describe('when on the list page', () => {
     });
 
     it('should display Unknown overall policy status', async () => {
+      mockEndpointListApi(createPolicyResponse('' as HostPolicyResponseActionStatus));
       const renderResult = await renderAndWaitForData();
-      reactTestingLibrary.act(() => {
-        dispatchServerReturnedEndpointPolicyResponse('' as HostPolicyResponseActionStatus);
-      });
       const policyStatusLink = await renderResult.findByTestId('policyStatusValue');
       expect(policyStatusLink.textContent).toEqual('Unknown');
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx
index 8b8ac3a1d3587..8d08ac4e59a87 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx
@@ -14,6 +14,8 @@ import {
   EuiHealth,
   EuiToolTip,
   EuiSelectableProps,
+  EuiSuperDatePicker,
+  EuiSpacer,
 } from '@elastic/eui';
 import { useHistory } from 'react-router-dom';
 import { i18n } from '@kbn/i18n';
@@ -31,6 +33,7 @@ import {
 import { useNavigateByRouterEventHandler } from '../../../../common/hooks/endpoint/use_navigate_by_router_event_handler';
 import { CreateStructuredSelector } from '../../../../common/store';
 import { Immutable, HostInfo } from '../../../../../common/endpoint/types';
+import { DEFAULT_POLL_INTERVAL } from '../../../common/constants';
 import { PolicyEmptyState, HostsEmptyState } from '../../../components/management_empty_state';
 import { FormattedDate } from '../../../../common/components/formatted_date';
 import { useNavigateToAppEventHandler } from '../../../../common/hooks/endpoint/use_navigate_to_app_event_handler';
@@ -84,6 +87,8 @@ export const EndpointList = () => {
     policyItemsLoading,
     endpointPackageVersion,
     endpointsExist,
+    autoRefreshInterval,
+    isAutoRefreshEnabled,
   } = useEndpointSelector(selector);
   const { formatUrl, search } = useFormatUrl(SecurityPageName.administration);
 
@@ -135,6 +140,27 @@ export const EndpointList = () => {
     }
   );
 
+  const onRefresh = useCallback(() => {
+    dispatch({
+      type: 'appRequestedEndpointList',
+    });
+  }, [dispatch]);
+
+  const onRefreshChange = useCallback(
+    (evt) => {
+      dispatch({
+        type: 'userUpdatedEndpointListRefreshOptions',
+        payload: {
+          isAutoRefreshEnabled: !evt.isPaused,
+          autoRefreshInterval: evt.refreshInterval,
+        },
+      });
+    },
+    [dispatch]
+  );
+
+  const NOOP = useCallback(() => {}, []);
+
   const handleDeployEndpointsClick = useNavigateToAppEventHandler<
     AgentPolicyDetailsDeployAgentAction
   >('ingestManager', {
@@ -368,6 +394,20 @@ export const EndpointList = () => {
     handleCreatePolicyClick,
   ]);
 
+  const hasListData = listData && listData.length > 0;
+
+  const refreshStyle = useMemo(() => {
+    return { display: hasListData ? 'flex' : 'none', maxWidth: 200 };
+  }, [hasListData]);
+
+  const refreshIsPaused = useMemo(() => {
+    return !hasListData ? false : hasSelectedEndpoint ? true : !isAutoRefreshEnabled;
+  }, [hasListData, hasSelectedEndpoint, isAutoRefreshEnabled]);
+
+  const refreshInterval = useMemo(() => {
+    return !hasListData ? DEFAULT_POLL_INTERVAL : autoRefreshInterval;
+  }, [hasListData, autoRefreshInterval]);
+
   return (
     <AdministrationListPage
       data-test-subj="endpointPage"
@@ -386,7 +426,23 @@ export const EndpointList = () => {
       }
     >
       {hasSelectedEndpoint && <EndpointDetailsFlyout />}
-      {listData && listData.length > 0 && (
+      {
+        <>
+          <div style={refreshStyle}>
+            <EuiSuperDatePicker
+              onTimeChange={NOOP}
+              isDisabled={hasSelectedEndpoint}
+              onRefresh={onRefresh}
+              isPaused={refreshIsPaused}
+              refreshInterval={refreshInterval}
+              onRefreshChange={onRefreshChange}
+              isAutoRefreshOnly={true}
+            />
+          </div>
+          <EuiSpacer size="m" />
+        </>
+      }
+      {hasListData && (
         <>
           <EuiText color="subdued" size="xs" data-test-subj="endpointListTableTotal">
             <FormattedMessage
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts
index 6268f55c5518c..c9385bf9cebf2 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts
@@ -7,16 +7,78 @@
 import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { deleteMetadataStream } from '../../../security_solution_endpoint_api_int/apis/data_stream_helper';
-
 export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const pageObjects = getPageObjects(['common', 'endpoint', 'header', 'endpointPageUtils']);
   const esArchiver = getService('esArchiver');
   const testSubjects = getService('testSubjects');
 
+  const expectedData = [
+    [
+      'Hostname',
+      'Agent Status',
+      'Integration',
+      'Configuration Status',
+      'Operating System',
+      'IP Address',
+      'Version',
+      'Last Active',
+    ],
+    [
+      'cadmann-4.example.com',
+      'Error',
+      'Default',
+      'Failure',
+      'windows 10.0',
+      '10.192.213.130, 10.70.28.129',
+      '6.6.1',
+      'Jan 24, 2020 @ 16:06:09.541',
+    ],
+    [
+      'thurlow-9.example.com',
+      'Error',
+      'Default',
+      'Success',
+      'windows 10.0',
+      '10.46.229.234',
+      '6.0.0',
+      'Jan 24, 2020 @ 16:06:09.541',
+    ],
+    [
+      'rezzani-7.example.com',
+      'Error',
+      'Default',
+      'Failure',
+      'windows 10.0',
+      '10.101.149.26, 2606:a000:ffc0:39:11ef:37b9:3371:578c',
+      '6.8.0',
+      'Jan 24, 2020 @ 16:06:09.541',
+    ],
+  ];
+
   describe('endpoint list', function () {
     this.tags('ciGroup7');
     const sleep = (ms = 100) => new Promise((resolve) => setTimeout(resolve, ms));
 
+    describe('when initially navigating to page', () => {
+      before(async () => {
+        await pageObjects.endpoint.navigateToEndpointList();
+      });
+      after(async () => {
+        await deleteMetadataStream(getService);
+      });
+
+      it('finds no data in list and prompts onboarding to add policy', async () => {
+        await testSubjects.exists('emptyPolicyTable');
+      });
+
+      it('finds data after load and polling', async () => {
+        await esArchiver.load('endpoint/metadata/api_feature', { useCreate: true });
+        await pageObjects.endpoint.waitForTableToHaveData('endpointListTable', 10000);
+        const tableData = await pageObjects.endpointPageUtils.tableData('endpointListTable');
+        expect(tableData).to.eql(expectedData);
+      });
+    });
+
     describe('when there is data,', () => {
       before(async () => {
         await esArchiver.load('endpoint/metadata/api_feature', { useCreate: true });
@@ -32,48 +94,6 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       });
 
       it('displays table data', async () => {
-        const expectedData = [
-          [
-            'Hostname',
-            'Agent Status',
-            'Integration',
-            'Configuration Status',
-            'Operating System',
-            'IP Address',
-            'Version',
-            'Last Active',
-          ],
-          [
-            'cadmann-4.example.com',
-            'Error',
-            'Default',
-            'Failure',
-            'windows 10.0',
-            '10.192.213.130, 10.70.28.129',
-            '6.6.1',
-            'Jan 24, 2020 @ 16:06:09.541',
-          ],
-          [
-            'thurlow-9.example.com',
-            'Error',
-            'Default',
-            'Success',
-            'windows 10.0',
-            '10.46.229.234',
-            '6.0.0',
-            'Jan 24, 2020 @ 16:06:09.541',
-          ],
-          [
-            'rezzani-7.example.com',
-            'Error',
-            'Default',
-            'Failure',
-            'windows 10.0',
-            '10.101.149.26, 2606:a000:ffc0:39:11ef:37b9:3371:578c',
-            '6.8.0',
-            'Jan 24, 2020 @ 16:06:09.541',
-          ],
-        ];
         const tableData = await pageObjects.endpointPageUtils.tableData('endpointListTable');
         expect(tableData).to.eql(expectedData);
       });
@@ -147,7 +167,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
         });
 
         it('displays details row headers', async () => {
-          const expectedData = [
+          const expectedHeaders = [
             'OS',
             'Last Seen',
             'Alerts',
@@ -160,7 +180,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
           const keys = await pageObjects.endpoint.endpointFlyoutDescriptionKeys(
             'endpointDetailsFlyout'
           );
-          expect(keys).to.eql(expectedData);
+          expect(keys).to.eql(expectedHeaders);
         });
 
         it('displays details row descriptions', async () => {
diff --git a/x-pack/test/security_solution_endpoint/page_objects/endpoint_page.ts b/x-pack/test/security_solution_endpoint/page_objects/endpoint_page.ts
index f89ee5fe2729b..351084909a0dc 100644
--- a/x-pack/test/security_solution_endpoint/page_objects/endpoint_page.ts
+++ b/x-pack/test/security_solution_endpoint/page_objects/endpoint_page.ts
@@ -24,8 +24,8 @@ export function EndpointPageProvider({ getService, getPageObjects }: FtrProvider
       await pageObjects.header.waitUntilLoadingHasFinished();
     },
 
-    async waitForTableToHaveData(dataTestSubj: string) {
-      await retry.waitForWithTimeout('table to have data', 2000, async () => {
+    async waitForTableToHaveData(dataTestSubj: string, timeout = 2000) {
+      await retry.waitForWithTimeout('table to have data', timeout, async () => {
         const tableData = await pageObjects.endpointPageUtils.tableData(dataTestSubj);
         if (tableData[1][0] === 'No items found') {
           return false;

From 4b46316395a52da7b75fe2bf30985a8d9011be99 Mon Sep 17 00:00:00 2001
From: DeDe Morton <dede.morton@elastic.co>
Date: Wed, 19 Aug 2020 18:02:34 -0700
Subject: [PATCH 46/85] Edit text strings for Ingest Manager Overview and Add
 data pages (#74818)

* Edit Ingest Manager text strings in Overview and Add Data pages

* Add fixes from review

* remove blank line

* Change configurations to policies

* Remove "configuration" from text

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../ingest_manager/components/alpha_flyout.tsx       |  2 +-
 .../enrollment_instructions/manual/index.tsx         | 12 ++++++------
 .../ingest_manager/components/settings_flyout.tsx    |  7 ++++---
 .../applications/ingest_manager/layouts/default.tsx  |  2 +-
 .../components/agent_enrollment_flyout/index.tsx     |  4 ++--
 .../agent_enrollment_flyout/managed_instructions.tsx |  4 ++--
 .../standalone_instructions.tsx                      |  8 ++++----
 .../components/agent_enrollment_flyout/steps.tsx     |  6 +++---
 .../ingest_manager/sections/overview/index.tsx       |  2 +-
 9 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_flyout.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_flyout.tsx
index 110d6de02c12b..e07f467d5f037 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_flyout.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_flyout.tsx
@@ -45,7 +45,7 @@ export const AlphaFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
           <p>
             <FormattedMessage
               id="xpack.ingestManager.alphaMessaging.feedbackText"
-              defaultMessage="We encourage you to read our {docsLink} or to ask questions and send feedback in our {forumLink}."
+              defaultMessage="Read our {docsLink} or go to our {forumLink} for questions or feedback."
               values={{
                 docsLink: (
                   <EuiLink
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/enrollment_instructions/manual/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/enrollment_instructions/manual/index.tsx
index 9efc95b0a04cf..550c282460531 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/enrollment_instructions/manual/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/enrollment_instructions/manual/index.tsx
@@ -44,7 +44,7 @@ systemctl start elastic-agent`;
       <EuiText>
         <FormattedMessage
           id="xpack.ingestManager.enrollmentInstructions.descriptionText"
-          defaultMessage="From the agent’s directory, run the appropriate commands to enroll and start an Elastic Agent. You can reuse these commands to setup agents on more than one machine. Be sure to run the enrollment steps as a user with Administrator privilege on the system."
+          defaultMessage="From the agent directory, run these commands to enroll and start an Elastic Agent. You can reuse these commands to set up agents on more than one host. Requires administrator privileges."
         />
       </EuiText>
       <EuiSpacer size="l" />
@@ -83,19 +83,19 @@ systemctl start elastic-agent`;
         </h4>
       </EuiTitle>
       <EuiSpacer size="s" />
+      <EuiCodeBlock fontSize="m" isCopyable={true} paddingSize="m">
+        <CommandCode>{macOsLinuxTarCommand}</CommandCode>
+      </EuiCodeBlock>
+      <EuiSpacer size="s" />
       <EuiText color="subdued" size="s">
         <FormattedMessage
           id="xpack.ingestManager.enrollmentInstructions.macLinuxTarInstructions"
-          defaultMessage="You will need to run {command} if the agent’s system reboots."
+          defaultMessage="The {command} command runs the agent in the foreground. If the agent's host reboots, you'll need to run the command again."
           values={{
             command: <EuiCode>./elastic-agent run</EuiCode>,
           }}
         />
       </EuiText>
-      <EuiSpacer size="s" />
-      <EuiCodeBlock fontSize="m" isCopyable={true} paddingSize="m">
-        <CommandCode>{macOsLinuxTarCommand}</CommandCode>
-      </EuiCodeBlock>
     </>
   );
 };
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/settings_flyout.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/settings_flyout.tsx
index be1b3df8a0c3e..9a9557f77c40c 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/settings_flyout.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/settings_flyout.tsx
@@ -139,7 +139,8 @@ export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
             id: 'disabled',
             disabled: true,
             label: i18n.translate('xpack.ingestManager.settings.autoUpgradeDisabledLabel', {
-              defaultMessage: 'Manually manage agent binary versions. Requires Gold license.',
+              defaultMessage:
+                'Manually manage agent binary versions. Requires a Gold subscription.',
             }),
           },
         ]}
@@ -167,7 +168,7 @@ export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
               'xpack.ingestManager.settings.integrationUpgradeEnabledFieldLabel',
               {
                 defaultMessage:
-                  'Automatically update integrations to the latest version to receive the latest assets. Agent policies may need to be updated in order to use new features.',
+                  'Automatically update integrations to the latest version to get the latest assets. You might need to update agent policies to use new features.',
               }
             ),
           },
@@ -210,7 +211,7 @@ export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
       <EuiText color="subdued" size="s">
         <FormattedMessage
           id="xpack.ingestManager.settings.globalOutputDescription"
-          defaultMessage="The global output is applied to all agent policies and specifies where data is sent."
+          defaultMessage="Specify where to send data. These settings are applied to all Elastic Agent policies."
         />
       </EuiText>
       <EuiSpacer size="m" />
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx
index 3a68cb948eb2d..726da7a790b97 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx
@@ -111,7 +111,7 @@ export const DefaultLayout: React.FunctionComponent<Props> = ({
                     >
                       <FormattedMessage
                         id="xpack.ingestManager.appNavigation.sendFeedbackButton"
-                        defaultMessage="Send Feedback"
+                        defaultMessage="Send feedback"
                       />
                     </EuiButtonEmpty>
                   </EuiFlexItem>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/index.tsx
index f85d0bea74f22..414c4e0d7ad2c 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/index.tsx
@@ -48,13 +48,13 @@ export const AgentEnrollmentFlyout: React.FunctionComponent<Props> = ({
           <EuiTab isSelected={mode === 'managed'} onClick={() => setMode('managed')}>
             <FormattedMessage
               id="xpack.ingestManager.agentEnrollment.enrollFleetTabLabel"
-              defaultMessage="Enroll with Fleet"
+              defaultMessage="Enroll in Fleet"
             />
           </EuiTab>
           <EuiTab isSelected={mode === 'standalone'} onClick={() => setMode('standalone')}>
             <FormattedMessage
               id="xpack.ingestManager.agentEnrollment.enrollStandaloneTabLabel"
-              defaultMessage="Standalone mode"
+              defaultMessage="Run standalone"
             />
           </EuiTab>
         </EuiTabs>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/managed_instructions.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/managed_instructions.tsx
index 3821d8a2384ca..b02893057c9c3 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/managed_instructions.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/managed_instructions.tsx
@@ -60,7 +60,7 @@ export const ManagedInstructions: React.FunctionComponent<Props> = ({ agentPolic
       <EuiText>
         <FormattedMessage
           id="xpack.ingestManager.agentEnrollment.managedDescription"
-          defaultMessage="Whether you need one agent or thousands, Fleet makes it easy to centrally manage and deploy updates to your agents. Follow the instructions below to download and enroll an Elastic Agent with Fleet."
+          defaultMessage="Enroll an Elastic Agent in Fleet to automatically deploy updates and centrally manage the agent."
         />
       </EuiText>
       <EuiSpacer size="l" />
@@ -72,7 +72,7 @@ export const ManagedInstructions: React.FunctionComponent<Props> = ({ agentPolic
         <>
           <FormattedMessage
             id="xpack.ingestManager.agentEnrollment.fleetNotInitializedText"
-            defaultMessage="Fleet needs to be set up before agents can be enrolled. {link}"
+            defaultMessage="Before enrolling agents, set up Fleet. {link}"
             values={{
               link: (
                 <EuiLink href={getHref('fleet')}>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/standalone_instructions.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/standalone_instructions.tsx
index c2da0b704eaff..abe834e7db19c 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/standalone_instructions.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/standalone_instructions.tsx
@@ -81,7 +81,7 @@ export const StandaloneInstructions: React.FunctionComponent<Props> = ({ agentPo
           <EuiText>
             <FormattedMessage
               id="xpack.ingestManager.agentEnrollment.stepConfigureAgentDescription"
-              defaultMessage="Copy this policy and put it into a file named {fileName} on the system where the Elastic Agent is installed. Don’t forget to modify {ESUsernameVariable} and {ESPasswordVariable} in the {outputSection} section of the policy file so that it uses your actual Elasticsearch credentials."
+              defaultMessage="Copy this policy to the {fileName} on the host where the Elastic Agent is installed. Modify {ESUsernameVariable} and {ESPasswordVariable} in the {outputSection} section of {fileName} to use your Elasticsearch credentials."
               values={{
                 fileName: <EuiCode>elastic-agent.yml</EuiCode>,
                 ESUsernameVariable: <EuiCode>ES_USERNAME</EuiCode>,
@@ -129,7 +129,7 @@ export const StandaloneInstructions: React.FunctionComponent<Props> = ({ agentPo
           <EuiText>
             <FormattedMessage
               id="xpack.ingestManager.agentEnrollment.stepRunAgentDescription"
-              defaultMessage="From the agent’s directory, run the following command to start the agent."
+              defaultMessage="From the agent directory, run these commands to enroll and start an Elastic Agent. You can reuse these commands to set up agents on more than one host. Requires administrator privileges."
             />
             <EuiSpacer size="m" />
             <EuiCodeBlock fontSize="m">{RUN_INSTRUCTIONS}</EuiCodeBlock>
@@ -157,7 +157,7 @@ export const StandaloneInstructions: React.FunctionComponent<Props> = ({ agentPo
           <EuiText>
             <FormattedMessage
               id="xpack.ingestManager.agentEnrollment.stepCheckForDataDescription"
-              defaultMessage="After starting the agent, the agent should begin sending data. You can view this data on Ingest Manager’s datasets page."
+              defaultMessage="The agent should begin sending data. Go to Datasets to view your data."
             />
           </EuiText>
         </>
@@ -170,7 +170,7 @@ export const StandaloneInstructions: React.FunctionComponent<Props> = ({ agentPo
       <EuiText>
         <FormattedMessage
           id="xpack.ingestManager.agentEnrollment.standaloneDescription"
-          defaultMessage="Agents running in standalone mode need to be updated manually if you ever wish to make changes to their policy. Follow the instructions below to download and setup an Elastic Agent in standalone mode."
+          defaultMessage="Run an Elastic Agent standalone to configure and update the agent manually on the host where the agent is installed."
         />
       </EuiText>
       <EuiSpacer size="l" />
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/steps.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/steps.tsx
index a70741d1df7f7..0ae61ff421ffa 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/steps.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/steps.tsx
@@ -14,14 +14,14 @@ import { AgentPolicy } from '../../../../types';
 export const DownloadStep = () => {
   return {
     title: i18n.translate('xpack.ingestManager.agentEnrollment.stepDownloadAgentTitle', {
-      defaultMessage: 'Download the Elastic Agent',
+      defaultMessage: 'Download the Elastic Agent to your host',
     }),
     children: (
       <>
         <EuiText>
           <FormattedMessage
             id="xpack.ingestManager.agentEnrollment.downloadDescription"
-            defaultMessage="Download the Elastic Agent on your host’s machine. You can access the agent binaries and their verification signatures from the Elastic Agent download page."
+            defaultMessage="You can download the agent binaries and their verification signatures from the Elastic Agent download page."
           />
         </EuiText>
         <EuiSpacer size="l" />
@@ -33,7 +33,7 @@ export const DownloadStep = () => {
         >
           <FormattedMessage
             id="xpack.ingestManager.agentEnrollment.downloadLink"
-            defaultMessage="Go to elastic.co/downloads"
+            defaultMessage="Go to download page"
           />
         </EuiButton>
       </>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx
index 187b701dc4167..0d8788bce2a1d 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx
@@ -71,7 +71,7 @@ export const IngestManagerOverview: React.FunctionComponent = () => {
               <p>
                 <FormattedMessage
                   id="xpack.ingestManager.overviewPageSubtitle"
-                  defaultMessage="Central management for Elastic Agents and agent policies."
+                  defaultMessage="Manage Elastic Agents and their policies in a central location."
                 />
               </p>
             </EuiText>

From 28df9266a0b8906e2cf6537aa12b118dfdd7082d Mon Sep 17 00:00:00 2001
From: Peter Pisljar <peter.pisljar@gmail.com>
Date: Thu, 20 Aug 2020 06:40:08 +0200
Subject: [PATCH 47/85] adds metric_vis_renderer (#57694)

---
 .../common/ast/build_function.test.ts         |  17 +++
 .../expressions/common/ast/build_function.ts  |  12 +-
 src/plugins/vis_type_metric/kibana.json       |   2 +-
 .../__snapshots__/metric_vis_fn.test.ts.snap  |   2 +-
 .../public/__snapshots__/to_ast.test.ts.snap  |  73 +++++++++++
 .../metric_vis_component.test.tsx.snap        |  40 +++---
 .../components/metric_vis_component.test.tsx  |  38 +++---
 .../components/metric_vis_component.tsx       |  21 ++--
 .../vis_type_metric/public/metric_vis_fn.ts   |   8 +-
 .../public/metric_vis_renderer.tsx            |  54 ++++++++
 .../vis_type_metric/public/metric_vis_type.ts |   5 +-
 src/plugins/vis_type_metric/public/plugin.ts  |   7 +-
 .../vis_type_metric/public/services.ts        |   3 +
 .../vis_type_metric/public/to_ast.test.ts     |  54 ++++++++
 src/plugins/vis_type_metric/public/to_ast.ts  | 103 ++++++++++++++++
 .../visualizations/public/components/index.ts |   2 +
 .../components/visualization_container.tsx}   |  17 +--
 src/plugins/visualizations/public/index.ts    |   2 +
 .../__snapshots__/build_pipeline.test.ts.snap |   8 +-
 .../public/legacy/build_pipeline.test.ts      |  39 +-----
 .../public/legacy/build_pipeline.ts           | 115 ++++++------------
 src/plugins/visualizations/public/types.ts    |  14 ++-
 src/plugins/visualizations/public/vis.ts      |   4 +-
 .../public/vis_types/base_vis_type.ts         |   9 +-
 .../snapshots/baseline/combined_test3.json    |   2 +-
 .../snapshots/baseline/final_output_test.json |   2 +-
 .../snapshots/baseline/metric_all_data.json   |   2 +-
 .../baseline/metric_multi_metric_data.json    |   2 +-
 .../baseline/metric_percentage_mode.json      |   2 +-
 .../baseline/metric_single_metric_data.json   |   2 +-
 .../snapshots/baseline/partial_test_2.json    |   2 +-
 .../snapshots/baseline/step_output_test3.json |   2 +-
 .../snapshots/session/combined_test3.json     |   2 +-
 .../snapshots/session/final_output_test.json  |   2 +-
 .../snapshots/session/metric_all_data.json    |   2 +-
 .../session/metric_multi_metric_data.json     |   2 +-
 .../session/metric_percentage_mode.json       |   2 +-
 .../session/metric_single_metric_data.json    |   2 +-
 .../snapshots/session/partial_test_2.json     |   2 +-
 .../snapshots/session/step_output_test3.json  |   2 +-
 40 files changed, 463 insertions(+), 218 deletions(-)
 create mode 100644 src/plugins/vis_type_metric/public/__snapshots__/to_ast.test.ts.snap
 create mode 100644 src/plugins/vis_type_metric/public/metric_vis_renderer.tsx
 create mode 100644 src/plugins/vis_type_metric/public/to_ast.test.ts
 create mode 100644 src/plugins/vis_type_metric/public/to_ast.ts
 rename src/plugins/{vis_type_metric/public/metric_vis_type.test.ts => visualizations/public/components/visualization_container.tsx} (68%)

diff --git a/src/plugins/expressions/common/ast/build_function.test.ts b/src/plugins/expressions/common/ast/build_function.test.ts
index a2b54f31f6f8f..1f914d6f471e6 100644
--- a/src/plugins/expressions/common/ast/build_function.test.ts
+++ b/src/plugins/expressions/common/ast/build_function.test.ts
@@ -79,6 +79,11 @@ describe('buildExpressionFunction()', () => {
     `);
   });
 
+  test('ignores any args in initial state which value is undefined', () => {
+    const fn = buildExpressionFunction('hello', { world: undefined });
+    expect(fn.arguments).not.toHaveProperty('world');
+  });
+
   test('returns all expected properties', () => {
     const fn = buildExpressionFunction('hello', { world: [true] });
     expect(Object.keys(fn)).toMatchInlineSnapshot(`
@@ -264,6 +269,18 @@ describe('buildExpressionFunction()', () => {
       `);
     });
 
+    test('does not add new argument if the value is undefined', () => {
+      const fn = buildExpressionFunction('hello', { world: [true] });
+      fn.addArgument('foo', undefined);
+      expect(fn.toAst().arguments).toMatchInlineSnapshot(`
+        Object {
+          "world": Array [
+            true,
+          ],
+        }
+      `);
+    });
+
     test('mutates a function already associated with an expression', () => {
       const fn = buildExpressionFunction('hello', { world: [true] });
       const exp = buildExpression([fn]);
diff --git a/src/plugins/expressions/common/ast/build_function.ts b/src/plugins/expressions/common/ast/build_function.ts
index 5a1bd615d6450..6cd16b2bc1354 100644
--- a/src/plugins/expressions/common/ast/build_function.ts
+++ b/src/plugins/expressions/common/ast/build_function.ts
@@ -183,8 +183,10 @@ export function buildExpressionFunction<
       acc[key] = value.map((v) => {
         return isExpressionAst(v) ? buildExpression(v) : v;
       });
-    } else {
+    } else if (value !== undefined) {
       acc[key] = isExpressionAst(value) ? [buildExpression(value)] : [value];
+    } else {
+      delete acc[key];
     }
     return acc;
   }, initialArgs as FunctionBuilderArguments<FnDef>);
@@ -195,10 +197,12 @@ export function buildExpressionFunction<
     arguments: args,
 
     addArgument(key, value) {
-      if (!args.hasOwnProperty(key)) {
-        args[key] = [];
+      if (value !== undefined) {
+        if (!args.hasOwnProperty(key)) {
+          args[key] = [];
+        }
+        args[key].push(value);
       }
-      args[key].push(value);
       return this;
     },
 
diff --git a/src/plugins/vis_type_metric/kibana.json b/src/plugins/vis_type_metric/kibana.json
index b2ebc91471e9d..26ca09e22f26e 100644
--- a/src/plugins/vis_type_metric/kibana.json
+++ b/src/plugins/vis_type_metric/kibana.json
@@ -4,6 +4,6 @@
   "kibanaVersion": "kibana",
   "server": true,
   "ui": true,
-  "requiredPlugins": ["data", "visualizations", "charts","expressions"],
+  "requiredPlugins": ["data", "visualizations", "charts", "expressions"],
   "requiredBundles": ["kibanaUtils", "kibanaReact"]
 }
diff --git a/src/plugins/vis_type_metric/public/__snapshots__/metric_vis_fn.test.ts.snap b/src/plugins/vis_type_metric/public/__snapshots__/metric_vis_fn.test.ts.snap
index 44414cedf966a..706d2a902aa90 100644
--- a/src/plugins/vis_type_metric/public/__snapshots__/metric_vis_fn.test.ts.snap
+++ b/src/plugins/vis_type_metric/public/__snapshots__/metric_vis_fn.test.ts.snap
@@ -2,7 +2,7 @@
 
 exports[`interpreter/functions#metric returns an object with the correct structure 1`] = `
 Object {
-  "as": "visualization",
+  "as": "metric_vis",
   "type": "render",
   "value": Object {
     "params": Object {
diff --git a/src/plugins/vis_type_metric/public/__snapshots__/to_ast.test.ts.snap b/src/plugins/vis_type_metric/public/__snapshots__/to_ast.test.ts.snap
new file mode 100644
index 0000000000000..117c188c6cce2
--- /dev/null
+++ b/src/plugins/vis_type_metric/public/__snapshots__/to_ast.test.ts.snap
@@ -0,0 +1,73 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`metric vis toExpressionAst function with percentage mode should have percentage format 1`] = `
+Object {
+  "chain": Array [
+    Object {
+      "arguments": Object {
+        "aggConfigs": Array [
+          "[]",
+        ],
+        "includeFormatHints": Array [
+          false,
+        ],
+        "index": Array [
+          "123",
+        ],
+        "metricsAtAllLevels": Array [
+          false,
+        ],
+        "partialRows": Array [
+          false,
+        ],
+      },
+      "function": "esaggs",
+      "type": "function",
+    },
+    Object {
+      "arguments": Object {
+        "percentageMode": Array [
+          true,
+        ],
+      },
+      "function": "metricVis",
+      "type": "function",
+    },
+  ],
+  "type": "expression",
+}
+`;
+
+exports[`metric vis toExpressionAst function without params 1`] = `
+Object {
+  "chain": Array [
+    Object {
+      "arguments": Object {
+        "aggConfigs": Array [
+          "[]",
+        ],
+        "includeFormatHints": Array [
+          false,
+        ],
+        "index": Array [
+          "123",
+        ],
+        "metricsAtAllLevels": Array [
+          false,
+        ],
+        "partialRows": Array [
+          false,
+        ],
+      },
+      "function": "esaggs",
+      "type": "function",
+    },
+    Object {
+      "arguments": Object {},
+      "function": "metricVis",
+      "type": "function",
+    },
+  ],
+  "type": "expression",
+}
+`;
diff --git a/src/plugins/vis_type_metric/public/components/__snapshots__/metric_vis_component.test.tsx.snap b/src/plugins/vis_type_metric/public/components/__snapshots__/metric_vis_component.test.tsx.snap
index 47ca3f1e0465e..f07fdfa682d87 100644
--- a/src/plugins/vis_type_metric/public/components/__snapshots__/metric_vis_component.test.tsx.snap
+++ b/src/plugins/vis_type_metric/public/components/__snapshots__/metric_vis_component.test.tsx.snap
@@ -1,9 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`MetricVisComponent should render correct structure for multi-value metrics 1`] = `
-<div
-  className="mtrVis"
->
+Array [
   <MetricVisValue
     key="0"
     metric={
@@ -17,7 +15,7 @@ exports[`MetricVisComponent should render correct structure for multi-value metr
       }
     }
     showLabel={true}
-  />
+  />,
   <MetricVisValue
     key="1"
     metric={
@@ -31,27 +29,23 @@ exports[`MetricVisComponent should render correct structure for multi-value metr
       }
     }
     showLabel={true}
-  />
-</div>
+  />,
+]
 `;
 
 exports[`MetricVisComponent should render correct structure for single metric 1`] = `
-<div
-  className="mtrVis"
->
-  <MetricVisValue
-    key="0"
-    metric={
-      Object {
-        "bgColor": undefined,
-        "color": undefined,
-        "label": "Count",
-        "lightText": false,
-        "rowIndex": 0,
-        "value": 4301021,
-      }
+<MetricVisValue
+  key="0"
+  metric={
+    Object {
+      "bgColor": undefined,
+      "color": undefined,
+      "label": "Count",
+      "lightText": false,
+      "rowIndex": 0,
+      "value": 4301021,
     }
-    showLabel={true}
-  />
-</div>
+  }
+  showLabel={true}
+/>
 `;
diff --git a/src/plugins/vis_type_metric/public/components/metric_vis_component.test.tsx b/src/plugins/vis_type_metric/public/components/metric_vis_component.test.tsx
index ba32fb2712e68..b56d4e4f62e41 100644
--- a/src/plugins/vis_type_metric/public/components/metric_vis_component.test.tsx
+++ b/src/plugins/vis_type_metric/public/components/metric_vis_component.test.tsx
@@ -21,7 +21,6 @@ import React from 'react';
 import { shallow } from 'enzyme';
 
 import { MetricVisComponent, MetricVisComponentProps } from './metric_vis_component';
-import { ExprVis } from '../../../visualizations/public';
 
 jest.mock('../services', () => ({
   getFormatService: () => ({
@@ -41,29 +40,30 @@ const baseVisData = {
 } as any;
 
 describe('MetricVisComponent', function () {
-  const vis: ExprVis = {
-    params: {
-      metric: {
-        colorSchema: 'Green to Red',
-        colorsRange: [{ from: 0, to: 1000 }],
-        style: {},
-        labels: {
-          show: true,
-        },
-      },
-      dimensions: {
-        metrics: [{ accessor: 0 }],
-        bucket: null,
+  const visParams = {
+    type: 'metric',
+    addTooltip: false,
+    addLegend: false,
+    metric: {
+      colorSchema: 'Green to Red',
+      colorsRange: [{ from: 0, to: 1000 }],
+      style: {},
+      labels: {
+        show: true,
       },
     },
-  } as any;
+    dimensions: {
+      metrics: [{ accessor: 0 } as any],
+      bucket: undefined,
+    },
+  };
 
   const getComponent = (propOverrides: Partial<Props> = {} as Partial<Props>) => {
     const props: Props = {
-      vis,
-      visParams: vis.params as any,
+      visParams: visParams as any,
       visData: baseVisData,
       renderComplete: jest.fn(),
+      fireEvent: jest.fn(),
       ...propOverrides,
     };
 
@@ -88,9 +88,9 @@ describe('MetricVisComponent', function () {
         rows: [{ 'col-0': 182, 'col-1': 445842.4634666484 }],
       },
       visParams: {
-        ...vis.params,
+        ...visParams,
         dimensions: {
-          ...vis.params.dimensions,
+          ...visParams.dimensions,
           metrics: [{ accessor: 0 }, { accessor: 1 }],
         },
       },
diff --git a/src/plugins/vis_type_metric/public/components/metric_vis_component.tsx b/src/plugins/vis_type_metric/public/components/metric_vis_component.tsx
index 4385826762612..9ce3820ee4e23 100644
--- a/src/plugins/vis_type_metric/public/components/metric_vis_component.tsx
+++ b/src/plugins/vis_type_metric/public/components/metric_vis_component.tsx
@@ -27,13 +27,13 @@ import { KibanaDatatable } from '../../../expressions/public';
 import { getHeatmapColors } from '../../../charts/public';
 import { VisParams, MetricVisMetric } from '../types';
 import { getFormatService } from '../services';
-import { SchemaConfig, ExprVis } from '../../../visualizations/public';
+import { SchemaConfig } from '../../../visualizations/public';
 import { Range } from '../../../expressions/public';
 
 export interface MetricVisComponentProps {
   visParams: VisParams;
   visData: Input;
-  vis: ExprVis;
+  fireEvent: (event: any) => void;
   renderComplete: () => void;
 }
 
@@ -166,10 +166,17 @@ export class MetricVisComponent extends Component<MetricVisComponentProps> {
       return;
     }
     const table = this.props.visData;
-    this.props.vis.API.events.filter({
-      table,
-      column: dimensions.bucket.accessor,
-      row: metric.rowIndex,
+    this.props.fireEvent({
+      name: 'filterBucket',
+      data: {
+        data: [
+          {
+            table,
+            column: dimensions.bucket.accessor,
+            row: metric.rowIndex,
+          },
+        ],
+      },
     });
   };
 
@@ -199,6 +206,6 @@ export class MetricVisComponent extends Component<MetricVisComponentProps> {
       const metrics = this.processTableGroups(this.props.visData);
       metricsHtml = metrics.map(this.renderMetric);
     }
-    return <div className="mtrVis">{metricsHtml}</div>;
+    return metricsHtml;
   }
 }
diff --git a/src/plugins/vis_type_metric/public/metric_vis_fn.ts b/src/plugins/vis_type_metric/public/metric_vis_fn.ts
index 3d16fed0fa385..b58be63581724 100644
--- a/src/plugins/vis_type_metric/public/metric_vis_fn.ts
+++ b/src/plugins/vis_type_metric/public/metric_vis_fn.ts
@@ -53,12 +53,14 @@ interface RenderValue {
   params: any;
 }
 
-export const createMetricVisFn = (): ExpressionFunctionDefinition<
+export type MetricVisExpressionFunctionDefinition = ExpressionFunctionDefinition<
   'metricVis',
   Input,
   Arguments,
   Render<RenderValue>
-> => ({
+>;
+
+export const createMetricVisFn = (): MetricVisExpressionFunctionDefinition => ({
   name: 'metricVis',
   type: 'render',
   inputTypes: ['kibana_datatable'],
@@ -175,7 +177,7 @@ export const createMetricVisFn = (): ExpressionFunctionDefinition<
 
     return {
       type: 'render',
-      as: 'visualization',
+      as: 'metric_vis',
       value: {
         visData: input,
         visType,
diff --git a/src/plugins/vis_type_metric/public/metric_vis_renderer.tsx b/src/plugins/vis_type_metric/public/metric_vis_renderer.tsx
new file mode 100644
index 0000000000000..2bae668b080ea
--- /dev/null
+++ b/src/plugins/vis_type_metric/public/metric_vis_renderer.tsx
@@ -0,0 +1,54 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from 'react';
+import { render, unmountComponentAtNode } from 'react-dom';
+import { MetricVisComponent } from './components/metric_vis_component';
+import { getI18n } from './services';
+import { VisualizationContainer } from '../../visualizations/public';
+import { ExpressionRenderDefinition } from '../../expressions/common/expression_renderers';
+
+export const metricVisRenderer: () => ExpressionRenderDefinition = () => ({
+  name: 'metric_vis',
+  displayName: 'metric visualization',
+  reuseDomNode: true,
+  render: async (domNode: HTMLElement, config: any, handlers: any) => {
+    const { visData, visConfig } = config;
+
+    const I18nContext = getI18n().Context;
+
+    handlers.onDestroy(() => {
+      unmountComponentAtNode(domNode);
+    });
+
+    render(
+      <I18nContext>
+        <VisualizationContainer className="mtrVis">
+          <MetricVisComponent
+            visData={visData}
+            visParams={visConfig}
+            renderComplete={handlers.done}
+            fireEvent={handlers.event}
+          />
+        </VisualizationContainer>
+      </I18nContext>,
+      domNode
+    );
+  },
+});
diff --git a/src/plugins/vis_type_metric/public/metric_vis_type.ts b/src/plugins/vis_type_metric/public/metric_vis_type.ts
index b7e9213283bee..6b4d6e151693f 100644
--- a/src/plugins/vis_type_metric/public/metric_vis_type.ts
+++ b/src/plugins/vis_type_metric/public/metric_vis_type.ts
@@ -18,12 +18,11 @@
  */
 
 import { i18n } from '@kbn/i18n';
-
-import { MetricVisComponent } from './components/metric_vis_component';
 import { MetricVisOptions } from './components/metric_vis_options';
 import { ColorSchemas, colorSchemas, ColorModes } from '../../charts/public';
 import { AggGroupNames } from '../../data/public';
 import { Schemas } from '../../vis_default_editor/public';
+import { toExpressionAst } from './to_ast';
 
 export const createMetricVisTypeDefinition = () => ({
   name: 'metric',
@@ -32,8 +31,8 @@ export const createMetricVisTypeDefinition = () => ({
   description: i18n.translate('visTypeMetric.metricDescription', {
     defaultMessage: 'Display a calculation as a single number',
   }),
+  toExpressionAst,
   visConfig: {
-    component: MetricVisComponent,
     defaults: {
       addTooltip: true,
       addLegend: false,
diff --git a/src/plugins/vis_type_metric/public/plugin.ts b/src/plugins/vis_type_metric/public/plugin.ts
index a3951fa46c21c..b9e094aa76889 100644
--- a/src/plugins/vis_type_metric/public/plugin.ts
+++ b/src/plugins/vis_type_metric/public/plugin.ts
@@ -25,8 +25,9 @@ import { createMetricVisFn } from './metric_vis_fn';
 import { createMetricVisTypeDefinition } from './metric_vis_type';
 import { ChartsPluginSetup } from '../../charts/public';
 import { DataPublicPluginStart } from '../../data/public';
-import { setFormatService } from './services';
+import { setFormatService, setI18n } from './services';
 import { ConfigSchema } from '../config';
+import { metricVisRenderer } from './metric_vis_renderer';
 
 /** @internal */
 export interface MetricVisPluginSetupDependencies {
@@ -53,10 +54,12 @@ export class MetricVisPlugin implements Plugin<void, void> {
     { expressions, visualizations, charts }: MetricVisPluginSetupDependencies
   ) {
     expressions.registerFunction(createMetricVisFn);
-    visualizations.createReactVisualization(createMetricVisTypeDefinition());
+    expressions.registerRenderer(metricVisRenderer);
+    visualizations.createBaseVisualization(createMetricVisTypeDefinition());
   }
 
   public start(core: CoreStart, { data }: MetricVisPluginStartDependencies) {
+    setI18n(core.i18n);
     setFormatService(data.fieldFormats);
   }
 }
diff --git a/src/plugins/vis_type_metric/public/services.ts b/src/plugins/vis_type_metric/public/services.ts
index 681afbaf0b268..0e19cfdce228d 100644
--- a/src/plugins/vis_type_metric/public/services.ts
+++ b/src/plugins/vis_type_metric/public/services.ts
@@ -17,9 +17,12 @@
  * under the License.
  */
 
+import { I18nStart } from 'kibana/public';
 import { createGetterSetter } from '../../kibana_utils/common';
 import { DataPublicPluginStart } from '../../data/public';
 
 export const [getFormatService, setFormatService] = createGetterSetter<
   DataPublicPluginStart['fieldFormats']
 >('metric data.fieldFormats');
+
+export const [getI18n, setI18n] = createGetterSetter<I18nStart>('I18n');
diff --git a/src/plugins/vis_type_metric/public/to_ast.test.ts b/src/plugins/vis_type_metric/public/to_ast.test.ts
new file mode 100644
index 0000000000000..e741e64c0422b
--- /dev/null
+++ b/src/plugins/vis_type_metric/public/to_ast.test.ts
@@ -0,0 +1,54 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { toExpressionAst } from './to_ast';
+import { Vis } from '../../visualizations/public';
+
+describe('metric vis toExpressionAst function', () => {
+  let vis: Vis;
+
+  beforeEach(() => {
+    vis = {
+      isHierarchical: () => false,
+      type: {},
+      params: {
+        percentageMode: false,
+      },
+      data: {
+        indexPattern: { id: '123' } as any,
+        aggs: {
+          getResponseAggs: () => [],
+          aggs: [],
+        } as any,
+      },
+    } as any;
+  });
+
+  it('without params', () => {
+    vis.params = { metric: {} };
+    const actual = toExpressionAst(vis, {});
+    expect(actual).toMatchSnapshot();
+  });
+
+  it('with percentage mode should have percentage format', () => {
+    vis.params = { metric: { percentageMode: true } };
+    const actual = toExpressionAst(vis, {});
+    expect(actual).toMatchSnapshot();
+  });
+});
diff --git a/src/plugins/vis_type_metric/public/to_ast.ts b/src/plugins/vis_type_metric/public/to_ast.ts
new file mode 100644
index 0000000000000..7eefd8328ab76
--- /dev/null
+++ b/src/plugins/vis_type_metric/public/to_ast.ts
@@ -0,0 +1,103 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { get } from 'lodash';
+import { getVisSchemas, SchemaConfig, Vis } from '../../visualizations/public';
+import { buildExpression, buildExpressionFunction } from '../../expressions/public';
+import { MetricVisExpressionFunctionDefinition } from './metric_vis_fn';
+import { EsaggsExpressionFunctionDefinition } from '../../data/common/search/expressions';
+
+const prepareDimension = (params: SchemaConfig) => {
+  const visdimension = buildExpressionFunction('visdimension', { accessor: params.accessor });
+
+  if (params.format) {
+    visdimension.addArgument('format', params.format.id);
+    visdimension.addArgument('formatParams', JSON.stringify(params.format.params));
+  }
+
+  return buildExpression([visdimension]);
+};
+
+export const toExpressionAst = (vis: Vis, params: any) => {
+  // soon this becomes: const esaggs = vis.data.aggs!.toExpressionAst();
+  const esaggs = buildExpressionFunction<EsaggsExpressionFunctionDefinition>('esaggs', {
+    index: vis.data.indexPattern!.id!,
+    metricsAtAllLevels: vis.isHierarchical(),
+    partialRows: vis.type.requiresPartialRows || vis.params.showPartialRows || false,
+    aggConfigs: JSON.stringify(vis.data.aggs!.aggs),
+    includeFormatHints: false,
+  });
+
+  const schemas = getVisSchemas(vis, params);
+
+  const {
+    percentageMode,
+    useRanges,
+    colorSchema,
+    metricColorMode,
+    colorsRange,
+    labels,
+    invertColors,
+    style,
+  } = vis.params.metric;
+
+  // fix formatter for percentage mode
+  if (get(vis.params, 'metric.percentageMode') === true) {
+    schemas.metric.forEach((metric: SchemaConfig) => {
+      metric.format = { id: 'percent' };
+    });
+  }
+
+  // @ts-expect-error
+  const metricVis = buildExpressionFunction<MetricVisExpressionFunctionDefinition>('metricVis', {
+    percentageMode,
+    colorSchema,
+    colorMode: metricColorMode,
+    useRanges,
+    invertColors,
+    showLabels: labels && labels.show,
+  });
+
+  if (style) {
+    metricVis.addArgument('bgFill', style.bgFill);
+    metricVis.addArgument('font', buildExpression(`font size=${style.fontSize}`));
+    metricVis.addArgument('subText', style.subText);
+  }
+
+  if (colorsRange) {
+    colorsRange.forEach((range: any) => {
+      metricVis.addArgument(
+        'colorRange',
+        buildExpression(`range from=${range.from} to=${range.to}`)
+      );
+    });
+  }
+
+  if (schemas.group) {
+    metricVis.addArgument('bucket', prepareDimension(schemas.group[0]));
+  }
+
+  schemas.metric.forEach((metric) => {
+    metricVis.addArgument('metric', prepareDimension(metric));
+  });
+
+  const ast = buildExpression([esaggs, metricVis]);
+
+  return ast.toAst();
+};
diff --git a/src/plugins/visualizations/public/components/index.ts b/src/plugins/visualizations/public/components/index.ts
index 73685de81d68e..195a49f9e0d54 100644
--- a/src/plugins/visualizations/public/components/index.ts
+++ b/src/plugins/visualizations/public/components/index.ts
@@ -18,3 +18,5 @@
  */
 
 export { Visualization } from './visualization';
+export { VisualizationContainer } from './visualization_container';
+export { VisualizationNoResults } from './visualization_noresults';
diff --git a/src/plugins/vis_type_metric/public/metric_vis_type.test.ts b/src/plugins/visualizations/public/components/visualization_container.tsx
similarity index 68%
rename from src/plugins/vis_type_metric/public/metric_vis_type.test.ts
rename to src/plugins/visualizations/public/components/visualization_container.tsx
index 636118c692aaa..d6f87d4cea123 100644
--- a/src/plugins/vis_type_metric/public/metric_vis_type.test.ts
+++ b/src/plugins/visualizations/public/components/visualization_container.tsx
@@ -17,13 +17,14 @@
  * under the License.
  */
 
-import { createMetricVisTypeDefinition } from './metric_vis_type';
-import { MetricVisComponent } from './components/metric_vis_component';
+import React, { ReactNode } from 'react';
 
-describe('metric_vis - createMetricVisTypeDefinition', () => {
-  it('has metric vis component set', () => {
-    const def = createMetricVisTypeDefinition();
+interface VisualizationContainerProps {
+  className?: string;
+  children: ReactNode;
+}
 
-    expect(def.visConfig.component).toBe(MetricVisComponent);
-  });
-});
+export const VisualizationContainer = (props: VisualizationContainerProps) => {
+  const classes = `visualization ${props.className}`;
+  return <div className={classes}>{props.children}</div>;
+};
diff --git a/src/plugins/visualizations/public/index.ts b/src/plugins/visualizations/public/index.ts
index 49cfbe76aa9d0..17c292a1b183b 100644
--- a/src/plugins/visualizations/public/index.ts
+++ b/src/plugins/visualizations/public/index.ts
@@ -31,6 +31,8 @@ export function plugin(initializerContext: PluginInitializerContext) {
 export { Vis } from './vis';
 export { TypesService } from './vis_types/types_service';
 export { VISUALIZE_EMBEDDABLE_TYPE, VIS_EVENT_TO_TRIGGER } from './embeddable';
+export { VisualizationContainer, VisualizationNoResults } from './components';
+export { getSchemas as getVisSchemas } from './legacy/build_pipeline';
 
 /** @public types */
 export { VisualizationsSetup, VisualizationsStart };
diff --git a/src/plugins/visualizations/public/legacy/__snapshots__/build_pipeline.test.ts.snap b/src/plugins/visualizations/public/legacy/__snapshots__/build_pipeline.test.ts.snap
index 90c1d4472d5ea..df29c078d23e4 100644
--- a/src/plugins/visualizations/public/legacy/__snapshots__/build_pipeline.test.ts.snap
+++ b/src/plugins/visualizations/public/legacy/__snapshots__/build_pipeline.test.ts.snap
@@ -1,17 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`visualize loader pipeline helpers: build pipeline buildPipeline calls toExpression on vis_type if it exists 1`] = `"kibana | kibana_context | testing custom expressions"`;
+exports[`visualize loader pipeline helpers: build pipeline buildPipeline calls toExpression on vis_type if it exists 1`] = `"kibana | kibana_context | test"`;
 
 exports[`visualize loader pipeline helpers: build pipeline buildPipelineVisFunction handles input_control_vis function 1`] = `"input_control_vis visConfig='{\\"some\\":\\"nested\\",\\"data\\":{\\"here\\":true}}' "`;
 
 exports[`visualize loader pipeline helpers: build pipeline buildPipelineVisFunction handles markdown function 1`] = `"markdownvis '## hello _markdown_' font={font size=12} openLinksInNewTab=true "`;
 
-exports[`visualize loader pipeline helpers: build pipeline buildPipelineVisFunction handles metric function with buckets 1`] = `"metricvis metric={visdimension 0 } metric={visdimension 1 } "`;
-
-exports[`visualize loader pipeline helpers: build pipeline buildPipelineVisFunction handles metric function with percentage mode should have percentage format 1`] = `"metricvis percentageMode=true metric={visdimension 0 format='percent' } "`;
-
-exports[`visualize loader pipeline helpers: build pipeline buildPipelineVisFunction handles metric function without buckets 1`] = `"metricvis metric={visdimension 0 } metric={visdimension 1 } "`;
-
 exports[`visualize loader pipeline helpers: build pipeline buildPipelineVisFunction handles metrics/tsvb function 1`] = `"tsvb params='{\\"foo\\":\\"bar\\"}'  uiState='{}' "`;
 
 exports[`visualize loader pipeline helpers: build pipeline buildPipelineVisFunction handles pie function 1`] = `"kibana_pie visConfig='{\\"dimensions\\":{\\"metric\\":{\\"accessor\\":0,\\"label\\":\\"\\",\\"format\\":{},\\"params\\":{},\\"aggType\\":\\"\\"},\\"buckets\\":[1,2]}}' "`;
diff --git a/src/plugins/visualizations/public/legacy/build_pipeline.test.ts b/src/plugins/visualizations/public/legacy/build_pipeline.test.ts
index 9ecd321963e8a..50fa5ac64e2a1 100644
--- a/src/plugins/visualizations/public/legacy/build_pipeline.test.ts
+++ b/src/plugins/visualizations/public/legacy/build_pipeline.test.ts
@@ -29,6 +29,7 @@ import {
 import { Vis } from '..';
 import { dataPluginMock } from '../../../../plugins/data/public/mocks';
 import { IndexPattern, IAggConfigs } from '../../../../plugins/data/public';
+import { parseExpression } from '../../../expressions/common';
 
 describe('visualize loader pipeline helpers: build pipeline', () => {
   describe('prepareJson', () => {
@@ -217,42 +218,6 @@ describe('visualize loader pipeline helpers: build pipeline', () => {
       });
     });
 
-    describe('handles metric function', () => {
-      it('without buckets', () => {
-        const params = { metric: {} };
-        const schemas = {
-          ...schemasDef,
-          metric: [
-            { ...schemaConfig, accessor: 0 },
-            { ...schemaConfig, accessor: 1 },
-          ],
-        };
-        const actual = buildPipelineVisFunction.metric(params, schemas, uiState);
-        expect(actual).toMatchSnapshot();
-      });
-
-      it('with buckets', () => {
-        const params = { metric: {} };
-        const schemas = {
-          ...schemasDef,
-          metric: [
-            { ...schemaConfig, accessor: 0 },
-            { ...schemaConfig, accessor: 1 },
-          ],
-          group: [{ accessor: 2 }],
-        };
-        const actual = buildPipelineVisFunction.metric(params, schemas, uiState);
-        expect(actual).toMatchSnapshot();
-      });
-
-      it('with percentage mode should have percentage format', () => {
-        const params = { metric: { percentageMode: true } };
-        const schemas = { ...schemasDef };
-        const actual = buildPipelineVisFunction.metric(params, schemas, uiState);
-        expect(actual).toMatchSnapshot();
-      });
-    });
-
     describe('handles tagcloud function', () => {
       it('without buckets', () => {
         const actual = buildPipelineVisFunction.tagcloud({}, schemasDef, uiState);
@@ -331,7 +296,7 @@ describe('visualize loader pipeline helpers: build pipeline', () => {
         },
         // @ts-ignore
         type: {
-          toExpression: () => 'testing custom expressions',
+          toExpressionAst: () => parseExpression('test'),
         },
       } as unknown) as Vis;
       const expression = await buildPipeline(vis, {
diff --git a/src/plugins/visualizations/public/legacy/build_pipeline.ts b/src/plugins/visualizations/public/legacy/build_pipeline.ts
index d52e2fcc13bff..ebd240c79287a 100644
--- a/src/plugins/visualizations/public/legacy/build_pipeline.ts
+++ b/src/plugins/visualizations/public/legacy/build_pipeline.ts
@@ -19,7 +19,7 @@
 
 import { get } from 'lodash';
 import moment from 'moment';
-import { SerializedFieldFormat } from '../../../../plugins/expressions/public';
+import { formatExpression, SerializedFieldFormat } from '../../../../plugins/expressions/public';
 import { IAggConfig, search, TimefilterContract } from '../../../../plugins/data/public';
 import { Vis, VisParams } from '../types';
 const { isDateHistogramBucketAggConfig } = search.aggs;
@@ -80,7 +80,7 @@ const vislibCharts: string[] = [
   'line',
 ];
 
-const getSchemas = (
+export const getSchemas = (
   vis: Vis,
   opts: {
     timeRange?: any;
@@ -287,52 +287,6 @@ export const buildPipelineVisFunction: BuildPipelineVisFunction = {
     };
     return `kibana_table ${prepareJson('visConfig', visConfig)}`;
   },
-  metric: (params, schemas) => {
-    const {
-      percentageMode,
-      useRanges,
-      colorSchema,
-      metricColorMode,
-      colorsRange,
-      labels,
-      invertColors,
-      style,
-    } = params.metric;
-    const { metrics, bucket } = buildVisConfig.metric(schemas).dimensions;
-
-    // fix formatter for percentage mode
-    if (get(params, 'metric.percentageMode') === true) {
-      metrics.forEach((metric: SchemaConfig) => {
-        metric.format = { id: 'percent' };
-      });
-    }
-
-    let expr = `metricvis `;
-    expr += prepareValue('percentageMode', percentageMode);
-    expr += prepareValue('colorSchema', colorSchema);
-    expr += prepareValue('colorMode', metricColorMode);
-    expr += prepareValue('useRanges', useRanges);
-    expr += prepareValue('invertColors', invertColors);
-    expr += prepareValue('showLabels', labels && labels.show);
-    if (style) {
-      expr += prepareValue('bgFill', style.bgFill);
-      expr += prepareValue('font', `{font size=${style.fontSize}}`, true);
-      expr += prepareValue('subText', style.subText);
-      expr += prepareDimension('bucket', bucket);
-    }
-
-    if (colorsRange) {
-      colorsRange.forEach((range: any) => {
-        expr += prepareValue('colorRange', `{range from=${range.from} to=${range.to}}`, true);
-      });
-    }
-
-    metrics.forEach((metric: SchemaConfig) => {
-      expr += prepareDimension('metric', metric);
-    });
-
-    return expr;
-  },
   tagcloud: (params, schemas) => {
     const { scale, orientation, minFontSize, maxFontSize, showLabel } = params;
     const { metric, bucket } = buildVisConfig.tagcloud(schemas);
@@ -390,14 +344,6 @@ const buildVisConfig: BuildVisConfigFunction = {
     }
     return visConfig;
   },
-  metric: (schemas) => {
-    const visConfig = { dimensions: {} } as any;
-    visConfig.dimensions.metrics = schemas.metric;
-    if (schemas.group) {
-      visConfig.dimensions.bucket = schemas.group[0];
-    }
-    return visConfig;
-  },
   tagcloud: (schemas) => {
     const visConfig = {} as any;
     visConfig.metric = schemas.metric[0];
@@ -507,39 +453,46 @@ export const buildPipeline = async (
   }
   pipeline += '| ';
 
-  // request handler
-  if (vis.type.requestHandler === 'courier') {
-    pipeline += `esaggs
+  if (vis.type.toExpressionAst) {
+    const visAst = await vis.type.toExpressionAst(vis, params);
+    pipeline += formatExpression(visAst);
+  } else {
+    // request handler
+    if (vis.type.requestHandler === 'courier') {
+      pipeline += `esaggs
     ${prepareString('index', indexPattern!.id)}
     metricsAtAllLevels=${vis.isHierarchical()}
     partialRows=${vis.type.requiresPartialRows || vis.params.showPartialRows || false}
     ${prepareJson('aggConfigs', vis.data.aggs!.aggs)} | `;
-  }
+    }
 
-  const schemas = getSchemas(vis, {
-    timeRange: params.timeRange,
-    timefilter: params.timefilter,
-  });
-  if (buildPipelineVisFunction[vis.type.name]) {
-    pipeline += buildPipelineVisFunction[vis.type.name]({ title, ...vis.params }, schemas, uiState);
-  } else if (vislibCharts.includes(vis.type.name)) {
-    const visConfig = { ...vis.params };
-    visConfig.dimensions = await buildVislibDimensions(vis, params);
-
-    pipeline += `vislib type='${vis.type.name}' ${prepareJson('visConfig', visConfig)}`;
-  } else if (vis.type.toExpression) {
-    pipeline += await vis.type.toExpression(vis, params);
-  } else {
-    const visConfig = { ...vis.params };
-    visConfig.dimensions = schemas;
-    pipeline += `visualization type='${vis.type.name}'
+    const schemas = getSchemas(vis, {
+      timeRange: params.timeRange,
+      timefilter: params.timefilter,
+    });
+    if (buildPipelineVisFunction[vis.type.name]) {
+      pipeline += buildPipelineVisFunction[vis.type.name](
+        { title, ...vis.params },
+        schemas,
+        uiState
+      );
+    } else if (vislibCharts.includes(vis.type.name)) {
+      const visConfig = { ...vis.params };
+      visConfig.dimensions = await buildVislibDimensions(vis, params);
+
+      pipeline += `vislib type='${vis.type.name}' ${prepareJson('visConfig', visConfig)}`;
+    } else {
+      const visConfig = { ...vis.params };
+      visConfig.dimensions = schemas;
+      pipeline += `visualization type='${vis.type.name}'
     ${prepareJson('visConfig', visConfig)}
     metricsAtAllLevels=${vis.isHierarchical()}
     partialRows=${vis.type.requiresPartialRows || vis.params.showPartialRows || false} `;
-    if (indexPattern) {
-      pipeline += `${prepareString('index', indexPattern.id)} `;
-      if (vis.data.aggs) {
-        pipeline += `${prepareJson('aggConfigs', vis.data.aggs!.aggs)}`;
+      if (indexPattern) {
+        pipeline += `${prepareString('index', indexPattern.id)} `;
+        if (vis.data.aggs) {
+          pipeline += `${prepareJson('aggConfigs', vis.data.aggs!.aggs)}`;
+        }
       }
     }
   }
diff --git a/src/plugins/visualizations/public/types.ts b/src/plugins/visualizations/public/types.ts
index daf275297fb82..f47ffbbe921a2 100644
--- a/src/plugins/visualizations/public/types.ts
+++ b/src/plugins/visualizations/public/types.ts
@@ -18,7 +18,11 @@
  */
 
 import { SavedObject } from '../../../plugins/saved_objects/public';
-import { AggConfigOptions, SearchSourceFields } from '../../../plugins/data/public';
+import {
+  AggConfigOptions,
+  SearchSourceFields,
+  TimefilterContract,
+} from '../../../plugins/data/public';
 import { SerializedVis, Vis, VisParams } from './vis';
 
 export { Vis, SerializedVis, VisParams };
@@ -60,3 +64,11 @@ export interface VisResponseValue {
   visConfig: object;
   params?: object;
 }
+
+export interface VisToExpressionAstParams {
+  timefilter: TimefilterContract;
+  timeRange?: any;
+  abortSignal?: AbortSignal;
+}
+
+export type VisToExpressionAst = (vis: Vis, params: VisToExpressionAstParams) => string;
diff --git a/src/plugins/visualizations/public/vis.ts b/src/plugins/visualizations/public/vis.ts
index e8ae48cdce145..b4fc9df1c6ecc 100644
--- a/src/plugins/visualizations/public/vis.ts
+++ b/src/plugins/visualizations/public/vis.ts
@@ -202,8 +202,8 @@ export class Vis {
     };
   }
 
-  toAST() {
-    return this.type.toAST(this.params);
+  toExpressionAst() {
+    return this.type.toExpressionAst(this.params);
   }
 
   // deprecated
diff --git a/src/plugins/visualizations/public/vis_types/base_vis_type.ts b/src/plugins/visualizations/public/vis_types/base_vis_type.ts
index 1a3a426398e36..fa0bbfc5e250a 100644
--- a/src/plugins/visualizations/public/vis_types/base_vis_type.ts
+++ b/src/plugins/visualizations/public/vis_types/base_vis_type.ts
@@ -18,7 +18,7 @@
  */
 
 import _ from 'lodash';
-import { VisualizationControllerConstructor } from '../types';
+import { VisToExpressionAst, VisualizationControllerConstructor } from '../types';
 import { TriggerContextMapping } from '../../../ui_actions/public';
 import { Adapters } from '../../../inspector/public';
 
@@ -31,7 +31,7 @@ export interface BaseVisTypeOptions {
   image?: string;
   stage?: 'experimental' | 'beta' | 'production';
   options?: Record<string, any>;
-  visualization: VisualizationControllerConstructor;
+  visualization: VisualizationControllerConstructor | undefined;
   visConfig?: Record<string, any>;
   editor?: any;
   editorConfig?: Record<string, any>;
@@ -42,6 +42,7 @@ export interface BaseVisTypeOptions {
   setup?: unknown;
   useCustomNoDataScreen?: boolean;
   inspectorAdapters?: Adapters | (() => Adapters);
+  toExpressionAst?: VisToExpressionAst;
 }
 
 export class BaseVisType {
@@ -54,7 +55,7 @@ export class BaseVisType {
   stage: 'experimental' | 'beta' | 'production';
   isExperimental: boolean;
   options: Record<string, any>;
-  visualization: VisualizationControllerConstructor;
+  visualization: VisualizationControllerConstructor | undefined;
   visConfig: Record<string, any>;
   editor: any;
   editorConfig: Record<string, any>;
@@ -66,6 +67,7 @@ export class BaseVisType {
   setup?: unknown;
   useCustomNoDataScreen: boolean;
   inspectorAdapters?: Adapters | (() => Adapters);
+  toExpressionAst?: VisToExpressionAst;
 
   constructor(opts: BaseVisTypeOptions) {
     if (!opts.icon && !opts.image) {
@@ -102,6 +104,7 @@ export class BaseVisType {
     this.hierarchicalData = opts.hierarchicalData || false;
     this.useCustomNoDataScreen = opts.useCustomNoDataScreen || false;
     this.inspectorAdapters = opts.inspectorAdapters;
+    this.toExpressionAst = opts.toExpressionAst;
   }
 
   public get schemas() {
diff --git a/test/interpreter_functional/snapshots/baseline/combined_test3.json b/test/interpreter_functional/snapshots/baseline/combined_test3.json
index af9fe198d88ea..2760875119197 100644
--- a/test/interpreter_functional/snapshots/baseline/combined_test3.json
+++ b/test/interpreter_functional/snapshots/baseline/combined_test3.json
@@ -1 +1 @@
-{"as":"visualization","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
+{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
diff --git a/test/interpreter_functional/snapshots/baseline/final_output_test.json b/test/interpreter_functional/snapshots/baseline/final_output_test.json
index af9fe198d88ea..2760875119197 100644
--- a/test/interpreter_functional/snapshots/baseline/final_output_test.json
+++ b/test/interpreter_functional/snapshots/baseline/final_output_test.json
@@ -1 +1 @@
-{"as":"visualization","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
+{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
diff --git a/test/interpreter_functional/snapshots/baseline/metric_all_data.json b/test/interpreter_functional/snapshots/baseline/metric_all_data.json
index 9b0122c157481..ae72bcfa6d5ec 100644
--- a/test/interpreter_functional/snapshots/baseline/metric_all_data.json
+++ b/test/interpreter_functional/snapshots/baseline/metric_all_data.json
@@ -1 +1 @@
-{"as":"visualization","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":2,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
+{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":2,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
diff --git a/test/interpreter_functional/snapshots/baseline/metric_multi_metric_data.json b/test/interpreter_functional/snapshots/baseline/metric_multi_metric_data.json
index 2d6e756a7f0a3..8568215fd9e1a 100644
--- a/test/interpreter_functional/snapshots/baseline/metric_multi_metric_data.json
+++ b/test/interpreter_functional/snapshots/baseline/metric_multi_metric_data.json
@@ -1 +1 @@
-{"as":"visualization","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},{"accessor":1,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
+{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},{"accessor":1,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
diff --git a/test/interpreter_functional/snapshots/baseline/metric_percentage_mode.json b/test/interpreter_functional/snapshots/baseline/metric_percentage_mode.json
index 37c6885d76cb0..d11e1dfb925f1 100644
--- a/test/interpreter_functional/snapshots/baseline/metric_percentage_mode.json
+++ b/test/interpreter_functional/snapshots/baseline/metric_percentage_mode.json
@@ -1 +1 @@
-{"as":"visualization","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":1000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":true,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
+{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":1000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":true,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
diff --git a/test/interpreter_functional/snapshots/baseline/metric_single_metric_data.json b/test/interpreter_functional/snapshots/baseline/metric_single_metric_data.json
index 60a0e450906a2..b160e05935f17 100644
--- a/test/interpreter_functional/snapshots/baseline/metric_single_metric_data.json
+++ b/test/interpreter_functional/snapshots/baseline/metric_single_metric_data.json
@@ -1 +1 @@
-{"as":"visualization","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
+{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
diff --git a/test/interpreter_functional/snapshots/baseline/partial_test_2.json b/test/interpreter_functional/snapshots/baseline/partial_test_2.json
index af9fe198d88ea..2760875119197 100644
--- a/test/interpreter_functional/snapshots/baseline/partial_test_2.json
+++ b/test/interpreter_functional/snapshots/baseline/partial_test_2.json
@@ -1 +1 @@
-{"as":"visualization","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
+{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
diff --git a/test/interpreter_functional/snapshots/baseline/step_output_test3.json b/test/interpreter_functional/snapshots/baseline/step_output_test3.json
index af9fe198d88ea..2760875119197 100644
--- a/test/interpreter_functional/snapshots/baseline/step_output_test3.json
+++ b/test/interpreter_functional/snapshots/baseline/step_output_test3.json
@@ -1 +1 @@
-{"as":"visualization","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
+{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
diff --git a/test/interpreter_functional/snapshots/session/combined_test3.json b/test/interpreter_functional/snapshots/session/combined_test3.json
index af9fe198d88ea..2760875119197 100644
--- a/test/interpreter_functional/snapshots/session/combined_test3.json
+++ b/test/interpreter_functional/snapshots/session/combined_test3.json
@@ -1 +1 @@
-{"as":"visualization","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
+{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
diff --git a/test/interpreter_functional/snapshots/session/final_output_test.json b/test/interpreter_functional/snapshots/session/final_output_test.json
index af9fe198d88ea..2760875119197 100644
--- a/test/interpreter_functional/snapshots/session/final_output_test.json
+++ b/test/interpreter_functional/snapshots/session/final_output_test.json
@@ -1 +1 @@
-{"as":"visualization","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
+{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
diff --git a/test/interpreter_functional/snapshots/session/metric_all_data.json b/test/interpreter_functional/snapshots/session/metric_all_data.json
index 9b0122c157481..ae72bcfa6d5ec 100644
--- a/test/interpreter_functional/snapshots/session/metric_all_data.json
+++ b/test/interpreter_functional/snapshots/session/metric_all_data.json
@@ -1 +1 @@
-{"as":"visualization","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":2,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
+{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":2,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
diff --git a/test/interpreter_functional/snapshots/session/metric_multi_metric_data.json b/test/interpreter_functional/snapshots/session/metric_multi_metric_data.json
index 2d6e756a7f0a3..8568215fd9e1a 100644
--- a/test/interpreter_functional/snapshots/session/metric_multi_metric_data.json
+++ b/test/interpreter_functional/snapshots/session/metric_multi_metric_data.json
@@ -1 +1 @@
-{"as":"visualization","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},{"accessor":1,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
+{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},{"accessor":1,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
diff --git a/test/interpreter_functional/snapshots/session/metric_percentage_mode.json b/test/interpreter_functional/snapshots/session/metric_percentage_mode.json
index 37c6885d76cb0..d11e1dfb925f1 100644
--- a/test/interpreter_functional/snapshots/session/metric_percentage_mode.json
+++ b/test/interpreter_functional/snapshots/session/metric_percentage_mode.json
@@ -1 +1 @@
-{"as":"visualization","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":1000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":true,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
+{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":1000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":true,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
diff --git a/test/interpreter_functional/snapshots/session/metric_single_metric_data.json b/test/interpreter_functional/snapshots/session/metric_single_metric_data.json
index 60a0e450906a2..b160e05935f17 100644
--- a/test/interpreter_functional/snapshots/session/metric_single_metric_data.json
+++ b/test/interpreter_functional/snapshots/session/metric_single_metric_data.json
@@ -1 +1 @@
-{"as":"visualization","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
+{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
diff --git a/test/interpreter_functional/snapshots/session/partial_test_2.json b/test/interpreter_functional/snapshots/session/partial_test_2.json
index af9fe198d88ea..2760875119197 100644
--- a/test/interpreter_functional/snapshots/session/partial_test_2.json
+++ b/test/interpreter_functional/snapshots/session/partial_test_2.json
@@ -1 +1 @@
-{"as":"visualization","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
+{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
diff --git a/test/interpreter_functional/snapshots/session/step_output_test3.json b/test/interpreter_functional/snapshots/session/step_output_test3.json
index af9fe198d88ea..2760875119197 100644
--- a/test/interpreter_functional/snapshots/session/step_output_test3.json
+++ b/test/interpreter_functional/snapshots/session/step_output_test3.json
@@ -1 +1 @@
-{"as":"visualization","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file
+{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visType":"metric"}}
\ No newline at end of file

From f1248072d3d639e5a878e85627f74da5eab713c5 Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Wed, 19 Aug 2020 23:00:53 -0700
Subject: [PATCH 48/85] skip flaky suite (#75522)

---
 .../tests/actions/builtin_action_types/servicenow.ts           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/servicenow.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/servicenow.ts
index 70b6a8fe512e1..3c8fc78b7f872 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/servicenow.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/servicenow.ts
@@ -77,7 +77,8 @@ export default function servicenowTest({ getService }: FtrProviderContext) {
   let proxyServer: any;
   let proxyHaveBeenCalled = false;
 
-  describe('ServiceNow', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/75522
+  describe.skip('ServiceNow', () => {
     before(() => {
       servicenowSimulatorURL = kibanaServer.resolveUrl(
         getExternalServiceSimulatorPath(ExternalServiceSimulator.SERVICENOW)

From be0724dd91f4158bf58c1b019758beec0523c3e5 Mon Sep 17 00:00:00 2001
From: Maja Grubic <maja.grubic@elastic.co>
Date: Thu, 20 Aug 2020 08:02:05 +0100
Subject: [PATCH 49/85] [Time to Visualize] Unifying feature flag config for
 visualize editor and dashboard (#75408)

* Unifying feature flag config for visualize/dashboard

* Removing unused import

* Adding missing comma
---
 src/plugins/visualize/config.ts               | 26 -------------------
 src/plugins/visualize/kibana.json             |  1 +
 .../visualize/public/application/types.ts     |  4 +--
 .../application/utils/get_top_nav_config.tsx  |  6 ++---
 src/plugins/visualize/public/plugin.ts        |  9 +++----
 src/plugins/visualize/server/index.ts         | 11 +-------
 test/new_visualize_flow/config.js             |  1 -
 7 files changed, 10 insertions(+), 48 deletions(-)
 delete mode 100644 src/plugins/visualize/config.ts

diff --git a/src/plugins/visualize/config.ts b/src/plugins/visualize/config.ts
deleted file mode 100644
index ee79a37717f26..0000000000000
--- a/src/plugins/visualize/config.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { schema, TypeOf } from '@kbn/config-schema';
-
-export const configSchema = schema.object({
-  showNewVisualizeFlow: schema.boolean({ defaultValue: false }),
-});
-
-export type ConfigSchema = TypeOf<typeof configSchema>;
diff --git a/src/plugins/visualize/kibana.json b/src/plugins/visualize/kibana.json
index a6cc8d8f8af60..29fcd30184cb2 100644
--- a/src/plugins/visualize/kibana.json
+++ b/src/plugins/visualize/kibana.json
@@ -10,6 +10,7 @@
     "savedObjects",
     "visualizations",
     "embeddable",
+    "dashboard",
     "uiActions"
   ],
   "optionalPlugins": ["home", "share"],
diff --git a/src/plugins/visualize/public/application/types.ts b/src/plugins/visualize/public/application/types.ts
index 65b88485b2f06..0a12dbc22a744 100644
--- a/src/plugins/visualize/public/application/types.ts
+++ b/src/plugins/visualize/public/application/types.ts
@@ -44,7 +44,7 @@ import { SharePluginStart } from 'src/plugins/share/public';
 import { SavedObjectsStart, SavedObject } from 'src/plugins/saved_objects/public';
 import { EmbeddableStart } from 'src/plugins/embeddable/public';
 import { KibanaLegacyStart } from 'src/plugins/kibana_legacy/public';
-import { ConfigSchema } from '../../config';
+import { DashboardStart } from '../../../dashboard/public';
 
 export type PureVisState = SavedVisState;
 
@@ -111,7 +111,7 @@ export interface VisualizeServices extends CoreStart {
   createVisEmbeddableFromObject: VisualizationsStart['__LEGACY']['createVisEmbeddableFromObject'];
   restorePreviousUrl: () => void;
   scopedHistory: ScopedHistory;
-  featureFlagConfig: ConfigSchema;
+  dashboard: DashboardStart;
 }
 
 export interface SavedVisInstance {
diff --git a/src/plugins/visualize/public/application/utils/get_top_nav_config.tsx b/src/plugins/visualize/public/application/utils/get_top_nav_config.tsx
index 87a6437192aa9..43121f2cffc41 100644
--- a/src/plugins/visualize/public/application/utils/get_top_nav_config.tsx
+++ b/src/plugins/visualize/public/application/utils/get_top_nav_config.tsx
@@ -75,7 +75,7 @@ export const getTopNavConfig = (
     toastNotifications,
     visualizeCapabilities,
     i18n: { Context: I18nContext },
-    featureFlagConfig,
+    dashboard,
   }: VisualizeServices
 ) => {
   const { vis, embeddableHandler } = visInstance;
@@ -212,7 +212,7 @@ export const getTopNavConfig = (
               };
               if (
                 originatingApp === 'dashboards' &&
-                featureFlagConfig.showNewVisualizeFlow &&
+                dashboard.dashboardFeatureFlagConfig.allowByValueEmbeddables &&
                 !savedVis
               ) {
                 return createVisReference();
@@ -292,7 +292,7 @@ export const getTopNavConfig = (
               const isSaveAsButton = anchorElement.classList.contains('saveAsButton');
               if (
                 originatingApp === 'dashboards' &&
-                featureFlagConfig.showNewVisualizeFlow &&
+                dashboard.dashboardFeatureFlagConfig.allowByValueEmbeddables &&
                 !isSaveAsButton
               ) {
                 createVisReference();
diff --git a/src/plugins/visualize/public/plugin.ts b/src/plugins/visualize/public/plugin.ts
index 8794593d6c958..29d6f978bd05e 100644
--- a/src/plugins/visualize/public/plugin.ts
+++ b/src/plugins/visualize/public/plugin.ts
@@ -48,6 +48,7 @@ import { VisualizeServices } from './application/types';
 import { DEFAULT_APP_CATEGORIES } from '../../../core/public';
 import { SavedObjectsStart } from '../../saved_objects/public';
 import { EmbeddableStart } from '../../embeddable/public';
+import { DashboardStart } from '../../dashboard/public';
 import { UiActionsStart, VISUALIZE_FIELD_TRIGGER } from '../../ui_actions/public';
 import {
   setUISettings,
@@ -67,6 +68,7 @@ export interface VisualizePluginStartDependencies {
   embeddable: EmbeddableStart;
   kibanaLegacy: KibanaLegacyStart;
   savedObjects: SavedObjectsStart;
+  dashboard: DashboardStart;
   uiActions: UiActionsStart;
 }
 
@@ -77,10 +79,6 @@ export interface VisualizePluginSetupDependencies {
   share?: SharePluginSetup;
 }
 
-export interface FeatureFlagConfig {
-  showNewVisualizeFlow: boolean;
-}
-
 export class VisualizePlugin
   implements
     Plugin<void, void, VisualizePluginSetupDependencies, VisualizePluginStartDependencies> {
@@ -171,7 +169,6 @@ export class VisualizePlugin
          * this should be replaced to use only scoped history after moving legacy apps to browser routing
          */
         const history = createHashHistory();
-
         const services: VisualizeServices = {
           ...coreStart,
           history,
@@ -198,7 +195,7 @@ export class VisualizePlugin
           savedObjectsPublic: pluginsStart.savedObjects,
           scopedHistory: params.history,
           restorePreviousUrl,
-          featureFlagConfig: this.initializerContext.config.get<FeatureFlagConfig>(),
+          dashboard: pluginsStart.dashboard,
         };
 
         params.element.classList.add('visAppWrapper');
diff --git a/src/plugins/visualize/server/index.ts b/src/plugins/visualize/server/index.ts
index 6da0a513b1475..5cebef71d8d22 100644
--- a/src/plugins/visualize/server/index.ts
+++ b/src/plugins/visualize/server/index.ts
@@ -17,17 +17,8 @@
  * under the License.
  */
 
-import { PluginInitializerContext, PluginConfigDescriptor } from 'kibana/server';
+import { PluginInitializerContext } from 'kibana/server';
 import { VisualizeServerPlugin } from './plugin';
 
-import { ConfigSchema, configSchema } from '../config';
-
-export const config: PluginConfigDescriptor<ConfigSchema> = {
-  exposeToBrowser: {
-    showNewVisualizeFlow: true,
-  },
-  schema: configSchema,
-};
-
 export const plugin = (initContext: PluginInitializerContext) =>
   new VisualizeServerPlugin(initContext);
diff --git a/test/new_visualize_flow/config.js b/test/new_visualize_flow/config.js
index a6440d16481d5..c4790a35404c9 100644
--- a/test/new_visualize_flow/config.js
+++ b/test/new_visualize_flow/config.js
@@ -37,7 +37,6 @@ export default async function ({ readConfigFile }) {
         ...commonConfig.get('kbnTestServer.serverArgs'),
         '--oss',
         '--telemetry.optIn=false',
-        '--visualize.showNewVisualizeFlow=true',
       ],
     },
 

From 4a0a79f9c3dd739e463809c80886e8af08a1b2c7 Mon Sep 17 00:00:00 2001
From: MadameSheema <snootchie.boochies@gmail.com>
Date: Thu, 20 Aug 2020 09:39:09 +0200
Subject: [PATCH 50/85] fixes timeline local storage test (#75123)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../cypress/integration/timeline_local_storage.spec.ts       | 3 +--
 x-pack/plugins/security_solution/cypress/screens/timeline.ts | 5 +++--
 x-pack/plugins/security_solution/cypress/tasks/timeline.ts   | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/x-pack/plugins/security_solution/cypress/integration/timeline_local_storage.spec.ts b/x-pack/plugins/security_solution/cypress/integration/timeline_local_storage.spec.ts
index 2fb265c55e3ad..383ebe2220585 100644
--- a/x-pack/plugins/security_solution/cypress/integration/timeline_local_storage.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/timeline_local_storage.spec.ts
@@ -13,8 +13,7 @@ import { TABLE_COLUMN_EVENTS_MESSAGE } from '../screens/hosts/external_events';
 import { waitsForEventsToBeLoaded, openEventsViewerFieldsBrowser } from '../tasks/hosts/events';
 import { removeColumn, resetFields } from '../tasks/timeline';
 
-// FLAKY: https://github.com/elastic/kibana/issues/72339
-describe.skip('persistent timeline', () => {
+describe('persistent timeline', () => {
   before(() => {
     loginAndWaitForPage(HOSTS_URL);
     openEvents();
diff --git a/x-pack/plugins/security_solution/cypress/screens/timeline.ts b/x-pack/plugins/security_solution/cypress/screens/timeline.ts
index 68425731f149a..135dea35ca0d8 100644
--- a/x-pack/plugins/security_solution/cypress/screens/timeline.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/timeline.ts
@@ -11,6 +11,8 @@ export const CREATE_NEW_TIMELINE = '[data-test-subj="timeline-new"]';
 export const DRAGGABLE_HEADER =
   '[data-test-subj="events-viewer-panel"] [data-test-subj="headers-group"] [data-test-subj="draggable-header"]';
 
+export const HEADER = '[data-test-subj="header"]';
+
 export const HEADERS_GROUP = '[data-test-subj="headers-group"]';
 
 export const ID_HEADER_FIELD = '[data-test-subj="timeline"] [data-test-subj="header-text-_id"]';
@@ -23,8 +25,7 @@ export const PIN_EVENT = '[data-test-subj="pin"]';
 
 export const PROVIDER_BADGE = '[data-test-subj="providerBadge"]';
 
-export const REMOVE_COLUMN =
-  '[data-test-subj="events-viewer-panel"] [data-test-subj="remove-column"]';
+export const REMOVE_COLUMN = '[data-test-subj="remove-column"]';
 
 export const RESET_FIELDS =
   '[data-test-subj="events-viewer-panel"] [data-test-subj="reset-fields"]';
diff --git a/x-pack/plugins/security_solution/cypress/tasks/timeline.ts b/x-pack/plugins/security_solution/cypress/tasks/timeline.ts
index d5106f34cc9c5..9eeb9fc8bdf8a 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/timeline.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/timeline.ts
@@ -9,6 +9,7 @@ import { DATE_PICKER_APPLY_BUTTON_TIMELINE } from '../screens/date_picker';
 import {
   CLOSE_TIMELINE_BTN,
   CREATE_NEW_TIMELINE,
+  HEADER,
   ID_FIELD,
   ID_HEADER_FIELD,
   ID_TOGGLE_FIELD,
@@ -114,7 +115,7 @@ export const dragAndDropIdToggleFieldToTimeline = () => {
 };
 
 export const removeColumn = (column: number) => {
-  cy.get(REMOVE_COLUMN).first().should('exist');
+  cy.get(HEADER).eq(column).click();
   cy.get(REMOVE_COLUMN).eq(column).click({ force: true });
 };
 

From eba85ef50a021b4b6587c1937ef2e51466c270e6 Mon Sep 17 00:00:00 2001
From: MadameSheema <snootchie.boochies@gmail.com>
Date: Thu, 20 Aug 2020 09:39:38 +0200
Subject: [PATCH 51/85] fixes 're-orders columns via drag and drop' test
 (#75126)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../cypress/integration/events_viewer.spec.ts                 | 4 +++-
 .../plugins/security_solution/cypress/screens/hosts/events.ts | 2 ++
 .../plugins/security_solution/cypress/tasks/hosts/events.ts   | 2 --
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/security_solution/cypress/integration/events_viewer.spec.ts b/x-pack/plugins/security_solution/cypress/integration/events_viewer.spec.ts
index cd4573817cc27..5f2de69689865 100644
--- a/x-pack/plugins/security_solution/cypress/integration/events_viewer.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/events_viewer.spec.ts
@@ -10,6 +10,7 @@ import {
   FIELDS_BROWSER_SELECTED_CATEGORY_TITLE,
 } from '../screens/fields_browser';
 import {
+  EVENTS_PAGE,
   HEADER_SUBTITLE,
   HOST_GEO_CITY_NAME_HEADER,
   HOST_GEO_COUNTRY_NAME_HEADER,
@@ -153,7 +154,7 @@ describe('Events Viewer', () => {
     });
   });
 
-  context.skip('Events columns', () => {
+  context('Events columns', () => {
     before(() => {
       loginAndWaitForPage(HOSTS_URL);
       openEvents();
@@ -171,6 +172,7 @@ describe('Events Viewer', () => {
       const expectedOrderAfterDragAndDrop =
         'message@timestamphost.nameevent.moduleevent.datasetevent.actionuser.namesource.ipdestination.ip';
 
+      cy.get(EVENTS_PAGE).scrollTo('bottom');
       cy.get(HEADERS_GROUP).invoke('text').should('equal', originalColumnOrder);
       dragAndDropColumn({ column: 0, newPosition: 1 });
       cy.get(HEADERS_GROUP).invoke('text').should('equal', expectedOrderAfterDragAndDrop);
diff --git a/x-pack/plugins/security_solution/cypress/screens/hosts/events.ts b/x-pack/plugins/security_solution/cypress/screens/hosts/events.ts
index 4b1ca19bd96fe..05f517b5de662 100644
--- a/x-pack/plugins/security_solution/cypress/screens/hosts/events.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/hosts/events.ts
@@ -6,6 +6,8 @@
 
 export const CLOSE_MODAL = '[data-test-subj="modal-inspect-close"]';
 
+export const EVENTS_PAGE = '[data-test-subj="pageContainer"]';
+
 export const EVENTS_VIEWER_FIELDS_BUTTON =
   '[data-test-subj="events-viewer-panel"] [data-test-subj="show-field-browser"]';
 
diff --git a/x-pack/plugins/security_solution/cypress/tasks/hosts/events.ts b/x-pack/plugins/security_solution/cypress/tasks/hosts/events.ts
index 1d2c4aa8d0834..226178cd92f18 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/hosts/events.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/hosts/events.ts
@@ -68,8 +68,6 @@ export const dragAndDropColumn = ({
     .eq(column)
     .then((header) => drag(header));
 
-  cy.wait(5000); // wait for DOM updates before moving
-
   cy.get(DRAGGABLE_HEADER)
     .eq(newPosition)
     .then((targetPosition) => {

From c88c73298c2a1c370cf090e11d83685d5e6c3b70 Mon Sep 17 00:00:00 2001
From: Robert Oskamp <robert.oskamp@elastic.co>
Date: Thu, 20 Aug 2020 10:07:21 +0200
Subject: [PATCH 52/85] [ML] Functional tests - refactor structure of ML and
 Transform test files (#75307)

This PR refactors the structure of ML and Transform functional UI test files.
---
 .../apis/ml/annotations/create_annotations.ts |   2 +-
 .../apis/ml/annotations/delete_annotations.ts |   2 +-
 .../apis/ml/annotations/get_annotations.ts    |   2 +-
 .../apis/ml/annotations/update_annotations.ts |   2 +-
 .../apis/ml/anomaly_detectors/create.ts       |   2 +-
 .../apis/ml/anomaly_detectors/get.ts          |   2 +-
 .../apis/ml/calendars/create_calendars.ts     |   2 +-
 .../apis/ml/calendars/delete_calendars.ts     |   2 +-
 .../apis/ml/calendars/get_calendars.ts        |   2 +-
 .../apis/ml/calendars/update_calendars.ts     |   2 +-
 .../apis/ml/data_frame_analytics/delete.ts    |   2 +-
 .../apis/ml/data_frame_analytics/get.ts       |   2 +-
 .../apis/ml/data_frame_analytics/update.ts    |   2 +-
 .../data_visualizer/get_field_histograms.ts   |   2 +-
 .../ml/data_visualizer/get_field_stats.ts     |   2 +-
 .../ml/data_visualizer/get_overall_stats.ts   |   2 +-
 .../ml/fields_service/field_cardinality.ts    |   2 +-
 .../ml/fields_service/time_field_range.ts     |   2 +-
 .../apis/ml/filters/create_filters.ts         |   2 +-
 .../apis/ml/filters/delete_filters.ts         |   2 +-
 .../apis/ml/filters/get_filters.ts            |   2 +-
 .../apis/ml/filters/update_filters.ts         |   2 +-
 .../job_validation/bucket_span_estimator.ts   |   2 +-
 .../calculate_model_memory_limit.ts           |   2 +-
 .../apis/ml/job_validation/cardinality.ts     |   2 +-
 .../apis/ml/job_validation/validate.ts        |   2 +-
 .../ml/jobs/categorization_field_examples.ts  |   2 +-
 .../apis/ml/jobs/close_jobs.ts                |   2 +-
 .../apis/ml/jobs/delete_jobs.ts               |   2 +-
 .../apis/ml/jobs/jobs_summary.ts              |   2 +-
 .../apis/ml/modules/get_module.ts             |   2 +-
 .../apis/ml/modules/recognize_module.ts       |   2 +-
 .../apis/ml/modules/setup_module.ts           |   2 +-
 .../ml/results/get_anomalies_table_data.ts    |   2 +-
 .../apis/transform/delete_transforms.ts       |   2 +-
 x-pack/test/api_integration/services/ml.ts    |   3 +
 .../apps/ml/anomaly_detection/advanced_job.ts | 366 +++++++-----------
 .../apps/ml/anomaly_detection/annotations.ts  |  29 +-
 .../ml/anomaly_detection/anomaly_explorer.ts  |  31 +-
 .../anomaly_detection/categorization_job.ts   | 198 ++++------
 .../ml/anomaly_detection/date_nanos_job.ts    | 189 +++------
 .../ml/anomaly_detection/multi_metric_job.ts  | 191 ++++-----
 .../ml/anomaly_detection/population_job.ts    | 194 ++++------
 .../ml/anomaly_detection/saved_search_job.ts  |  90 ++---
 .../ml/anomaly_detection/single_metric_job.ts | 192 ++++-----
 .../anomaly_detection/single_metric_viewer.ts |  24 +-
 .../classification_creation.ts                | 104 +++--
 .../apps/ml/data_frame_analytics/cloning.ts   |  43 +-
 .../outlier_detection_creation.ts             | 110 +++---
 .../regression_creation.ts                    | 104 +++--
 .../data_visualizer/file_data_visualizer.ts   |  33 +-
 .../data_visualizer/index_data_visualizer.ts  |  68 ++--
 x-pack/test/functional/apps/ml/pages.ts       |  34 +-
 .../test/functional/apps/transform/cloning.ts |  90 ++---
 .../apps/transform/creation_index_pattern.ts  | 106 ++---
 .../apps/transform/creation_saved_search.ts   | 107 +++--
 .../test/functional/apps/transform/editing.ts |  49 +--
 .../test/functional/services/ml/common_api.ts |  22 ++
 .../services/ml/{common.ts => common_ui.ts}   |   8 +-
 .../ml/data_frame_analytics_creation.ts       |  20 +-
 .../services/ml/data_frame_analytics_edit.ts  |   8 +-
 .../services/ml/data_visualizer_file_based.ts |   6 +-
 x-pack/test/functional/services/ml/index.ts   |  22 +-
 .../services/ml/job_wizard_advanced.ts        |  12 +-
 .../services/ml/job_wizard_common.ts          |  16 +-
 .../functional/services/ml/test_execution.ts  |  17 +
 .../functional/services/ml/test_resources.ts  |   2 +-
 .../functional/services/transform/index.ts    |   3 +
 .../services/transform/test_execution.ts      |  17 +
 69 files changed, 1134 insertions(+), 1444 deletions(-)
 create mode 100644 x-pack/test/functional/services/ml/common_api.ts
 rename x-pack/test/functional/services/ml/{common.ts => common_ui.ts} (92%)
 create mode 100644 x-pack/test/functional/services/ml/test_execution.ts
 create mode 100644 x-pack/test/functional/services/transform/test_execution.ts

diff --git a/x-pack/test/api_integration/apis/ml/annotations/create_annotations.ts b/x-pack/test/api_integration/apis/ml/annotations/create_annotations.ts
index aff1150997496..6b8fbe8350a43 100644
--- a/x-pack/test/api_integration/apis/ml/annotations/create_annotations.ts
+++ b/x-pack/test/api_integration/apis/ml/annotations/create_annotations.ts
@@ -7,7 +7,7 @@
 import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { Annotation } from '../../../../../plugins/ml/common/types/annotations';
 import { createJobConfig, createAnnotationRequestBody } from './common_jobs';
diff --git a/x-pack/test/api_integration/apis/ml/annotations/delete_annotations.ts b/x-pack/test/api_integration/apis/ml/annotations/delete_annotations.ts
index d3451c4d7da0c..5e55fb616cbfb 100644
--- a/x-pack/test/api_integration/apis/ml/annotations/delete_annotations.ts
+++ b/x-pack/test/api_integration/apis/ml/annotations/delete_annotations.ts
@@ -6,7 +6,7 @@
 
 import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { testSetupJobConfigs, jobIds, testSetupAnnotations } from './common_jobs';
 
diff --git a/x-pack/test/api_integration/apis/ml/annotations/get_annotations.ts b/x-pack/test/api_integration/apis/ml/annotations/get_annotations.ts
index 29ad905bd3f2d..b720477abb350 100644
--- a/x-pack/test/api_integration/apis/ml/annotations/get_annotations.ts
+++ b/x-pack/test/api_integration/apis/ml/annotations/get_annotations.ts
@@ -7,7 +7,7 @@
 import expect from '@kbn/expect';
 import { omit } from 'lodash';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { testSetupJobConfigs, jobIds, testSetupAnnotations } from './common_jobs';
 
diff --git a/x-pack/test/api_integration/apis/ml/annotations/update_annotations.ts b/x-pack/test/api_integration/apis/ml/annotations/update_annotations.ts
index bcfb7ab0825b8..a1e4bcac31807 100644
--- a/x-pack/test/api_integration/apis/ml/annotations/update_annotations.ts
+++ b/x-pack/test/api_integration/apis/ml/annotations/update_annotations.ts
@@ -6,7 +6,7 @@
 
 import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { ANNOTATION_TYPE } from '../../../../../plugins/ml/common/constants/annotations';
 import { Annotation } from '../../../../../plugins/ml/common/types/annotations';
diff --git a/x-pack/test/api_integration/apis/ml/anomaly_detectors/create.ts b/x-pack/test/api_integration/apis/ml/anomaly_detectors/create.ts
index 71703ed019dc5..8eb4d7f756fe5 100644
--- a/x-pack/test/api_integration/apis/ml/anomaly_detectors/create.ts
+++ b/x-pack/test/api_integration/apis/ml/anomaly_detectors/create.ts
@@ -8,7 +8,7 @@ import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/anomaly_detectors/get.ts b/x-pack/test/api_integration/apis/ml/anomaly_detectors/get.ts
index e17870d8c6408..58202ea9b35b3 100644
--- a/x-pack/test/api_integration/apis/ml/anomaly_detectors/get.ts
+++ b/x-pack/test/api_integration/apis/ml/anomaly_detectors/get.ts
@@ -7,7 +7,7 @@
 import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/calendars/create_calendars.ts b/x-pack/test/api_integration/apis/ml/calendars/create_calendars.ts
index 82f4eee8cc328..e351eafea6e7f 100644
--- a/x-pack/test/api_integration/apis/ml/calendars/create_calendars.ts
+++ b/x-pack/test/api_integration/apis/ml/calendars/create_calendars.ts
@@ -8,7 +8,7 @@ import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
   const supertest = getService('supertestWithoutAuth');
diff --git a/x-pack/test/api_integration/apis/ml/calendars/delete_calendars.ts b/x-pack/test/api_integration/apis/ml/calendars/delete_calendars.ts
index eef8479b811b4..575c7c99dde17 100644
--- a/x-pack/test/api_integration/apis/ml/calendars/delete_calendars.ts
+++ b/x-pack/test/api_integration/apis/ml/calendars/delete_calendars.ts
@@ -8,7 +8,7 @@ import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
   const supertest = getService('supertestWithoutAuth');
diff --git a/x-pack/test/api_integration/apis/ml/calendars/get_calendars.ts b/x-pack/test/api_integration/apis/ml/calendars/get_calendars.ts
index 0b4f4a8f73ede..a5e65028196fe 100644
--- a/x-pack/test/api_integration/apis/ml/calendars/get_calendars.ts
+++ b/x-pack/test/api_integration/apis/ml/calendars/get_calendars.ts
@@ -7,7 +7,7 @@
 import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
   const supertest = getService('supertestWithoutAuth');
diff --git a/x-pack/test/api_integration/apis/ml/calendars/update_calendars.ts b/x-pack/test/api_integration/apis/ml/calendars/update_calendars.ts
index 65832ac9ca81e..69a8eb3e06ee8 100644
--- a/x-pack/test/api_integration/apis/ml/calendars/update_calendars.ts
+++ b/x-pack/test/api_integration/apis/ml/calendars/update_calendars.ts
@@ -8,7 +8,7 @@ import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
   const supertest = getService('supertestWithoutAuth');
diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/delete.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/delete.ts
index 2a39bc14fbb7f..c6043b7a282d4 100644
--- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/delete.ts
+++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/delete.ts
@@ -9,7 +9,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { DataFrameAnalyticsConfig } from '../../../../../plugins/ml/public/application/data_frame_analytics/common';
 import { DeepPartial } from '../../../../../plugins/ml/common/types/common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/get.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/get.ts
index d3e4788ee41da..ebae5a80c2337 100644
--- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/get.ts
+++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/get.ts
@@ -7,7 +7,7 @@
 import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 import { DataFrameAnalyticsConfig } from '../../../../../plugins/ml/public/application/data_frame_analytics/common';
 import { DeepPartial } from '../../../../../plugins/ml/common/types/common';
 
diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/update.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/update.ts
index 5dc781657619d..f4964308cd8c9 100644
--- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/update.ts
+++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/update.ts
@@ -9,7 +9,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { DataFrameAnalyticsConfig } from '../../../../../plugins/ml/public/application/data_frame_analytics/common';
 import { DeepPartial } from '../../../../../plugins/ml/common/types/common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_histograms.ts b/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_histograms.ts
index 1a71894f8423d..299f5f93fd281 100644
--- a/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_histograms.ts
+++ b/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_histograms.ts
@@ -8,7 +8,7 @@ import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_stats.ts b/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_stats.ts
index 5373da6a794c7..5795eac9637b1 100644
--- a/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_stats.ts
+++ b/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_stats.ts
@@ -8,7 +8,7 @@ import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/data_visualizer/get_overall_stats.ts b/x-pack/test/api_integration/apis/ml/data_visualizer/get_overall_stats.ts
index d87ab16d71c18..fa83807be161a 100644
--- a/x-pack/test/api_integration/apis/ml/data_visualizer/get_overall_stats.ts
+++ b/x-pack/test/api_integration/apis/ml/data_visualizer/get_overall_stats.ts
@@ -8,7 +8,7 @@ import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/fields_service/field_cardinality.ts b/x-pack/test/api_integration/apis/ml/fields_service/field_cardinality.ts
index ced4d937863ee..627d9454beeb6 100644
--- a/x-pack/test/api_integration/apis/ml/fields_service/field_cardinality.ts
+++ b/x-pack/test/api_integration/apis/ml/fields_service/field_cardinality.ts
@@ -8,7 +8,7 @@ import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/fields_service/time_field_range.ts b/x-pack/test/api_integration/apis/ml/fields_service/time_field_range.ts
index 2128b1fe8d9e1..b1c086ddbb456 100644
--- a/x-pack/test/api_integration/apis/ml/fields_service/time_field_range.ts
+++ b/x-pack/test/api_integration/apis/ml/fields_service/time_field_range.ts
@@ -8,7 +8,7 @@ import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/filters/create_filters.ts b/x-pack/test/api_integration/apis/ml/filters/create_filters.ts
index 233c95b190f02..dfec7798ffc0c 100644
--- a/x-pack/test/api_integration/apis/ml/filters/create_filters.ts
+++ b/x-pack/test/api_integration/apis/ml/filters/create_filters.ts
@@ -8,7 +8,7 @@ import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
   const supertest = getService('supertestWithoutAuth');
diff --git a/x-pack/test/api_integration/apis/ml/filters/delete_filters.ts b/x-pack/test/api_integration/apis/ml/filters/delete_filters.ts
index d0323360400be..7a55c2308eb9d 100644
--- a/x-pack/test/api_integration/apis/ml/filters/delete_filters.ts
+++ b/x-pack/test/api_integration/apis/ml/filters/delete_filters.ts
@@ -8,7 +8,7 @@ import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
   const supertest = getService('supertestWithoutAuth');
diff --git a/x-pack/test/api_integration/apis/ml/filters/get_filters.ts b/x-pack/test/api_integration/apis/ml/filters/get_filters.ts
index f0aa7aac7b9e4..5d7900ea5e9d9 100644
--- a/x-pack/test/api_integration/apis/ml/filters/get_filters.ts
+++ b/x-pack/test/api_integration/apis/ml/filters/get_filters.ts
@@ -8,7 +8,7 @@ import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
   const supertest = getService('supertestWithoutAuth');
diff --git a/x-pack/test/api_integration/apis/ml/filters/update_filters.ts b/x-pack/test/api_integration/apis/ml/filters/update_filters.ts
index 87eec99906c34..fbbb94d54c035 100644
--- a/x-pack/test/api_integration/apis/ml/filters/update_filters.ts
+++ b/x-pack/test/api_integration/apis/ml/filters/update_filters.ts
@@ -8,7 +8,7 @@ import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
   const supertest = getService('supertestWithoutAuth');
diff --git a/x-pack/test/api_integration/apis/ml/job_validation/bucket_span_estimator.ts b/x-pack/test/api_integration/apis/ml/job_validation/bucket_span_estimator.ts
index c556a6c28554b..a03432232a7d8 100644
--- a/x-pack/test/api_integration/apis/ml/job_validation/bucket_span_estimator.ts
+++ b/x-pack/test/api_integration/apis/ml/job_validation/bucket_span_estimator.ts
@@ -8,7 +8,7 @@ import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/job_validation/calculate_model_memory_limit.ts b/x-pack/test/api_integration/apis/ml/job_validation/calculate_model_memory_limit.ts
index 409bd161e601b..30a387fe33b0e 100644
--- a/x-pack/test/api_integration/apis/ml/job_validation/calculate_model_memory_limit.ts
+++ b/x-pack/test/api_integration/apis/ml/job_validation/calculate_model_memory_limit.ts
@@ -6,7 +6,7 @@
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/job_validation/cardinality.ts b/x-pack/test/api_integration/apis/ml/job_validation/cardinality.ts
index ed61f234a671d..ddf752bd876cb 100644
--- a/x-pack/test/api_integration/apis/ml/job_validation/cardinality.ts
+++ b/x-pack/test/api_integration/apis/ml/job_validation/cardinality.ts
@@ -6,7 +6,7 @@
 import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/job_validation/validate.ts b/x-pack/test/api_integration/apis/ml/job_validation/validate.ts
index 5e9b2d68bd6df..dab69498efc77 100644
--- a/x-pack/test/api_integration/apis/ml/job_validation/validate.ts
+++ b/x-pack/test/api_integration/apis/ml/job_validation/validate.ts
@@ -6,7 +6,7 @@
 import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 import pkg from '../../../../../../package.json';
 
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/api_integration/apis/ml/jobs/categorization_field_examples.ts b/x-pack/test/api_integration/apis/ml/jobs/categorization_field_examples.ts
index b99a4965adb9d..ccab65e1576a2 100644
--- a/x-pack/test/api_integration/apis/ml/jobs/categorization_field_examples.ts
+++ b/x-pack/test/api_integration/apis/ml/jobs/categorization_field_examples.ts
@@ -8,7 +8,7 @@ import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 const start = 1554463535770;
 const end = 1574316073914;
diff --git a/x-pack/test/api_integration/apis/ml/jobs/close_jobs.ts b/x-pack/test/api_integration/apis/ml/jobs/close_jobs.ts
index f411595aca995..5b9c5393e81d9 100644
--- a/x-pack/test/api_integration/apis/ml/jobs/close_jobs.ts
+++ b/x-pack/test/api_integration/apis/ml/jobs/close_jobs.ts
@@ -7,7 +7,7 @@
 import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { JOB_STATE, DATAFEED_STATE } from '../../../../../plugins/ml/common/constants/states';
 import { MULTI_METRIC_JOB_CONFIG, SINGLE_METRIC_JOB_CONFIG, DATAFEED_CONFIG } from './common_jobs';
diff --git a/x-pack/test/api_integration/apis/ml/jobs/delete_jobs.ts b/x-pack/test/api_integration/apis/ml/jobs/delete_jobs.ts
index 4976b6441c37a..e8f733d2fc6ad 100644
--- a/x-pack/test/api_integration/apis/ml/jobs/delete_jobs.ts
+++ b/x-pack/test/api_integration/apis/ml/jobs/delete_jobs.ts
@@ -7,7 +7,7 @@
 import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { MULTI_METRIC_JOB_CONFIG, SINGLE_METRIC_JOB_CONFIG } from './common_jobs';
 
diff --git a/x-pack/test/api_integration/apis/ml/jobs/jobs_summary.ts b/x-pack/test/api_integration/apis/ml/jobs/jobs_summary.ts
index 0a6e1ed75020a..f7ff5b118f6ae 100644
--- a/x-pack/test/api_integration/apis/ml/jobs/jobs_summary.ts
+++ b/x-pack/test/api_integration/apis/ml/jobs/jobs_summary.ts
@@ -7,7 +7,7 @@
 import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { MULTI_METRIC_JOB_CONFIG, SINGLE_METRIC_JOB_CONFIG } from './common_jobs';
 
diff --git a/x-pack/test/api_integration/apis/ml/modules/get_module.ts b/x-pack/test/api_integration/apis/ml/modules/get_module.ts
index e2a5d3cd425dc..a3d060bb1faca 100644
--- a/x-pack/test/api_integration/apis/ml/modules/get_module.ts
+++ b/x-pack/test/api_integration/apis/ml/modules/get_module.ts
@@ -8,7 +8,7 @@ import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 const moduleIds = [
   'apache_ecs',
diff --git a/x-pack/test/api_integration/apis/ml/modules/recognize_module.ts b/x-pack/test/api_integration/apis/ml/modules/recognize_module.ts
index 6634c4e2ed16c..d50148ec583a0 100644
--- a/x-pack/test/api_integration/apis/ml/modules/recognize_module.ts
+++ b/x-pack/test/api_integration/apis/ml/modules/recognize_module.ts
@@ -8,7 +8,7 @@ import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/modules/setup_module.ts b/x-pack/test/api_integration/apis/ml/modules/setup_module.ts
index 6c3eda197f892..bc7fc691bc60d 100644
--- a/x-pack/test/api_integration/apis/ml/modules/setup_module.ts
+++ b/x-pack/test/api_integration/apis/ml/modules/setup_module.ts
@@ -12,7 +12,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context';
 import { JOB_STATE, DATAFEED_STATE } from '../../../../../plugins/ml/common/constants/states';
 import { Job } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/results/get_anomalies_table_data.ts b/x-pack/test/api_integration/apis/ml/results/get_anomalies_table_data.ts
index f769d0d878cb2..d1d7d2e8d78ce 100644
--- a/x-pack/test/api_integration/apis/ml/results/get_anomalies_table_data.ts
+++ b/x-pack/test/api_integration/apis/ml/results/get_anomalies_table_data.ts
@@ -7,7 +7,7 @@ import expect from '@kbn/expect';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { Datafeed, Job } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/transform/delete_transforms.ts b/x-pack/test/api_integration/apis/transform/delete_transforms.ts
index 136bb85dd5ac2..7f01d2741ad15 100644
--- a/x-pack/test/api_integration/apis/transform/delete_transforms.ts
+++ b/x-pack/test/api_integration/apis/transform/delete_transforms.ts
@@ -6,7 +6,7 @@
 import expect from '@kbn/expect';
 import { TransformEndpointRequest } from '../../../../plugins/transform/common';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { COMMON_REQUEST_HEADERS } from '../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../functional/services/ml/common_api';
 import { USER } from '../../../functional/services/transform/security_common';
 
 async function asyncForEach(array: any[], callback: Function) {
diff --git a/x-pack/test/api_integration/services/ml.ts b/x-pack/test/api_integration/services/ml.ts
index be3b9732f83bf..a8780473fad67 100644
--- a/x-pack/test/api_integration/services/ml.ts
+++ b/x-pack/test/api_integration/services/ml.ts
@@ -7,16 +7,19 @@
 import { FtrProviderContext } from '../../functional/ftr_provider_context';
 
 import { MachineLearningAPIProvider } from '../../functional/services/ml/api';
+import { MachineLearningCommonAPIProvider } from '../../functional/services/ml/common_api';
 import { MachineLearningSecurityCommonProvider } from '../../functional/services/ml/security_common';
 import { MachineLearningTestResourcesProvider } from '../../functional/services/ml/test_resources';
 
 export function MachineLearningProvider(context: FtrProviderContext) {
   const api = MachineLearningAPIProvider(context);
+  const commonAPI = MachineLearningCommonAPIProvider(context);
   const securityCommon = MachineLearningSecurityCommonProvider(context);
   const testResources = MachineLearningTestResourcesProvider(context);
 
   return {
     api,
+    commonAPI,
     securityCommon,
     testResources,
   };
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/advanced_job.ts b/x-pack/test/functional/apps/ml/anomaly_detection/advanced_job.ts
index a8836a463e652..18a7a4b26a752 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/advanced_job.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/advanced_job.ts
@@ -33,60 +33,6 @@ interface PickFieldsConfig {
   summaryCountField?: string;
 }
 
-// type guards
-// Detector
-const isDetectorWithField = (arg: any): arg is Required<Pick<Detector, 'field'>> => {
-  return arg.hasOwnProperty('field');
-};
-const isDetectorWithByField = (arg: any): arg is Required<Pick<Detector, 'byField'>> => {
-  return arg.hasOwnProperty('byField');
-};
-const isDetectorWithOverField = (arg: any): arg is Required<Pick<Detector, 'overField'>> => {
-  return arg.hasOwnProperty('overField');
-};
-const isDetectorWithPartitionField = (
-  arg: any
-): arg is Required<Pick<Detector, 'partitionField'>> => {
-  return arg.hasOwnProperty('partitionField');
-};
-const isDetectorWithExcludeFrequent = (
-  arg: any
-): arg is Required<Pick<Detector, 'excludeFrequent'>> => {
-  return arg.hasOwnProperty('excludeFrequent');
-};
-const isDetectorWithDescription = (arg: any): arg is Required<Pick<Detector, 'description'>> => {
-  return arg.hasOwnProperty('description');
-};
-
-// DatafeedConfig
-const isDatafeedConfigWithQueryDelay = (
-  arg: any
-): arg is Required<Pick<DatafeedConfig, 'queryDelay'>> => {
-  return arg.hasOwnProperty('queryDelay');
-};
-const isDatafeedConfigWithFrequency = (
-  arg: any
-): arg is Required<Pick<DatafeedConfig, 'frequency'>> => {
-  return arg.hasOwnProperty('frequency');
-};
-const isDatafeedConfigWithScrollSize = (
-  arg: any
-): arg is Required<Pick<DatafeedConfig, 'scrollSize'>> => {
-  return arg.hasOwnProperty('scrollSize');
-};
-
-// PickFieldsConfig
-const isPickFieldsConfigWithCategorizationField = (
-  arg: any
-): arg is Required<Pick<PickFieldsConfig, 'categorizationField'>> => {
-  return arg.hasOwnProperty('categorizationField');
-};
-const isPickFieldsConfigWithSummaryCountField = (
-  arg: any
-): arg is Required<Pick<PickFieldsConfig, 'summaryCountField'>> => {
-  return arg.hasOwnProperty('summaryCountField');
-};
-
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const ml = getService('ml');
@@ -290,88 +236,80 @@ export default function ({ getService }: FtrProviderContext) {
 
     for (const testData of testDataList) {
       describe(`${testData.suiteTitle}`, function () {
-        it('job creation loads the job management page', async () => {
+        it('job creation loads the advanced wizard for the source data', async () => {
+          await ml.testExecution.logTestStep('job creation navigates to job management');
           await ml.navigation.navigateToMl();
           await ml.navigation.navigateToJobManagement();
-        });
 
-        it('job creation loads the new job source selection page', async () => {
+          await ml.testExecution.logTestStep(
+            'job creation loads the new job source selection page'
+          );
           await ml.jobManagement.navigateToNewJobSourceSelection();
-        });
 
-        it('job creation loads the job type selection page', async () => {
+          await ml.testExecution.logTestStep('job creation loads the job type selection page');
           await ml.jobSourceSelection.selectSourceForAnomalyDetectionJob(testData.jobSource);
-        });
 
-        it('job creation loads the advanced job wizard page', async () => {
+          await ml.testExecution.logTestStep('job creation loads the advanced job wizard page');
           await ml.jobTypeSelection.selectAdvancedJob();
         });
 
-        it('job creation displays the configure datafeed step', async () => {
+        it('job creation navigates through the advanced wizard and sets all needed fields', async () => {
+          await ml.testExecution.logTestStep('job creation displays the configure datafeed step');
           await ml.jobWizardCommon.assertConfigureDatafeedSectionExists();
-        });
 
-        it('job creation pre-fills the datafeed query editor', async () => {
+          await ml.testExecution.logTestStep('job creation pre-fills the datafeed query editor');
           await ml.jobWizardAdvanced.assertDatafeedQueryEditorExists();
           await ml.jobWizardAdvanced.assertDatafeedQueryEditorValue(defaultValues.datafeedQuery);
-        });
 
-        it('job creation inputs the query delay', async () => {
+          await ml.testExecution.logTestStep('job creation inputs the query delay');
           await ml.jobWizardAdvanced.assertQueryDelayInputExists();
           await ml.jobWizardAdvanced.assertQueryDelayValue(defaultValues.queryDelay);
-          if (isDatafeedConfigWithQueryDelay(testData.datafeedConfig)) {
-            await ml.jobWizardAdvanced.setQueryDelay(testData.datafeedConfig.queryDelay);
+          if (testData.datafeedConfig.hasOwnProperty('queryDelay')) {
+            await ml.jobWizardAdvanced.setQueryDelay(testData.datafeedConfig.queryDelay!);
           }
-        });
 
-        it('job creation inputs the frequency', async () => {
+          await ml.testExecution.logTestStep('job creation inputs the frequency');
           await ml.jobWizardAdvanced.assertFrequencyInputExists();
           await ml.jobWizardAdvanced.assertFrequencyValue(defaultValues.frequency);
-          if (isDatafeedConfigWithFrequency(testData.datafeedConfig)) {
-            await ml.jobWizardAdvanced.setFrequency(testData.datafeedConfig.frequency);
+          if (testData.datafeedConfig.hasOwnProperty('frequency')) {
+            await ml.jobWizardAdvanced.setFrequency(testData.datafeedConfig.frequency!);
           }
-        });
 
-        it('job creation inputs the scroll size', async () => {
+          await ml.testExecution.logTestStep('job creation inputs the scroll size');
           await ml.jobWizardAdvanced.assertScrollSizeInputExists();
           await ml.jobWizardAdvanced.assertScrollSizeValue(defaultValues.scrollSize);
-          if (isDatafeedConfigWithScrollSize(testData.datafeedConfig)) {
-            await ml.jobWizardAdvanced.setScrollSize(testData.datafeedConfig.scrollSize);
+          if (testData.datafeedConfig.hasOwnProperty('scrollSize')) {
+            await ml.jobWizardAdvanced.setScrollSize(testData.datafeedConfig.scrollSize!);
           }
-        });
 
-        it('job creation pre-fills the time field', async () => {
+          await ml.testExecution.logTestStep('job creation pre-fills the time field');
           await ml.jobWizardAdvanced.assertTimeFieldInputExists();
           await ml.jobWizardAdvanced.assertTimeFieldSelection([testData.expected.wizard.timeField]);
-        });
 
-        it('job creation displays the pick fields step', async () => {
+          await ml.testExecution.logTestStep('job creation displays the pick fields step');
           await ml.jobWizardCommon.advanceToPickFieldsSection();
-        });
 
-        it('job creation selects the categorization field', async () => {
+          await ml.testExecution.logTestStep('job creation selects the categorization field');
           await ml.jobWizardAdvanced.assertCategorizationFieldInputExists();
-          if (isPickFieldsConfigWithCategorizationField(testData.pickFieldsConfig)) {
+          if (testData.pickFieldsConfig.hasOwnProperty('categorizationField')) {
             await ml.jobWizardAdvanced.selectCategorizationField(
-              testData.pickFieldsConfig.categorizationField
+              testData.pickFieldsConfig.categorizationField!
             );
           } else {
             await ml.jobWizardAdvanced.assertCategorizationFieldSelection([]);
           }
-        });
 
-        it('job creation selects the summary count field', async () => {
+          await ml.testExecution.logTestStep('job creation selects the summary count field');
           await ml.jobWizardAdvanced.assertSummaryCountFieldInputExists();
-          if (isPickFieldsConfigWithSummaryCountField(testData.pickFieldsConfig)) {
+          if (testData.pickFieldsConfig.hasOwnProperty('summaryCountField')) {
             await ml.jobWizardAdvanced.selectSummaryCountField(
-              testData.pickFieldsConfig.summaryCountField
+              testData.pickFieldsConfig.summaryCountField!
             );
           } else {
             await ml.jobWizardAdvanced.assertSummaryCountFieldSelection([]);
           }
-        });
 
-        it('job creation adds detectors', async () => {
+          await ml.testExecution.logTestStep('job creation adds detectors');
           for (const detector of testData.pickFieldsConfig.detectors) {
             await ml.jobWizardAdvanced.openCreateDetectorModal();
             await ml.jobWizardAdvanced.assertDetectorFunctionInputExists();
@@ -390,128 +328,118 @@ export default function ({ getService }: FtrProviderContext) {
             await ml.jobWizardAdvanced.assertDetectorDescriptionValue('');
 
             await ml.jobWizardAdvanced.selectDetectorFunction(detector.function);
-            if (isDetectorWithField(detector)) {
-              await ml.jobWizardAdvanced.selectDetectorField(detector.field);
+            if (detector.hasOwnProperty('field')) {
+              await ml.jobWizardAdvanced.selectDetectorField(detector.field!);
             }
-            if (isDetectorWithByField(detector)) {
-              await ml.jobWizardAdvanced.selectDetectorByField(detector.byField);
+            if (detector.hasOwnProperty('byField')) {
+              await ml.jobWizardAdvanced.selectDetectorByField(detector.byField!);
             }
-            if (isDetectorWithOverField(detector)) {
-              await ml.jobWizardAdvanced.selectDetectorOverField(detector.overField);
+            if (detector.hasOwnProperty('overField')) {
+              await ml.jobWizardAdvanced.selectDetectorOverField(detector.overField!);
             }
-            if (isDetectorWithPartitionField(detector)) {
-              await ml.jobWizardAdvanced.selectDetectorPartitionField(detector.partitionField);
+            if (detector.hasOwnProperty('partitionField')) {
+              await ml.jobWizardAdvanced.selectDetectorPartitionField(detector.partitionField!);
             }
-            if (isDetectorWithExcludeFrequent(detector)) {
-              await ml.jobWizardAdvanced.selectDetectorExcludeFrequent(detector.excludeFrequent);
+            if (detector.hasOwnProperty('excludeFrequent')) {
+              await ml.jobWizardAdvanced.selectDetectorExcludeFrequent(detector.excludeFrequent!);
             }
-            if (isDetectorWithDescription(detector)) {
-              await ml.jobWizardAdvanced.setDetectorDescription(detector.description);
+            if (detector.hasOwnProperty('description')) {
+              await ml.jobWizardAdvanced.setDetectorDescription(detector.description!);
             }
 
             await ml.jobWizardAdvanced.confirmAddDetectorModal();
           }
-        });
 
-        it('job creation displays detector entries', async () => {
+          await ml.testExecution.logTestStep('job creation displays detector entries');
           for (const [index, detector] of testData.pickFieldsConfig.detectors.entries()) {
             await ml.jobWizardAdvanced.assertDetectorEntryExists(
               index,
               detector.identifier,
-              isDetectorWithDescription(detector) ? detector.description : undefined
+              detector.hasOwnProperty('description') ? detector.description! : undefined
             );
           }
-        });
 
-        it('job creation inputs the bucket span', async () => {
+          await ml.testExecution.logTestStep('job creation inputs the bucket span');
           await ml.jobWizardCommon.assertBucketSpanInputExists();
           await ml.jobWizardCommon.setBucketSpan(testData.pickFieldsConfig.bucketSpan);
-        });
 
-        it('job creation inputs influencers', async () => {
+          await ml.testExecution.logTestStep('job creation inputs influencers');
           await ml.jobWizardCommon.assertInfluencerInputExists();
           await ml.jobWizardCommon.assertInfluencerSelection([]);
           for (const influencer of testData.pickFieldsConfig.influencers) {
             await ml.jobWizardCommon.addInfluencer(influencer);
           }
-        });
 
-        it('job creation inputs the model memory limit', async () => {
+          await ml.testExecution.logTestStep('job creation inputs the model memory limit');
           await ml.jobWizardCommon.assertModelMemoryLimitInputExists({
             withAdvancedSection: false,
           });
           await ml.jobWizardCommon.setModelMemoryLimit(testData.pickFieldsConfig.memoryLimit, {
             withAdvancedSection: false,
           });
-        });
 
-        it('job creation displays the job details step', async () => {
+          await ml.testExecution.logTestStep('job creation displays the job details step');
           await ml.jobWizardCommon.advanceToJobDetailsSection();
-        });
 
-        it('job creation inputs the job id', async () => {
+          await ml.testExecution.logTestStep('job creation inputs the job id');
           await ml.jobWizardCommon.assertJobIdInputExists();
           await ml.jobWizardCommon.setJobId(testData.jobId);
-        });
 
-        it('job creation inputs the job description', async () => {
+          await ml.testExecution.logTestStep('job creation inputs the job description');
           await ml.jobWizardCommon.assertJobDescriptionInputExists();
           await ml.jobWizardCommon.setJobDescription(testData.jobDescription);
-        });
 
-        it('job creation inputs job groups', async () => {
+          await ml.testExecution.logTestStep('job creation inputs job groups');
           await ml.jobWizardCommon.assertJobGroupInputExists();
           for (const jobGroup of testData.jobGroups) {
             await ml.jobWizardCommon.addJobGroup(jobGroup);
           }
           await ml.jobWizardCommon.assertJobGroupSelection(testData.jobGroups);
-        });
 
-        it('job creation opens the additional settings section', async () => {
+          await ml.testExecution.logTestStep('job creation opens the additional settings section');
           await ml.jobWizardCommon.ensureAdditionalSettingsSectionOpen();
-        });
 
-        it('job creation adds a new custom url', async () => {
+          await ml.testExecution.logTestStep('job creation adds a new custom url');
           await ml.jobWizardCommon.addCustomUrl({ label: 'check-kibana-dashboard' });
-        });
 
-        it('job creation assigns calendars', async () => {
+          await ml.testExecution.logTestStep('job creation assigns calendars');
           await ml.jobWizardCommon.addCalendar(calendarId);
-        });
 
-        it('job creation displays the model plot switch', async () => {
+          await ml.testExecution.logTestStep('job creation displays the model plot switch');
           await ml.jobWizardCommon.assertModelPlotSwitchExists({ withAdvancedSection: false });
-        });
 
-        it('job creation enables the dedicated index switch', async () => {
+          await ml.testExecution.logTestStep('job creation enables the dedicated index switch');
           await ml.jobWizardCommon.assertDedicatedIndexSwitchExists({ withAdvancedSection: false });
           await ml.jobWizardCommon.activateDedicatedIndexSwitch({ withAdvancedSection: false });
-        });
 
-        it('job creation displays the validation step', async () => {
+          await ml.testExecution.logTestStep('job creation displays the validation step');
           await ml.jobWizardCommon.advanceToValidationSection();
-        });
 
-        it('job creation displays the summary step', async () => {
+          await ml.testExecution.logTestStep('job creation displays the summary step');
           await ml.jobWizardCommon.advanceToSummarySection();
         });
 
-        it('job creation creates the job and finishes processing', async () => {
+        it('job creation runs the job and displays it correctly in the job list', async () => {
+          await ml.testExecution.logTestStep(
+            'job creation creates the job and finishes processing'
+          );
           await ml.jobWizardCommon.assertCreateJobButtonExists();
           await ml.jobWizardAdvanced.createJob();
           await ml.jobManagement.assertStartDatafeedModalExists();
           await ml.jobManagement.confirmStartDatafeedModal();
           await ml.jobManagement.waitForJobCompletion(testData.jobId);
-        });
 
-        it('job creation displays the created job in the job list', async () => {
+          await ml.testExecution.logTestStep(
+            'job creation displays the created job in the job list'
+          );
           await ml.jobTable.refreshJobList();
           await ml.jobTable.filterWithSearchString(testData.jobId);
           const rows = await ml.jobTable.parseJobTable();
           expect(rows.filter((row) => row.id === testData.jobId)).to.have.length(1);
-        });
 
-        it('job creation displays details for the created job in the job list', async () => {
+          await ml.testExecution.logTestStep(
+            'job creation displays details for the created job in the job list'
+          );
           await ml.jobTable.assertJobRowFields(testData.jobId, {
             id: testData.jobId,
             description: testData.jobDescription,
@@ -530,84 +458,78 @@ export default function ({ getService }: FtrProviderContext) {
               ...testData.expected.modelSizeStats,
             }
           );
-        });
 
-        it('job creation has detector results', async () => {
+          await ml.testExecution.logTestStep('job creation has detector results');
           for (let i = 0; i < testData.pickFieldsConfig.detectors.length; i++) {
             await ml.api.assertDetectorResultsExist(testData.jobId, i);
           }
         });
 
-        it('job cloning clicks the clone action and loads the advanced wizard', async () => {
+        it('job cloning opens the existing job in the advanced wizard', async () => {
+          await ml.testExecution.logTestStep(
+            'job cloning clicks the clone action and loads the advanced wizard'
+          );
           await ml.jobTable.clickCloneJobAction(testData.jobId);
           await ml.jobTypeSelection.assertAdvancedJobWizardOpen();
         });
 
-        it('job cloning displays the configure datafeed step', async () => {
+        it('job cloning navigates through the advanced wizard, checks and sets all needed fields', async () => {
+          await ml.testExecution.logTestStep('job cloning displays the configure datafeed step');
           await ml.jobWizardCommon.assertConfigureDatafeedSectionExists();
-        });
 
-        it('job cloning pre-fills the datafeed query editor', async () => {
+          await ml.testExecution.logTestStep('job cloning pre-fills the datafeed query editor');
           await ml.jobWizardAdvanced.assertDatafeedQueryEditorExists();
           await ml.jobWizardAdvanced.assertDatafeedQueryEditorValue(defaultValues.datafeedQuery);
-        });
 
-        it('job cloning pre-fills the query delay', async () => {
+          await ml.testExecution.logTestStep('job cloning pre-fills the query delay');
           await ml.jobWizardAdvanced.assertQueryDelayInputExists();
-          if (isDatafeedConfigWithQueryDelay(testData.datafeedConfig)) {
-            await ml.jobWizardAdvanced.assertQueryDelayValue(testData.datafeedConfig.queryDelay);
+          if (testData.datafeedConfig.hasOwnProperty('queryDelay')) {
+            await ml.jobWizardAdvanced.assertQueryDelayValue(testData.datafeedConfig.queryDelay!);
           }
-        });
 
-        it('job cloning pre-fills the frequency', async () => {
+          await ml.testExecution.logTestStep('job cloning pre-fills the frequency');
           await ml.jobWizardAdvanced.assertFrequencyInputExists();
-          if (isDatafeedConfigWithFrequency(testData.datafeedConfig)) {
-            await ml.jobWizardAdvanced.assertFrequencyValue(testData.datafeedConfig.frequency);
+          if (testData.datafeedConfig.hasOwnProperty('frequency')) {
+            await ml.jobWizardAdvanced.assertFrequencyValue(testData.datafeedConfig.frequency!);
           }
-        });
 
-        it('job cloning pre-fills the scroll size', async () => {
+          await ml.testExecution.logTestStep('job cloning pre-fills the scroll size');
           await ml.jobWizardAdvanced.assertScrollSizeInputExists();
           await ml.jobWizardAdvanced.assertScrollSizeValue(
-            isDatafeedConfigWithScrollSize(testData.datafeedConfig)
-              ? testData.datafeedConfig.scrollSize
+            testData.datafeedConfig.hasOwnProperty('scrollSize')
+              ? testData.datafeedConfig.scrollSize!
               : defaultValues.scrollSize
           );
-        });
 
-        it('job creation pre-fills the time field', async () => {
+          await ml.testExecution.logTestStep('job creation pre-fills the time field');
           await ml.jobWizardAdvanced.assertTimeFieldInputExists();
           await ml.jobWizardAdvanced.assertTimeFieldSelection([testData.expected.wizard.timeField]);
-        });
 
-        it('job cloning displays the pick fields step', async () => {
+          await ml.testExecution.logTestStep('job cloning displays the pick fields step');
           await ml.jobWizardCommon.advanceToPickFieldsSection();
-        });
 
-        it('job cloning pre-fills the categorization field', async () => {
+          await ml.testExecution.logTestStep('job cloning pre-fills the categorization field');
           await ml.jobWizardAdvanced.assertCategorizationFieldInputExists();
           await ml.jobWizardAdvanced.assertCategorizationFieldSelection(
-            isPickFieldsConfigWithCategorizationField(testData.pickFieldsConfig)
-              ? [testData.pickFieldsConfig.categorizationField]
+            testData.pickFieldsConfig.hasOwnProperty('categorizationField')
+              ? [testData.pickFieldsConfig.categorizationField!]
               : []
           );
-        });
 
-        it('job cloning pre-fills the summary count field', async () => {
+          await ml.testExecution.logTestStep('job cloning pre-fills the summary count field');
           await ml.jobWizardAdvanced.assertSummaryCountFieldInputExists();
           await ml.jobWizardAdvanced.assertSummaryCountFieldSelection(
-            isPickFieldsConfigWithSummaryCountField(testData.pickFieldsConfig)
-              ? [testData.pickFieldsConfig.summaryCountField]
+            testData.pickFieldsConfig.hasOwnProperty('summaryCountField')
+              ? [testData.pickFieldsConfig.summaryCountField!]
               : []
           );
-        });
 
-        it('job cloning pre-fills detectors', async () => {
+          await ml.testExecution.logTestStep('job cloning pre-fills detectors');
           for (const [index, detector] of testData.pickFieldsConfig.detectors.entries()) {
             await ml.jobWizardAdvanced.assertDetectorEntryExists(
               index,
               detector.identifier,
-              isDetectorWithDescription(detector) ? detector.description : undefined
+              detector.hasOwnProperty('description') ? detector.description! : undefined
             );
             await ml.jobWizardAdvanced.clickEditDetector(index);
 
@@ -621,134 +543,121 @@ export default function ({ getService }: FtrProviderContext) {
 
             await ml.jobWizardAdvanced.assertDetectorFunctionSelection([detector.function]);
             await ml.jobWizardAdvanced.assertDetectorFieldSelection(
-              isDetectorWithField(detector) ? [detector.field] : []
+              detector.hasOwnProperty('field') ? [detector.field!] : []
             );
             await ml.jobWizardAdvanced.assertDetectorByFieldSelection(
-              isDetectorWithByField(detector) ? [detector.byField] : []
+              detector.hasOwnProperty('byField') ? [detector.byField!] : []
             );
             await ml.jobWizardAdvanced.assertDetectorOverFieldSelection(
-              isDetectorWithOverField(detector) ? [detector.overField] : []
+              detector.hasOwnProperty('overField') ? [detector.overField!] : []
             );
             await ml.jobWizardAdvanced.assertDetectorPartitionFieldSelection(
-              isDetectorWithPartitionField(detector) ? [detector.partitionField] : []
+              detector.hasOwnProperty('partitionField') ? [detector.partitionField!] : []
             );
             await ml.jobWizardAdvanced.assertDetectorExcludeFrequentSelection(
-              isDetectorWithExcludeFrequent(detector) ? [detector.excludeFrequent] : []
+              detector.hasOwnProperty('excludeFrequent') ? [detector.excludeFrequent!] : []
             );
             // Currently, a description different form the identifier is generated for detectors with partition field
             await ml.jobWizardAdvanced.assertDetectorDescriptionValue(
-              isDetectorWithDescription(detector)
-                ? detector.description
+              detector.hasOwnProperty('description')
+                ? detector.description!
                 : detector.identifier.replace('partition_field_name', 'partitionfield')
             );
 
             await ml.jobWizardAdvanced.cancelAddDetectorModal();
           }
-        });
 
-        it('job cloning pre-fills the bucket span', async () => {
+          await ml.testExecution.logTestStep('job cloning pre-fills the bucket span');
           await ml.jobWizardCommon.assertBucketSpanInputExists();
           await ml.jobWizardCommon.assertBucketSpanValue(testData.pickFieldsConfig.bucketSpan);
-        });
 
-        it('job cloning pre-fills influencers', async () => {
+          await ml.testExecution.logTestStep('job cloning pre-fills influencers');
           await ml.jobWizardCommon.assertInfluencerInputExists();
           await ml.jobWizardCommon.assertInfluencerSelection(testData.pickFieldsConfig.influencers);
-        });
-
-        // MML during clone has changed in #61589
-        // TODO: adjust test code to reflect the new behavior
-        it.skip('job cloning pre-fills the model memory limit', async () => {
-          await ml.jobWizardCommon.assertModelMemoryLimitInputExists({
-            withAdvancedSection: false,
-          });
-          await ml.jobWizardCommon.assertModelMemoryLimitValue(
-            testData.pickFieldsConfig.memoryLimit,
-            {
-              withAdvancedSection: false,
-            }
-          );
-        });
 
-        it('job cloning displays the job details step', async () => {
+          // MML during clone has changed in #61589
+          // TODO: adjust test code to reflect the new behavior
+          // await ml.testExecution.logTestStep('job cloning pre-fills the model memory limit');
+          // await ml.jobWizardCommon.assertModelMemoryLimitInputExists({
+          //   withAdvancedSection: false,
+          // });
+          // await ml.jobWizardCommon.assertModelMemoryLimitValue(
+          //   testData.pickFieldsConfig.memoryLimit,
+          //   {
+          //     withAdvancedSection: false,
+          //   }
+          // );
+
+          await ml.testExecution.logTestStep('job cloning displays the job details step');
           await ml.jobWizardCommon.advanceToJobDetailsSection();
-        });
 
-        it('job cloning does not pre-fill the job id', async () => {
+          await ml.testExecution.logTestStep('job cloning does not pre-fill the job id');
           await ml.jobWizardCommon.assertJobIdInputExists();
           await ml.jobWizardCommon.assertJobIdValue('');
-        });
 
-        it('job cloning inputs the clone job id', async () => {
+          await ml.testExecution.logTestStep('job cloning inputs the clone job id');
           await ml.jobWizardCommon.setJobId(testData.jobIdClone);
-        });
 
-        it('job cloning pre-fills the job description', async () => {
+          await ml.testExecution.logTestStep('job cloning pre-fills the job description');
           await ml.jobWizardCommon.assertJobDescriptionInputExists();
           await ml.jobWizardCommon.assertJobDescriptionValue(testData.jobDescription);
-        });
 
-        it('job cloning pre-fills job groups', async () => {
+          await ml.testExecution.logTestStep('job cloning pre-fills job groups');
           await ml.jobWizardCommon.assertJobGroupInputExists();
           await ml.jobWizardCommon.assertJobGroupSelection(testData.jobGroups);
-        });
 
-        it('job cloning inputs the clone job group', async () => {
+          await ml.testExecution.logTestStep('job cloning inputs the clone job group');
           await ml.jobWizardCommon.assertJobGroupInputExists();
           await ml.jobWizardCommon.addJobGroup('clone');
           await ml.jobWizardCommon.assertJobGroupSelection(testData.jobGroupsClone);
-        });
 
-        it('job cloning opens the additional settings section', async () => {
+          await ml.testExecution.logTestStep('job cloning opens the additional settings section');
           await ml.jobWizardCommon.ensureAdditionalSettingsSectionOpen();
-        });
 
-        it('job cloning persists custom urls', async () => {
+          await ml.testExecution.logTestStep('job cloning persists custom urls');
           await ml.customUrls.assertCustomUrlItem(0, 'check-kibana-dashboard');
-        });
 
-        it('job cloning persists assigned calendars', async () => {
+          await ml.testExecution.logTestStep('job cloning persists assigned calendars');
           await ml.jobWizardCommon.assertCalendarsSelection([calendarId]);
-        });
 
-        it('job cloning pre-fills the model plot switch', async () => {
+          await ml.testExecution.logTestStep('job cloning pre-fills the model plot switch');
           await ml.jobWizardCommon.assertModelPlotSwitchExists({ withAdvancedSection: false });
           await ml.jobWizardCommon.assertModelPlotSwitchCheckedState(false, {
             withAdvancedSection: false,
           });
-        });
 
-        it('job cloning pre-fills the dedicated index switch', async () => {
+          await ml.testExecution.logTestStep('job cloning pre-fills the dedicated index switch');
           await ml.jobWizardCommon.assertDedicatedIndexSwitchExists({ withAdvancedSection: false });
           await ml.jobWizardCommon.assertDedicatedIndexSwitchCheckedState(true, {
             withAdvancedSection: false,
           });
-        });
 
-        it('job cloning displays the validation step', async () => {
+          await ml.testExecution.logTestStep('job cloning displays the validation step');
           await ml.jobWizardCommon.advanceToValidationSection();
-        });
 
-        it('job cloning displays the summary step', async () => {
+          await ml.testExecution.logTestStep('job cloning displays the summary step');
           await ml.jobWizardCommon.advanceToSummarySection();
         });
 
-        it('job cloning creates the job and finishes processing', async () => {
+        it('job cloning runs the clone job and displays it correctly in the job list', async () => {
+          await ml.testExecution.logTestStep('job cloning creates the job and finishes processing');
           await ml.jobWizardCommon.assertCreateJobButtonExists();
           await ml.jobWizardAdvanced.createJob();
           await ml.jobManagement.assertStartDatafeedModalExists();
           await ml.jobManagement.confirmStartDatafeedModal();
           await ml.jobManagement.waitForJobCompletion(testData.jobIdClone);
-        });
 
-        it('job cloning displays the created job in the job list', async () => {
+          await ml.testExecution.logTestStep(
+            'job cloning displays the created job in the job list'
+          );
           await ml.jobTable.refreshJobList();
           await ml.jobTable.filterWithSearchString(testData.jobIdClone);
           const rows = await ml.jobTable.parseJobTable();
           expect(rows.filter((row) => row.id === testData.jobIdClone)).to.have.length(1);
-        });
 
-        it('job creation displays details for the created job in the job list', async () => {
+          await ml.testExecution.logTestStep(
+            'job cloning displays details for the created job in the job list'
+          );
           await ml.jobTable.assertJobRowFields(testData.jobIdClone, {
             id: testData.jobIdClone,
             description: testData.jobDescription,
@@ -767,9 +676,8 @@ export default function ({ getService }: FtrProviderContext) {
               ...testData.expected.modelSizeStats,
             }
           );
-        });
 
-        it('job creation has detector results', async () => {
+          await ml.testExecution.logTestStep('job cloning has detector results');
           for (let i = 0; i < testData.pickFieldsConfig.detectors.length; i++) {
             await ml.api.assertDetectorResultsExist(testData.jobIdClone, i);
           }
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/annotations.ts b/x-pack/test/functional/apps/ml/anomaly_detection/annotations.ts
index 202910622fb64..9e48c71ab0eba 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/annotations.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/annotations.ts
@@ -56,7 +56,8 @@ export default function ({ getService }: FtrProviderContext) {
       await ml.api.cleanMlIndices();
     });
 
-    it('loads from job list row link', async () => {
+    it('displays error on broken annotation index and recovers after fix', async () => {
+      await ml.testExecution.logTestStep('loads from job list row link');
       await ml.navigation.navigateToMl();
       await ml.navigation.navigateToJobManagement();
 
@@ -66,43 +67,35 @@ export default function ({ getService }: FtrProviderContext) {
       expect(rows.filter((row) => row.id === JOB_CONFIG.job_id)).to.have.length(1);
 
       await ml.jobTable.clickOpenJobInSingleMetricViewerButton(JOB_CONFIG.job_id);
-      await ml.common.waitForMlLoadingIndicatorToDisappear();
-    });
+      await ml.commonUI.waitForMlLoadingIndicatorToDisappear();
 
-    it('pre-fills the job selection', async () => {
+      await ml.testExecution.logTestStep('pre-fills the job selection');
       await ml.jobSelection.assertJobSelection([JOB_CONFIG.job_id]);
-    });
 
-    it('pre-fills the detector input', async () => {
+      await ml.testExecution.logTestStep('pre-fills the detector input');
       await ml.singleMetricViewer.assertDetectorInputExsist();
       await ml.singleMetricViewer.assertDetectorInputValue('0');
-    });
 
-    it('should display the annotations section showing an error', async () => {
+      await ml.testExecution.logTestStep('should display the annotations section showing an error');
       await ml.singleMetricViewer.assertAnnotationsExists('error');
-    });
 
-    it('should navigate to anomaly explorer', async () => {
+      await ml.testExecution.logTestStep('should navigate to anomaly explorer');
       await ml.navigation.navigateToAnomalyExplorerViaSingleMetricViewer();
-    });
 
-    it('should display the annotations section showing an error', async () => {
+      await ml.testExecution.logTestStep('should display the annotations section showing an error');
       await ml.anomalyExplorer.assertAnnotationsPanelExists('error');
-    });
 
-    it('should display the annotations section without an error', async () => {
+      await ml.testExecution.logTestStep('should display the annotations section without an error');
       // restores the aliases to point to the original working annotations index
       // so we can run tests against successfully loaded annotations sections.
       await ml.testResources.restoreAnnotationsIndexState();
       await ml.anomalyExplorer.refreshPage();
       await ml.anomalyExplorer.assertAnnotationsPanelExists('loaded');
-    });
 
-    it('should navigate to single metric viewer', async () => {
+      await ml.testExecution.logTestStep('should navigate to single metric viewer');
       await ml.navigation.navigateToSingleMetricViewerViaAnomalyExplorer();
-    });
 
-    it('should display the annotations section without an error', async () => {
+      await ml.testExecution.logTestStep('should display the annotations section without an error');
       await ml.singleMetricViewer.assertAnnotationsExists('loaded');
     });
   });
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/anomaly_explorer.ts b/x-pack/test/functional/apps/ml/anomaly_detection/anomaly_explorer.ts
index cbee36abef78d..cfbebd478fcb8 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/anomaly_explorer.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/anomaly_explorer.ts
@@ -79,24 +79,26 @@ export default function ({ getService }: FtrProviderContext) {
           await ml.api.cleanMlIndices();
         });
 
-        it('loads from job list row link', async () => {
+        it('opens a job from job list link', async () => {
+          await ml.testExecution.logTestStep('navigate to job list');
           await ml.navigation.navigateToMl();
           await ml.navigation.navigateToJobManagement();
 
+          await ml.testExecution.logTestStep('open job in anomaly explorer');
           await ml.jobTable.waitForJobsToLoad();
           await ml.jobTable.filterWithSearchString(testData.jobConfig.job_id);
           const rows = await ml.jobTable.parseJobTable();
           expect(rows.filter((row) => row.id === testData.jobConfig.job_id)).to.have.length(1);
 
           await ml.jobTable.clickOpenJobInAnomalyExplorerButton(testData.jobConfig.job_id);
-          await ml.common.waitForMlLoadingIndicatorToDisappear();
+          await ml.commonUI.waitForMlLoadingIndicatorToDisappear();
         });
 
-        it('pre-fills the job selection', async () => {
+        it('displays job results', async () => {
+          await ml.testExecution.logTestStep('pre-fills the job selection');
           await ml.jobSelection.assertJobSelection([testData.jobConfig.job_id]);
-        });
 
-        it('displays the influencers list', async () => {
+          await ml.testExecution.logTestStep('displays the influencers list');
           await ml.anomalyExplorer.assertInfluencerListExists();
           for (const influencerBlock of testData.expected.influencers) {
             await ml.anomalyExplorer.assertInfluencerFieldExists(influencerBlock.field);
@@ -111,27 +113,26 @@ export default function ({ getService }: FtrProviderContext) {
               );
             }
           }
-        });
 
-        it('displays the swimlanes', async () => {
+          await ml.testExecution.logTestStep('displays the swimlanes');
           await ml.anomalyExplorer.assertOverallSwimlaneExists();
           await ml.anomalyExplorer.assertSwimlaneViewByExists();
-        });
 
-        it('should display the annotations panel', async () => {
+          await ml.testExecution.logTestStep('should display the annotations panel');
           await ml.anomalyExplorer.assertAnnotationsPanelExists('loaded');
-        });
 
-        it('displays the anomalies table', async () => {
+          await ml.testExecution.logTestStep('displays the anomalies table');
           await ml.anomaliesTable.assertTableExists();
-        });
 
-        it('anomalies table is not empty', async () => {
+          await ml.testExecution.logTestStep('anomalies table is not empty');
           await ml.anomaliesTable.assertTableNotEmpty();
         });
 
-        // should be the last step because it navigates away from the Anomaly Explorer page
-        it('should allow to attach anomaly swimlane embeddable to the dashboard', async () => {
+        it('adds swim lane embeddable to a dashboard', async () => {
+          // should be the last step because it navigates away from the Anomaly Explorer page
+          await ml.testExecution.logTestStep(
+            'should allow to attach anomaly swimlane embeddable to the dashboard'
+          );
           await ml.anomalyExplorer.openAddToDashboardControl();
           await ml.anomalyExplorer.addAndEditSwimlaneInDashboard('ML Test');
         });
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/categorization_job.ts b/x-pack/test/functional/apps/ml/anomaly_detection/categorization_job.ts
index 1581bd54f5c44..c410aff292ffa 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/categorization_job.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/categorization_job.ts
@@ -89,49 +89,46 @@ export default function ({ getService }: FtrProviderContext) {
       await ml.api.cleanMlIndices();
     });
 
-    it('job creation loads the job management page', async () => {
+    it('job creation loads the categorization wizard for the source data', async () => {
+      await ml.testExecution.logTestStep('job creation loads the job management page');
+      await ml.testExecution.logTestStep('');
       await ml.navigation.navigateToMl();
       await ml.navigation.navigateToJobManagement();
-    });
 
-    it('job creation loads the new job source selection page', async () => {
+      await ml.testExecution.logTestStep('job creation loads the new job source selection page');
       await ml.jobManagement.navigateToNewJobSourceSelection();
-    });
 
-    it('job creation loads the job type selection page', async () => {
+      await ml.testExecution.logTestStep('job creation loads the job type selection page');
       await ml.jobSourceSelection.selectSourceForAnomalyDetectionJob('ft_categorization');
-    });
 
-    it('job creation loads the categorization job wizard page', async () => {
+      await ml.testExecution.logTestStep('job creation loads the categorization job wizard page');
       await ml.jobTypeSelection.selectCategorizationJob();
     });
 
-    it('job creation displays the time range step', async () => {
+    it('job creation navigates through the categorization wizard and sets all needed fields', async () => {
+      await ml.testExecution.logTestStep('job creation displays the time range step');
       await ml.jobWizardCommon.assertTimeRangeSectionExists();
-    });
 
-    it('job creation sets the timerange', async () => {
+      await ml.testExecution.logTestStep('job creation sets the timerange');
       await ml.jobWizardCommon.clickUseFullDataButton(
         'Apr 5, 2019 @ 11:25:35.770',
         'Nov 21, 2019 @ 06:01:13.914'
       );
-    });
 
-    it('job creation displays the event rate chart', async () => {
+      await ml.testExecution.logTestStep('job creation displays the event rate chart');
       await ml.jobWizardCommon.assertEventRateChartExists();
       await ml.jobWizardCommon.assertEventRateChartHasData();
-    });
 
-    it('job creation displays the pick fields step', async () => {
+      await ml.testExecution.logTestStep('job creation displays the pick fields step');
       await ml.jobWizardCommon.advanceToPickFieldsSection();
-    });
 
-    it(`job creation selects ${detectorTypeIdentifier} detector type`, async () => {
+      await ml.testExecution.logTestStep(
+        `job creation selects ${detectorTypeIdentifier} detector type`
+      );
       await ml.jobWizardCategorization.assertCategorizationDetectorTypeSelectionExists();
       await ml.jobWizardCategorization.selectCategorizationDetectorType(detectorTypeIdentifier);
-    });
 
-    it(`job creation selects the categorization field`, async () => {
+      await ml.testExecution.logTestStep(`job creation selects the categorization field`);
       await ml.jobWizardCategorization.assertCategorizationFieldInputExists();
       await ml.jobWizardCategorization.selectCategorizationField(categorizationFieldIdentifier);
       await ml.jobWizardCategorization.assertCategorizationExamplesCallout(
@@ -140,81 +137,67 @@ export default function ({ getService }: FtrProviderContext) {
       await ml.jobWizardCategorization.assertCategorizationExamplesTable(
         categorizationExampleCount
       );
-    });
 
-    it('job creation inputs the bucket span', async () => {
+      await ml.testExecution.logTestStep('job creation inputs the bucket span');
       await ml.jobWizardCommon.assertBucketSpanInputExists();
       await ml.jobWizardCommon.setBucketSpan(bucketSpan);
-    });
 
-    it('job creation displays the job details step', async () => {
+      await ml.testExecution.logTestStep('job creation displays the job details step');
       await ml.jobWizardCommon.advanceToJobDetailsSection();
-    });
 
-    it('job creation inputs the job id', async () => {
+      await ml.testExecution.logTestStep('job creation inputs the job id');
       await ml.jobWizardCommon.assertJobIdInputExists();
       await ml.jobWizardCommon.setJobId(jobId);
-    });
 
-    it('job creation inputs the job description', async () => {
+      await ml.testExecution.logTestStep('job creation inputs the job description');
       await ml.jobWizardCommon.assertJobDescriptionInputExists();
       await ml.jobWizardCommon.setJobDescription(jobDescription);
-    });
 
-    it('job creation inputs job groups', async () => {
+      await ml.testExecution.logTestStep('job creation inputs job groups');
       await ml.jobWizardCommon.assertJobGroupInputExists();
       for (const jobGroup of jobGroups) {
         await ml.jobWizardCommon.addJobGroup(jobGroup);
       }
       await ml.jobWizardCommon.assertJobGroupSelection(jobGroups);
-    });
 
-    it('job creation opens the additional settings section', async () => {
+      await ml.testExecution.logTestStep('job creation opens the additional settings section');
       await ml.jobWizardCommon.ensureAdditionalSettingsSectionOpen();
-    });
 
-    it('job creation adds a new custom url', async () => {
+      await ml.testExecution.logTestStep('job creation adds a new custom url');
       await ml.jobWizardCommon.addCustomUrl({ label: 'check-kibana-dashboard' });
-    });
 
-    it('job creation assigns calendars', async () => {
+      await ml.testExecution.logTestStep('job creation assigns calendars');
       await ml.jobWizardCommon.addCalendar(calendarId);
-    });
 
-    it('job creation opens the advanced section', async () => {
+      await ml.testExecution.logTestStep('job creation opens the advanced section');
       await ml.jobWizardCommon.ensureAdvancedSectionOpen();
-    });
 
-    it('job creation displays the model plot switch', async () => {
+      await ml.testExecution.logTestStep('job creation displays the model plot switch');
       await ml.jobWizardCommon.assertModelPlotSwitchExists();
       await ml.jobWizardCommon.assertModelPlotSwitchEnabled(false);
       await ml.jobWizardCommon.assertModelPlotSwitchCheckedState(false);
-    });
 
-    it('job creation enables the dedicated index switch', async () => {
+      await ml.testExecution.logTestStep('job creation enables the dedicated index switch');
       await ml.jobWizardCommon.assertDedicatedIndexSwitchExists();
       await ml.jobWizardCommon.activateDedicatedIndexSwitch();
-    });
 
-    it('job creation inputs the model memory limit', async () => {
+      await ml.testExecution.logTestStep('job creation inputs the model memory limit');
       await ml.jobWizardCommon.assertModelMemoryLimitInputExists();
       await ml.jobWizardCommon.setModelMemoryLimit(memoryLimit);
-    });
 
-    it('job creation displays the validation step', async () => {
+      await ml.testExecution.logTestStep('job creation displays the validation step');
       await ml.jobWizardCommon.advanceToValidationSection();
-    });
 
-    it('job creation displays the summary step', async () => {
+      await ml.testExecution.logTestStep('job creation displays the summary step');
       await ml.jobWizardCommon.advanceToSummarySection();
     });
 
-    it('job creation creates the job and finishes processing', async () => {
+    it('job creation runs the job and displays it correctly in the job list', async () => {
+      await ml.testExecution.logTestStep('job creation creates the job and finishes processing');
       await ml.jobWizardCommon.assertCreateJobButtonExists();
       await ml.jobWizardCommon.createJobAndWaitForCompletion();
-    });
 
-    it('job creation displays the created job in the job list', async () => {
+      await ml.testExecution.logTestStep('job creation displays the created job in the job list');
       await ml.navigation.navigateToMl();
       await ml.navigation.navigateToJobManagement();
 
@@ -222,9 +205,10 @@ export default function ({ getService }: FtrProviderContext) {
       await ml.jobTable.filterWithSearchString(jobId);
       const rows = await ml.jobTable.parseJobTable();
       expect(rows.filter((row) => row.id === jobId)).to.have.length(1);
-    });
 
-    it('job creation displays details for the created job in the job list', async () => {
+      await ml.testExecution.logTestStep(
+        'job creation displays details for the created job in the job list'
+      );
       await ml.jobTable.assertJobRowFields(jobId, getExpectedRow(jobId, jobGroups));
 
       await ml.jobTable.assertJobRowDetailsCounts(
@@ -232,123 +216,106 @@ export default function ({ getService }: FtrProviderContext) {
         getExpectedCounts(jobId),
         getExpectedModelSizeStats(jobId)
       );
-    });
 
-    it('job creation has detector results', async () => {
+      await ml.testExecution.logTestStep('job creation has detector results');
       await ml.api.assertDetectorResultsExist(jobId, 0);
     });
 
-    it('job cloning clicks the clone action and loads the single metric wizard', async () => {
+    it('job cloning opens the existing job in the categorization wizard', async () => {
+      await ml.testExecution.logTestStep(
+        'job cloning clicks the clone action and loads the single metric wizard'
+      );
       await ml.jobTable.clickCloneJobAction(jobId);
       await ml.jobTypeSelection.assertCategorizationJobWizardOpen();
     });
 
-    it('job cloning displays the time range step', async () => {
+    it('job cloning navigates through the categorization wizard, checks and sets all needed fields', async () => {
+      await ml.testExecution.logTestStep('job cloning displays the time range step');
       await ml.jobWizardCommon.assertTimeRangeSectionExists();
-    });
 
-    it('job cloning sets the timerange', async () => {
+      await ml.testExecution.logTestStep('job cloning sets the timerange');
       await ml.jobWizardCommon.clickUseFullDataButton(
         'Apr 5, 2019 @ 11:25:35.770',
         'Nov 21, 2019 @ 06:01:13.914'
       );
-    });
 
-    it('job cloning displays the event rate chart', async () => {
+      await ml.testExecution.logTestStep('job cloning displays the event rate chart');
       await ml.jobWizardCommon.assertEventRateChartExists();
       await ml.jobWizardCommon.assertEventRateChartHasData();
-    });
 
-    it('job cloning displays the pick fields step', async () => {
+      await ml.testExecution.logTestStep('job cloning displays the pick fields step');
       await ml.jobWizardCommon.advanceToPickFieldsSection();
-    });
 
-    it('job cloning pre-fills field and aggregation', async () => {
+      await ml.testExecution.logTestStep('job cloning pre-fills field and aggregation');
       await ml.jobWizardCategorization.assertCategorizationDetectorTypeSelectionExists();
-    });
 
-    it('job cloning pre-fills the bucket span', async () => {
+      await ml.testExecution.logTestStep('job cloning pre-fills the bucket span');
       await ml.jobWizardCommon.assertBucketSpanInputExists();
       await ml.jobWizardCommon.assertBucketSpanValue(bucketSpan);
-    });
 
-    it('job cloning displays the job details step', async () => {
+      await ml.testExecution.logTestStep('job cloning displays the job details step');
       await ml.jobWizardCommon.advanceToJobDetailsSection();
-    });
 
-    it('job cloning does not pre-fill the job id', async () => {
+      await ml.testExecution.logTestStep('job cloning does not pre-fill the job id');
       await ml.jobWizardCommon.assertJobIdInputExists();
       await ml.jobWizardCommon.assertJobIdValue('');
-    });
 
-    it('job cloning inputs the clone job id', async () => {
+      await ml.testExecution.logTestStep('job cloning inputs the clone job id');
       await ml.jobWizardCommon.setJobId(jobIdClone);
-    });
 
-    it('job cloning pre-fills the job description', async () => {
+      await ml.testExecution.logTestStep('job cloning pre-fills the job description');
       await ml.jobWizardCommon.assertJobDescriptionInputExists();
       await ml.jobWizardCommon.assertJobDescriptionValue(jobDescription);
-    });
 
-    it('job cloning pre-fills job groups', async () => {
+      await ml.testExecution.logTestStep('job cloning pre-fills job groups');
       await ml.jobWizardCommon.assertJobGroupInputExists();
       await ml.jobWizardCommon.assertJobGroupSelection(jobGroups);
-    });
 
-    it('job cloning inputs the clone job group', async () => {
+      await ml.testExecution.logTestStep('job cloning inputs the clone job group');
       await ml.jobWizardCommon.assertJobGroupInputExists();
       await ml.jobWizardCommon.addJobGroup('clone');
       await ml.jobWizardCommon.assertJobGroupSelection(jobGroupsClone);
-    });
 
-    it('job cloning opens the additional settings section', async () => {
+      await ml.testExecution.logTestStep('job cloning opens the additional settings section');
       await ml.jobWizardCommon.ensureAdditionalSettingsSectionOpen();
-    });
 
-    it('job cloning persists custom urls', async () => {
+      await ml.testExecution.logTestStep('job cloning persists custom urls');
       await ml.customUrls.assertCustomUrlItem(0, 'check-kibana-dashboard');
-    });
 
-    it('job cloning persists assigned calendars', async () => {
+      await ml.testExecution.logTestStep('job cloning persists assigned calendars');
       await ml.jobWizardCommon.assertCalendarsSelection([calendarId]);
-    });
 
-    it('job cloning opens the advanced section', async () => {
+      await ml.testExecution.logTestStep('job cloning opens the advanced section');
       await ml.jobWizardCommon.ensureAdvancedSectionOpen();
-    });
 
-    it('job cloning pre-fills the model plot switch', async () => {
+      await ml.testExecution.logTestStep('job cloning pre-fills the model plot switch');
       await ml.jobWizardCommon.assertModelPlotSwitchExists();
       await ml.jobWizardCommon.assertModelPlotSwitchEnabled(false);
       await ml.jobWizardCommon.assertModelPlotSwitchCheckedState(false);
-    });
 
-    it('job cloning pre-fills the dedicated index switch', async () => {
+      await ml.testExecution.logTestStep('job cloning pre-fills the dedicated index switch');
       await ml.jobWizardCommon.assertDedicatedIndexSwitchExists();
       await ml.jobWizardCommon.assertDedicatedIndexSwitchCheckedState(true);
-    });
 
-    // MML during clone has changed in #61589
-    // TODO: adjust test code to reflect the new behavior
-    it.skip('job cloning pre-fills the model memory limit', async () => {
-      await ml.jobWizardCommon.assertModelMemoryLimitInputExists();
-      await ml.jobWizardCommon.assertModelMemoryLimitValue(memoryLimit);
-    });
+      // MML during clone has changed in #61589
+      // TODO: adjust test code to reflect the new behavior
+      // await ml.testExecution.logTestStep('job cloning pre-fills the model memory limit');
+      // await ml.jobWizardCommon.assertModelMemoryLimitInputExists();
+      // await ml.jobWizardCommon.assertModelMemoryLimitValue(memoryLimit);
 
-    it('job cloning displays the validation step', async () => {
+      await ml.testExecution.logTestStep('job cloning displays the validation step');
       await ml.jobWizardCommon.advanceToValidationSection();
-    });
 
-    it('job cloning displays the summary step', async () => {
+      await ml.testExecution.logTestStep('job cloning displays the summary step');
       await ml.jobWizardCommon.advanceToSummarySection();
     });
 
-    it('job cloning creates the job and finishes processing', async () => {
+    it('job cloning runs the clone job and displays it correctly in the job list', async () => {
+      await ml.testExecution.logTestStep('job cloning creates the job and finishes processing');
       await ml.jobWizardCommon.assertCreateJobButtonExists();
       await ml.jobWizardCommon.createJobAndWaitForCompletion();
-    });
 
-    it('job cloning displays the created job in the job list', async () => {
+      await ml.testExecution.logTestStep('job cloning displays the created job in the job list');
       await ml.navigation.navigateToMl();
       await ml.navigation.navigateToJobManagement();
 
@@ -356,9 +323,10 @@ export default function ({ getService }: FtrProviderContext) {
       await ml.jobTable.filterWithSearchString(jobIdClone);
       const rows = await ml.jobTable.parseJobTable();
       expect(rows.filter((row) => row.id === jobIdClone)).to.have.length(1);
-    });
 
-    it('job cloning displays details for the created job in the job list', async () => {
+      await ml.testExecution.logTestStep(
+        'job cloning displays details for the created job in the job list'
+      );
       await ml.jobTable.assertJobRowFields(jobIdClone, getExpectedRow(jobIdClone, jobGroupsClone));
 
       await ml.jobTable.assertJobRowDetailsCounts(
@@ -366,32 +334,32 @@ export default function ({ getService }: FtrProviderContext) {
         getExpectedCounts(jobIdClone),
         getExpectedModelSizeStats(jobIdClone)
       );
-    });
 
-    it('job cloning has detector results', async () => {
+      await ml.testExecution.logTestStep('job cloning has detector results');
       await ml.api.assertDetectorResultsExist(jobId, 0);
     });
 
-    it('job deletion has results for the job before deletion', async () => {
+    it('deletes the cloned job', async () => {
+      await ml.testExecution.logTestStep('job deletion has results for the job before deletion');
       await ml.api.assertJobResultsExist(jobIdClone);
-    });
 
-    it('job deletion triggers the delete action', async () => {
+      await ml.testExecution.logTestStep('job deletion triggers the delete action');
       await ml.jobTable.clickDeleteJobAction(jobIdClone);
-    });
 
-    it('job deletion confirms the delete modal', async () => {
+      await ml.testExecution.logTestStep('job deletion confirms the delete modal');
       await ml.jobTable.confirmDeleteJobModal();
-    });
 
-    it('job deletion does not display the deleted job in the job list any more', async () => {
+      await ml.testExecution.logTestStep(
+        'job deletion does not display the deleted job in the job list any more'
+      );
       await ml.jobTable.waitForJobsToLoad();
       await ml.jobTable.filterWithSearchString(jobIdClone);
       const rows = await ml.jobTable.parseJobTable();
       expect(rows.filter((row) => row.id === jobIdClone)).to.have.length(0);
-    });
 
-    it('job deletion does not have results for the deleted job any more', async () => {
+      await ml.testExecution.logTestStep(
+        'job deletion does not have results for the deleted job any more'
+      );
       await ml.api.assertNoJobResultsExist(jobIdClone);
     });
   });
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/date_nanos_job.ts b/x-pack/test/functional/apps/ml/anomaly_detection/date_nanos_job.ts
index 50622604c4e5c..22b4c4a1fdfe3 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/date_nanos_job.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/date_nanos_job.ts
@@ -32,55 +32,6 @@ interface PickFieldsConfig {
   summaryCountField?: string;
 }
 
-// type guards
-// Detector
-const isDetectorWithField = (arg: any): arg is Required<Pick<Detector, 'field'>> => {
-  return arg.hasOwnProperty('field');
-};
-const isDetectorWithByField = (arg: any): arg is Required<Pick<Detector, 'byField'>> => {
-  return arg.hasOwnProperty('byField');
-};
-const isDetectorWithOverField = (arg: any): arg is Required<Pick<Detector, 'overField'>> => {
-  return arg.hasOwnProperty('overField');
-};
-const isDetectorWithPartitionField = (
-  arg: any
-): arg is Required<Pick<Detector, 'partitionField'>> => {
-  return arg.hasOwnProperty('partitionField');
-};
-const isDetectorWithExcludeFrequent = (
-  arg: any
-): arg is Required<Pick<Detector, 'excludeFrequent'>> => {
-  return arg.hasOwnProperty('excludeFrequent');
-};
-const isDetectorWithDescription = (arg: any): arg is Required<Pick<Detector, 'description'>> => {
-  return arg.hasOwnProperty('description');
-};
-
-// DatafeedConfig
-const isDatafeedConfigWithQueryDelay = (
-  arg: any
-): arg is Required<Pick<DatafeedConfig, 'queryDelay'>> => {
-  return arg.hasOwnProperty('queryDelay');
-};
-const isDatafeedConfigWithFrequency = (
-  arg: any
-): arg is Required<Pick<DatafeedConfig, 'frequency'>> => {
-  return arg.hasOwnProperty('frequency');
-};
-const isDatafeedConfigWithScrollSize = (
-  arg: any
-): arg is Required<Pick<DatafeedConfig, 'scrollSize'>> => {
-  return arg.hasOwnProperty('scrollSize');
-};
-
-// PickFieldsConfig
-const isPickFieldsConfigWithSummaryCountField = (
-  arg: any
-): arg is Required<Pick<PickFieldsConfig, 'summaryCountField'>> => {
-  return arg.hasOwnProperty('summaryCountField');
-};
-
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const ml = getService('ml');
@@ -183,77 +134,70 @@ export default function ({ getService }: FtrProviderContext) {
 
     for (const testData of testDataList) {
       describe(`${testData.suiteTitle}`, function () {
-        it('job creation loads the job management page', async () => {
+        it('loads the advanced wizard for the source data', async () => {
+          await ml.testExecution.logTestStep('job creation loads the job management page');
           await ml.navigation.navigateToMl();
           await ml.navigation.navigateToJobManagement();
-        });
 
-        it('job creation loads the new job source selection page', async () => {
+          await ml.testExecution.logTestStep(
+            'job creation loads the new job source selection page'
+          );
           await ml.jobManagement.navigateToNewJobSourceSelection();
-        });
 
-        it('job creation loads the job type selection page', async () => {
+          await ml.testExecution.logTestStep('job creation loads the job type selection page');
           await ml.jobSourceSelection.selectSourceForAnomalyDetectionJob(testData.jobSource);
-        });
 
-        it('job creation loads the advanced job wizard page', async () => {
+          await ml.testExecution.logTestStep('job creation loads the advanced job wizard page');
           await ml.jobTypeSelection.selectAdvancedJob();
         });
 
-        it('job creation displays the configure datafeed step', async () => {
+        it('navigates through the advanced wizard and sets all needed fields', async () => {
+          await ml.testExecution.logTestStep('job creation displays the configure datafeed step');
           await ml.jobWizardCommon.assertConfigureDatafeedSectionExists();
-        });
 
-        it('job creation pre-fills the datafeed query editor', async () => {
+          await ml.testExecution.logTestStep('job creation pre-fills the datafeed query editor');
           await ml.jobWizardAdvanced.assertDatafeedQueryEditorExists();
           await ml.jobWizardAdvanced.assertDatafeedQueryEditorValue(defaultValues.datafeedQuery);
-        });
 
-        it('job creation inputs the query delay', async () => {
+          await ml.testExecution.logTestStep('job creation inputs the query delay');
           await ml.jobWizardAdvanced.assertQueryDelayInputExists();
           await ml.jobWizardAdvanced.assertQueryDelayValue(defaultValues.queryDelay);
-          if (isDatafeedConfigWithQueryDelay(testData.datafeedConfig)) {
-            await ml.jobWizardAdvanced.setQueryDelay(testData.datafeedConfig.queryDelay);
+          if (testData.datafeedConfig.hasOwnProperty('queryDelay')) {
+            await ml.jobWizardAdvanced.setQueryDelay(testData.datafeedConfig.queryDelay!);
           }
-        });
 
-        it('job creation inputs the frequency', async () => {
+          await ml.testExecution.logTestStep('job creation inputs the frequency');
           await ml.jobWizardAdvanced.assertFrequencyInputExists();
           await ml.jobWizardAdvanced.assertFrequencyValue(defaultValues.frequency);
-          if (isDatafeedConfigWithFrequency(testData.datafeedConfig)) {
-            await ml.jobWizardAdvanced.setFrequency(testData.datafeedConfig.frequency);
+          if (testData.datafeedConfig.hasOwnProperty('frequency')) {
+            await ml.jobWizardAdvanced.setFrequency(testData.datafeedConfig.frequency!);
           }
-        });
 
-        it('job creation inputs the scroll size', async () => {
+          await ml.testExecution.logTestStep('job creation inputs the scroll size');
           await ml.jobWizardAdvanced.assertScrollSizeInputExists();
           await ml.jobWizardAdvanced.assertScrollSizeValue(defaultValues.scrollSize);
-          if (isDatafeedConfigWithScrollSize(testData.datafeedConfig)) {
-            await ml.jobWizardAdvanced.setScrollSize(testData.datafeedConfig.scrollSize);
+          if (testData.datafeedConfig.hasOwnProperty('scrollSize')) {
+            await ml.jobWizardAdvanced.setScrollSize(testData.datafeedConfig.scrollSize!);
           }
-        });
 
-        it('job creation pre-fills the time field', async () => {
+          await ml.testExecution.logTestStep('ob creation pre-fills the time field');
           await ml.jobWizardAdvanced.assertTimeFieldInputExists();
           await ml.jobWizardAdvanced.assertTimeFieldSelection([testData.expected.wizard.timeField]);
-        });
 
-        it('job creation displays the pick fields step', async () => {
+          await ml.testExecution.logTestStep('job creation displays the pick fields step');
           await ml.jobWizardCommon.advanceToPickFieldsSection();
-        });
 
-        it('job creation selects the summary count field', async () => {
+          await ml.testExecution.logTestStep('job creation selects the summary count field');
           await ml.jobWizardAdvanced.assertSummaryCountFieldInputExists();
-          if (isPickFieldsConfigWithSummaryCountField(testData.pickFieldsConfig)) {
+          if (testData.pickFieldsConfig.hasOwnProperty('summaryCountField')) {
             await ml.jobWizardAdvanced.selectSummaryCountField(
-              testData.pickFieldsConfig.summaryCountField
+              testData.pickFieldsConfig.summaryCountField!
             );
           } else {
             await ml.jobWizardAdvanced.assertSummaryCountFieldSelection([]);
           }
-        });
 
-        it('job creation adds detectors', async () => {
+          await ml.testExecution.logTestStep('job creation adds detectors');
           for (const detector of testData.pickFieldsConfig.detectors) {
             await ml.jobWizardAdvanced.openCreateDetectorModal();
             await ml.jobWizardAdvanced.assertDetectorFunctionInputExists();
@@ -272,120 +216,112 @@ export default function ({ getService }: FtrProviderContext) {
             await ml.jobWizardAdvanced.assertDetectorDescriptionValue('');
 
             await ml.jobWizardAdvanced.selectDetectorFunction(detector.function);
-            if (isDetectorWithField(detector)) {
-              await ml.jobWizardAdvanced.selectDetectorField(detector.field);
+            if (detector.hasOwnProperty('field')) {
+              await ml.jobWizardAdvanced.selectDetectorField(detector.field!);
             }
-            if (isDetectorWithByField(detector)) {
-              await ml.jobWizardAdvanced.selectDetectorByField(detector.byField);
+            if (detector.hasOwnProperty('byField')) {
+              await ml.jobWizardAdvanced.selectDetectorByField(detector.byField!);
             }
-            if (isDetectorWithOverField(detector)) {
-              await ml.jobWizardAdvanced.selectDetectorOverField(detector.overField);
+            if (detector.hasOwnProperty('overField')) {
+              await ml.jobWizardAdvanced.selectDetectorOverField(detector.overField!);
             }
-            if (isDetectorWithPartitionField(detector)) {
-              await ml.jobWizardAdvanced.selectDetectorPartitionField(detector.partitionField);
+            if (detector.hasOwnProperty('partitionField')) {
+              await ml.jobWizardAdvanced.selectDetectorPartitionField(detector.partitionField!);
             }
-            if (isDetectorWithExcludeFrequent(detector)) {
-              await ml.jobWizardAdvanced.selectDetectorExcludeFrequent(detector.excludeFrequent);
+            if (detector.hasOwnProperty('excludeFrequent')) {
+              await ml.jobWizardAdvanced.selectDetectorExcludeFrequent(detector.excludeFrequent!);
             }
-            if (isDetectorWithDescription(detector)) {
-              await ml.jobWizardAdvanced.setDetectorDescription(detector.description);
+            if (detector.hasOwnProperty('description')) {
+              await ml.jobWizardAdvanced.setDetectorDescription(detector.description!);
             }
 
             await ml.jobWizardAdvanced.confirmAddDetectorModal();
           }
-        });
 
-        it('job creation displays detector entries', async () => {
+          await ml.testExecution.logTestStep('job creation displays detector entries');
           for (const [index, detector] of testData.pickFieldsConfig.detectors.entries()) {
             await ml.jobWizardAdvanced.assertDetectorEntryExists(
               index,
               detector.identifier,
-              isDetectorWithDescription(detector) ? detector.description : undefined
+              detector.hasOwnProperty('description') ? detector.description! : undefined
             );
           }
-        });
 
-        it('job creation inputs the bucket span', async () => {
+          await ml.testExecution.logTestStep('job creation inputs the bucket span');
           await ml.jobWizardCommon.assertBucketSpanInputExists();
           await ml.jobWizardCommon.setBucketSpan(testData.pickFieldsConfig.bucketSpan);
-        });
 
-        it('job creation inputs influencers', async () => {
+          await ml.testExecution.logTestStep('job creation inputs influencers');
           await ml.jobWizardCommon.assertInfluencerInputExists();
           await ml.jobWizardCommon.assertInfluencerSelection([]);
           for (const influencer of testData.pickFieldsConfig.influencers) {
             await ml.jobWizardCommon.addInfluencer(influencer);
           }
-        });
 
-        it('job creation inputs the model memory limit', async () => {
+          await ml.testExecution.logTestStep('job creation inputs the model memory limit');
           await ml.jobWizardCommon.assertModelMemoryLimitInputExists({
             withAdvancedSection: false,
           });
           await ml.jobWizardCommon.setModelMemoryLimit(testData.pickFieldsConfig.memoryLimit, {
             withAdvancedSection: false,
           });
-        });
 
-        it('job creation displays the job details step', async () => {
+          await ml.testExecution.logTestStep('job creation displays the job details step');
           await ml.jobWizardCommon.advanceToJobDetailsSection();
-        });
 
-        it('job creation inputs the job id', async () => {
+          await ml.testExecution.logTestStep('job creation inputs the job id');
           await ml.jobWizardCommon.assertJobIdInputExists();
           await ml.jobWizardCommon.setJobId(testData.jobId);
-        });
 
-        it('job creation inputs the job description', async () => {
+          await ml.testExecution.logTestStep('job creation inputs the job description');
           await ml.jobWizardCommon.assertJobDescriptionInputExists();
           await ml.jobWizardCommon.setJobDescription(testData.jobDescription);
-        });
 
-        it('job creation inputs job groups', async () => {
+          await ml.testExecution.logTestStep('job creation inputs job groups');
           await ml.jobWizardCommon.assertJobGroupInputExists();
           for (const jobGroup of testData.jobGroups) {
             await ml.jobWizardCommon.addJobGroup(jobGroup);
           }
           await ml.jobWizardCommon.assertJobGroupSelection(testData.jobGroups);
-        });
 
-        it('job creation opens the additional settings section', async () => {
+          await ml.testExecution.logTestStep('job creation opens the additional settings section');
           await ml.jobWizardCommon.ensureAdditionalSettingsSectionOpen();
-        });
 
-        it('job creation displays the model plot switch', async () => {
+          await ml.testExecution.logTestStep('job creation displays the model plot switch');
           await ml.jobWizardCommon.assertModelPlotSwitchExists({ withAdvancedSection: false });
-        });
 
-        it('job creation enables the dedicated index switch', async () => {
+          await ml.testExecution.logTestStep('job creation enables the dedicated index switch');
           await ml.jobWizardCommon.assertDedicatedIndexSwitchExists({ withAdvancedSection: false });
           await ml.jobWizardCommon.activateDedicatedIndexSwitch({ withAdvancedSection: false });
-        });
 
-        it('job creation displays the validation step', async () => {
+          await ml.testExecution.logTestStep('job creation displays the validation step');
           await ml.jobWizardCommon.advanceToValidationSection();
-        });
 
-        it('job creation displays the summary step', async () => {
+          await ml.testExecution.logTestStep('job creation displays the summary step');
           await ml.jobWizardCommon.advanceToSummarySection();
         });
 
-        it('job creation creates the job and finishes processing', async () => {
+        it('runs the job and displays it correctly in the job list', async () => {
+          await ml.testExecution.logTestStep(
+            'job creation creates the job and finishes processing'
+          );
           await ml.jobWizardCommon.assertCreateJobButtonExists();
           await ml.jobWizardAdvanced.createJob();
           await ml.jobManagement.assertStartDatafeedModalExists();
           await ml.jobManagement.confirmStartDatafeedModal();
           await ml.jobManagement.waitForJobCompletion(testData.jobId);
-        });
 
-        it('job creation displays the created job in the job list', async () => {
+          await ml.testExecution.logTestStep(
+            'job creation displays the created job in the job list'
+          );
           await ml.jobTable.refreshJobList();
           await ml.jobTable.filterWithSearchString(testData.jobId);
           const rows = await ml.jobTable.parseJobTable();
           expect(rows.filter((row) => row.id === testData.jobId)).to.have.length(1);
-        });
 
-        it('job creation displays details for the created job in the job list', async () => {
+          await ml.testExecution.logTestStep(
+            'job creation displays details for the created job in the job list'
+          );
           await ml.jobTable.assertJobRowFields(testData.jobId, {
             id: testData.jobId,
             description: testData.jobDescription,
@@ -404,9 +340,8 @@ export default function ({ getService }: FtrProviderContext) {
               ...testData.expected.modelSizeStats,
             }
           );
-        });
 
-        it('job creation has detector results', async () => {
+          await ml.testExecution.logTestStep('job creation has detector results');
           for (let i = 0; i < testData.pickFieldsConfig.detectors.length; i++) {
             await ml.api.assertDetectorResultsExist(testData.jobId, i);
           }
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/multi_metric_job.ts b/x-pack/test/functional/apps/ml/anomaly_detection/multi_metric_job.ts
index 85477b105abe9..8702cfd734454 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/multi_metric_job.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/multi_metric_job.ts
@@ -86,52 +86,50 @@ export default function ({ getService }: FtrProviderContext) {
       await ml.api.cleanMlIndices();
     });
 
-    it('job creation loads the job management page', async () => {
+    it('job creation loads the multi metric wizard for the source data', async () => {
+      await ml.testExecution.logTestStep('job creation loads the job management page');
       await ml.navigation.navigateToMl();
       await ml.navigation.navigateToJobManagement();
-    });
 
-    it('job creation loads the new job source selection page', async () => {
+      await ml.testExecution.logTestStep('job creation loads the new job source selection page');
       await ml.jobManagement.navigateToNewJobSourceSelection();
-    });
 
-    it('job creation loads the job type selection page', async () => {
+      await ml.testExecution.logTestStep('job creation loads the job type selection page');
       await ml.jobSourceSelection.selectSourceForAnomalyDetectionJob('ft_farequote');
-    });
 
-    it('job creation loads the multi metric job wizard page', async () => {
+      await ml.testExecution.logTestStep('job creation loads the multi metric job wizard page');
       await ml.jobTypeSelection.selectMultiMetricJob();
     });
 
-    it('job creation displays the time range step', async () => {
+    it('job creation navigates through the multi metric wizard and sets all needed fields', async () => {
+      await ml.testExecution.logTestStep('job creation displays the time range step');
       await ml.jobWizardCommon.assertTimeRangeSectionExists();
-    });
 
-    it('job creation sets the timerange', async () => {
+      await ml.testExecution.logTestStep('job creation sets the timerange');
       await ml.jobWizardCommon.clickUseFullDataButton(
         'Feb 7, 2016 @ 00:00:00.000',
         'Feb 11, 2016 @ 23:59:54.000'
       );
-    });
 
-    it('job creation displays the event rate chart', async () => {
+      await ml.testExecution.logTestStep('job creation displays the event rate chart');
       await ml.jobWizardCommon.assertEventRateChartExists();
       await ml.jobWizardCommon.assertEventRateChartHasData();
-    });
 
-    it('job creation displays the pick fields step', async () => {
+      await ml.testExecution.logTestStep('job creation displays the pick fields step');
       await ml.jobWizardCommon.advanceToPickFieldsSection();
-    });
 
-    it('job creation selects detectors and displays detector previews', async () => {
+      await ml.testExecution.logTestStep(
+        'job creation selects detectors and displays detector previews'
+      );
       for (const [index, aggAndFieldIdentifier] of aggAndFieldIdentifiers.entries()) {
         await ml.jobWizardCommon.assertAggAndFieldInputExists();
         await ml.jobWizardCommon.selectAggAndField(aggAndFieldIdentifier, false);
         await ml.jobWizardCommon.assertDetectorPreviewExists(aggAndFieldIdentifier, index, 'LINE');
       }
-    });
 
-    it('job creation inputs the split field and displays split cards', async () => {
+      await ml.testExecution.logTestStep(
+        'job creation inputs the split field and displays split cards'
+      );
       await ml.jobWizardMultiMetric.assertSplitFieldInputExists();
       await ml.jobWizardMultiMetric.selectSplitField(splitField);
 
@@ -140,84 +138,69 @@ export default function ({ getService }: FtrProviderContext) {
       await ml.jobWizardMultiMetric.assertDetectorSplitNumberOfBackCards(9);
 
       await ml.jobWizardCommon.assertInfluencerSelection([splitField]);
-    });
 
-    it('job creation displays the influencer field', async () => {
+      await ml.testExecution.logTestStep('job creation displays the influencer field');
       await ml.jobWizardCommon.assertInfluencerInputExists();
       await ml.jobWizardCommon.assertInfluencerSelection([splitField]);
-    });
 
-    it('job creation inputs the bucket span', async () => {
+      await ml.testExecution.logTestStep('job creation inputs the bucket span');
       await ml.jobWizardCommon.assertBucketSpanInputExists();
       await ml.jobWizardCommon.setBucketSpan(bucketSpan);
-    });
 
-    it('job creation displays the job details step', async () => {
+      await ml.testExecution.logTestStep('job creation displays the job details step');
       await ml.jobWizardCommon.advanceToJobDetailsSection();
-    });
 
-    it('job creation inputs the job id', async () => {
+      await ml.testExecution.logTestStep('job creation inputs the job id');
       await ml.jobWizardCommon.assertJobIdInputExists();
       await ml.jobWizardCommon.setJobId(jobId);
-    });
 
-    it('job creation inputs the job description', async () => {
+      await ml.testExecution.logTestStep('job creation inputs the job description');
       await ml.jobWizardCommon.assertJobDescriptionInputExists();
       await ml.jobWizardCommon.setJobDescription(jobDescription);
-    });
 
-    it('job creation inputs job groups', async () => {
+      await ml.testExecution.logTestStep('job creation inputs job groups');
       await ml.jobWizardCommon.assertJobGroupInputExists();
       for (const jobGroup of jobGroups) {
         await ml.jobWizardCommon.addJobGroup(jobGroup);
       }
       await ml.jobWizardCommon.assertJobGroupSelection(jobGroups);
-    });
 
-    it('job creation opens the additional settings section', async () => {
+      await ml.testExecution.logTestStep('job creation opens the additional settings section');
       await ml.jobWizardCommon.ensureAdditionalSettingsSectionOpen();
-    });
 
-    it('job creation adds a new custom url', async () => {
+      await ml.testExecution.logTestStep('job creation adds a new custom url');
       await ml.jobWizardCommon.addCustomUrl({ label: 'check-kibana-dashboard' });
-    });
 
-    it('job creation assigns calendars', async () => {
+      await ml.testExecution.logTestStep('job creation assigns calendars');
       await ml.jobWizardCommon.addCalendar(calendarId);
-    });
 
-    it('job creation opens the advanced section', async () => {
+      await ml.testExecution.logTestStep('job creation opens the advanced section');
       await ml.jobWizardCommon.ensureAdvancedSectionOpen();
-    });
 
-    it('job creation displays the model plot switch', async () => {
+      await ml.testExecution.logTestStep('job creation displays the model plot switch');
       await ml.jobWizardCommon.assertModelPlotSwitchExists();
-    });
 
-    it('job creation enables the dedicated index switch', async () => {
+      await ml.testExecution.logTestStep('job creation enables the dedicated index switch');
       await ml.jobWizardCommon.assertDedicatedIndexSwitchExists();
       await ml.jobWizardCommon.activateDedicatedIndexSwitch();
-    });
 
-    it('job creation inputs the model memory limit', async () => {
+      await ml.testExecution.logTestStep('job creation inputs the model memory limit');
       await ml.jobWizardCommon.assertModelMemoryLimitInputExists();
       await ml.jobWizardCommon.setModelMemoryLimit(memoryLimit);
-    });
 
-    it('job creation displays the validation step', async () => {
+      await ml.testExecution.logTestStep('job creation displays the validation step');
       await ml.jobWizardCommon.advanceToValidationSection();
-    });
 
-    it('job creation displays the summary step', async () => {
+      await ml.testExecution.logTestStep('job creation displays the summary step');
       await ml.jobWizardCommon.advanceToSummarySection();
     });
 
-    it('job creation creates the job and finishes processing', async () => {
+    it('job creation runs the job and displays it correctly in the job list', async () => {
+      await ml.testExecution.logTestStep('job creation creates the job and finishes processing');
       await ml.jobWizardCommon.assertCreateJobButtonExists();
       await ml.jobWizardCommon.createJobAndWaitForCompletion();
-    });
 
-    it('job creation displays the created job in the job list', async () => {
+      await ml.testExecution.logTestStep('job creation displays the created job in the job list');
       await ml.navigation.navigateToMl();
       await ml.navigation.navigateToJobManagement();
 
@@ -225,9 +208,10 @@ export default function ({ getService }: FtrProviderContext) {
       await ml.jobTable.filterWithSearchString(jobId);
       const rows = await ml.jobTable.parseJobTable();
       expect(rows.filter((row) => row.id === jobId)).to.have.length(1);
-    });
 
-    it('job creation displays details for the created job in the job list', async () => {
+      await ml.testExecution.logTestStep(
+        'job creation displays details for the created job in the job list'
+      );
       await ml.jobTable.assertJobRowFields(jobId, getExpectedRow(jobId, jobGroups));
 
       await ml.jobTable.assertJobRowDetailsCounts(
@@ -235,40 +219,41 @@ export default function ({ getService }: FtrProviderContext) {
         getExpectedCounts(jobId),
         getExpectedModelSizeStats(jobId)
       );
-    });
 
-    it('job creation has detector results', async () => {
+      await ml.testExecution.logTestStep('job creation has detector results');
       for (let i = 0; i < aggAndFieldIdentifiers.length; i++) {
         await ml.api.assertDetectorResultsExist(jobId, i);
       }
     });
 
-    it('job cloning clicks the clone action and loads the multi metric wizard', async () => {
+    it('job cloning opens the existing job in the multi metric wizard', async () => {
+      await ml.testExecution.logTestStep(
+        'job cloning clicks the clone action and loads the multi metric wizard'
+      );
       await ml.jobTable.clickCloneJobAction(jobId);
       await ml.jobTypeSelection.assertMultiMetricJobWizardOpen();
     });
 
-    it('job cloning displays the time range step', async () => {
+    it('job cloning navigates through the multi metric wizard, checks and sets all needed fields', async () => {
+      await ml.testExecution.logTestStep('job cloning displays the time range step');
       await ml.jobWizardCommon.assertTimeRangeSectionExists();
-    });
 
-    it('job cloning sets the timerange', async () => {
+      await ml.testExecution.logTestStep('job cloning sets the timerange');
       await ml.jobWizardCommon.clickUseFullDataButton(
         'Feb 7, 2016 @ 00:00:00.000',
         'Feb 11, 2016 @ 23:59:54.000'
       );
-    });
 
-    it('job cloning displays the event rate chart', async () => {
+      await ml.testExecution.logTestStep('job cloning displays the event rate chart');
       await ml.jobWizardCommon.assertEventRateChartExists();
       await ml.jobWizardCommon.assertEventRateChartHasData();
-    });
 
-    it('job cloning displays the pick fields step', async () => {
+      await ml.testExecution.logTestStep('job cloning displays the pick fields step');
       await ml.jobWizardCommon.advanceToPickFieldsSection();
-    });
 
-    it('job cloning pre-fills detectors and shows preview with split cards', async () => {
+      await ml.testExecution.logTestStep(
+        'job cloning pre-fills detectors and shows preview with split cards'
+      );
       for (const [index, aggAndFieldIdentifier] of aggAndFieldIdentifiers.entries()) {
         await ml.jobWizardCommon.assertDetectorPreviewExists(aggAndFieldIdentifier, index, 'LINE');
       }
@@ -276,99 +261,81 @@ export default function ({ getService }: FtrProviderContext) {
       await ml.jobWizardMultiMetric.assertDetectorSplitExists(splitField);
       await ml.jobWizardMultiMetric.assertDetectorSplitFrontCardTitle('AAL');
       await ml.jobWizardMultiMetric.assertDetectorSplitNumberOfBackCards(9);
-    });
 
-    it('job cloning pre-fills the split field', async () => {
+      await ml.testExecution.logTestStep('job cloning pre-fills the split field');
       await ml.jobWizardMultiMetric.assertSplitFieldInputExists();
       await ml.jobWizardMultiMetric.assertSplitFieldSelection([splitField]);
-    });
 
-    it('job cloning pre-fills influencers', async () => {
+      await ml.testExecution.logTestStep('job cloning pre-fills influencers');
       await ml.jobWizardCommon.assertInfluencerInputExists();
       await ml.jobWizardCommon.assertInfluencerSelection([splitField]);
-    });
 
-    it('job cloning pre-fills the bucket span', async () => {
+      await ml.testExecution.logTestStep('job cloning pre-fills the bucket span');
       await ml.jobWizardCommon.assertBucketSpanInputExists();
       await ml.jobWizardCommon.assertBucketSpanValue(bucketSpan);
-    });
 
-    it('job cloning displays the job details step', async () => {
+      await ml.testExecution.logTestStep('job cloning displays the job details step');
       await ml.jobWizardCommon.advanceToJobDetailsSection();
-    });
 
-    it('job cloning does not pre-fill the job id', async () => {
+      await ml.testExecution.logTestStep('job cloning does not pre-fill the job id');
       await ml.jobWizardCommon.assertJobIdInputExists();
       await ml.jobWizardCommon.assertJobIdValue('');
-    });
 
-    it('job cloning inputs the clone job id', async () => {
+      await ml.testExecution.logTestStep('job cloning inputs the clone job id');
       await ml.jobWizardCommon.setJobId(jobIdClone);
-    });
 
-    it('job cloning pre-fills the job description', async () => {
+      await ml.testExecution.logTestStep('job cloning pre-fills the job description');
       await ml.jobWizardCommon.assertJobDescriptionInputExists();
       await ml.jobWizardCommon.assertJobDescriptionValue(jobDescription);
-    });
 
-    it('job cloning pre-fills job groups', async () => {
+      await ml.testExecution.logTestStep('job cloning pre-fills job groups');
       await ml.jobWizardCommon.assertJobGroupInputExists();
       await ml.jobWizardCommon.assertJobGroupSelection(jobGroups);
-    });
 
-    it('job cloning inputs the clone job group', async () => {
+      await ml.testExecution.logTestStep('job cloning inputs the clone job group');
       await ml.jobWizardCommon.assertJobGroupInputExists();
       await ml.jobWizardCommon.addJobGroup('clone');
       await ml.jobWizardCommon.assertJobGroupSelection(jobGroupsClone);
-    });
 
-    it('job cloning opens the additional settings section', async () => {
+      await ml.testExecution.logTestStep('job cloning opens the additional settings section');
       await ml.jobWizardCommon.ensureAdditionalSettingsSectionOpen();
-    });
 
-    it('job cloning persists custom urls', async () => {
+      await ml.testExecution.logTestStep('job cloning persists custom urls');
       await ml.customUrls.assertCustomUrlItem(0, 'check-kibana-dashboard');
-    });
 
-    it('job cloning persists assigned calendars', async () => {
+      await ml.testExecution.logTestStep('job cloning persists assigned calendars');
       await ml.jobWizardCommon.assertCalendarsSelection([calendarId]);
-    });
 
-    it('job cloning opens the advanced section', async () => {
+      await ml.testExecution.logTestStep('job cloning opens the advanced section');
       await ml.jobWizardCommon.ensureAdvancedSectionOpen();
-    });
 
-    it('job cloning pre-fills the model plot switch', async () => {
+      await ml.testExecution.logTestStep('job cloning pre-fills the model plot switch');
       await ml.jobWizardCommon.assertModelPlotSwitchExists();
       await ml.jobWizardCommon.assertModelPlotSwitchCheckedState(false);
-    });
 
-    it('job cloning pre-fills the dedicated index switch', async () => {
+      await ml.testExecution.logTestStep('job cloning pre-fills the dedicated index switch');
       await ml.jobWizardCommon.assertDedicatedIndexSwitchExists();
       await ml.jobWizardCommon.assertDedicatedIndexSwitchCheckedState(true);
-    });
 
-    // MML during clone has changed in #61589
-    // TODO: adjust test code to reflect the new behavior
-    it.skip('job cloning pre-fills the model memory limit', async () => {
-      await ml.jobWizardCommon.assertModelMemoryLimitInputExists();
-      await ml.jobWizardCommon.assertModelMemoryLimitValue(memoryLimit);
-    });
+      // MML during clone has changed in #61589
+      // TODO: adjust test code to reflect the new behavior
+      // await ml.testExecution.logTestStep('job cloning pre-fills the model memory limit');
+      // await ml.jobWizardCommon.assertModelMemoryLimitInputExists();
+      // await ml.jobWizardCommon.assertModelMemoryLimitValue(memoryLimit);
 
-    it('job cloning displays the validation step', async () => {
+      await ml.testExecution.logTestStep('job cloning displays the validation step');
       await ml.jobWizardCommon.advanceToValidationSection();
-    });
 
-    it('job cloning displays the summary step', async () => {
+      await ml.testExecution.logTestStep('job cloning displays the summary step');
       await ml.jobWizardCommon.advanceToSummarySection();
     });
 
-    it('job cloning creates the job and finishes processing', async () => {
+    it('job cloning runs the clone job and displays it correctly in the job list', async () => {
+      await ml.testExecution.logTestStep('job cloning creates the job and finishes processing');
       await ml.jobWizardCommon.assertCreateJobButtonExists();
       await ml.jobWizardCommon.createJobAndWaitForCompletion();
-    });
 
-    it('job cloning displays the created job in the job list', async () => {
+      await ml.testExecution.logTestStep('job cloning displays the created job in the job list');
       await ml.navigation.navigateToMl();
       await ml.navigation.navigateToJobManagement();
 
@@ -376,9 +343,10 @@ export default function ({ getService }: FtrProviderContext) {
       await ml.jobTable.filterWithSearchString(jobIdClone);
       const rows = await ml.jobTable.parseJobTable();
       expect(rows.filter((row) => row.id === jobIdClone)).to.have.length(1);
-    });
 
-    it('job cloning displays details for the created job in the job list', async () => {
+      await ml.testExecution.logTestStep(
+        'job cloning displays details for the created job in the job list'
+      );
       await ml.jobTable.assertJobRowFields(jobIdClone, getExpectedRow(jobIdClone, jobGroupsClone));
 
       await ml.jobTable.assertJobRowDetailsCounts(
@@ -386,9 +354,8 @@ export default function ({ getService }: FtrProviderContext) {
         getExpectedCounts(jobIdClone),
         getExpectedModelSizeStats(jobIdClone)
       );
-    });
 
-    it('job cloning has detector results', async () => {
+      await ml.testExecution.logTestStep('job cloning has detector results');
       for (let i = 0; i < aggAndFieldIdentifiers.length; i++) {
         await ml.api.assertDetectorResultsExist(jobId, i);
       }
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/population_job.ts b/x-pack/test/functional/apps/ml/anomaly_detection/population_job.ts
index c6de7f8a2bd39..3ec78eccf3de4 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/population_job.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/population_job.ts
@@ -100,57 +100,54 @@ export default function ({ getService }: FtrProviderContext) {
       await ml.api.cleanMlIndices();
     });
 
-    it('job creation loads the job management page', async () => {
+    it('job creation loads the population wizard for the source data', async () => {
+      await ml.testExecution.logTestStep('job creation loads the job management page');
       await ml.navigation.navigateToMl();
       await ml.navigation.navigateToJobManagement();
-    });
 
-    it('job creation loads the new job source selection page', async () => {
+      await ml.testExecution.logTestStep('job creation loads the new job source selection page');
       await ml.jobManagement.navigateToNewJobSourceSelection();
-    });
 
-    it('job creation loads the job type selection page', async () => {
+      await ml.testExecution.logTestStep('job creation loads the job type selection page');
       await ml.jobSourceSelection.selectSourceForAnomalyDetectionJob('ft_ecommerce');
-    });
 
-    it('job creation loads the population job wizard page', async () => {
+      await ml.testExecution.logTestStep('job creation loads the population job wizard page');
       await ml.jobTypeSelection.selectPopulationJob();
     });
 
-    it('job creation displays the time range step', async () => {
+    it('job creation navigates through the population wizard and sets all needed fields', async () => {
+      await ml.testExecution.logTestStep('job creation displays the time range step');
       await ml.jobWizardCommon.assertTimeRangeSectionExists();
-    });
 
-    it('job creation sets the timerange', async () => {
+      await ml.testExecution.logTestStep('job creation sets the timerange');
       await ml.jobWizardCommon.clickUseFullDataButton(
         'Jun 12, 2019 @ 00:04:19.000',
         'Jul 12, 2019 @ 23:45:36.000'
       );
-    });
 
-    it('job creation displays the event rate chart', async () => {
+      await ml.testExecution.logTestStep('job creation displays the event rate chart');
       await ml.jobWizardCommon.assertEventRateChartExists();
       await ml.jobWizardCommon.assertEventRateChartHasData();
-    });
 
-    it('job creation displays the pick fields step', async () => {
+      await ml.testExecution.logTestStep('job creation displays the pick fields step');
       await ml.jobWizardCommon.advanceToPickFieldsSection();
-    });
 
-    it('job creation selects the population field', async () => {
+      await ml.testExecution.logTestStep('job creation selects the population field');
       await ml.jobWizardPopulation.assertPopulationFieldInputExists();
       await ml.jobWizardPopulation.selectPopulationField(populationField);
-    });
 
-    it('job creation selects detectors and displays detector previews', async () => {
+      await ml.testExecution.logTestStep(
+        'job creation selects detectors and displays detector previews'
+      );
       for (const [index, detector] of detectors.entries()) {
         await ml.jobWizardCommon.assertAggAndFieldInputExists();
         await ml.jobWizardCommon.selectAggAndField(detector.identifier, false);
         await ml.jobWizardCommon.assertDetectorPreviewExists(detector.identifier, index, 'SCATTER');
       }
-    });
 
-    it('job creation inputs detector split fields and displays split cards', async () => {
+      await ml.testExecution.logTestStep(
+        'job creation inputs detector split fields and displays split cards'
+      );
       for (const [index, detector] of detectors.entries()) {
         await ml.jobWizardPopulation.assertDetectorSplitFieldInputExists(index);
         await ml.jobWizardPopulation.selectDetectorSplitField(index, detector.splitField);
@@ -165,86 +162,71 @@ export default function ({ getService }: FtrProviderContext) {
           detector.numberOfBackCards
         );
       }
-    });
 
-    it('job creation displays the influencer field', async () => {
+      await ml.testExecution.logTestStep('job creation displays the influencer field');
       await ml.jobWizardCommon.assertInfluencerInputExists();
       await ml.jobWizardCommon.assertInfluencerSelection(
         [populationField].concat(detectors.map((detector) => detector.splitField))
       );
-    });
 
-    it('job creation inputs the bucket span', async () => {
+      await ml.testExecution.logTestStep('job creation inputs the bucket span');
       await ml.jobWizardCommon.assertBucketSpanInputExists();
       await ml.jobWizardCommon.setBucketSpan(bucketSpan);
-    });
 
-    it('job creation displays the job details step', async () => {
+      await ml.testExecution.logTestStep('job creation displays the job details step');
       await ml.jobWizardCommon.advanceToJobDetailsSection();
-    });
 
-    it('job creation inputs the job id', async () => {
+      await ml.testExecution.logTestStep('job creation inputs the job id');
       await ml.jobWizardCommon.assertJobIdInputExists();
       await ml.jobWizardCommon.setJobId(jobId);
-    });
 
-    it('job creation inputs the job description', async () => {
+      await ml.testExecution.logTestStep('job creation inputs the job description');
       await ml.jobWizardCommon.assertJobDescriptionInputExists();
       await ml.jobWizardCommon.setJobDescription(jobDescription);
-    });
 
-    it('job creation inputs job groups', async () => {
+      await ml.testExecution.logTestStep('job creation inputs job groups');
       await ml.jobWizardCommon.assertJobGroupInputExists();
       for (const jobGroup of jobGroups) {
         await ml.jobWizardCommon.addJobGroup(jobGroup);
       }
       await ml.jobWizardCommon.assertJobGroupSelection(jobGroups);
-    });
 
-    it('job creation opens the additional settings section', async () => {
+      await ml.testExecution.logTestStep('job creation opens the additional settings section');
       await ml.jobWizardCommon.ensureAdditionalSettingsSectionOpen();
-    });
 
-    it('job creation adds a new custom url', async () => {
+      await ml.testExecution.logTestStep('job creation adds a new custom url');
       await ml.jobWizardCommon.addCustomUrl({ label: 'check-kibana-dashboard' });
-    });
 
-    it('job creation assigns calendars', async () => {
+      await ml.testExecution.logTestStep('job creation assigns calendars');
       await ml.jobWizardCommon.addCalendar(calendarId);
-    });
 
-    it('job creation opens the advanced section', async () => {
+      await ml.testExecution.logTestStep('job creation opens the advanced section');
       await ml.jobWizardCommon.ensureAdvancedSectionOpen();
-    });
 
-    it('job creation displays the model plot switch', async () => {
+      await ml.testExecution.logTestStep('job creation displays the model plot switch');
       await ml.jobWizardCommon.assertModelPlotSwitchExists();
-    });
 
-    it('job creation enables the dedicated index switch', async () => {
+      await ml.testExecution.logTestStep('job creation enables the dedicated index switch');
       await ml.jobWizardCommon.assertDedicatedIndexSwitchExists();
       await ml.jobWizardCommon.activateDedicatedIndexSwitch();
-    });
 
-    it('job creation inputs the model memory limit', async () => {
+      await ml.testExecution.logTestStep('job creation inputs the model memory limit');
       await ml.jobWizardCommon.assertModelMemoryLimitInputExists();
       await ml.jobWizardCommon.setModelMemoryLimit(memoryLimit);
-    });
 
-    it('job creation displays the validation step', async () => {
+      await ml.testExecution.logTestStep('job creation displays the validation step');
       await ml.jobWizardCommon.advanceToValidationSection();
-    });
 
-    it('job creation displays the summary step', async () => {
+      await ml.testExecution.logTestStep('job creation displays the summary step');
       await ml.jobWizardCommon.advanceToSummarySection();
     });
 
-    it('job creation creates the job and finishes processing', async () => {
+    it('job creation runs the job and displays it correctly in the job list', async () => {
+      await ml.testExecution.logTestStep('job creation creates the job and finishes processing');
       await ml.jobWizardCommon.assertCreateJobButtonExists();
       await ml.jobWizardCommon.createJobAndWaitForCompletion();
-    });
 
-    it('job creation displays the created job in the job list', async () => {
+      await ml.testExecution.logTestStep('job creation displays the created job in the job list');
       await ml.navigation.navigateToMl();
       await ml.navigation.navigateToJobManagement();
 
@@ -252,9 +234,10 @@ export default function ({ getService }: FtrProviderContext) {
       await ml.jobTable.filterWithSearchString(jobId);
       const rows = await ml.jobTable.parseJobTable();
       expect(rows.filter((row) => row.id === jobId)).to.have.length(1);
-    });
 
-    it('job creation displays details for the created job in the job list', async () => {
+      await ml.testExecution.logTestStep(
+        'job creation displays details for the created job in the job list'
+      );
       await ml.jobTable.assertJobRowFields(jobId, getExpectedRow(jobId, jobGroups));
 
       await ml.jobTable.assertJobRowDetailsCounts(
@@ -262,45 +245,45 @@ export default function ({ getService }: FtrProviderContext) {
         getExpectedCounts(jobId),
         getExpectedModelSizeStats(jobId)
       );
-    });
 
-    it('job creation has detector results', async () => {
+      await ml.testExecution.logTestStep('job creation has detector results');
       for (let i = 0; i < detectors.length; i++) {
         await ml.api.assertDetectorResultsExist(jobId, i);
       }
     });
 
-    it('job cloning clicks the clone action and loads the population wizard', async () => {
+    it('job cloning opens the existing job in the population wizard', async () => {
+      await ml.testExecution.logTestStep(
+        'job cloning clicks the clone action and loads the population wizard'
+      );
       await ml.jobTable.clickCloneJobAction(jobId);
       await ml.jobTypeSelection.assertPopulationJobWizardOpen();
     });
 
-    it('job cloning displays the time range step', async () => {
+    it('job cloning navigates through the population wizard, checks and sets all needed fields', async () => {
+      await ml.testExecution.logTestStep('job cloning displays the time range step');
       await ml.jobWizardCommon.assertTimeRangeSectionExists();
-    });
 
-    it('job cloning sets the timerange', async () => {
+      await ml.testExecution.logTestStep('job cloning sets the timerange');
       await ml.jobWizardCommon.clickUseFullDataButton(
         'Jun 12, 2019 @ 00:04:19.000',
         'Jul 12, 2019 @ 23:45:36.000'
       );
-    });
 
-    it('job cloning displays the event rate chart', async () => {
+      await ml.testExecution.logTestStep('job cloning displays the event rate chart');
       await ml.jobWizardCommon.assertEventRateChartExists();
       await ml.jobWizardCommon.assertEventRateChartHasData();
-    });
 
-    it('job cloning displays the pick fields step', async () => {
+      await ml.testExecution.logTestStep('job cloning displays the pick fields step');
       await ml.jobWizardCommon.advanceToPickFieldsSection();
-    });
 
-    it('job cloning pre-fills the population field', async () => {
+      await ml.testExecution.logTestStep('job cloning pre-fills the population field');
       await ml.jobWizardPopulation.assertPopulationFieldInputExists();
       await ml.jobWizardPopulation.assertPopulationFieldSelection([populationField]);
-    });
 
-    it('job cloning pre-fills detectors and shows preview with split cards', async () => {
+      await ml.testExecution.logTestStep(
+        'job cloning pre-fills detectors and shows preview with split cards'
+      );
       for (const [index, detector] of detectors.entries()) {
         await ml.jobWizardCommon.assertDetectorPreviewExists(detector.identifier, index, 'SCATTER');
 
@@ -317,96 +300,79 @@ export default function ({ getService }: FtrProviderContext) {
           detector.numberOfBackCards
         );
       }
-    });
 
-    it('job cloning pre-fills influencers', async () => {
+      await ml.testExecution.logTestStep('job cloning pre-fills influencers');
       await ml.jobWizardCommon.assertInfluencerInputExists();
       await ml.jobWizardCommon.assertInfluencerSelection(
         [populationField].concat(detectors.map((detector) => detector.splitField))
       );
-    });
 
-    it('job cloning pre-fills the bucket span', async () => {
+      await ml.testExecution.logTestStep('job cloning pre-fills the bucket span');
       await ml.jobWizardCommon.assertBucketSpanInputExists();
       await ml.jobWizardCommon.assertBucketSpanValue(bucketSpan);
-    });
 
-    it('job cloning displays the job details step', async () => {
+      await ml.testExecution.logTestStep('job cloning displays the job details step');
       await ml.jobWizardCommon.advanceToJobDetailsSection();
-    });
 
-    it('job cloning does not pre-fill the job id', async () => {
+      await ml.testExecution.logTestStep('job cloning does not pre-fill the job id');
       await ml.jobWizardCommon.assertJobIdInputExists();
       await ml.jobWizardCommon.assertJobIdValue('');
-    });
 
-    it('job cloning inputs the clone job id', async () => {
+      await ml.testExecution.logTestStep('job cloning inputs the clone job id');
       await ml.jobWizardCommon.setJobId(jobIdClone);
-    });
 
-    it('job cloning pre-fills the job description', async () => {
+      await ml.testExecution.logTestStep('job cloning pre-fills the job description');
       await ml.jobWizardCommon.assertJobDescriptionInputExists();
       await ml.jobWizardCommon.assertJobDescriptionValue(jobDescription);
-    });
 
-    it('job cloning pre-fills job groups', async () => {
+      await ml.testExecution.logTestStep('job cloning pre-fills job groups');
       await ml.jobWizardCommon.assertJobGroupInputExists();
       await ml.jobWizardCommon.assertJobGroupSelection(jobGroups);
-    });
 
-    it('job cloning inputs the clone job group', async () => {
+      await ml.testExecution.logTestStep('job cloning inputs the clone job group');
       await ml.jobWizardCommon.assertJobGroupInputExists();
       await ml.jobWizardCommon.addJobGroup('clone');
       await ml.jobWizardCommon.assertJobGroupSelection(jobGroupsClone);
-    });
 
-    it('job cloning opens the additional settings section', async () => {
+      await ml.testExecution.logTestStep('job cloning opens the additional settings section');
       await ml.jobWizardCommon.ensureAdditionalSettingsSectionOpen();
-    });
 
-    it('job cloning persists custom urls', async () => {
+      await ml.testExecution.logTestStep('job cloning persists custom urls');
       await ml.customUrls.assertCustomUrlItem(0, 'check-kibana-dashboard');
-    });
 
-    it('job cloning persists assigned calendars', async () => {
+      await ml.testExecution.logTestStep('job cloning persists assigned calendars');
       await ml.jobWizardCommon.assertCalendarsSelection([calendarId]);
-    });
 
-    it('job cloning opens the advanced section', async () => {
+      await ml.testExecution.logTestStep('job cloning opens the advanced section');
       await ml.jobWizardCommon.ensureAdvancedSectionOpen();
-    });
 
-    it('job cloning pre-fills the model plot switch', async () => {
+      await ml.testExecution.logTestStep('job cloning pre-fills the model plot switch');
       await ml.jobWizardCommon.assertModelPlotSwitchExists();
       await ml.jobWizardCommon.assertModelPlotSwitchCheckedState(false);
-    });
 
-    it('job cloning pre-fills the dedicated index switch', async () => {
+      await ml.testExecution.logTestStep('job cloning pre-fills the dedicated index switch');
       await ml.jobWizardCommon.assertDedicatedIndexSwitchExists();
       await ml.jobWizardCommon.assertDedicatedIndexSwitchCheckedState(true);
-    });
 
-    // MML during clone has changed in #61589
-    // TODO: adjust test code to reflect the new behavior
-    it.skip('job cloning pre-fills the model memory limit', async () => {
-      await ml.jobWizardCommon.assertModelMemoryLimitInputExists();
-      await ml.jobWizardCommon.assertModelMemoryLimitValue(memoryLimit);
-    });
+      // MML during clone has changed in #61589
+      // TODO: adjust test code to reflect the new behavior
+      // await ml.testExecution.logTestStep('job cloning pre-fills the model memory limit');
+      // await ml.jobWizardCommon.assertModelMemoryLimitInputExists();
+      // await ml.jobWizardCommon.assertModelMemoryLimitValue(memoryLimit);
 
-    it('job cloning displays the validation step', async () => {
+      await ml.testExecution.logTestStep('job cloning displays the validation step');
       await ml.jobWizardCommon.advanceToValidationSection();
-    });
 
-    it('job cloning displays the summary step', async () => {
+      await ml.testExecution.logTestStep('job cloning displays the summary step');
       await ml.jobWizardCommon.advanceToSummarySection();
     });
 
-    it('job cloning creates the job and finishes processing', async () => {
+    it('job cloning runs the clone job and displays it correctly in the job list', async () => {
+      await ml.testExecution.logTestStep('job cloning creates the job and finishes processing');
       await ml.jobWizardCommon.assertCreateJobButtonExists();
       await ml.jobWizardCommon.createJobAndWaitForCompletion();
-    });
 
-    it('job cloning displays the created job in the job list', async () => {
+      await ml.testExecution.logTestStep('job cloning displays the created job in the job list');
       await ml.navigation.navigateToMl();
       await ml.navigation.navigateToJobManagement();
 
@@ -414,9 +380,10 @@ export default function ({ getService }: FtrProviderContext) {
       await ml.jobTable.filterWithSearchString(jobIdClone);
       const rows = await ml.jobTable.parseJobTable();
       expect(rows.filter((row) => row.id === jobIdClone)).to.have.length(1);
-    });
 
-    it('job cloning displays details for the created job in the job list', async () => {
+      await ml.testExecution.logTestStep(
+        'job cloning displays details for the created job in the job list'
+      );
       await ml.jobTable.assertJobRowFields(jobIdClone, getExpectedRow(jobIdClone, jobGroupsClone));
 
       await ml.jobTable.assertJobRowDetailsCounts(
@@ -424,9 +391,8 @@ export default function ({ getService }: FtrProviderContext) {
         getExpectedCounts(jobIdClone),
         getExpectedModelSizeStats(jobIdClone)
       );
-    });
 
-    it('job cloning has detector results', async () => {
+      await ml.testExecution.logTestStep('job cloning has detector results');
       for (let i = 0; i < detectors.length; i++) {
         await ml.api.assertDetectorResultsExist(jobId, i);
       }
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/saved_search_job.ts b/x-pack/test/functional/apps/ml/anomaly_detection/saved_search_job.ts
index 6f40ec5427b74..170b88efd70f5 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/saved_search_job.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/saved_search_job.ts
@@ -286,44 +286,43 @@ export default function ({ getService }: FtrProviderContext) {
 
     for (const testData of testDataList) {
       describe(` ${testData.suiteTitle}`, function () {
-        it('job creation loads the job management page', async () => {
+        it('job creation loads the multi metric wizard for the source data', async () => {
+          await ml.testExecution.logTestStep('job creation loads the job management page');
           await ml.navigation.navigateToMl();
           await ml.navigation.navigateToJobManagement();
-        });
 
-        it('job creation loads the new job source selection page', async () => {
+          await ml.testExecution.logTestStep(
+            'job creation loads the new job source selection page'
+          );
           await ml.jobManagement.navigateToNewJobSourceSelection();
-        });
 
-        it('job creation loads the job type selection page', async () => {
+          await ml.testExecution.logTestStep('job creation loads the job type selection page');
           await ml.jobSourceSelection.selectSourceForAnomalyDetectionJob(testData.jobSource);
-        });
 
-        it('job creation loads the multi metric job wizard page', async () => {
+          await ml.testExecution.logTestStep('job creation loads the multi metric job wizard page');
           await ml.jobTypeSelection.selectMultiMetricJob();
         });
 
-        it('job creation displays the time range step', async () => {
+        it('job creation navigates through the multi metric wizard and sets all needed fields', async () => {
+          await ml.testExecution.logTestStep('job creation displays the time range step');
           await ml.jobWizardCommon.assertTimeRangeSectionExists();
-        });
 
-        it('job creation sets the timerange', async () => {
+          await ml.testExecution.logTestStep('job creation sets the timerange');
           await ml.jobWizardCommon.clickUseFullDataButton(
             'Feb 7, 2016 @ 00:00:00.000',
             'Feb 11, 2016 @ 23:59:54.000'
           );
-        });
 
-        it('job creation displays the event rate chart', async () => {
+          await ml.testExecution.logTestStep('job creation displays the event rate chart');
           await ml.jobWizardCommon.assertEventRateChartExists();
           await ml.jobWizardCommon.assertEventRateChartHasData();
-        });
 
-        it('job creation displays the pick fields step', async () => {
+          await ml.testExecution.logTestStep('job creation displays the pick fields step');
           await ml.jobWizardCommon.advanceToPickFieldsSection();
-        });
 
-        it('job creation selects detectors and displays detector previews', async () => {
+          await ml.testExecution.logTestStep(
+            'job creation selects detectors and displays detector previews'
+          );
           for (const [index, aggAndFieldIdentifier] of testData.aggAndFieldIdentifiers.entries()) {
             await ml.jobWizardCommon.assertAggAndFieldInputExists();
             await ml.jobWizardCommon.selectAggAndField(aggAndFieldIdentifier, false);
@@ -333,9 +332,10 @@ export default function ({ getService }: FtrProviderContext) {
               'LINE'
             );
           }
-        });
 
-        it('job creation inputs the split field and displays split cards', async () => {
+          await ml.testExecution.logTestStep(
+            'job creation inputs the split field and displays split cards'
+          );
           await ml.jobWizardMultiMetric.assertSplitFieldInputExists();
           await ml.jobWizardMultiMetric.selectSplitField(testData.splitField);
 
@@ -348,72 +348,64 @@ export default function ({ getService }: FtrProviderContext) {
           );
 
           await ml.jobWizardCommon.assertInfluencerSelection([testData.splitField]);
-        });
 
-        it('job creation displays the influencer field', async () => {
+          await ml.testExecution.logTestStep('job creation displays the influencer field');
           await ml.jobWizardCommon.assertInfluencerInputExists();
           await ml.jobWizardCommon.assertInfluencerSelection([testData.splitField]);
-        });
 
-        it('job creation inputs the bucket span', async () => {
+          await ml.testExecution.logTestStep('job creation inputs the bucket span');
           await ml.jobWizardCommon.assertBucketSpanInputExists();
           await ml.jobWizardCommon.setBucketSpan(testData.bucketSpan);
-        });
 
-        it('job creation displays the job details step', async () => {
+          await ml.testExecution.logTestStep('job creation displays the job details step');
           await ml.jobWizardCommon.advanceToJobDetailsSection();
-        });
 
-        it('job creation inputs the job id', async () => {
+          await ml.testExecution.logTestStep('job creation inputs the job id');
           await ml.jobWizardCommon.assertJobIdInputExists();
           await ml.jobWizardCommon.setJobId(testData.jobId);
-        });
 
-        it('job creation inputs the job description', async () => {
+          await ml.testExecution.logTestStep('job creation inputs the job description');
           await ml.jobWizardCommon.assertJobDescriptionInputExists();
           await ml.jobWizardCommon.setJobDescription(testData.jobDescription);
-        });
 
-        it('job creation inputs job groups', async () => {
+          await ml.testExecution.logTestStep('job creation inputs job groups');
           await ml.jobWizardCommon.assertJobGroupInputExists();
           for (const jobGroup of testData.jobGroups) {
             await ml.jobWizardCommon.addJobGroup(jobGroup);
           }
           await ml.jobWizardCommon.assertJobGroupSelection(testData.jobGroups);
-        });
 
-        it('job creation opens the advanced section', async () => {
+          await ml.testExecution.logTestStep('job creation opens the advanced section');
           await ml.jobWizardCommon.ensureAdvancedSectionOpen();
-        });
 
-        it('job creation displays the model plot switch', async () => {
+          await ml.testExecution.logTestStep('job creation displays the model plot switch');
           await ml.jobWizardCommon.assertModelPlotSwitchExists();
-        });
 
-        it('job creation enables the dedicated index switch', async () => {
+          await ml.testExecution.logTestStep('job creation enables the dedicated index switch');
           await ml.jobWizardCommon.assertDedicatedIndexSwitchExists();
           await ml.jobWizardCommon.activateDedicatedIndexSwitch();
-        });
 
-        it('job creation inputs the model memory limit', async () => {
+          await ml.testExecution.logTestStep('job creation inputs the model memory limit');
           await ml.jobWizardCommon.assertModelMemoryLimitInputExists();
           await ml.jobWizardCommon.setModelMemoryLimit(testData.memoryLimit);
-        });
 
-        it('job creation displays the validation step', async () => {
+          await ml.testExecution.logTestStep('job creation displays the validation step');
           await ml.jobWizardCommon.advanceToValidationSection();
-        });
 
-        it('job creation displays the summary step', async () => {
+          await ml.testExecution.logTestStep('job creation displays the summary step');
           await ml.jobWizardCommon.advanceToSummarySection();
         });
 
-        it('job creation creates the job and finishes processing', async () => {
+        it('job creation runs the job and displays it correctly in the job list', async () => {
+          await ml.testExecution.logTestStep(
+            'job creation creates the job and finishes processing'
+          );
           await ml.jobWizardCommon.assertCreateJobButtonExists();
           await ml.jobWizardCommon.createJobAndWaitForCompletion();
-        });
 
-        it('job creation displays the created job in the job list', async () => {
+          await ml.testExecution.logTestStep(
+            'job creation displays the created job in the job list'
+          );
           await ml.navigation.navigateToMl();
           await ml.navigation.navigateToJobManagement();
 
@@ -421,9 +413,10 @@ export default function ({ getService }: FtrProviderContext) {
           await ml.jobTable.filterWithSearchString(testData.jobId);
           const rows = await ml.jobTable.parseJobTable();
           expect(rows.filter((row) => row.id === testData.jobId)).to.have.length(1);
-        });
 
-        it('job creation displays details for the created job in the job list', async () => {
+          await ml.testExecution.logTestStep(
+            'job creation displays details for the created job in the job list'
+          );
           await ml.jobTable.assertJobRowFields(testData.jobId, {
             id: testData.jobId,
             description: testData.jobDescription,
@@ -442,9 +435,8 @@ export default function ({ getService }: FtrProviderContext) {
               ...testData.expected.modelSizeStats,
             }
           );
-        });
 
-        it('has detector results', async () => {
+          await ml.testExecution.logTestStep('has detector results');
           for (let i = 0; i < testData.aggAndFieldIdentifiers.length; i++) {
             await ml.api.assertDetectorResultsExist(testData.jobId, i);
           }
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_job.ts b/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_job.ts
index 58f3960153bc6..ba5628661bfc2 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_job.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_job.ts
@@ -85,120 +85,101 @@ export default function ({ getService }: FtrProviderContext) {
       await ml.api.cleanMlIndices();
     });
 
-    it('job creation loads the job management page', async () => {
+    it('job creation loads the single metric wizard for the source data', async () => {
+      await ml.testExecution.logTestStep('job creation loads the job management page');
       await ml.navigation.navigateToMl();
       await ml.navigation.navigateToJobManagement();
-    });
 
-    it('job creation loads the new job source selection page', async () => {
+      await ml.testExecution.logTestStep('job creation loads the new job source selection page');
       await ml.jobManagement.navigateToNewJobSourceSelection();
-    });
 
-    it('job creation loads the job type selection page', async () => {
+      await ml.testExecution.logTestStep('job creation loads the job type selection page');
       await ml.jobSourceSelection.selectSourceForAnomalyDetectionJob('ft_farequote');
-    });
 
-    it('job creation loads the single metric job wizard page', async () => {
+      await ml.testExecution.logTestStep('job creation loads the single metric job wizard page');
       await ml.jobTypeSelection.selectSingleMetricJob();
     });
 
-    it('job creation displays the time range step', async () => {
+    it('job creation navigates through the single metric wizard and sets all needed fields', async () => {
+      await ml.testExecution.logTestStep('job creation displays the time range step');
       await ml.jobWizardCommon.assertTimeRangeSectionExists();
-    });
 
-    it('job creation sets the timerange', async () => {
+      await ml.testExecution.logTestStep('job creation sets the timerange');
       await ml.jobWizardCommon.clickUseFullDataButton(
         'Feb 7, 2016 @ 00:00:00.000',
         'Feb 11, 2016 @ 23:59:54.000'
       );
-    });
 
-    it('job creation displays the event rate chart', async () => {
+      await ml.testExecution.logTestStep('job creation displays the event rate chart');
       await ml.jobWizardCommon.assertEventRateChartExists();
       await ml.jobWizardCommon.assertEventRateChartHasData();
-    });
 
-    it('job creation displays the pick fields step', async () => {
+      await ml.testExecution.logTestStep('job creation displays the pick fields step');
       await ml.jobWizardCommon.advanceToPickFieldsSection();
-    });
 
-    it('job creation selects field and aggregation', async () => {
+      await ml.testExecution.logTestStep('job creation selects field and aggregation');
       await ml.jobWizardCommon.assertAggAndFieldInputExists();
       await ml.jobWizardCommon.selectAggAndField(aggAndFieldIdentifier, true);
       await ml.jobWizardCommon.assertAnomalyChartExists('LINE');
-    });
 
-    it('job creation inputs the bucket span', async () => {
+      await ml.testExecution.logTestStep('job creation inputs the bucket span');
       await ml.jobWizardCommon.assertBucketSpanInputExists();
       await ml.jobWizardCommon.setBucketSpan(bucketSpan);
-    });
 
-    it('job creation displays the job details step', async () => {
+      await ml.testExecution.logTestStep('job creation displays the job details step');
       await ml.jobWizardCommon.advanceToJobDetailsSection();
-    });
 
-    it('job creation inputs the job id', async () => {
+      await ml.testExecution.logTestStep('job creation inputs the job id');
       await ml.jobWizardCommon.assertJobIdInputExists();
       await ml.jobWizardCommon.setJobId(jobId);
-    });
 
-    it('job creation inputs the job description', async () => {
+      await ml.testExecution.logTestStep('job creation inputs the job description');
       await ml.jobWizardCommon.assertJobDescriptionInputExists();
       await ml.jobWizardCommon.setJobDescription(jobDescription);
-    });
 
-    it('job creation inputs job groups', async () => {
+      await ml.testExecution.logTestStep('job creation inputs job groups');
       await ml.jobWizardCommon.assertJobGroupInputExists();
       for (const jobGroup of jobGroups) {
         await ml.jobWizardCommon.addJobGroup(jobGroup);
       }
       await ml.jobWizardCommon.assertJobGroupSelection(jobGroups);
-    });
 
-    it('job creation opens the additional settings section', async () => {
+      await ml.testExecution.logTestStep('job creation opens the additional settings section');
       await ml.jobWizardCommon.ensureAdditionalSettingsSectionOpen();
-    });
 
-    it('job creation adds a new custom url', async () => {
+      await ml.testExecution.logTestStep('job creation adds a new custom url');
       await ml.jobWizardCommon.addCustomUrl({ label: 'check-kibana-dashboard' });
-    });
 
-    it('job creation assigns calendars', async () => {
+      await ml.testExecution.logTestStep('job creation assigns calendars');
       await ml.jobWizardCommon.addCalendar(calendarId);
-    });
 
-    it('job creation opens the advanced section', async () => {
+      await ml.testExecution.logTestStep('job creation opens the advanced section');
       await ml.jobWizardCommon.ensureAdvancedSectionOpen();
-    });
 
-    it('job creation displays the model plot switch', async () => {
+      await ml.testExecution.logTestStep('job creation displays the model plot switch');
       await ml.jobWizardCommon.assertModelPlotSwitchExists();
-    });
 
-    it('job creation enables the dedicated index switch', async () => {
+      await ml.testExecution.logTestStep('job creation enables the dedicated index switch');
       await ml.jobWizardCommon.assertDedicatedIndexSwitchExists();
       await ml.jobWizardCommon.activateDedicatedIndexSwitch();
-    });
 
-    it('job creation inputs the model memory limit', async () => {
+      await ml.testExecution.logTestStep('job creation inputs the model memory limit');
       await ml.jobWizardCommon.assertModelMemoryLimitInputExists();
       await ml.jobWizardCommon.setModelMemoryLimit(memoryLimit);
-    });
 
-    it('job creation displays the validation step', async () => {
+      await ml.testExecution.logTestStep('job creation displays the validation step');
       await ml.jobWizardCommon.advanceToValidationSection();
-    });
 
-    it('job creation displays the summary step', async () => {
+      await ml.testExecution.logTestStep('job creation displays the summary step');
       await ml.jobWizardCommon.advanceToSummarySection();
     });
 
-    it('job creation creates the job and finishes processing', async () => {
+    it('job creation runs the job and displays it correctly in the job list', async () => {
+      await ml.testExecution.logTestStep('job creation creates the job and finishes processing');
       await ml.jobWizardCommon.assertCreateJobButtonExists();
       await ml.jobWizardCommon.createJobAndWaitForCompletion();
-    });
 
-    it('job creation displays the created job in the job list', async () => {
+      await ml.testExecution.logTestStep('job creation displays the created job in the job list');
       await ml.navigation.navigateToMl();
       await ml.navigation.navigateToJobManagement();
 
@@ -206,9 +187,10 @@ export default function ({ getService }: FtrProviderContext) {
       await ml.jobTable.filterWithSearchString(jobId);
       const rows = await ml.jobTable.parseJobTable();
       expect(rows.filter((row) => row.id === jobId)).to.have.length(1);
-    });
 
-    it('job creation displays details for the created job in the job list', async () => {
+      await ml.testExecution.logTestStep(
+        'job creation displays details for the created job in the job list'
+      );
       await ml.jobTable.assertJobRowFields(jobId, getExpectedRow(jobId, jobGroups));
 
       await ml.jobTable.assertJobRowDetailsCounts(
@@ -216,124 +198,107 @@ export default function ({ getService }: FtrProviderContext) {
         getExpectedCounts(jobId),
         getExpectedModelSizeStats(jobId)
       );
-    });
 
-    it('job creation has detector results', async () => {
+      await ml.testExecution.logTestStep('job creation has detector results');
       await ml.api.assertDetectorResultsExist(jobId, 0);
     });
 
-    it('job cloning clicks the clone action and loads the single metric wizard', async () => {
+    it('job cloning opens the existing job in the single metric wizard', async () => {
+      await ml.testExecution.logTestStep(
+        'job cloning clicks the clone action and loads the single metric wizard'
+      );
       await ml.jobTable.clickCloneJobAction(jobId);
       await ml.jobTypeSelection.assertSingleMetricJobWizardOpen();
     });
 
-    it('job cloning displays the time range step', async () => {
+    it('job cloning navigates through the single metric wizard, checks and sets all needed fields', async () => {
+      await ml.testExecution.logTestStep('job cloning displays the time range step');
       await ml.jobWizardCommon.assertTimeRangeSectionExists();
-    });
 
-    it('job cloning sets the timerange', async () => {
+      await ml.testExecution.logTestStep('job cloning sets the timerange');
       await ml.jobWizardCommon.clickUseFullDataButton(
         'Feb 7, 2016 @ 00:00:00.000',
         'Feb 11, 2016 @ 23:59:54.000'
       );
-    });
 
-    it('job cloning displays the event rate chart', async () => {
+      await ml.testExecution.logTestStep('job cloning displays the event rate chart');
       await ml.jobWizardCommon.assertEventRateChartExists();
       await ml.jobWizardCommon.assertEventRateChartHasData();
-    });
 
-    it('job cloning displays the pick fields step', async () => {
+      await ml.testExecution.logTestStep('job cloning displays the pick fields step');
       await ml.jobWizardCommon.advanceToPickFieldsSection();
-    });
 
-    it('job cloning pre-fills field and aggregation', async () => {
+      await ml.testExecution.logTestStep('job cloning pre-fills field and aggregation');
       await ml.jobWizardCommon.assertAggAndFieldInputExists();
       await ml.jobWizardCommon.assertAggAndFieldSelection([aggAndFieldIdentifier]);
       await ml.jobWizardCommon.assertAnomalyChartExists('LINE');
-    });
 
-    it('job cloning pre-fills the bucket span', async () => {
+      await ml.testExecution.logTestStep('job cloning pre-fills the bucket span');
       await ml.jobWizardCommon.assertBucketSpanInputExists();
       await ml.jobWizardCommon.assertBucketSpanValue(bucketSpan);
-    });
 
-    it('job cloning displays the job details step', async () => {
+      await ml.testExecution.logTestStep('job cloning displays the job details step');
       await ml.jobWizardCommon.advanceToJobDetailsSection();
-    });
 
-    it('job cloning does not pre-fill the job id', async () => {
+      await ml.testExecution.logTestStep('job cloning does not pre-fill the job id');
       await ml.jobWizardCommon.assertJobIdInputExists();
       await ml.jobWizardCommon.assertJobIdValue('');
-    });
 
-    it('job cloning inputs the clone job id', async () => {
+      await ml.testExecution.logTestStep('job cloning inputs the clone job id');
       await ml.jobWizardCommon.setJobId(jobIdClone);
-    });
 
-    it('job cloning pre-fills the job description', async () => {
+      await ml.testExecution.logTestStep('job cloning pre-fills the job description');
       await ml.jobWizardCommon.assertJobDescriptionInputExists();
       await ml.jobWizardCommon.assertJobDescriptionValue(jobDescription);
-    });
 
-    it('job cloning pre-fills job groups', async () => {
+      await ml.testExecution.logTestStep('job cloning pre-fills job groups');
       await ml.jobWizardCommon.assertJobGroupInputExists();
       await ml.jobWizardCommon.assertJobGroupSelection(jobGroups);
-    });
 
-    it('job cloning inputs the clone job group', async () => {
+      await ml.testExecution.logTestStep('job cloning inputs the clone job group');
       await ml.jobWizardCommon.assertJobGroupInputExists();
       await ml.jobWizardCommon.addJobGroup('clone');
       await ml.jobWizardCommon.assertJobGroupSelection(jobGroupsClone);
-    });
 
-    it('job cloning opens the additional settings section', async () => {
+      await ml.testExecution.logTestStep('job cloning opens the additional settings section');
       await ml.jobWizardCommon.ensureAdditionalSettingsSectionOpen();
-    });
 
-    it('job cloning persists custom urls', async () => {
+      await ml.testExecution.logTestStep('job cloning persists custom urls');
       await ml.customUrls.assertCustomUrlItem(0, 'check-kibana-dashboard');
-    });
 
-    it('job cloning persists assigned calendars', async () => {
+      await ml.testExecution.logTestStep('job cloning persists assigned calendars');
       await ml.jobWizardCommon.assertCalendarsSelection([calendarId]);
-    });
 
-    it('job cloning opens the advanced section', async () => {
+      await ml.testExecution.logTestStep('job cloning opens the advanced section');
       await ml.jobWizardCommon.ensureAdvancedSectionOpen();
-    });
 
-    it('job cloning pre-fills the model plot switch', async () => {
+      await ml.testExecution.logTestStep('job cloning pre-fills the model plot switch');
       await ml.jobWizardCommon.assertModelPlotSwitchExists();
       await ml.jobWizardCommon.assertModelPlotSwitchCheckedState(true);
-    });
 
-    it('job cloning pre-fills the dedicated index switch', async () => {
+      await ml.testExecution.logTestStep('job cloning pre-fills the dedicated index switch');
       await ml.jobWizardCommon.assertDedicatedIndexSwitchExists();
       await ml.jobWizardCommon.assertDedicatedIndexSwitchCheckedState(true);
-    });
 
-    // MML during clone has changed in #61589
-    // TODO: adjust test code to reflect the new behavior
-    it.skip('job cloning pre-fills the model memory limit', async () => {
-      await ml.jobWizardCommon.assertModelMemoryLimitInputExists();
-      await ml.jobWizardCommon.assertModelMemoryLimitValue(memoryLimit);
-    });
+      // MML during clone has changed in #61589
+      // TODO: adjust test code to reflect the new behavior
+      // await ml.testExecution.logTestStep('job cloning pre-fills the model memory limit');
+      // await ml.jobWizardCommon.assertModelMemoryLimitInputExists();
+      // await ml.jobWizardCommon.assertModelMemoryLimitValue(memoryLimit);
 
-    it('job cloning displays the validation step', async () => {
+      await ml.testExecution.logTestStep('job cloning displays the validation step');
       await ml.jobWizardCommon.advanceToValidationSection();
-    });
 
-    it('job cloning displays the summary step', async () => {
+      await ml.testExecution.logTestStep('job cloning displays the summary step');
       await ml.jobWizardCommon.advanceToSummarySection();
     });
 
-    it('job cloning creates the job and finishes processing', async () => {
+    it('job cloning runs the clone job and displays it correctly in the job list', async () => {
+      await ml.testExecution.logTestStep('job cloning creates the job and finishes processing');
       await ml.jobWizardCommon.assertCreateJobButtonExists();
       await ml.jobWizardCommon.createJobAndWaitForCompletion();
-    });
 
-    it('job cloning displays the created job in the job list', async () => {
+      await ml.testExecution.logTestStep('job cloning displays the created job in the job list');
       await ml.navigation.navigateToMl();
       await ml.navigation.navigateToJobManagement();
 
@@ -341,9 +306,10 @@ export default function ({ getService }: FtrProviderContext) {
       await ml.jobTable.filterWithSearchString(jobIdClone);
       const rows = await ml.jobTable.parseJobTable();
       expect(rows.filter((row) => row.id === jobIdClone)).to.have.length(1);
-    });
 
-    it('job cloning displays details for the created job in the job list', async () => {
+      await ml.testExecution.logTestStep(
+        'job cloning displays details for the created job in the job list'
+      );
       await ml.jobTable.assertJobRowFields(jobIdClone, getExpectedRow(jobIdClone, jobGroupsClone));
 
       await ml.jobTable.assertJobRowDetailsCounts(
@@ -351,32 +317,32 @@ export default function ({ getService }: FtrProviderContext) {
         getExpectedCounts(jobIdClone),
         getExpectedModelSizeStats(jobIdClone)
       );
-    });
 
-    it('job cloning has detector results', async () => {
+      await ml.testExecution.logTestStep('job cloning has detector results');
       await ml.api.assertDetectorResultsExist(jobId, 0);
     });
 
-    it('job deletion has results for the job before deletion', async () => {
+    it('deletes the cloned job', async () => {
+      await ml.testExecution.logTestStep('job deletion has results for the job before deletion');
       await ml.api.assertJobResultsExist(jobIdClone);
-    });
 
-    it('job deletion triggers the delete action', async () => {
+      await ml.testExecution.logTestStep('job deletion triggers the delete action');
       await ml.jobTable.clickDeleteJobAction(jobIdClone);
-    });
 
-    it('job deletion confirms the delete modal', async () => {
+      await ml.testExecution.logTestStep('job deletion confirms the delete modal');
       await ml.jobTable.confirmDeleteJobModal();
-    });
 
-    it('job deletion does not display the deleted job in the job list any more', async () => {
+      await ml.testExecution.logTestStep(
+        'job deletion does not display the deleted job in the job list any more'
+      );
       await ml.jobTable.waitForJobsToLoad();
       await ml.jobTable.filterWithSearchString(jobIdClone);
       const rows = await ml.jobTable.parseJobTable();
       expect(rows.filter((row) => row.id === jobIdClone)).to.have.length(0);
-    });
 
-    it('job deletion does not have results for the deleted job any more', async () => {
+      await ml.testExecution.logTestStep(
+        'job deletion does not have results for the deleted job any more'
+      );
       await ml.api.assertNoJobResultsExist(jobIdClone);
     });
   });
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_viewer.ts b/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_viewer.ts
index 3855bd0c884cd..e1ab3f8e092c3 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_viewer.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_viewer.ts
@@ -53,41 +53,39 @@ export default function ({ getService }: FtrProviderContext) {
       await ml.api.cleanMlIndices();
     });
 
-    it('loads from job list row link', async () => {
+    it('opens a job from job list link', async () => {
+      await ml.testExecution.logTestStep('navigate to job list');
       await ml.navigation.navigateToMl();
       await ml.navigation.navigateToJobManagement();
 
+      await ml.testExecution.logTestStep('open job in single metric viewer');
       await ml.jobTable.waitForJobsToLoad();
       await ml.jobTable.filterWithSearchString(JOB_CONFIG.job_id);
       const rows = await ml.jobTable.parseJobTable();
       expect(rows.filter((row) => row.id === JOB_CONFIG.job_id)).to.have.length(1);
 
       await ml.jobTable.clickOpenJobInSingleMetricViewerButton(JOB_CONFIG.job_id);
-      await ml.common.waitForMlLoadingIndicatorToDisappear();
+      await ml.commonUI.waitForMlLoadingIndicatorToDisappear();
     });
 
-    it('pre-fills the job selection', async () => {
+    it('displays job results', async () => {
+      await ml.testExecution.logTestStep('pre-fills the job selection');
       await ml.jobSelection.assertJobSelection([JOB_CONFIG.job_id]);
-    });
 
-    it('pre-fills the detector input', async () => {
+      await ml.testExecution.logTestStep('pre-fills the detector input');
       await ml.singleMetricViewer.assertDetectorInputExsist();
       await ml.singleMetricViewer.assertDetectorInputValue('0');
-    });
 
-    it('displays the chart', async () => {
+      await ml.testExecution.logTestStep('displays the chart');
       await ml.singleMetricViewer.assertChartExsist();
-    });
 
-    it('should display the annotations section', async () => {
+      await ml.testExecution.logTestStep('should display the annotations section');
       await ml.singleMetricViewer.assertAnnotationsExists('loaded');
-    });
 
-    it('displays the anomalies table', async () => {
+      await ml.testExecution.logTestStep('displays the anomalies table');
       await ml.anomaliesTable.assertTableExists();
-    });
 
-    it('anomalies table is not empty', async () => {
+      await ml.testExecution.logTestStep('anomalies table is not empty');
       await ml.anomaliesTable.assertTableNotEmpty();
     });
   });
diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts
index a62bfdcde0572..6beefaafa3792 100644
--- a/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts
+++ b/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts
@@ -56,108 +56,96 @@ export default function ({ getService }: FtrProviderContext) {
           await ml.testResources.deleteIndexPatternByTitle(testData.destinationIndex);
         });
 
-        it('loads the data frame analytics page', async () => {
+        it('loads the data frame analytics wizard', async () => {
+          await ml.testExecution.logTestStep('loads the data frame analytics page');
           await ml.navigation.navigateToMl();
           await ml.navigation.navigateToDataFrameAnalytics();
-        });
 
-        it('loads the source selection modal', async () => {
+          await ml.testExecution.logTestStep('loads the source selection modal');
           await ml.dataFrameAnalytics.startAnalyticsCreation();
-        });
 
-        it('selects the source data and loads the job wizard page', async () => {
+          await ml.testExecution.logTestStep(
+            'selects the source data and loads the job wizard page'
+          );
           await ml.jobSourceSelection.selectSourceForAnalyticsJob(testData.source);
           await ml.dataFrameAnalyticsCreation.assertConfigurationStepActive();
         });
 
-        it('selects the job type', async () => {
+        it('navigates through the wizard and sets all needed fields', async () => {
+          await ml.testExecution.logTestStep('selects the job type');
           await ml.dataFrameAnalyticsCreation.assertJobTypeSelectExists();
           await ml.dataFrameAnalyticsCreation.selectJobType(testData.jobType);
-        });
 
-        it('inputs the dependent variable', async () => {
+          await ml.testExecution.logTestStep('inputs the dependent variable');
           await ml.dataFrameAnalyticsCreation.assertDependentVariableInputExists();
           await ml.dataFrameAnalyticsCreation.selectDependentVariable(testData.dependentVariable);
-        });
 
-        it('inputs the training percent', async () => {
+          await ml.testExecution.logTestStep('inputs the training percent');
           await ml.dataFrameAnalyticsCreation.assertTrainingPercentInputExists();
           await ml.dataFrameAnalyticsCreation.setTrainingPercent(testData.trainingPercent);
-        });
 
-        it('displays the source data preview', async () => {
+          await ml.testExecution.logTestStep('displays the source data preview');
           await ml.dataFrameAnalyticsCreation.assertSourceDataPreviewExists();
-        });
 
-        it('displays the include fields selection', async () => {
+          await ml.testExecution.logTestStep('displays the include fields selection');
           await ml.dataFrameAnalyticsCreation.assertIncludeFieldsSelectionExists();
-        });
 
-        it('continues to the additional options step', async () => {
+          await ml.testExecution.logTestStep('continues to the additional options step');
           await ml.dataFrameAnalyticsCreation.continueToAdditionalOptionsStep();
-        });
 
-        it('accepts the suggested model memory limit', async () => {
+          await ml.testExecution.logTestStep('accepts the suggested model memory limit');
           await ml.dataFrameAnalyticsCreation.assertModelMemoryInputExists();
           await ml.dataFrameAnalyticsCreation.assertModelMemoryInputPopulated();
-        });
 
-        it('continues to the details step', async () => {
+          await ml.testExecution.logTestStep('continues to the details step');
           await ml.dataFrameAnalyticsCreation.continueToDetailsStep();
-        });
 
-        it('inputs the job id', async () => {
+          await ml.testExecution.logTestStep('inputs the job id');
           await ml.dataFrameAnalyticsCreation.assertJobIdInputExists();
           await ml.dataFrameAnalyticsCreation.setJobId(testData.jobId);
-        });
 
-        it('inputs the job description', async () => {
+          await ml.testExecution.logTestStep('inputs the job description');
           await ml.dataFrameAnalyticsCreation.assertJobDescriptionInputExists();
           await ml.dataFrameAnalyticsCreation.setJobDescription(testData.jobDescription);
-        });
 
-        it('should default the set destination index to job id switch to true', async () => {
+          await ml.testExecution.logTestStep(
+            'should default the set destination index to job id switch to true'
+          );
           await ml.dataFrameAnalyticsCreation.assertDestIndexSameAsIdSwitchExists();
           await ml.dataFrameAnalyticsCreation.assertDestIndexSameAsIdCheckState(true);
-        });
 
-        it('should input the destination index', async () => {
+          await ml.testExecution.logTestStep('should input the destination index');
           await ml.dataFrameAnalyticsCreation.setDestIndexSameAsIdCheckState(false);
           await ml.dataFrameAnalyticsCreation.assertDestIndexInputExists();
           await ml.dataFrameAnalyticsCreation.setDestIndex(testData.destinationIndex);
-        });
 
-        it('sets the create index pattern switch', async () => {
+          await ml.testExecution.logTestStep('sets the create index pattern switch');
           await ml.dataFrameAnalyticsCreation.assertCreateIndexPatternSwitchExists();
           await ml.dataFrameAnalyticsCreation.setCreateIndexPatternSwitchState(
             testData.createIndexPattern
           );
-        });
 
-        it('continues to the create step', async () => {
+          await ml.testExecution.logTestStep('continues to the create step');
           await ml.dataFrameAnalyticsCreation.continueToCreateStep();
         });
 
-        it('creates and starts the analytics job', async () => {
+        it('runs the analytics job and displays it correctly in the job list', async () => {
+          await ml.testExecution.logTestStep('creates and starts the analytics job');
           await ml.dataFrameAnalyticsCreation.assertCreateButtonExists();
           await ml.dataFrameAnalyticsCreation.assertStartJobCheckboxCheckState(true);
           await ml.dataFrameAnalyticsCreation.createAnalyticsJob(testData.jobId);
-        });
 
-        it('finishes analytics processing', async () => {
+          await ml.testExecution.logTestStep('finishes analytics processing');
           await ml.dataFrameAnalytics.waitForAnalyticsCompletion(testData.jobId);
-        });
 
-        it('displays the analytics table', async () => {
+          await ml.testExecution.logTestStep('displays the analytics table');
           await ml.dataFrameAnalyticsCreation.navigateToJobManagementPage();
           await ml.dataFrameAnalytics.assertAnalyticsTableExists();
-        });
 
-        it('displays the stats bar', async () => {
+          await ml.testExecution.logTestStep('displays the stats bar');
           await ml.dataFrameAnalytics.assertAnalyticsStatsBarExists();
-        });
 
-        it('displays the created job in the analytics table', async () => {
+          await ml.testExecution.logTestStep('displays the created job in the analytics table');
           await ml.dataFrameAnalyticsTable.refreshAnalyticsTable();
           await ml.dataFrameAnalyticsTable.filterWithSearchString(testData.jobId);
           const rows = await ml.dataFrameAnalyticsTable.parseAnalyticsTable();
@@ -166,9 +154,10 @@ export default function ({ getService }: FtrProviderContext) {
             1,
             `Filtered analytics table should have 1 row for job id '${testData.jobId}' (got matching items '${filteredRows}')`
           );
-        });
 
-        it('displays details for the created job in the analytics table', async () => {
+          await ml.testExecution.logTestStep(
+            'displays details for the created job in the analytics table'
+          );
           await ml.dataFrameAnalyticsTable.assertAnalyticsRowFields(testData.jobId, {
             id: testData.jobId,
             description: testData.jobDescription,
@@ -180,25 +169,28 @@ export default function ({ getService }: FtrProviderContext) {
           });
         });
 
-        it('should open the edit form for the created job in the analytics table', async () => {
+        it('edits the analytics job and displays it correctly in the job list', async () => {
+          await ml.testExecution.logTestStep(
+            'should open the edit form for the created job in the analytics table'
+          );
           await ml.dataFrameAnalyticsTable.openEditFlyout(testData.jobId);
-        });
 
-        it('should input the description in the edit form', async () => {
+          await ml.testExecution.logTestStep('should input the description in the edit form');
           await ml.dataFrameAnalyticsEdit.assertJobDescriptionEditInputExists();
           await ml.dataFrameAnalyticsEdit.setJobDescriptionEdit(editedDescription);
-        });
 
-        it('should input the model memory limit in the edit form', async () => {
+          await ml.testExecution.logTestStep(
+            'should input the model memory limit in the edit form'
+          );
           await ml.dataFrameAnalyticsEdit.assertJobMmlEditInputExists();
           await ml.dataFrameAnalyticsEdit.setJobMmlEdit('21mb');
-        });
 
-        it('should submit the edit job form', async () => {
+          await ml.testExecution.logTestStep('should submit the edit job form');
           await ml.dataFrameAnalyticsEdit.updateAnalyticsJob();
-        });
 
-        it('displays details for the edited job in the analytics table', async () => {
+          await ml.testExecution.logTestStep(
+            'displays details for the edited job in the analytics table'
+          );
           await ml.dataFrameAnalyticsTable.assertAnalyticsRowFields(testData.jobId, {
             id: testData.jobId,
             description: editedDescription,
@@ -208,14 +200,14 @@ export default function ({ getService }: FtrProviderContext) {
             status: testData.expected.row.status,
             progress: testData.expected.row.progress,
           });
-        });
 
-        it('creates the destination index and writes results to it', async () => {
+          await ml.testExecution.logTestStep(
+            'creates the destination index and writes results to it'
+          );
           await ml.api.assertIndicesExist(testData.destinationIndex);
           await ml.api.assertIndicesNotEmpty(testData.destinationIndex);
-        });
 
-        it('displays the results view for created job', async () => {
+          await ml.testExecution.logTestStep('displays the results view for created job');
           await ml.dataFrameAnalyticsTable.openResultsView();
           await ml.dataFrameAnalytics.assertClassificationEvaluatePanelElementsExists();
           await ml.dataFrameAnalytics.assertClassificationTablePanelExists();
diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/cloning.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/cloning.ts
index e8f0a69b397cd..5494f2f963d37 100644
--- a/x-pack/test/functional/apps/ml/data_frame_analytics/cloning.ts
+++ b/x-pack/test/functional/apps/ml/data_frame_analytics/cloning.ts
@@ -159,57 +159,62 @@ export default function ({ getService }: FtrProviderContext) {
           await ml.testResources.deleteIndexPatternByTitle(cloneDestIndex);
         });
 
-        it('should open the wizard with a proper header', async () => {
+        it('opens the existing job in the data frame analytics job wizard', async () => {
+          await ml.testExecution.logTestStep('should open the wizard with a proper header');
           const headerText = await ml.dataFrameAnalyticsCreation.getHeaderText();
           expect(headerText).to.match(/Clone job/);
           await ml.dataFrameAnalyticsCreation.assertConfigurationStepActive();
         });
 
-        it('should have correct init form values for config step', async () => {
+        it('navigates through the wizard, checks and sets all needed fields', async () => {
+          await ml.testExecution.logTestStep(
+            'should have correct init form values for config step'
+          );
           await ml.dataFrameAnalyticsCreation.assertInitialCloneJobConfigStep(
             testData.job as DataFrameAnalyticsConfig
           );
-        });
 
-        it('should continue to the additional options step', async () => {
+          await ml.testExecution.logTestStep('should continue to the additional options step');
           await ml.dataFrameAnalyticsCreation.continueToAdditionalOptionsStep();
-        });
 
-        it('should have correct init form values for additional options step', async () => {
+          await ml.testExecution.logTestStep(
+            'should have correct init form values for additional options step'
+          );
           await ml.dataFrameAnalyticsCreation.assertInitialCloneJobAdditionalOptionsStep(
             testData.job.analysis as DataFrameAnalyticsConfig['analysis']
           );
-        });
 
-        it('should continue to the details step', async () => {
+          await ml.testExecution.logTestStep('should continue to the details step');
           await ml.dataFrameAnalyticsCreation.continueToDetailsStep();
-        });
 
-        it('should have correct init form values for details step', async () => {
+          await ml.testExecution.logTestStep(
+            'should have correct init form values for details step'
+          );
           await ml.dataFrameAnalyticsCreation.assertInitialCloneJobDetailsStep(
             testData.job as DataFrameAnalyticsConfig
           );
           await ml.dataFrameAnalyticsCreation.setJobId(cloneJobId);
           await ml.dataFrameAnalyticsCreation.setDestIndex(cloneDestIndex);
-        });
 
-        it('should continue to the create step', async () => {
+          await ml.testExecution.logTestStep('should continue to the create step');
           await ml.dataFrameAnalyticsCreation.continueToCreateStep();
         });
 
-        it('should have enabled Create button on a valid form input', async () => {
+        it('runs the clone analytics job and displays it correctly in the job list', async () => {
+          await ml.testExecution.logTestStep(
+            'should have enabled Create button on a valid form input'
+          );
           expect(await ml.dataFrameAnalyticsCreation.isCreateButtonDisabled()).to.be(false);
-        });
 
-        it('should create a clone job', async () => {
+          await ml.testExecution.logTestStep('should create a clone job');
           await ml.dataFrameAnalyticsCreation.createAnalyticsJob(cloneJobId);
-        });
 
-        it('should finish analytics processing', async () => {
+          await ml.testExecution.logTestStep('should finish analytics processing');
           await ml.dataFrameAnalytics.waitForAnalyticsCompletion(cloneJobId);
-        });
 
-        it('should display the created job in the analytics table', async () => {
+          await ml.testExecution.logTestStep(
+            'should display the created job in the analytics table'
+          );
           await ml.dataFrameAnalyticsCreation.navigateToJobManagementPage();
           await ml.dataFrameAnalyticsTable.refreshAnalyticsTable();
           await ml.dataFrameAnalyticsTable.filterWithSearchString(cloneJobId);
diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts
index 5b89cec49db3e..e4bc7b940aaea 100644
--- a/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts
+++ b/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts
@@ -66,116 +66,102 @@ export default function ({ getService }: FtrProviderContext) {
           await ml.testResources.deleteIndexPatternByTitle(testData.destinationIndex);
         });
 
-        it('loads the data frame analytics page', async () => {
+        it('loads the data frame analytics wizard', async () => {
+          await ml.testExecution.logTestStep('loads the data frame analytics page');
           await ml.navigation.navigateToMl();
           await ml.navigation.navigateToDataFrameAnalytics();
-        });
 
-        it('loads the source selection modal', async () => {
+          await ml.testExecution.logTestStep('loads the source selection modal');
           await ml.dataFrameAnalytics.startAnalyticsCreation();
-        });
 
-        it('selects the source data and loads the job wizard page', async () => {
+          await ml.testExecution.logTestStep(
+            'selects the source data and loads the job wizard page'
+          );
           await ml.jobSourceSelection.selectSourceForAnalyticsJob(testData.source);
           await ml.dataFrameAnalyticsCreation.assertConfigurationStepActive();
         });
 
-        it('selects the job type', async () => {
+        it('navigates through the wizard and sets all needed fields', async () => {
+          await ml.testExecution.logTestStep('selects the job type');
           await ml.dataFrameAnalyticsCreation.assertJobTypeSelectExists();
           await ml.dataFrameAnalyticsCreation.selectJobType(testData.jobType);
-        });
 
-        it('does not display the dependent variable input', async () => {
+          await ml.testExecution.logTestStep('does not display the dependent variable input');
           await ml.dataFrameAnalyticsCreation.assertDependentVariableInputMissing();
-        });
 
-        it('does not display the training percent input', async () => {
+          await ml.testExecution.logTestStep('does not display the training percent input');
           await ml.dataFrameAnalyticsCreation.assertTrainingPercentInputMissing();
-        });
 
-        it('displays the source data preview', async () => {
+          await ml.testExecution.logTestStep('displays the source data preview');
           await ml.dataFrameAnalyticsCreation.assertSourceDataPreviewExists();
-        });
 
-        it('enables the source data preview histogram charts', async () => {
+          await ml.testExecution.logTestStep('enables the source data preview histogram charts');
           await ml.dataFrameAnalyticsCreation.enableSourceDataPreviewHistogramCharts();
-        });
 
-        it('displays the source data preview histogram charts', async () => {
+          await ml.testExecution.logTestStep('displays the source data preview histogram charts');
           await ml.dataFrameAnalyticsCreation.assertSourceDataPreviewHistogramCharts(
             testData.expected.histogramCharts
           );
-        });
 
-        it('displays the include fields selection', async () => {
+          await ml.testExecution.logTestStep('displays the include fields selection');
           await ml.dataFrameAnalyticsCreation.assertIncludeFieldsSelectionExists();
-        });
 
-        it('continues to the additional options step', async () => {
+          await ml.testExecution.logTestStep('continues to the additional options step');
           await ml.dataFrameAnalyticsCreation.continueToAdditionalOptionsStep();
-        });
 
-        it('accepts the suggested model memory limit', async () => {
+          await ml.testExecution.logTestStep('accepts the suggested model memory limit');
           await ml.dataFrameAnalyticsCreation.assertModelMemoryInputExists();
           await ml.dataFrameAnalyticsCreation.assertModelMemoryInputPopulated();
-        });
 
-        it('continues to the details step', async () => {
+          await ml.testExecution.logTestStep('continues to the details step');
           await ml.dataFrameAnalyticsCreation.continueToDetailsStep();
-        });
 
-        it('inputs the job id', async () => {
+          await ml.testExecution.logTestStep('inputs the job id');
           await ml.dataFrameAnalyticsCreation.assertJobIdInputExists();
           await ml.dataFrameAnalyticsCreation.setJobId(testData.jobId);
-        });
 
-        it('inputs the job description', async () => {
+          await ml.testExecution.logTestStep('inputs the job description');
           await ml.dataFrameAnalyticsCreation.assertJobDescriptionInputExists();
           await ml.dataFrameAnalyticsCreation.setJobDescription(testData.jobDescription);
-        });
 
-        it('should default the set destination index to job id switch to true', async () => {
+          await ml.testExecution.logTestStep(
+            'should default the set destination index to job id switch to true'
+          );
           await ml.dataFrameAnalyticsCreation.assertDestIndexSameAsIdSwitchExists();
           await ml.dataFrameAnalyticsCreation.assertDestIndexSameAsIdCheckState(true);
-        });
 
-        it('should input the destination index', async () => {
+          await ml.testExecution.logTestStep('should input the destination index');
           await ml.dataFrameAnalyticsCreation.setDestIndexSameAsIdCheckState(false);
           await ml.dataFrameAnalyticsCreation.assertDestIndexInputExists();
           await ml.dataFrameAnalyticsCreation.setDestIndex(testData.destinationIndex);
-        });
 
-        it('sets the create index pattern switch', async () => {
+          await ml.testExecution.logTestStep('sets the create index pattern switch');
           await ml.dataFrameAnalyticsCreation.assertCreateIndexPatternSwitchExists();
           await ml.dataFrameAnalyticsCreation.setCreateIndexPatternSwitchState(
             testData.createIndexPattern
           );
-        });
 
-        it('continues to the create step', async () => {
+          await ml.testExecution.logTestStep('continues to the create step');
           await ml.dataFrameAnalyticsCreation.continueToCreateStep();
         });
 
-        it('creates and starts the analytics job', async () => {
+        it('runs the analytics job and displays it correctly in the job list', async () => {
+          await ml.testExecution.logTestStep('creates and starts the analytics job');
           await ml.dataFrameAnalyticsCreation.assertCreateButtonExists();
           await ml.dataFrameAnalyticsCreation.assertStartJobCheckboxCheckState(true);
           await ml.dataFrameAnalyticsCreation.createAnalyticsJob(testData.jobId);
-        });
 
-        it('finishes analytics processing', async () => {
+          await ml.testExecution.logTestStep('finishes analytics processing');
           await ml.dataFrameAnalytics.waitForAnalyticsCompletion(testData.jobId);
-        });
 
-        it('displays the analytics table', async () => {
+          await ml.testExecution.logTestStep('displays the analytics table');
           await ml.dataFrameAnalyticsCreation.navigateToJobManagementPage();
           await ml.dataFrameAnalytics.assertAnalyticsTableExists();
-        });
 
-        it('displays the stats bar', async () => {
+          await ml.testExecution.logTestStep('displays the stats bar');
           await ml.dataFrameAnalytics.assertAnalyticsStatsBarExists();
-        });
 
-        it('displays the created job in the analytics table', async () => {
+          await ml.testExecution.logTestStep('displays the created job in the analytics table');
           await ml.dataFrameAnalyticsTable.refreshAnalyticsTable();
           await ml.dataFrameAnalyticsTable.filterWithSearchString(testData.jobId);
           const rows = await ml.dataFrameAnalyticsTable.parseAnalyticsTable();
@@ -184,9 +170,10 @@ export default function ({ getService }: FtrProviderContext) {
             1,
             `Filtered analytics table should have 1 row for job id '${testData.jobId}' (got matching items '${filteredRows}')`
           );
-        });
 
-        it('displays details for the created job in the analytics table', async () => {
+          await ml.testExecution.logTestStep(
+            'displays details for the created job in the analytics table'
+          );
           await ml.dataFrameAnalyticsTable.assertAnalyticsRowFields(testData.jobId, {
             id: testData.jobId,
             description: testData.jobDescription,
@@ -198,25 +185,28 @@ export default function ({ getService }: FtrProviderContext) {
           });
         });
 
-        it('should open the edit form for the created job in the analytics table', async () => {
+        it('edits the analytics job and displays it correctly in the job list', async () => {
+          await ml.testExecution.logTestStep(
+            'should open the edit form for the created job in the analytics table'
+          );
           await ml.dataFrameAnalyticsTable.openEditFlyout(testData.jobId);
-        });
 
-        it('should input the description in the edit form', async () => {
+          await ml.testExecution.logTestStep('should input the description in the edit form');
           await ml.dataFrameAnalyticsEdit.assertJobDescriptionEditInputExists();
           await ml.dataFrameAnalyticsEdit.setJobDescriptionEdit(editedDescription);
-        });
 
-        it('should input the model memory limit in the edit form', async () => {
+          await ml.testExecution.logTestStep(
+            'should input the model memory limit in the edit form'
+          );
           await ml.dataFrameAnalyticsEdit.assertJobMmlEditInputExists();
           await ml.dataFrameAnalyticsEdit.setJobMmlEdit('21mb');
-        });
 
-        it('should submit the edit job form', async () => {
+          await ml.testExecution.logTestStep('should submit the edit job form');
           await ml.dataFrameAnalyticsEdit.updateAnalyticsJob();
-        });
 
-        it('displays details for the edited job in the analytics table', async () => {
+          await ml.testExecution.logTestStep(
+            'displays details for the edited job in the analytics table'
+          );
           await ml.dataFrameAnalyticsTable.assertAnalyticsRowFields(testData.jobId, {
             id: testData.jobId,
             description: editedDescription,
@@ -226,14 +216,14 @@ export default function ({ getService }: FtrProviderContext) {
             status: testData.expected.row.status,
             progress: testData.expected.row.progress,
           });
-        });
 
-        it('creates the destination index and writes results to it', async () => {
+          await ml.testExecution.logTestStep(
+            'creates the destination index and writes results to it'
+          );
           await ml.api.assertIndicesExist(testData.destinationIndex);
           await ml.api.assertIndicesNotEmpty(testData.destinationIndex);
-        });
 
-        it('displays the results view for created job', async () => {
+          await ml.testExecution.logTestStep('displays the results view for created job');
           await ml.dataFrameAnalyticsTable.openResultsView();
           await ml.dataFrameAnalytics.assertOutlierTablePanelExists();
         });
diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts
index a67a348323347..af9c5417e4826 100644
--- a/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts
+++ b/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts
@@ -56,108 +56,96 @@ export default function ({ getService }: FtrProviderContext) {
           await ml.testResources.deleteIndexPatternByTitle(testData.destinationIndex);
         });
 
-        it('loads the data frame analytics page', async () => {
+        it('loads the data frame analytics wizard', async () => {
+          await ml.testExecution.logTestStep('loads the data frame analytics page');
           await ml.navigation.navigateToMl();
           await ml.navigation.navigateToDataFrameAnalytics();
-        });
 
-        it('loads the source selection modal', async () => {
+          await ml.testExecution.logTestStep('loads the source selection modal');
           await ml.dataFrameAnalytics.startAnalyticsCreation();
-        });
 
-        it('selects the source data and loads the job wizard page', async () => {
+          await ml.testExecution.logTestStep(
+            'selects the source data and loads the job wizard page'
+          );
           await ml.jobSourceSelection.selectSourceForAnalyticsJob(testData.source);
           await ml.dataFrameAnalyticsCreation.assertConfigurationStepActive();
         });
 
-        it('selects the job type', async () => {
+        it('navigates through the wizard and sets all needed fields', async () => {
+          await ml.testExecution.logTestStep('selects the job type');
           await ml.dataFrameAnalyticsCreation.assertJobTypeSelectExists();
           await ml.dataFrameAnalyticsCreation.selectJobType(testData.jobType);
-        });
 
-        it('inputs the dependent variable', async () => {
+          await ml.testExecution.logTestStep('inputs the dependent variable');
           await ml.dataFrameAnalyticsCreation.assertDependentVariableInputExists();
           await ml.dataFrameAnalyticsCreation.selectDependentVariable(testData.dependentVariable);
-        });
 
-        it('inputs the training percent', async () => {
+          await ml.testExecution.logTestStep('inputs the training percent');
           await ml.dataFrameAnalyticsCreation.assertTrainingPercentInputExists();
           await ml.dataFrameAnalyticsCreation.setTrainingPercent(testData.trainingPercent);
-        });
 
-        it('displays the source data preview', async () => {
+          await ml.testExecution.logTestStep('displays the source data preview');
           await ml.dataFrameAnalyticsCreation.assertSourceDataPreviewExists();
-        });
 
-        it('displays the include fields selection', async () => {
+          await ml.testExecution.logTestStep('displays the include fields selection');
           await ml.dataFrameAnalyticsCreation.assertIncludeFieldsSelectionExists();
-        });
 
-        it('continues to the additional options step', async () => {
+          await ml.testExecution.logTestStep('continues to the additional options step');
           await ml.dataFrameAnalyticsCreation.continueToAdditionalOptionsStep();
-        });
 
-        it('accepts the suggested model memory limit', async () => {
+          await ml.testExecution.logTestStep('accepts the suggested model memory limit');
           await ml.dataFrameAnalyticsCreation.assertModelMemoryInputExists();
           await ml.dataFrameAnalyticsCreation.assertModelMemoryInputPopulated();
-        });
 
-        it('continues to the details step', async () => {
+          await ml.testExecution.logTestStep('continues to the details step');
           await ml.dataFrameAnalyticsCreation.continueToDetailsStep();
-        });
 
-        it('inputs the job id', async () => {
+          await ml.testExecution.logTestStep('inputs the job id');
           await ml.dataFrameAnalyticsCreation.assertJobIdInputExists();
           await ml.dataFrameAnalyticsCreation.setJobId(testData.jobId);
-        });
 
-        it('inputs the job description', async () => {
+          await ml.testExecution.logTestStep('inputs the job description');
           await ml.dataFrameAnalyticsCreation.assertJobDescriptionInputExists();
           await ml.dataFrameAnalyticsCreation.setJobDescription(testData.jobDescription);
-        });
 
-        it('should default the set destination index to job id switch to true', async () => {
+          await ml.testExecution.logTestStep(
+            'should default the set destination index to job id switch to true'
+          );
           await ml.dataFrameAnalyticsCreation.assertDestIndexSameAsIdSwitchExists();
           await ml.dataFrameAnalyticsCreation.assertDestIndexSameAsIdCheckState(true);
-        });
 
-        it('should input the destination index', async () => {
+          await ml.testExecution.logTestStep('should input the destination index');
           await ml.dataFrameAnalyticsCreation.setDestIndexSameAsIdCheckState(false);
           await ml.dataFrameAnalyticsCreation.assertDestIndexInputExists();
           await ml.dataFrameAnalyticsCreation.setDestIndex(testData.destinationIndex);
-        });
 
-        it('sets the create index pattern switch', async () => {
+          await ml.testExecution.logTestStep('sets the create index pattern switch');
           await ml.dataFrameAnalyticsCreation.assertCreateIndexPatternSwitchExists();
           await ml.dataFrameAnalyticsCreation.setCreateIndexPatternSwitchState(
             testData.createIndexPattern
           );
-        });
 
-        it('continues to the create step', async () => {
+          await ml.testExecution.logTestStep('continues to the create step');
           await ml.dataFrameAnalyticsCreation.continueToCreateStep();
         });
 
-        it('creates and starts the analytics job', async () => {
+        it('runs the analytics job and displays it correctly in the job list', async () => {
+          await ml.testExecution.logTestStep('creates and starts the analytics job');
           await ml.dataFrameAnalyticsCreation.assertCreateButtonExists();
           await ml.dataFrameAnalyticsCreation.assertStartJobCheckboxCheckState(true);
           await ml.dataFrameAnalyticsCreation.createAnalyticsJob(testData.jobId);
-        });
 
-        it('finishes analytics processing', async () => {
+          await ml.testExecution.logTestStep('finishes analytics processing');
           await ml.dataFrameAnalytics.waitForAnalyticsCompletion(testData.jobId);
-        });
 
-        it('displays the analytics table', async () => {
+          await ml.testExecution.logTestStep('displays the analytics table');
           await ml.dataFrameAnalyticsCreation.navigateToJobManagementPage();
           await ml.dataFrameAnalytics.assertAnalyticsTableExists();
-        });
 
-        it('displays the stats bar', async () => {
+          await ml.testExecution.logTestStep('displays the stats bar');
           await ml.dataFrameAnalytics.assertAnalyticsStatsBarExists();
-        });
 
-        it('displays the created job in the analytics table', async () => {
+          await ml.testExecution.logTestStep('displays the created job in the analytics table');
           await ml.dataFrameAnalyticsTable.refreshAnalyticsTable();
           await ml.dataFrameAnalyticsTable.filterWithSearchString(testData.jobId);
           const rows = await ml.dataFrameAnalyticsTable.parseAnalyticsTable();
@@ -166,9 +154,10 @@ export default function ({ getService }: FtrProviderContext) {
             1,
             `Filtered analytics table should have 1 row for job id '${testData.jobId}' (got matching items '${filteredRows}')`
           );
-        });
 
-        it('displays details for the created job in the analytics table', async () => {
+          await ml.testExecution.logTestStep(
+            'displays details for the created job in the analytics table'
+          );
           await ml.dataFrameAnalyticsTable.assertAnalyticsRowFields(testData.jobId, {
             id: testData.jobId,
             description: testData.jobDescription,
@@ -180,25 +169,28 @@ export default function ({ getService }: FtrProviderContext) {
           });
         });
 
-        it('should open the edit form for the created job in the analytics table', async () => {
+        it('edits the analytics job and displays it correctly in the job list', async () => {
+          await ml.testExecution.logTestStep(
+            'should open the edit form for the created job in the analytics table'
+          );
           await ml.dataFrameAnalyticsTable.openEditFlyout(testData.jobId);
-        });
 
-        it('should input the description in the edit form', async () => {
+          await ml.testExecution.logTestStep('should input the description in the edit form');
           await ml.dataFrameAnalyticsEdit.assertJobDescriptionEditInputExists();
           await ml.dataFrameAnalyticsEdit.setJobDescriptionEdit(editedDescription);
-        });
 
-        it('should input the model memory limit in the edit form', async () => {
+          await ml.testExecution.logTestStep(
+            'should input the model memory limit in the edit form'
+          );
           await ml.dataFrameAnalyticsEdit.assertJobMmlEditInputExists();
           await ml.dataFrameAnalyticsEdit.setJobMmlEdit('21mb');
-        });
 
-        it('should submit the edit job form', async () => {
+          await ml.testExecution.logTestStep('should submit the edit job form');
           await ml.dataFrameAnalyticsEdit.updateAnalyticsJob();
-        });
 
-        it('displays details for the edited job in the analytics table', async () => {
+          await ml.testExecution.logTestStep(
+            'displays details for the edited job in the analytics table'
+          );
           await ml.dataFrameAnalyticsTable.assertAnalyticsRowFields(testData.jobId, {
             id: testData.jobId,
             description: editedDescription,
@@ -208,14 +200,14 @@ export default function ({ getService }: FtrProviderContext) {
             status: testData.expected.row.status,
             progress: testData.expected.row.progress,
           });
-        });
 
-        it('creates the destination index and writes results to it', async () => {
+          await ml.testExecution.logTestStep(
+            'creates the destination index and writes results to it'
+          );
           await ml.api.assertIndicesExist(testData.destinationIndex);
           await ml.api.assertIndicesNotEmpty(testData.destinationIndex);
-        });
 
-        it('displays the results view for created job', async () => {
+          await ml.testExecution.logTestStep('displays the results view for created job');
           await ml.dataFrameAnalyticsTable.openResultsView();
           await ml.dataFrameAnalytics.assertRegressionEvaluatePanelElementsExists();
           await ml.dataFrameAnalytics.assertRegressionTablePanelExists();
diff --git a/x-pack/test/functional/apps/ml/data_visualizer/file_data_visualizer.ts b/x-pack/test/functional/apps/ml/data_visualizer/file_data_visualizer.ts
index 3c9111c246630..4b3b0c38f2acf 100644
--- a/x-pack/test/functional/apps/ml/data_visualizer/file_data_visualizer.ts
+++ b/x-pack/test/functional/apps/ml/data_visualizer/file_data_visualizer.ts
@@ -47,40 +47,34 @@ export default function ({ getService }: FtrProviderContext) {
           await ml.api.deleteIndices(testData.indexName);
         });
 
-        it('loads the data visualizer selector page', async () => {
+        it('displays and imports a file', async () => {
+          await ml.testExecution.logTestStep('loads the data visualizer selector page');
           await ml.navigation.navigateToDataVisualizer();
-        });
 
-        it('loads the file upload page', async () => {
+          await ml.testExecution.logTestStep('loads the file upload page');
           await ml.dataVisualizer.navigateToFileUpload();
-        });
 
-        it('selects a file and loads visualizer results', async () => {
+          await ml.testExecution.logTestStep('selects a file and loads visualizer results');
           await ml.dataVisualizerFileBased.selectFile(testData.filePath);
-        });
 
-        it('displays the components of the file details page', async () => {
+          await ml.testExecution.logTestStep('displays the components of the file details page');
           await ml.dataVisualizerFileBased.assertFileTitle(testData.expected.results.title);
           await ml.dataVisualizerFileBased.assertFileContentPanelExists();
           await ml.dataVisualizerFileBased.assertSummaryPanelExists();
           await ml.dataVisualizerFileBased.assertFileStatsPanelExists();
-        });
 
-        it('loads the import settings page', async () => {
+          await ml.testExecution.logTestStep('loads the import settings page');
           await ml.dataVisualizerFileBased.navigateToFileImport();
-        });
 
-        it('sets the index name', async () => {
+          await ml.testExecution.logTestStep('sets the index name');
           await ml.dataVisualizerFileBased.setIndexName(testData.indexName);
-        });
 
-        it('sets the create index pattern checkbox', async () => {
+          await ml.testExecution.logTestStep('sets the create index pattern checkbox');
           await ml.dataVisualizerFileBased.setCreateIndexPatternCheckboxState(
             testData.createIndexPattern
           );
-        });
 
-        it('imports the file', async () => {
+          await ml.testExecution.logTestStep('imports the file');
           await ml.dataVisualizerFileBased.startImportAndWaitForProcessing();
         });
       });
@@ -88,15 +82,14 @@ export default function ({ getService }: FtrProviderContext) {
 
     for (const testData of testDataListNegative) {
       describe(testData.suiteSuffix, function () {
-        it('loads the data visualizer selector page', async () => {
+        it('does not import an invalid file', async () => {
+          await ml.testExecution.logTestStep('loads the data visualizer selector page');
           await ml.navigation.navigateToDataVisualizer();
-        });
 
-        it('loads the file upload page', async () => {
+          await ml.testExecution.logTestStep('loads the file upload page');
           await ml.dataVisualizer.navigateToFileUpload();
-        });
 
-        it('selects a file and displays an error', async () => {
+          await ml.testExecution.logTestStep('selects a file and displays an error');
           await ml.dataVisualizerFileBased.selectFile(testData.filePath, true);
         });
       });
diff --git a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts
index eb76a8b4298af..2dc1d9ec00eca 100644
--- a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts
+++ b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts
@@ -292,67 +292,74 @@ export default function ({ getService }: FtrProviderContext) {
   };
 
   function runTests(testData: TestData) {
-    it(`${testData.suiteTitle} loads the saved search selection page`, async () => {
+    it(`${testData.suiteTitle} loads the source data in the data visualizer`, async () => {
+      await ml.testExecution.logTestStep(
+        `${testData.suiteTitle} loads the saved search selection page`
+      );
       await ml.dataVisualizer.navigateToIndexPatternSelection();
-    });
 
-    it(`${testData.suiteTitle} loads the index data visualizer page`, async () => {
+      await ml.testExecution.logTestStep(
+        `${testData.suiteTitle} loads the index data visualizer page`
+      );
       await ml.jobSourceSelection.selectSourceForIndexBasedDataVisualizer(
         testData.sourceIndexOrSavedSearch
       );
     });
 
-    it(`${testData.suiteTitle} displays the time range step`, async () => {
+    it(`${testData.suiteTitle} displays index details`, async () => {
+      await ml.testExecution.logTestStep(`${testData.suiteTitle} displays the time range step`);
       await ml.dataVisualizerIndexBased.assertTimeRangeSelectorSectionExists();
-    });
 
-    it(`${testData.suiteTitle} loads data for full time range`, async () => {
+      await ml.testExecution.logTestStep(`${testData.suiteTitle} loads data for full time range`);
       await ml.dataVisualizerIndexBased.clickUseFullDataButton(testData.expected.totalDocCount);
-    });
 
-    it(`${testData.suiteTitle} displays the panels of fields`, async () => {
+      await ml.testExecution.logTestStep(`${testData.suiteTitle} displays the panels of fields`);
       await ml.dataVisualizerIndexBased.assertFieldsPanelsExist(testData.expected.fieldsPanelCount);
-    });
 
-    if (testData.expected.metricCards !== undefined && testData.expected.metricCards.length > 0) {
-      it(`${testData.suiteTitle} displays the Metrics panel`, async () => {
+      if (testData.expected.metricCards !== undefined && testData.expected.metricCards.length > 0) {
+        await ml.testExecution.logTestStep(`${testData.suiteTitle} displays the Metrics panel`);
         await ml.dataVisualizerIndexBased.assertFieldsPanelForTypesExist([
           ML_JOB_FIELD_TYPES.NUMBER,
         ]); // document_count not exposed as a type in the panel
-      });
 
-      it(`${testData.suiteTitle} displays the expected metric field cards`, async () => {
+        await ml.testExecution.logTestStep(
+          `${testData.suiteTitle} displays the expected metric field cards`
+        );
         for (const fieldCard of testData.expected.metricCards as FieldVisConfig[]) {
           await ml.dataVisualizerIndexBased.assertCardExists(fieldCard.type, fieldCard.fieldName);
         }
-      });
 
-      it(`${testData.suiteTitle} filters metric fields cards with search`, async () => {
+        await ml.testExecution.logTestStep(
+          `${testData.suiteTitle} filters metric fields cards with search`
+        );
         await ml.dataVisualizerIndexBased.filterFieldsPanelWithSearchString(
           ['number'],
           testData.metricFieldsFilter,
           testData.expected.metricFieldsFilterCardCount
         );
-      });
-    }
+      }
 
-    if (
-      testData.expected.nonMetricCards !== undefined &&
-      testData.expected.nonMetricCards.length > 0
-    ) {
-      it(`${testData.suiteTitle} displays the non-metric Fields panel`, async () => {
+      if (
+        testData.expected.nonMetricCards !== undefined &&
+        testData.expected.nonMetricCards.length > 0
+      ) {
+        await ml.testExecution.logTestStep(
+          `${testData.suiteTitle} displays the non-metric Fields panel`
+        );
         await ml.dataVisualizerIndexBased.assertFieldsPanelForTypesExist(
           getFieldTypes(testData.expected.nonMetricCards as FieldVisConfig[])
         );
-      });
 
-      it(`${testData.suiteTitle} displays the expected non-metric field cards`, async () => {
+        await ml.testExecution.logTestStep(
+          `${testData.suiteTitle} displays the expected non-metric field cards`
+        );
         for (const fieldCard of testData.expected.nonMetricCards!) {
           await ml.dataVisualizerIndexBased.assertCardExists(fieldCard.type, fieldCard.fieldName);
         }
-      });
 
-      it(`${testData.suiteTitle} sets the non metric field types input`, async () => {
+        await ml.testExecution.logTestStep(
+          `${testData.suiteTitle} sets the non metric field types input`
+        );
         const fieldTypes: ML_JOB_FIELD_TYPES[] = getFieldTypes(
           testData.expected.nonMetricCards as FieldVisConfig[]
         );
@@ -362,16 +369,17 @@ export default function ({ getService }: FtrProviderContext) {
           testData.nonMetricFieldsTypeFilter,
           testData.expected.nonMetricFieldsTypeFilterCardCount
         );
-      });
 
-      it(`${testData.suiteTitle} filters non-metric fields cards with search`, async () => {
+        await ml.testExecution.logTestStep(
+          `${testData.suiteTitle} filters non-metric fields cards with search`
+        );
         await ml.dataVisualizerIndexBased.filterFieldsPanelWithSearchString(
           getFieldTypes(testData.expected.nonMetricCards as FieldVisConfig[]),
           testData.nonMetricFieldsFilter,
           testData.expected.nonMetricFieldsFilterCardCount
         );
-      });
-    }
+      }
+    });
   }
 
   describe('index based', function () {
diff --git a/x-pack/test/functional/apps/ml/pages.ts b/x-pack/test/functional/apps/ml/pages.ts
index 3691e6b1afcdc..5d084d5abe11e 100644
--- a/x-pack/test/functional/apps/ml/pages.ts
+++ b/x-pack/test/functional/apps/ml/pages.ts
@@ -16,53 +16,49 @@ export default function ({ getService }: FtrProviderContext) {
       await ml.securityUI.loginAsMlPowerUser();
     });
 
-    it('loads the home page', async () => {
+    it('loads the ML pages', async () => {
+      await ml.testExecution.logTestStep('home');
       await ml.navigation.navigateToMl();
-    });
 
-    it('loads the overview page', async () => {
+      await ml.testExecution.logTestStep('loads the overview page');
       await ml.navigation.navigateToOverview();
-    });
 
-    it('loads the anomaly detection area', async () => {
+      await ml.testExecution.logTestStep('loads the anomaly detection area');
       await ml.navigation.navigateToAnomalyDetection();
-    });
 
-    it('loads the job management page', async () => {
+      await ml.testExecution.logTestStep('loads the job management page');
       await ml.navigation.navigateToJobManagement();
       await ml.jobManagement.assertJobStatsBarExists();
       await ml.jobManagement.assertJobTableExists();
       await ml.jobManagement.assertCreateNewJobButtonExists();
-    });
 
-    it('loads the settings page', async () => {
+      await ml.testExecution.logTestStep('loads the settings page');
       await ml.navigation.navigateToSettings();
       await ml.settings.assertSettingsManageCalendarsLinkExists();
       await ml.settings.assertSettingsCreateCalendarLinkExists();
       await ml.settings.assertSettingsManageFilterListsLinkExists();
       await ml.settings.assertSettingsCreateFilterListLinkExists();
-    });
 
-    it('loads the data frame analytics page', async () => {
+      await ml.testExecution.logTestStep('loads the data frame analytics page');
       await ml.navigation.navigateToDataFrameAnalytics();
       await ml.dataFrameAnalytics.assertEmptyListMessageExists();
-    });
 
-    it('loads the data visualizer page', async () => {
+      await ml.testExecution.logTestStep('loads the data visualizer page');
       await ml.navigation.navigateToDataVisualizer();
       await ml.dataVisualizer.assertDataVisualizerImportDataCardExists();
       await ml.dataVisualizer.assertDataVisualizerIndexDataCardExists();
-    });
 
-    it('should load the stack management with the ML menu item being present', async () => {
+      await ml.testExecution.logTestStep(
+        'should load the stack management with the ML menu item being present'
+      );
       await ml.navigation.navigateToStackManagement();
-    });
 
-    it('should load the jobs list page in stack management', async () => {
+      await ml.testExecution.logTestStep('should load the jobs list page in stack management');
       await ml.navigation.navigateToStackManagementJobsListPage();
-    });
 
-    it('should load the analytics jobs list page in stack management', async () => {
+      await ml.testExecution.logTestStep(
+        'should load the analytics jobs list page in stack management'
+      );
       await ml.navigation.navigateToStackManagementJobsListPageAnalyticsTab();
     });
   });
diff --git a/x-pack/test/functional/apps/transform/cloning.ts b/x-pack/test/functional/apps/transform/cloning.ts
index d94923d9a7cce..d5c972cb8bd1f 100644
--- a/x-pack/test/functional/apps/transform/cloning.ts
+++ b/x-pack/test/functional/apps/transform/cloning.ts
@@ -87,138 +87,130 @@ export default function ({ getService }: FtrProviderContext) {
           await transform.testResources.deleteIndexPatternByTitle(testData.destinationIndex);
         });
 
-        it('should load the home page', async () => {
+        it('opens the existing transform in the wizard', async () => {
+          await transform.testExecution.logTestStep('should load the home page');
           await transform.navigation.navigateTo();
           await transform.management.assertTransformListPageExists();
-        });
 
-        it('should display the transforms table', async () => {
+          await transform.testExecution.logTestStep('should display the transforms table');
           await transform.management.assertTransformsTableExists();
-        });
 
-        it('should display the original transform in the transform list', async () => {
+          await transform.testExecution.logTestStep(
+            'should display the original transform in the transform list'
+          );
           await transform.table.refreshTransformList();
           await transform.table.filterWithSearchString(transformConfig.id);
           const rows = await transform.table.parseTransformTable();
           expect(rows.filter((row) => row.id === transformConfig.id)).to.have.length(1);
-        });
 
-        it('should show the actions popover', async () => {
+          await transform.testExecution.logTestStep('should show the actions popover');
           await transform.table.assertTransformRowActions(false);
-        });
 
-        it('should display the define pivot step', async () => {
+          await transform.testExecution.logTestStep('should display the define pivot step');
           await transform.table.clickTransformRowAction('Clone');
           await transform.wizard.assertDefineStepActive();
         });
 
-        it('should load the index preview', async () => {
+        it('navigates through the wizard, checks and sets all needed fields', async () => {
+          await transform.testExecution.logTestStep('should load the index preview');
           await transform.wizard.assertIndexPreviewLoaded();
-        });
 
-        it('should show the index preview', async () => {
+          await transform.testExecution.logTestStep('should show the index preview');
           await transform.wizard.assertIndexPreview(
             testData.expected.indexPreview.columns,
             testData.expected.indexPreview.rows
           );
-        });
 
-        it('should display the query input', async () => {
+          await transform.testExecution.logTestStep('should display the query input');
           await transform.wizard.assertQueryInputExists();
           await transform.wizard.assertQueryValue('');
-        });
 
-        it('should show the pre-filled group-by configuration', async () => {
+          await transform.testExecution.logTestStep(
+            'should show the pre-filled group-by configuration'
+          );
           await transform.wizard.assertGroupByEntryExists(
             testData.expected.groupBy.index,
             testData.expected.groupBy.label
           );
-        });
 
-        it('should show the pre-filled aggs configuration', async () => {
+          await transform.testExecution.logTestStep(
+            'should show the pre-filled aggs configuration'
+          );
           await transform.wizard.assertAggregationEntryExists(
             testData.expected.aggs.index,
             testData.expected.aggs.label
           );
-        });
 
-        it('should show the pivot preview', async () => {
+          await transform.testExecution.logTestStep('should show the pivot preview');
           await transform.wizard.assertPivotPreviewChartHistogramButtonMissing();
           await transform.wizard.assertPivotPreviewColumnValues(
             testData.expected.pivotPreview.column,
             testData.expected.pivotPreview.values
           );
-        });
 
-        it('should load the details step', async () => {
+          await transform.testExecution.logTestStep('should load the details step');
           await transform.wizard.advanceToDetailsStep();
-        });
 
-        it('should input the transform id', async () => {
+          await transform.testExecution.logTestStep('should input the transform id');
           await transform.wizard.assertTransformIdInputExists();
           await transform.wizard.assertTransformIdValue('');
           await transform.wizard.setTransformId(testData.transformId);
-        });
 
-        it('should input the transform description', async () => {
+          await transform.testExecution.logTestStep('should input the transform description');
           await transform.wizard.assertTransformDescriptionInputExists();
           await transform.wizard.assertTransformDescriptionValue('');
           await transform.wizard.setTransformDescription(testData.transformDescription);
-        });
 
-        it('should input the destination index', async () => {
+          await transform.testExecution.logTestStep('should input the destination index');
           await transform.wizard.assertDestinationIndexInputExists();
           await transform.wizard.assertDestinationIndexValue('');
           await transform.wizard.setDestinationIndex(testData.destinationIndex);
-        });
 
-        it('should display the create index pattern switch', async () => {
+          await transform.testExecution.logTestStep(
+            'should display the create index pattern switch'
+          );
           await transform.wizard.assertCreateIndexPatternSwitchExists();
           await transform.wizard.assertCreateIndexPatternSwitchCheckState(true);
-        });
 
-        it('should display the continuous mode switch', async () => {
+          await transform.testExecution.logTestStep('should display the continuous mode switch');
           await transform.wizard.assertContinuousModeSwitchExists();
           await transform.wizard.assertContinuousModeSwitchCheckState(false);
-        });
 
-        it('should load the create step', async () => {
+          await transform.testExecution.logTestStep('should load the create step');
           await transform.wizard.advanceToCreateStep();
-        });
 
-        it('should display the create and start button', async () => {
+          await transform.testExecution.logTestStep('should display the create and start button');
           await transform.wizard.assertCreateAndStartButtonExists();
           await transform.wizard.assertCreateAndStartButtonEnabled(true);
-        });
 
-        it('should display the create button', async () => {
+          await transform.testExecution.logTestStep('should display the create button');
           await transform.wizard.assertCreateButtonExists();
           await transform.wizard.assertCreateButtonEnabled(true);
-        });
 
-        it('should display the copy to clipboard button', async () => {
+          await transform.testExecution.logTestStep('should display the copy to clipboard button');
           await transform.wizard.assertCopyToClipboardButtonExists();
           await transform.wizard.assertCopyToClipboardButtonEnabled(true);
         });
 
-        it('should create the transform', async () => {
+        it('runs the clone transform and displays it correctly in the job list', async () => {
+          await transform.testExecution.logTestStep('should create the transform');
           await transform.wizard.createTransform();
-        });
 
-        it('should start the transform and finish processing', async () => {
+          await transform.testExecution.logTestStep(
+            'should start the transform and finish processing'
+          );
           await transform.wizard.startTransform();
           await transform.wizard.waitForProgressBarComplete();
-        });
 
-        it('should return to the management page', async () => {
+          await transform.testExecution.logTestStep('should return to the management page');
           await transform.wizard.returnToManagement();
-        });
 
-        it('should display the transforms table', async () => {
+          await transform.testExecution.logTestStep('should display the transforms table');
           await transform.management.assertTransformsTableExists();
-        });
 
-        it('should display the created transform in the transform list', async () => {
+          await transform.testExecution.logTestStep(
+            'should display the created transform in the transform list'
+          );
           await transform.table.refreshTransformList();
           await transform.table.filterWithSearchString(testData.transformId);
           const rows = await transform.table.parseTransformTable();
diff --git a/x-pack/test/functional/apps/transform/creation_index_pattern.ts b/x-pack/test/functional/apps/transform/creation_index_pattern.ts
index 7c9983101f607..daecc26186ac1 100644
--- a/x-pack/test/functional/apps/transform/creation_index_pattern.ts
+++ b/x-pack/test/functional/apps/transform/creation_index_pattern.ts
@@ -260,63 +260,54 @@ export default function ({ getService }: FtrProviderContext) {
           await transform.testResources.deleteIndexPatternByTitle(testData.destinationIndex);
         });
 
-        it('loads the home page', async () => {
+        it('loads the wizard for the source data', async () => {
+          await transform.testExecution.logTestStep('loads the home page');
           await transform.navigation.navigateTo();
           await transform.management.assertTransformListPageExists();
-        });
 
-        it('displays the stats bar', async () => {
+          await transform.testExecution.logTestStep('displays the stats bar');
           await transform.management.assertTransformStatsBarExists();
-        });
 
-        it('loads the source selection modal', async () => {
+          await transform.testExecution.logTestStep('loads the source selection modal');
           await transform.management.startTransformCreation();
-        });
 
-        it('selects the source data', async () => {
+          await transform.testExecution.logTestStep('selects the source data');
           await transform.sourceSelection.selectSource(testData.source);
         });
 
-        it('displays the define pivot step', async () => {
+        it('navigates through the wizard and sets all needed fields', async () => {
+          await transform.testExecution.logTestStep('displays the define pivot step');
           await transform.wizard.assertDefineStepActive();
-        });
 
-        it('loads the index preview', async () => {
+          await transform.testExecution.logTestStep('loads the index preview');
           await transform.wizard.assertIndexPreviewLoaded();
-        });
 
-        it('shows the index preview', async () => {
+          await transform.testExecution.logTestStep('shows the index preview');
           await transform.wizard.assertIndexPreview(
             testData.expected.indexPreview.columns,
             testData.expected.indexPreview.rows
           );
-        });
 
-        it('displays an empty pivot preview', async () => {
+          await transform.testExecution.logTestStep('displays an empty pivot preview');
           await transform.wizard.assertPivotPreviewEmpty();
-        });
 
-        it('displays the query input', async () => {
+          await transform.testExecution.logTestStep('displays the query input');
           await transform.wizard.assertQueryInputExists();
           await transform.wizard.assertQueryValue('');
-        });
 
-        it('displays the advanced query editor switch', async () => {
+          await transform.testExecution.logTestStep('displays the advanced query editor switch');
           await transform.wizard.assertAdvancedQueryEditorSwitchExists();
           await transform.wizard.assertAdvancedQueryEditorSwitchCheckState(false);
-        });
 
-        it('enables the index preview histogram charts', async () => {
+          await transform.testExecution.logTestStep('enables the index preview histogram charts');
           await transform.wizard.enableIndexPreviewHistogramCharts();
-        });
 
-        it('displays the index preview histogram charts', async () => {
+          await transform.testExecution.logTestStep('displays the index preview histogram charts');
           await transform.wizard.assertIndexPreviewHistogramCharts(
             testData.expected.histogramCharts
           );
-        });
 
-        it('adds the group by entries', async () => {
+          await transform.testExecution.logTestStep('adds the group by entries');
           for (const [index, entry] of testData.groupByEntries.entries()) {
             await transform.wizard.assertGroupByInputExists();
             await transform.wizard.assertGroupByInputValue([]);
@@ -327,112 +318,97 @@ export default function ({ getService }: FtrProviderContext) {
               entry.intervalLabel
             );
           }
-        });
 
-        it('adds the aggregation entries', async () => {
+          await transform.testExecution.logTestStep('adds the aggregation entries');
           await transform.wizard.addAggregationEntries(testData.aggregationEntries);
-        });
 
-        it('displays the advanced pivot editor switch', async () => {
+          await transform.testExecution.logTestStep('displays the advanced pivot editor switch');
           await transform.wizard.assertAdvancedPivotEditorSwitchExists();
           await transform.wizard.assertAdvancedPivotEditorSwitchCheckState(false);
-        });
 
-        it('displays the advanced configuration', async () => {
+          await transform.testExecution.logTestStep('displays the advanced configuration');
           await transform.wizard.enabledAdvancedPivotEditor();
           await transform.wizard.assertAdvancedPivotEditorContent(
             testData.expected.pivotAdvancedEditorValueArr
           );
-        });
 
-        it('loads the pivot preview', async () => {
+          await transform.testExecution.logTestStep('loads the pivot preview');
           await transform.wizard.assertPivotPreviewLoaded();
-        });
 
-        it('shows the pivot preview', async () => {
+          await transform.testExecution.logTestStep('shows the pivot preview');
           await transform.wizard.assertPivotPreviewChartHistogramButtonMissing();
           await transform.wizard.assertPivotPreviewColumnValues(
             testData.expected.pivotPreview.column,
             testData.expected.pivotPreview.values
           );
-        });
 
-        it('loads the details step', async () => {
+          await transform.testExecution.logTestStep('loads the details step');
           await transform.wizard.advanceToDetailsStep();
-        });
 
-        it('inputs the transform id', async () => {
+          await transform.testExecution.logTestStep('inputs the transform id');
           await transform.wizard.assertTransformIdInputExists();
           await transform.wizard.assertTransformIdValue('');
           await transform.wizard.setTransformId(testData.transformId);
-        });
 
-        it('inputs the transform description', async () => {
+          await transform.testExecution.logTestStep('inputs the transform description');
           await transform.wizard.assertTransformDescriptionInputExists();
           await transform.wizard.assertTransformDescriptionValue('');
           await transform.wizard.setTransformDescription(testData.transformDescription);
-        });
 
-        it('inputs the destination index', async () => {
+          await transform.testExecution.logTestStep('inputs the destination index');
           await transform.wizard.assertDestinationIndexInputExists();
           await transform.wizard.assertDestinationIndexValue('');
           await transform.wizard.setDestinationIndex(testData.destinationIndex);
-        });
 
-        it('displays the create index pattern switch', async () => {
+          await transform.testExecution.logTestStep('displays the create index pattern switch');
           await transform.wizard.assertCreateIndexPatternSwitchExists();
           await transform.wizard.assertCreateIndexPatternSwitchCheckState(true);
-        });
 
-        it('displays the continuous mode switch', async () => {
+          await transform.testExecution.logTestStep('displays the continuous mode switch');
           await transform.wizard.assertContinuousModeSwitchExists();
           await transform.wizard.assertContinuousModeSwitchCheckState(false);
-        });
 
-        it('loads the create step', async () => {
+          await transform.testExecution.logTestStep('loads the create step');
           await transform.wizard.advanceToCreateStep();
-        });
 
-        it('displays the create and start button', async () => {
+          await transform.testExecution.logTestStep('displays the create and start button');
           await transform.wizard.assertCreateAndStartButtonExists();
           await transform.wizard.assertCreateAndStartButtonEnabled(true);
-        });
 
-        it('displays the create button', async () => {
+          await transform.testExecution.logTestStep('displays the create button');
           await transform.wizard.assertCreateButtonExists();
           await transform.wizard.assertCreateButtonEnabled(true);
-        });
 
-        it('displays the copy to clipboard button', async () => {
+          await transform.testExecution.logTestStep('displays the copy to clipboard button');
           await transform.wizard.assertCopyToClipboardButtonExists();
           await transform.wizard.assertCopyToClipboardButtonEnabled(true);
         });
 
-        it('creates the transform', async () => {
+        it('runs the transform and displays it correctly in the job list', async () => {
+          await transform.testExecution.logTestStep('creates the transform');
           await transform.wizard.createTransform();
-        });
 
-        it('starts the transform and finishes processing', async () => {
+          await transform.testExecution.logTestStep('starts the transform and finishes processing');
           await transform.wizard.startTransform();
           await transform.wizard.waitForProgressBarComplete();
-        });
 
-        it('returns to the management page', async () => {
+          await transform.testExecution.logTestStep('returns to the management page');
           await transform.wizard.returnToManagement();
-        });
 
-        it('displays the transforms table', async () => {
+          await transform.testExecution.logTestStep('displays the transforms table');
           await transform.management.assertTransformsTableExists();
-        });
 
-        it('displays the created transform in the transform list', async () => {
+          await transform.testExecution.logTestStep(
+            'displays the created transform in the transform list'
+          );
           await transform.table.refreshTransformList();
           await transform.table.filterWithSearchString(testData.transformId);
           const rows = await transform.table.parseTransformTable();
           expect(rows.filter((row) => row.id === testData.transformId)).to.have.length(1);
-        });
 
-        it('transform creation displays details for the created transform in the transform list', async () => {
+          await transform.testExecution.logTestStep(
+            'transform creation displays details for the created transform in the transform list'
+          );
           await transform.table.assertTransformRowFields(testData.transformId, {
             id: testData.transformId,
             description: testData.transformDescription,
diff --git a/x-pack/test/functional/apps/transform/creation_saved_search.ts b/x-pack/test/functional/apps/transform/creation_saved_search.ts
index 54cc5b3f62933..d3cbc1159a9c7 100644
--- a/x-pack/test/functional/apps/transform/creation_saved_search.ts
+++ b/x-pack/test/functional/apps/transform/creation_saved_search.ts
@@ -79,51 +79,44 @@ export default function ({ getService }: FtrProviderContext) {
           await transform.testResources.deleteIndexPatternByTitle(testData.destinationIndex);
         });
 
-        it('loads the home page', async () => {
+        it('loads the wizard for the source data', async () => {
+          await transform.testExecution.logTestStep('loads the home page');
           await transform.navigation.navigateTo();
           await transform.management.assertTransformListPageExists();
-        });
 
-        it('displays the stats bar', async () => {
+          await transform.testExecution.logTestStep('displays the stats bar');
           await transform.management.assertTransformStatsBarExists();
-        });
 
-        it('loads the source selection modal', async () => {
+          await transform.testExecution.logTestStep('loads the source selection modal');
           await transform.management.startTransformCreation();
-        });
 
-        it('selects the source data', async () => {
+          await transform.testExecution.logTestStep('selects the source data');
           await transform.sourceSelection.selectSource(testData.source);
         });
 
-        it('displays the define pivot step', async () => {
+        it('navigates through the wizard and sets all needed fields', async () => {
+          await transform.testExecution.logTestStep('displays the define pivot step');
           await transform.wizard.assertDefineStepActive();
-        });
 
-        it('loads the index preview', async () => {
+          await transform.testExecution.logTestStep('loads the index preview');
           await transform.wizard.assertIndexPreviewLoaded();
-        });
 
-        it('shows the filtered index preview', async () => {
+          await transform.testExecution.logTestStep('shows the filtered index preview');
           await transform.wizard.assertIndexPreviewColumnValues(
             testData.expected.indexPreview.column,
             testData.expected.indexPreview.values
           );
-        });
 
-        it('displays an empty pivot preview', async () => {
+          await transform.testExecution.logTestStep('displays an empty pivot preview');
           await transform.wizard.assertPivotPreviewEmpty();
-        });
 
-        it('hides the query input', async () => {
+          await transform.testExecution.logTestStep('hides the query input');
           await transform.wizard.assertQueryInputMissing();
-        });
 
-        it('hides the advanced query editor switch', async () => {
+          await transform.testExecution.logTestStep('hides the advanced query editor switch');
           await transform.wizard.assertAdvancedQueryEditorSwitchMissing();
-        });
 
-        it('adds the group by entries', async () => {
+          await transform.testExecution.logTestStep('adds the group by entries');
           for (const [index, entry] of testData.groupByEntries.entries()) {
             await transform.wizard.assertGroupByInputExists();
             await transform.wizard.assertGroupByInputValue([]);
@@ -134,108 +127,94 @@ export default function ({ getService }: FtrProviderContext) {
               entry.intervalLabel
             );
           }
-        });
 
-        it('adds the aggregation entries', async () => {
+          await transform.testExecution.logTestStep('adds the aggregation entries');
           for (const [index, agg] of testData.aggregationEntries.entries()) {
             await transform.wizard.assertAggregationInputExists();
             await transform.wizard.assertAggregationInputValue([]);
             await transform.wizard.addAggregationEntry(index, agg.identifier, agg.label);
           }
-        });
 
-        it('displays the advanced pivot editor switch', async () => {
+          await transform.testExecution.logTestStep('displays the advanced pivot editor switch');
           await transform.wizard.assertAdvancedPivotEditorSwitchExists();
           await transform.wizard.assertAdvancedPivotEditorSwitchCheckState(false);
-        });
 
-        it('loads the pivot preview', async () => {
+          await transform.testExecution.logTestStep('loads the pivot preview');
           await transform.wizard.assertPivotPreviewLoaded();
-        });
 
-        it('shows the pivot preview', async () => {
+          await transform.testExecution.logTestStep('shows the pivot preview');
           await transform.wizard.assertPivotPreviewColumnValues(
             testData.expected.pivotPreview.column,
             testData.expected.pivotPreview.values
           );
-        });
 
-        it('loads the details step', async () => {
+          await transform.testExecution.logTestStep('loads the details step');
           await transform.wizard.advanceToDetailsStep();
-        });
 
-        it('inputs the transform id', async () => {
+          await transform.testExecution.logTestStep('inputs the transform id');
           await transform.wizard.assertTransformIdInputExists();
           await transform.wizard.assertTransformIdValue('');
           await transform.wizard.setTransformId(testData.transformId);
-        });
 
-        it('inputs the transform description', async () => {
+          await transform.testExecution.logTestStep('inputs the transform description');
           await transform.wizard.assertTransformDescriptionInputExists();
           await transform.wizard.assertTransformDescriptionValue('');
           await transform.wizard.setTransformDescription(testData.transformDescription);
-        });
 
-        it('inputs the destination index', async () => {
+          await transform.testExecution.logTestStep('inputs the destination index');
           await transform.wizard.assertDestinationIndexInputExists();
           await transform.wizard.assertDestinationIndexValue('');
           await transform.wizard.setDestinationIndex(testData.destinationIndex);
-        });
 
-        it('displays the create index pattern switch', async () => {
+          await transform.testExecution.logTestStep('displays the create index pattern switch');
           await transform.wizard.assertCreateIndexPatternSwitchExists();
           await transform.wizard.assertCreateIndexPatternSwitchCheckState(true);
-        });
 
-        it('displays the continuous mode switch', async () => {
+          await transform.testExecution.logTestStep('displays the continuous mode switch');
           await transform.wizard.assertContinuousModeSwitchExists();
           await transform.wizard.assertContinuousModeSwitchCheckState(false);
-        });
 
-        it('loads the create step', async () => {
+          await transform.testExecution.logTestStep('loads the create step');
           await transform.wizard.advanceToCreateStep();
-        });
 
-        it('displays the create and start button', async () => {
+          await transform.testExecution.logTestStep('displays the create and start button');
           await transform.wizard.assertCreateAndStartButtonExists();
           await transform.wizard.assertCreateAndStartButtonEnabled(true);
-        });
 
-        it('displays the create button', async () => {
+          await transform.testExecution.logTestStep('displays the create button');
           await transform.wizard.assertCreateButtonExists();
           await transform.wizard.assertCreateButtonEnabled(true);
-        });
 
-        it('displays the copy to clipboard button', async () => {
+          await transform.testExecution.logTestStep('displays the copy to clipboard button');
           await transform.wizard.assertCopyToClipboardButtonExists();
           await transform.wizard.assertCopyToClipboardButtonEnabled(true);
         });
 
-        it('creates the transform', async () => {
+        it('runs the transform and displays it correctly in the job list', async () => {
+          await transform.testExecution.logTestStep('creates the transform');
           await transform.wizard.createTransform();
-        });
 
-        it('starts the transform and finishes processing', async () => {
+          await transform.testExecution.logTestStep('starts the transform and finishes processing');
           await transform.wizard.startTransform();
           await transform.wizard.waitForProgressBarComplete();
-        });
 
-        it('returns to the management page', async () => {
+          await transform.testExecution.logTestStep('returns to the management page');
           await transform.wizard.returnToManagement();
-        });
 
-        it('displays the transforms table', async () => {
+          await transform.testExecution.logTestStep('displays the transforms table');
           await transform.management.assertTransformsTableExists();
-        });
 
-        it('displays the created transform in the transform list', async () => {
+          await transform.testExecution.logTestStep(
+            'displays the created transform in the transform list'
+          );
           await transform.table.refreshTransformList();
           await transform.table.filterWithSearchString(testData.transformId);
           const rows = await transform.table.parseTransformTable();
           expect(rows.filter((row) => row.id === testData.transformId)).to.have.length(1);
-        });
 
-        it('transform creation displays details for the created transform in the transform list', async () => {
+          await transform.testExecution.logTestStep(
+            'transform creation displays details for the created transform in the transform list'
+          );
           await transform.table.assertTransformRowFields(testData.transformId, {
             id: testData.transformId,
             description: testData.transformDescription,
@@ -243,13 +222,15 @@ export default function ({ getService }: FtrProviderContext) {
             mode: testData.expected.row.mode,
             progress: testData.expected.row.progress,
           });
-        });
 
-        it('expands the transform management table row and walks through available tabs', async () => {
+          await transform.testExecution.logTestStep(
+            'expands the transform management table row and walks through available tabs'
+          );
           await transform.table.assertTransformExpandedRow();
-        });
 
-        it('displays the transform preview in the expanded row', async () => {
+          await transform.testExecution.logTestStep(
+            'displays the transform preview in the expanded row'
+          );
           await transform.table.assertTransformsExpandedRowPreviewColumnValues(
             testData.expected.pivotPreview.column,
             testData.expected.pivotPreview.values
diff --git a/x-pack/test/functional/apps/transform/editing.ts b/x-pack/test/functional/apps/transform/editing.ts
index 44ecca17328a7..5582d279833e7 100644
--- a/x-pack/test/functional/apps/transform/editing.ts
+++ b/x-pack/test/functional/apps/transform/editing.ts
@@ -61,32 +61,32 @@ export default function ({ getService }: FtrProviderContext) {
     };
 
     describe(`${testData.suiteTitle}`, function () {
-      it('should load the home page', async () => {
+      it('opens the edit flyout for an existing transform', async () => {
+        await transform.testExecution.logTestStep('should load the home page');
         await transform.navigation.navigateTo();
         await transform.management.assertTransformListPageExists();
-      });
 
-      it('should display the transforms table', async () => {
+        await transform.testExecution.logTestStep('should display the transforms table');
         await transform.management.assertTransformsTableExists();
-      });
 
-      it('should display the original transform in the transform list', async () => {
+        await transform.testExecution.logTestStep(
+          'should display the original transform in the transform list'
+        );
         await transform.table.refreshTransformList();
         await transform.table.filterWithSearchString(transformConfig.id);
         const rows = await transform.table.parseTransformTable();
         expect(rows.filter((row) => row.id === transformConfig.id)).to.have.length(1);
-      });
 
-      it('should show the actions popover', async () => {
+        await transform.testExecution.logTestStep('should show the actions popover');
         await transform.table.assertTransformRowActions(false);
-      });
 
-      it('should show the edit flyout', async () => {
+        await transform.testExecution.logTestStep('should show the edit flyout');
         await transform.table.clickTransformRowAction('Edit');
         await transform.editFlyout.assertTransformEditFlyoutExists();
       });
 
-      it('should update the transform description', async () => {
+      it('navigates through the edit flyout and sets all needed fields', async () => {
+        await transform.testExecution.logTestStep('should update the transform description');
         await transform.editFlyout.assertTransformEditFlyoutInputExists('Description');
         await transform.editFlyout.assertTransformEditFlyoutInputValue(
           'Description',
@@ -96,18 +96,18 @@ export default function ({ getService }: FtrProviderContext) {
           'Description',
           testData.transformDescription
         );
-      });
 
-      it('should update the transform documents per second', async () => {
+        await transform.testExecution.logTestStep(
+          'should update the transform documents per second'
+        );
         await transform.editFlyout.assertTransformEditFlyoutInputExists('DocsPerSecond');
         await transform.editFlyout.assertTransformEditFlyoutInputValue('DocsPerSecond', '');
         await transform.editFlyout.setTransformEditFlyoutInputValue(
           'DocsPerSecond',
           testData.transformDocsPerSecond
         );
-      });
 
-      it('should update the transform frequency', async () => {
+        await transform.testExecution.logTestStep('should update the transform frequency');
         await transform.editFlyout.assertTransformEditFlyoutInputExists('Frequency');
         await transform.editFlyout.assertTransformEditFlyoutInputValue('Frequency', '');
         await transform.editFlyout.setTransformEditFlyoutInputValue(
@@ -116,22 +116,24 @@ export default function ({ getService }: FtrProviderContext) {
         );
       });
 
-      it('should update the transform', async () => {
+      it('updates the transform and displays it correctly in the job list', async () => {
+        await transform.testExecution.logTestStep('should update the transform');
         await transform.editFlyout.updateTransform();
-      });
 
-      it('should display the transforms table', async () => {
+        await transform.testExecution.logTestStep('should display the transforms table');
         await transform.management.assertTransformsTableExists();
-      });
 
-      it('should display the updated transform in the transform list', async () => {
+        await transform.testExecution.logTestStep(
+          'should display the updated transform in the transform list'
+        );
         await transform.table.refreshTransformList();
         await transform.table.filterWithSearchString(transformConfig.id);
         const rows = await transform.table.parseTransformTable();
         expect(rows.filter((row) => row.id === transformConfig.id)).to.have.length(1);
-      });
 
-      it('should display the updated transform in the transform list row cells', async () => {
+        await transform.testExecution.logTestStep(
+          'should display the updated transform in the transform list row cells'
+        );
         await transform.table.assertTransformRowFields(transformConfig.id, {
           id: transformConfig.id,
           description: testData.transformDescription,
@@ -139,9 +141,10 @@ export default function ({ getService }: FtrProviderContext) {
           mode: testData.expected.row.mode,
           progress: testData.expected.row.progress,
         });
-      });
 
-      it('should display the messages tab and include an update message', async () => {
+        await transform.testExecution.logTestStep(
+          'should display the messages tab and include an update message'
+        );
         await transform.table.assertTransformExpandedRowMessages(testData.expected.messageText);
       });
     });
diff --git a/x-pack/test/functional/services/ml/common_api.ts b/x-pack/test/functional/services/ml/common_api.ts
new file mode 100644
index 0000000000000..e68dbf4bdcaf6
--- /dev/null
+++ b/x-pack/test/functional/services/ml/common_api.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { ProvidedType } from '@kbn/test/types/ftr';
+
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export const COMMON_REQUEST_HEADERS = {
+  'kbn-xsrf': 'some-xsrf-token',
+};
+
+export type MlCommonAPI = ProvidedType<typeof MachineLearningCommonAPIProvider>;
+
+export function MachineLearningCommonAPIProvider({}: FtrProviderContext) {
+  return {
+    async getCommonRequestHeader() {
+      return COMMON_REQUEST_HEADERS;
+    },
+  };
+}
diff --git a/x-pack/test/functional/services/ml/common.ts b/x-pack/test/functional/services/ml/common_ui.ts
similarity index 92%
rename from x-pack/test/functional/services/ml/common.ts
rename to x-pack/test/functional/services/ml/common_ui.ts
index 3333a81f028fa..b66fd7087654d 100644
--- a/x-pack/test/functional/services/ml/common.ts
+++ b/x-pack/test/functional/services/ml/common_ui.ts
@@ -12,13 +12,9 @@ interface SetValueOptions {
   typeCharByChar?: boolean;
 }
 
-export const COMMON_REQUEST_HEADERS = {
-  'kbn-xsrf': 'some-xsrf-token',
-};
+export type MlCommonUI = ProvidedType<typeof MachineLearningCommonUIProvider>;
 
-export type MlCommon = ProvidedType<typeof MachineLearningCommonProvider>;
-
-export function MachineLearningCommonProvider({ getService }: FtrProviderContext) {
+export function MachineLearningCommonUIProvider({ getService }: FtrProviderContext) {
   const log = getService('log');
   const retry = getService('retry');
   const testSubjects = getService('testSubjects');
diff --git a/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts b/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts
index cdd26b60d3be0..ffa1d9fd46c75 100644
--- a/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts
+++ b/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts
@@ -7,7 +7,7 @@ import expect from '@kbn/expect';
 import { DataFrameAnalyticsConfig } from '../../../../plugins/ml/public/application/data_frame_analytics/common';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { MlCommon } from './common';
+import { MlCommonUI } from './common_ui';
 import { MlApi } from './api';
 import {
   ClassificationAnalysis,
@@ -32,7 +32,7 @@ const isClassificationAnalysis = (arg: any): arg is ClassificationAnalysis => {
 
 export function MachineLearningDataFrameAnalyticsCreationProvider(
   { getService }: FtrProviderContext,
-  mlCommon: MlCommon,
+  mlCommonUI: MlCommonUI,
   mlApi: MlApi
 ) {
   const testSubjects = getService('testSubjects');
@@ -113,16 +113,20 @@ export function MachineLearningDataFrameAnalyticsCreationProvider(
     },
 
     async setJobId(jobId: string) {
-      await mlCommon.setValueWithChecks('mlAnalyticsCreateJobFlyoutJobIdInput', jobId, {
+      await mlCommonUI.setValueWithChecks('mlAnalyticsCreateJobFlyoutJobIdInput', jobId, {
         clearWithKeyboard: true,
       });
       await this.assertJobIdValue(jobId);
     },
 
     async setJobDescription(jobDescription: string) {
-      await mlCommon.setValueWithChecks('mlDFAnalyticsJobCreationJobDescription', jobDescription, {
-        clearWithKeyboard: true,
-      });
+      await mlCommonUI.setValueWithChecks(
+        'mlDFAnalyticsJobCreationJobDescription',
+        jobDescription,
+        {
+          clearWithKeyboard: true,
+        }
+      );
       await this.assertJobDescriptionValue(jobDescription);
     },
 
@@ -218,7 +222,7 @@ export function MachineLearningDataFrameAnalyticsCreationProvider(
     },
 
     async setDestIndex(destIndex: string) {
-      await mlCommon.setValueWithChecks(
+      await mlCommonUI.setValueWithChecks(
         'mlAnalyticsCreateJobFlyoutDestinationIndexInput',
         destIndex,
         {
@@ -405,7 +409,7 @@ export function MachineLearningDataFrameAnalyticsCreationProvider(
 
     async setModelMemory(modelMemory: string) {
       await retry.tryForTime(15 * 1000, async () => {
-        await mlCommon.setValueWithChecks(
+        await mlCommonUI.setValueWithChecks(
           'mlAnalyticsCreateJobWizardModelMemoryInput',
           modelMemory,
           {
diff --git a/x-pack/test/functional/services/ml/data_frame_analytics_edit.ts b/x-pack/test/functional/services/ml/data_frame_analytics_edit.ts
index fd06dd24d6f8b..6e446667875d9 100644
--- a/x-pack/test/functional/services/ml/data_frame_analytics_edit.ts
+++ b/x-pack/test/functional/services/ml/data_frame_analytics_edit.ts
@@ -6,11 +6,11 @@
 import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { MlCommon } from './common';
+import { MlCommonUI } from './common_ui';
 
 export function MachineLearningDataFrameAnalyticsEditProvider(
   { getService }: FtrProviderContext,
-  mlCommon: MlCommon
+  mlCommonUI: MlCommonUI
 ) {
   const testSubjects = getService('testSubjects');
   const retry = getService('retry');
@@ -43,14 +43,14 @@ export function MachineLearningDataFrameAnalyticsEditProvider(
       );
     },
     async setJobDescriptionEdit(jobDescription: string) {
-      await mlCommon.setValueWithChecks('mlAnalyticsEditFlyoutDescriptionInput', jobDescription, {
+      await mlCommonUI.setValueWithChecks('mlAnalyticsEditFlyoutDescriptionInput', jobDescription, {
         clearWithKeyboard: true,
       });
       await this.assertJobDescriptionEditValue(jobDescription);
     },
 
     async setJobMmlEdit(mml: string) {
-      await mlCommon.setValueWithChecks('mlAnalyticsEditFlyoutmodelMemoryLimitInput', mml, {
+      await mlCommonUI.setValueWithChecks('mlAnalyticsEditFlyoutmodelMemoryLimitInput', mml, {
         clearWithKeyboard: true,
       });
       await this.assertJobMmlEditValue(mml);
diff --git a/x-pack/test/functional/services/ml/data_visualizer_file_based.ts b/x-pack/test/functional/services/ml/data_visualizer_file_based.ts
index 8c5e40dd5dbdd..14c6f8de7d329 100644
--- a/x-pack/test/functional/services/ml/data_visualizer_file_based.ts
+++ b/x-pack/test/functional/services/ml/data_visualizer_file_based.ts
@@ -7,11 +7,11 @@
 import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { MlCommon } from './common';
+import { MlCommonUI } from './common_ui';
 
 export function MachineLearningDataVisualizerFileBasedProvider(
   { getService, getPageObjects }: FtrProviderContext,
-  mlCommon: MlCommon
+  mlCommonUI: MlCommonUI
 ) {
   const log = getService('log');
   const retry = getService('retry');
@@ -75,7 +75,7 @@ export function MachineLearningDataVisualizerFileBasedProvider(
     },
 
     async setIndexName(indexName: string) {
-      await mlCommon.setValueWithChecks('mlFileDataVisIndexNameInput', indexName, {
+      await mlCommonUI.setValueWithChecks('mlFileDataVisIndexNameInput', indexName, {
         clearWithKeyboard: true,
       });
       await this.assertIndexNameValue(indexName);
diff --git a/x-pack/test/functional/services/ml/index.ts b/x-pack/test/functional/services/ml/index.ts
index fd36bb0f47f95..d7ff60440bf31 100644
--- a/x-pack/test/functional/services/ml/index.ts
+++ b/x-pack/test/functional/services/ml/index.ts
@@ -9,7 +9,8 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 import { MachineLearningAnomaliesTableProvider } from './anomalies_table';
 import { MachineLearningAnomalyExplorerProvider } from './anomaly_explorer';
 import { MachineLearningAPIProvider } from './api';
-import { MachineLearningCommonProvider } from './common';
+import { MachineLearningCommonAPIProvider } from './common_api';
+import { MachineLearningCommonUIProvider } from './common_ui';
 import { MachineLearningCustomUrlsProvider } from './custom_urls';
 import { MachineLearningDataFrameAnalyticsProvider } from './data_frame_analytics';
 import { MachineLearningDataFrameAnalyticsCreationProvider } from './data_frame_analytics_creation';
@@ -33,10 +34,12 @@ import { MachineLearningSecurityCommonProvider } from './security_common';
 import { MachineLearningSecurityUIProvider } from './security_ui';
 import { MachineLearningSettingsProvider } from './settings';
 import { MachineLearningSingleMetricViewerProvider } from './single_metric_viewer';
+import { MachineLearningTestExecutionProvider } from './test_execution';
 import { MachineLearningTestResourcesProvider } from './test_resources';
 
 export function MachineLearningProvider(context: FtrProviderContext) {
-  const common = MachineLearningCommonProvider(context);
+  const commonAPI = MachineLearningCommonAPIProvider(context);
+  const commonUI = MachineLearningCommonUIProvider(context);
 
   const anomaliesTable = MachineLearningAnomaliesTableProvider(context);
   const anomalyExplorer = MachineLearningAnomalyExplorerProvider(context);
@@ -45,22 +48,22 @@ export function MachineLearningProvider(context: FtrProviderContext) {
   const dataFrameAnalytics = MachineLearningDataFrameAnalyticsProvider(context, api);
   const dataFrameAnalyticsCreation = MachineLearningDataFrameAnalyticsCreationProvider(
     context,
-    common,
+    commonUI,
     api
   );
-  const dataFrameAnalyticsEdit = MachineLearningDataFrameAnalyticsEditProvider(context, common);
+  const dataFrameAnalyticsEdit = MachineLearningDataFrameAnalyticsEditProvider(context, commonUI);
   const dataFrameAnalyticsTable = MachineLearningDataFrameAnalyticsTableProvider(context);
   const dataVisualizer = MachineLearningDataVisualizerProvider(context);
-  const dataVisualizerFileBased = MachineLearningDataVisualizerFileBasedProvider(context, common);
+  const dataVisualizerFileBased = MachineLearningDataVisualizerFileBasedProvider(context, commonUI);
   const dataVisualizerIndexBased = MachineLearningDataVisualizerIndexBasedProvider(context);
   const jobManagement = MachineLearningJobManagementProvider(context, api);
   const jobSelection = MachineLearningJobSelectionProvider(context);
   const jobSourceSelection = MachineLearningJobSourceSelectionProvider(context);
   const jobTable = MachineLearningJobTableProvider(context);
   const jobTypeSelection = MachineLearningJobTypeSelectionProvider(context);
-  const jobWizardAdvanced = MachineLearningJobWizardAdvancedProvider(context, common);
+  const jobWizardAdvanced = MachineLearningJobWizardAdvancedProvider(context, commonUI);
   const jobWizardCategorization = MachineLearningJobWizardCategorizationProvider(context);
-  const jobWizardCommon = MachineLearningJobWizardCommonProvider(context, common, customUrls);
+  const jobWizardCommon = MachineLearningJobWizardCommonProvider(context, commonUI, customUrls);
   const jobWizardMultiMetric = MachineLearningJobWizardMultiMetricProvider(context);
   const jobWizardPopulation = MachineLearningJobWizardPopulationProvider(context);
   const navigation = MachineLearningNavigationProvider(context);
@@ -68,13 +71,15 @@ export function MachineLearningProvider(context: FtrProviderContext) {
   const securityUI = MachineLearningSecurityUIProvider(context, securityCommon);
   const settings = MachineLearningSettingsProvider(context);
   const singleMetricViewer = MachineLearningSingleMetricViewerProvider(context);
+  const testExecution = MachineLearningTestExecutionProvider(context);
   const testResources = MachineLearningTestResourcesProvider(context);
 
   return {
     anomaliesTable,
     anomalyExplorer,
     api,
-    common,
+    commonAPI,
+    commonUI,
     customUrls,
     dataFrameAnalytics,
     dataFrameAnalyticsCreation,
@@ -98,6 +103,7 @@ export function MachineLearningProvider(context: FtrProviderContext) {
     securityUI,
     settings,
     singleMetricViewer,
+    testExecution,
     testResources,
   };
 }
diff --git a/x-pack/test/functional/services/ml/job_wizard_advanced.ts b/x-pack/test/functional/services/ml/job_wizard_advanced.ts
index e4d2ecf66f646..dbb0c1ceeb14e 100644
--- a/x-pack/test/functional/services/ml/job_wizard_advanced.ts
+++ b/x-pack/test/functional/services/ml/job_wizard_advanced.ts
@@ -6,11 +6,11 @@
 import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { MlCommon } from './common';
+import { MlCommonUI } from './common_ui';
 
 export function MachineLearningJobWizardAdvancedProvider(
   { getService }: FtrProviderContext,
-  mlCommon: MlCommon
+  mlCommonUI: MlCommonUI
 ) {
   const comboBox = getService('comboBox');
   const testSubjects = getService('testSubjects');
@@ -54,7 +54,7 @@ export function MachineLearningJobWizardAdvancedProvider(
     },
 
     async setQueryDelay(queryDelay: string) {
-      await mlCommon.setValueWithChecks('mlJobWizardInputQueryDelay', queryDelay, {
+      await mlCommonUI.setValueWithChecks('mlJobWizardInputQueryDelay', queryDelay, {
         clearWithKeyboard: true,
         typeCharByChar: true,
       });
@@ -74,7 +74,7 @@ export function MachineLearningJobWizardAdvancedProvider(
     },
 
     async setFrequency(frequency: string) {
-      await mlCommon.setValueWithChecks('mlJobWizardInputFrequency', frequency, {
+      await mlCommonUI.setValueWithChecks('mlJobWizardInputFrequency', frequency, {
         clearWithKeyboard: true,
         typeCharByChar: true,
       });
@@ -94,7 +94,7 @@ export function MachineLearningJobWizardAdvancedProvider(
     },
 
     async setScrollSize(scrollSize: string) {
-      await mlCommon.setValueWithChecks('mlJobWizardInputScrollSize', scrollSize, {
+      await mlCommonUI.setValueWithChecks('mlJobWizardInputScrollSize', scrollSize, {
         clearWithKeyboard: true,
         typeCharByChar: true,
       });
@@ -303,7 +303,7 @@ export function MachineLearningJobWizardAdvancedProvider(
     },
 
     async setDetectorDescription(description: string) {
-      await mlCommon.setValueWithChecks('mlAdvancedDetectorDescriptionInput', description, {
+      await mlCommonUI.setValueWithChecks('mlAdvancedDetectorDescriptionInput', description, {
         clearWithKeyboard: true,
       });
       await this.assertDetectorDescriptionValue(description);
diff --git a/x-pack/test/functional/services/ml/job_wizard_common.ts b/x-pack/test/functional/services/ml/job_wizard_common.ts
index 2843c36e08a1d..97253c5f45303 100644
--- a/x-pack/test/functional/services/ml/job_wizard_common.ts
+++ b/x-pack/test/functional/services/ml/job_wizard_common.ts
@@ -6,12 +6,12 @@
 import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { MlCommon } from './common';
+import { MlCommonUI } from './common_ui';
 import { MlCustomUrls } from './custom_urls';
 
 export function MachineLearningJobWizardCommonProvider(
   { getService }: FtrProviderContext,
-  mlCommon: MlCommon,
+  mlCommonUI: MlCommonUI,
   customUrls: MlCustomUrls
 ) {
   const comboBox = getService('comboBox');
@@ -128,7 +128,7 @@ export function MachineLearningJobWizardCommonProvider(
     },
 
     async setBucketSpan(bucketSpan: string) {
-      await mlCommon.setValueWithChecks('mlJobWizardInputBucketSpan', bucketSpan, {
+      await mlCommonUI.setValueWithChecks('mlJobWizardInputBucketSpan', bucketSpan, {
         clearWithKeyboard: true,
         typeCharByChar: true,
       });
@@ -148,7 +148,7 @@ export function MachineLearningJobWizardCommonProvider(
     },
 
     async setJobId(jobId: string) {
-      await mlCommon.setValueWithChecks('mlJobWizardInputJobId', jobId, {
+      await mlCommonUI.setValueWithChecks('mlJobWizardInputJobId', jobId, {
         clearWithKeyboard: true,
       });
       await this.assertJobIdValue(jobId);
@@ -169,7 +169,7 @@ export function MachineLearningJobWizardCommonProvider(
     },
 
     async setJobDescription(jobDescription: string) {
-      await mlCommon.setValueWithChecks('mlJobWizardInputJobDescription', jobDescription, {
+      await mlCommonUI.setValueWithChecks('mlJobWizardInputJobDescription', jobDescription, {
         clearWithKeyboard: true,
       });
       await this.assertJobDescriptionValue(jobDescription);
@@ -219,11 +219,11 @@ export function MachineLearningJobWizardCommonProvider(
 
     async addCalendar(calendarId: string) {
       await this.ensureAdditionalSettingsSectionOpen();
-      await comboBox.setCustom('mlJobWizardComboBoxCalendars > comboBoxInput', calendarId);
+      await comboBox.set('mlJobWizardComboBoxCalendars > comboBoxInput', calendarId);
       const actualCalendarSelection = await this.getSelectedCalendars();
       expect(actualCalendarSelection).to.contain(
         calendarId,
-        `Expected calendar selection to conatin '${calendarId}' (got '${actualCalendarSelection}')`
+        `Expected calendar selection to contain '${calendarId}' (got '${actualCalendarSelection}')`
       );
     },
 
@@ -372,7 +372,7 @@ export function MachineLearningJobWizardCommonProvider(
         subj = advancedSectionSelector(subj);
       }
       await retry.tryForTime(15 * 1000, async () => {
-        await mlCommon.setValueWithChecks(subj, modelMemoryLimit, { clearWithKeyboard: true });
+        await mlCommonUI.setValueWithChecks(subj, modelMemoryLimit, { clearWithKeyboard: true });
         await this.assertModelMemoryLimitValue(modelMemoryLimit, {
           withAdvancedSection: sectionOptions.withAdvancedSection,
         });
diff --git a/x-pack/test/functional/services/ml/test_execution.ts b/x-pack/test/functional/services/ml/test_execution.ts
new file mode 100644
index 0000000000000..230c20b4d2d5a
--- /dev/null
+++ b/x-pack/test/functional/services/ml/test_execution.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export function MachineLearningTestExecutionProvider({ getService }: FtrProviderContext) {
+  const log = getService('log');
+
+  return {
+    async logTestStep(stepTitle: string) {
+      await log.debug(`=== TEST STEP === ${stepTitle}`);
+    },
+  };
+}
diff --git a/x-pack/test/functional/services/ml/test_resources.ts b/x-pack/test/functional/services/ml/test_resources.ts
index 675ec890b9edf..949635964c613 100644
--- a/x-pack/test/functional/services/ml/test_resources.ts
+++ b/x-pack/test/functional/services/ml/test_resources.ts
@@ -6,7 +6,7 @@
 
 import { ProvidedType } from '@kbn/test/types/ftr';
 import { savedSearches, dashboards } from './test_resources_data';
-import { COMMON_REQUEST_HEADERS } from './common';
+import { COMMON_REQUEST_HEADERS } from './common_api';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export enum SavedObjectType {
diff --git a/x-pack/test/functional/services/transform/index.ts b/x-pack/test/functional/services/transform/index.ts
index 24091ba773218..83a227ce56604 100644
--- a/x-pack/test/functional/services/transform/index.ts
+++ b/x-pack/test/functional/services/transform/index.ts
@@ -14,6 +14,7 @@ import { TransformSecurityCommonProvider } from './security_common';
 import { TransformSecurityUIProvider } from './security_ui';
 import { TransformSourceSelectionProvider } from './source_selection';
 import { TransformTableProvider } from './transform_table';
+import { TransformTestExecutionProvider } from './test_execution';
 import { TransformWizardProvider } from './wizard';
 
 import { MachineLearningTestResourcesProvider } from '../ml/test_resources';
@@ -27,6 +28,7 @@ export function TransformProvider(context: FtrProviderContext) {
   const securityUI = TransformSecurityUIProvider(context, securityCommon);
   const sourceSelection = TransformSourceSelectionProvider(context);
   const table = TransformTableProvider(context);
+  const testExecution = TransformTestExecutionProvider(context);
   const testResources = MachineLearningTestResourcesProvider(context);
   const wizard = TransformWizardProvider(context);
 
@@ -39,6 +41,7 @@ export function TransformProvider(context: FtrProviderContext) {
     securityUI,
     sourceSelection,
     table,
+    testExecution,
     testResources,
     wizard,
   };
diff --git a/x-pack/test/functional/services/transform/test_execution.ts b/x-pack/test/functional/services/transform/test_execution.ts
new file mode 100644
index 0000000000000..ee27f9ee5194b
--- /dev/null
+++ b/x-pack/test/functional/services/transform/test_execution.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export function TransformTestExecutionProvider({ getService }: FtrProviderContext) {
+  const log = getService('log');
+
+  return {
+    async logTestStep(stepTitle: string) {
+      await log.debug(`=== TEST STEP === ${stepTitle}`);
+    },
+  };
+}

From d158692bf5abdf39a3c512bb89d508e050d56823 Mon Sep 17 00:00:00 2001
From: Alexey Antonov <alexwizp@gmail.com>
Date: Thu, 20 Aug 2020 12:19:21 +0300
Subject: [PATCH 53/85] Vega is now GA (#75157)

* Bringing Vega out of experimental

Closes: #21721

* fix CI group 12

* remove experimental flag from doc

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 docs/visualize/vega.asciidoc                  |  8 ++----
 src/plugins/vis_type_vega/public/vega_type.ts |  1 -
 .../page_objects/vega_chart_page.ts           | 28 +++++++++++--------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/docs/visualize/vega.asciidoc b/docs/visualize/vega.asciidoc
index 9b8c32d7e41f0..b231159e86bde 100644
--- a/docs/visualize/vega.asciidoc
+++ b/docs/visualize/vega.asciidoc
@@ -1,8 +1,6 @@
 [[vega-graph]]
 == Vega
 
-experimental[]
-
 Build custom visualizations using Vega and Vega-Lite, backed by one or more
 data sources including {es}, Elastic Map Service, URL,
 or static data. Use the {kib} extensions to Vega to embed Vega into
@@ -1259,7 +1257,7 @@ Override it by providing a different `stroke`, `fill`, or `color` (Vega-Lite) va
 [[vega-queries]]
 ==== Writing {es} queries in Vega
 
-experimental[] {kib} extends the Vega https://vega.github.io/vega/docs/data/[data] elements
+{kib} extends the Vega https://vega.github.io/vega/docs/data/[data] elements
 with support for direct {es} queries specified as a `url`.
 
 Because of this, {kib} is **unable to support dynamically loaded data**,
@@ -1414,7 +1412,7 @@ try to get about 10-15 data points (buckets).
 [[vega-esmfiles]]
 === Access Elastic Map Service files
 
-experimental[] Access the Elastic Map Service files via the same mechanism:
+Access the Elastic Map Service files via the same mechanism:
 
 [source,yaml]
 ----
@@ -1619,7 +1617,7 @@ kibanaSetTimeFilter(start, end)
 [[vega-useful-links]]
 === Resources and examples
 
-experimental[] To learn more about Vega and Vega-Lite, refer to the resources and examples.
+To learn more about Vega and Vega-Lite, refer to the resources and examples.
 
 ==== Vega editor
 The https://vega.github.io/editor/[Vega Editor] includes examples for Vega & Vega-Lite, but does not support any
diff --git a/src/plugins/vis_type_vega/public/vega_type.ts b/src/plugins/vis_type_vega/public/vega_type.ts
index f49816017b684..46fd2fbc5587e 100644
--- a/src/plugins/vis_type_vega/public/vega_type.ts
+++ b/src/plugins/vis_type_vega/public/vega_type.ts
@@ -58,7 +58,6 @@ export const createVegaTypeDefinition = (dependencies: VegaVisualizationDependen
     getSupportedTriggers: () => {
       return [VIS_EVENT_TO_TRIGGER.applyFilter];
     },
-    stage: 'experimental',
     inspectorAdapters: createInspectorAdapters,
   };
 };
diff --git a/test/functional/page_objects/vega_chart_page.ts b/test/functional/page_objects/vega_chart_page.ts
index 1173c35af3384..6c64f9dda2efd 100644
--- a/test/functional/page_objects/vega_chart_page.ts
+++ b/test/functional/page_objects/vega_chart_page.ts
@@ -33,7 +33,6 @@ export function VegaChartPageProvider({
   const find = getService('find');
   const testSubjects = getService('testSubjects');
   const browser = getService('browser');
-  const { common } = getPageObjects(['common']);
   const retry = getService('retry');
 
   class VegaChartPage {
@@ -49,6 +48,15 @@ export function VegaChartPageProvider({
       return find.byCssSelector('div.vgaVis__controls');
     }
 
+    public getYAxisContainer() {
+      return find.byCssSelector('[aria-label^="Y-axis"]');
+    }
+
+    public async getAceGutterContainer() {
+      const editor = await this.getEditor();
+      return editor.findByClassName('ace_gutter');
+    }
+
     public async getRawSpec() {
       // Adapted from console_page.js:getVisibleTextFromAceEditor(). Is there a common utilities file?
       const editor = await this.getEditor();
@@ -83,20 +91,16 @@ export function VegaChartPageProvider({
     }
 
     public async typeInSpec(text: string) {
-      await this.focusEditor();
+      const aceGutter = await this.getAceGutterContainer();
 
-      let repeats = 20;
-      while (--repeats > 0) {
-        await browser.pressKeys(Key.ARROW_UP);
-        await common.sleep(50);
-      }
-      await browser.pressKeys(Key.ARROW_RIGHT);
+      await aceGutter.doubleClick();
+      await browser.pressKeys(Key.LEFT);
+      await browser.pressKeys(Key.RIGHT);
       await browser.pressKeys(text);
     }
 
     public async cleanSpec() {
-      const editor = await this.getEditor();
-      const aceGutter = await editor.findByClassName('ace_gutter');
+      const aceGutter = await this.getAceGutterContainer();
 
       await retry.try(async () => {
         await aceGutter.doubleClick();
@@ -107,11 +111,11 @@ export function VegaChartPageProvider({
     }
 
     public async getYAxisLabels() {
-      const chart = await testSubjects.find('visualizationLoader');
-      const yAxis = await chart.findByCssSelector('[aria-label^="Y-axis"]');
+      const yAxis = await this.getYAxisContainer();
       const tickGroup = await yAxis.findByClassName('role-axis-label');
       const labels = await tickGroup.findAllByCssSelector('text');
       const labelTexts: string[] = [];
+
       for (const label of labels) {
         labelTexts.push(await label.getVisibleText());
       }

From 77a434b2f79c01438234d39a7cc1f25ddecc9f76 Mon Sep 17 00:00:00 2001
From: Robert Oskamp <robert.oskamp@elastic.co>
Date: Thu, 20 Aug 2020 12:38:20 +0200
Subject: [PATCH 54/85] [ML] Functional tests - fix imports in results API
 tests (#75533)

This PR fixes the broken COMMON_REQUEST_HEADERS in the recently added results API tests.
---
 .../api_integration/apis/ml/results/get_categorizer_stats.ts    | 2 +-
 .../api_integration/apis/ml/results/get_stopped_partitions.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x-pack/test/api_integration/apis/ml/results/get_categorizer_stats.ts b/x-pack/test/api_integration/apis/ml/results/get_categorizer_stats.ts
index a9d863b7526f9..d2a0625cf4e24 100644
--- a/x-pack/test/api_integration/apis/ml/results/get_categorizer_stats.ts
+++ b/x-pack/test/api_integration/apis/ml/results/get_categorizer_stats.ts
@@ -7,7 +7,7 @@
 import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 import { Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
 import { AnomalyCategorizerStatsDoc } from '../../../../../plugins/ml/common/types/anomalies';
 
diff --git a/x-pack/test/api_integration/apis/ml/results/get_stopped_partitions.ts b/x-pack/test/api_integration/apis/ml/results/get_stopped_partitions.ts
index 424bc8c333aab..a46c8861258e9 100644
--- a/x-pack/test/api_integration/apis/ml/results/get_stopped_partitions.ts
+++ b/x-pack/test/api_integration/apis/ml/results/get_stopped_partitions.ts
@@ -8,7 +8,7 @@ import expect from '@kbn/expect';
 import { Datafeed, Job } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');

From bb8e5dc3a7f2b14daabe9f5186cffdc012a094d7 Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad.muhammad@elastic.co>
Date: Thu, 20 Aug 2020 14:27:06 +0200
Subject: [PATCH 55/85] Upgrade APM RUM packages from 5.4.0 to 5.5.0 (#75530)

---
 package.json        |  2 +-
 x-pack/package.json |  2 +-
 yarn.lock           | 28 ++++++++++++++--------------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 7d12af2eb5066..23fc31f369b8d 100644
--- a/package.json
+++ b/package.json
@@ -123,7 +123,7 @@
   "dependencies": {
     "@babel/core": "^7.11.1",
     "@babel/register": "^7.10.5",
-    "@elastic/apm-rum": "^5.4.0",
+    "@elastic/apm-rum": "^5.5.0",
     "@elastic/charts": "19.8.1",
     "@elastic/datemath": "5.0.3",
     "@elastic/elasticsearch": "7.9.0-rc.2",
diff --git a/x-pack/package.json b/x-pack/package.json
index 5333c67f6ac0f..a70373db36603 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -203,7 +203,7 @@
     "@babel/core": "^7.11.1",
     "@babel/register": "^7.10.5",
     "@babel/runtime": "^7.11.2",
-    "@elastic/apm-rum-react": "^1.2.2",
+    "@elastic/apm-rum-react": "^1.2.3",
     "@elastic/datemath": "5.0.3",
     "@elastic/ems-client": "7.9.3",
     "@elastic/eui": "27.4.0",
diff --git a/yarn.lock b/yarn.lock
index 0bc1ef72651e3..d13db64ad8b79 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1120,29 +1120,29 @@
     enabled "2.0.x"
     kuler "^2.0.0"
 
-"@elastic/apm-rum-core@^5.5.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@elastic/apm-rum-core/-/apm-rum-core-5.5.0.tgz#e05ffd87b95420c788ed3be7cfbbbce1ff54bcf5"
-  integrity sha512-fPx65oZD495WdHQ3YA8TnzqmjqlvSxoXm0tZqXQKzKVv7CMsNkolnEPSAXFl0W5pmAVRvw6T+vMmxcVIGsCD4Q==
+"@elastic/apm-rum-core@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@elastic/apm-rum-core/-/apm-rum-core-5.6.0.tgz#d1f643eb00e590d5884598a20bb54efb1490ee13"
+  integrity sha512-hG+lITWBQd0mw00BQ1zYVRKDCh5b9FKFiht9fMXcT0SENOsT5J37RIbQHPdVawluT7/mhDF07t4fR8V0xRB1/g==
   dependencies:
     error-stack-parser "^1.3.5"
     opentracing "^0.14.3"
     promise-polyfill "^8.1.3"
 
-"@elastic/apm-rum-react@^1.2.2":
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/@elastic/apm-rum-react/-/apm-rum-react-1.2.2.tgz#b92f1491bae62de0b4296264afe73171f17af022"
-  integrity sha512-KXM2qxG4p1GeDoud9jpmUA19uuQxW4M+CgtrNIXuNwITMIw46qRLyl5zOIvy9dqHodvLIvZ7RWsFtSZH4kZnAQ==
+"@elastic/apm-rum-react@^1.2.3":
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/@elastic/apm-rum-react/-/apm-rum-react-1.2.3.tgz#fdf28492daca0ee6aa67c53a457eea1f16739e1e"
+  integrity sha512-oCjF/L46OYDRLHKt60l7aU+DFE484dwb/kKN12VZCOgueDZm4BCJd7yaosBtWDhnw0tl0Iqc0X3r4U7pQ+g9aA==
   dependencies:
-    "@elastic/apm-rum" "^5.4.0"
+    "@elastic/apm-rum" "^5.5.0"
     hoist-non-react-statics "^3.3.0"
 
-"@elastic/apm-rum@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@elastic/apm-rum/-/apm-rum-5.4.0.tgz#2d87d5ca19f7f4a021c03f075d9d767894e88b3c"
-  integrity sha512-X4uaJlM28pyDOsD06serggspbTyz7Za0zFr+OWUntI6tQKu++Tn8yGsr6L2WuXhKNGhyJmrAfh13pmy9ZGyFcg==
+"@elastic/apm-rum@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@elastic/apm-rum/-/apm-rum-5.5.0.tgz#24a8b4db0fa328c1e54710d18837e1adba7e51e0"
+  integrity sha512-uEOJG7Lm0CLtGfXOLXSsiPLpTPvrNUqlWQEKf/D77lpHRVWxBb56xa4X4CK2on8V1XzHDufcYBPcBcKSGozTLw==
   dependencies:
-    "@elastic/apm-rum-core" "^5.5.0"
+    "@elastic/apm-rum-core" "^5.6.0"
 
 "@elastic/charts@19.8.1":
   version "19.8.1"

From cd36188c408ccdb635e7876b9b6c19995b7dd03a Mon Sep 17 00:00:00 2001
From: Vadim Dalecky <streamich@gmail.com>
Date: Thu, 20 Aug 2020 14:31:35 +0200
Subject: [PATCH 56/85] Modularize render complete (#74504)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: 🤖 remove unused render-complete logic

* feat: 🎸 add render-complete observables to IEmbeddable

* Revert "chore: 🤖 remove unused render-complete logic"

This reverts commit 0049c01fbd68532b2397c30bd1e5b36fe0bf2944.

* refactor: 💡 rename render complete "helper" to "listener"

* feat: 🎸 add render complete dispatcher to embeddable

* refactor: 💡 move data-title setup to Embeddable

* refactor: 💡 move embeddable data-title setting to render-compl

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../angular/directives/render_complete.ts     |  6 +-
 src/plugins/embeddable/kibana.json            |  3 +-
 .../public/lib/embeddables/embeddable.tsx     | 22 ++++-
 .../public/render_complete/index.ts           | 18 +---
 .../render_complete_dispatcher.ts             | 83 +++++++++++++++++++
 ..._helper.ts => render_complete_listener.ts} | 12 +--
 .../public/embeddable/visualize_embeddable.ts | 35 ++------
 7 files changed, 121 insertions(+), 58 deletions(-)
 create mode 100644 src/plugins/kibana_utils/public/render_complete/render_complete_dispatcher.ts
 rename src/plugins/kibana_utils/public/render_complete/{render_complete_helper.ts => render_complete_listener.ts} (80%)

diff --git a/src/plugins/discover/public/application/angular/directives/render_complete.ts b/src/plugins/discover/public/application/angular/directives/render_complete.ts
index 635cf68f12fcb..72f97138790b2 100644
--- a/src/plugins/discover/public/application/angular/directives/render_complete.ts
+++ b/src/plugins/discover/public/application/angular/directives/render_complete.ts
@@ -17,14 +17,14 @@
  * under the License.
  */
 import { IScope } from 'angular';
-import { RenderCompleteHelper } from '../../../../../kibana_utils/public';
+import { RenderCompleteListener } from '../../../../../kibana_utils/public';
 
 export function createRenderCompleteDirective() {
   return {
     controller($scope: IScope, $element: JQLite) {
       const el = $element[0];
-      const renderCompleteHelper = new RenderCompleteHelper(el);
-      $scope.$on('$destroy', renderCompleteHelper.destroy);
+      const renderCompleteListener = new RenderCompleteListener(el);
+      $scope.$on('$destroy', renderCompleteListener.destroy);
     },
   };
 }
diff --git a/src/plugins/embeddable/kibana.json b/src/plugins/embeddable/kibana.json
index c9694ad7b9423..6a8e6079232aa 100644
--- a/src/plugins/embeddable/kibana.json
+++ b/src/plugins/embeddable/kibana.json
@@ -12,6 +12,7 @@
   ],
   "requiredBundles": [
     "savedObjects",
-    "kibanaReact"
+    "kibanaReact",
+    "kibanaUtils"
   ]
 }
diff --git a/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx b/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx
index fcecf117d7d52..ffe8a5bf6e7dc 100644
--- a/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx
+++ b/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx
@@ -19,6 +19,8 @@
 
 import { cloneDeep, isEqual } from 'lodash';
 import * as Rx from 'rxjs';
+import { distinctUntilChanged, map } from 'rxjs/operators';
+import { RenderCompleteDispatcher } from '../../../../kibana_utils/public';
 import { Adapters, ViewMode } from '../types';
 import { IContainer } from '../containers';
 import { EmbeddableInput, EmbeddableOutput, IEmbeddable } from './i_embeddable';
@@ -47,6 +49,8 @@ export abstract class Embeddable<
   private readonly input$: Rx.BehaviorSubject<TEmbeddableInput>;
   private readonly output$: Rx.BehaviorSubject<TEmbeddableOutput>;
 
+  protected renderComplete = new RenderCompleteDispatcher();
+
   // Listener to parent changes, if this embeddable exists in a parent, in order
   // to update input when the parent changes.
   private parentSubscription?: Rx.Subscription;
@@ -77,6 +81,15 @@ export abstract class Embeddable<
         this.onResetInput(newInput);
       });
     }
+
+    this.getOutput$()
+      .pipe(
+        map(({ title }) => title || ''),
+        distinctUntilChanged()
+      )
+      .subscribe((title) => {
+        this.renderComplete.setTitle(title);
+      });
   }
 
   public getIsContainer(): this is IContainer {
@@ -105,8 +118,8 @@ export abstract class Embeddable<
     return this.input;
   }
 
-  public getTitle() {
-    return this.output.title;
+  public getTitle(): string {
+    return this.output.title || '';
   }
 
   /**
@@ -133,7 +146,10 @@ export abstract class Embeddable<
     }
   }
 
-  public render(domNode: HTMLElement | Element): void {
+  public render(el: HTMLElement): void {
+    this.renderComplete.setEl(el);
+    this.renderComplete.setTitle(this.output.title || '');
+
     if (this.destroyed) {
       throw new Error('Embeddable has been destroyed');
     }
diff --git a/src/plugins/kibana_utils/public/render_complete/index.ts b/src/plugins/kibana_utils/public/render_complete/index.ts
index ec86144f65a35..8f14b6ca8f0ab 100644
--- a/src/plugins/kibana_utils/public/render_complete/index.ts
+++ b/src/plugins/kibana_utils/public/render_complete/index.ts
@@ -17,19 +17,5 @@
  * under the License.
  */
 
-const dispatchCustomEvent = (el: HTMLElement, eventName: string) => {
-  // we're using the native events so that we aren't tied to the jQuery custom events,
-  // otherwise we have to use jQuery(element).on(...) because jQuery's events sit on top
-  // of the native events per https://github.com/jquery/jquery/issues/2476
-  el.dispatchEvent(new CustomEvent(eventName, { bubbles: true }));
-};
-
-export function dispatchRenderComplete(el: HTMLElement) {
-  dispatchCustomEvent(el, 'renderComplete');
-}
-
-export function dispatchRenderStart(el: HTMLElement) {
-  dispatchCustomEvent(el, 'renderStart');
-}
-
-export * from './render_complete_helper';
+export * from './render_complete_listener';
+export * from './render_complete_dispatcher';
diff --git a/src/plugins/kibana_utils/public/render_complete/render_complete_dispatcher.ts b/src/plugins/kibana_utils/public/render_complete/render_complete_dispatcher.ts
new file mode 100644
index 0000000000000..386bf1eb62568
--- /dev/null
+++ b/src/plugins/kibana_utils/public/render_complete/render_complete_dispatcher.ts
@@ -0,0 +1,83 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+const dispatchEvent = (el: HTMLElement, eventName: string) => {
+  el.dispatchEvent(new CustomEvent(eventName, { bubbles: true }));
+};
+
+export function dispatchRenderComplete(el: HTMLElement) {
+  dispatchEvent(el, 'renderComplete');
+}
+
+export function dispatchRenderStart(el: HTMLElement) {
+  dispatchEvent(el, 'renderStart');
+}
+
+/**
+ * Should call `dispatchComplete()` when UI block has finished loading its data and has
+ * completely rendered. Should `dispatchInProgress()` every time UI block
+ * starts loading data again. At the start it is assumed that UI block is loading
+ * so it dispatches "in progress" automatically, so you need to call `setRenderComplete`
+ * at least once.
+ *
+ * This is used for reporting to know that UI block is ready, so
+ * it can take a screenshot. It is also used in functional tests to know that
+ * page has stabilized.
+ */
+export class RenderCompleteDispatcher {
+  private count: number = 0;
+  private el?: HTMLElement;
+
+  constructor(el?: HTMLElement) {
+    this.setEl(el);
+  }
+
+  public setEl(el?: HTMLElement) {
+    this.el = el;
+    this.count = 0;
+    if (el) this.dispatchInProgress();
+  }
+
+  public dispatchInProgress() {
+    if (!this.el) return;
+    this.el.setAttribute('data-render-complete', 'false');
+    this.el.setAttribute('data-rendering-count', String(this.count));
+    dispatchRenderStart(this.el);
+  }
+
+  public dispatchComplete() {
+    if (!this.el) return;
+    this.count++;
+    this.el.setAttribute('data-render-complete', 'true');
+    this.el.setAttribute('data-rendering-count', String(this.count));
+    dispatchRenderComplete(this.el);
+  }
+
+  public dispatchError() {
+    if (!this.el) return;
+    this.count++;
+    this.el.setAttribute('data-render-complete', 'false');
+    this.el.setAttribute('data-rendering-count', String(this.count));
+  }
+
+  public setTitle(title: string) {
+    if (!this.el) return;
+    this.el.setAttribute('data-title', title);
+  }
+}
diff --git a/src/plugins/kibana_utils/public/render_complete/render_complete_helper.ts b/src/plugins/kibana_utils/public/render_complete/render_complete_listener.ts
similarity index 80%
rename from src/plugins/kibana_utils/public/render_complete/render_complete_helper.ts
rename to src/plugins/kibana_utils/public/render_complete/render_complete_listener.ts
index 1230638a1d709..d9289b20d4bfa 100644
--- a/src/plugins/kibana_utils/public/render_complete/render_complete_helper.ts
+++ b/src/plugins/kibana_utils/public/render_complete/render_complete_listener.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-const attributeName = 'data-render-complete';
+export class RenderCompleteListener {
+  private readonly attributeName = 'data-render-complete';
 
-export class RenderCompleteHelper {
   constructor(private readonly element: HTMLElement) {
     this.setup();
   }
@@ -30,23 +30,23 @@ export class RenderCompleteHelper {
   };
 
   public setup = () => {
-    this.element.setAttribute(attributeName, 'false');
+    this.element.setAttribute(this.attributeName, 'false');
     this.element.addEventListener('renderStart', this.start);
     this.element.addEventListener('renderComplete', this.complete);
   };
 
   public disable = () => {
-    this.element.setAttribute(attributeName, 'disabled');
+    this.element.setAttribute(this.attributeName, 'disabled');
     this.destroy();
   };
 
   private start = () => {
-    this.element.setAttribute(attributeName, 'false');
+    this.element.setAttribute(this.attributeName, 'false');
     return true;
   };
 
   private complete = () => {
-    this.element.setAttribute(attributeName, 'true');
+    this.element.setAttribute(this.attributeName, 'true');
     return true;
   };
 }
diff --git a/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts b/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts
index c4d5f5206ee90..a434bf9756b64 100644
--- a/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts
+++ b/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts
@@ -36,7 +36,6 @@ import {
   IContainer,
   Adapters,
 } from '../../../../plugins/embeddable/public';
-import { dispatchRenderComplete } from '../../../../plugins/kibana_utils/public';
 import {
   IExpressionLoaderParams,
   ExpressionsStart,
@@ -85,7 +84,6 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
   private timefilter: TimefilterContract;
   private timeRange?: TimeRange;
   private query?: Query;
-  private title?: string;
   private filters?: Filter[];
   private visCustomizations?: Pick<VisualizeInput, 'vis' | 'table'>;
   private subscriptions: Subscription[] = [];
@@ -158,7 +156,7 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
     if (!adapters) return;
 
     return this.deps.start().plugins.inspector.open(adapters, {
-      title: this.getTitle() || this.title || '',
+      title: this.getTitle(),
     });
   };
 
@@ -222,16 +220,6 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
       this.updateOutput({ title: this.vis.title });
     }
 
-    // Keep title depending on the output Embeddable to decouple the
-    // visual appearance of the title and the actual title content (useful in Dashboard)
-    if (this.output.title !== this.title) {
-      this.title = this.output.title;
-
-      if (this.domNode) {
-        this.domNode.setAttribute('data-title', this.title || '');
-      }
-    }
-
     if (this.vis.description && this.domNode) {
       this.domNode.setAttribute('data-description', this.vis.description);
     }
@@ -246,26 +234,20 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
   hasInspector = () => Boolean(this.getInspectorAdapters());
 
   onContainerLoading = () => {
-    this.domNode.setAttribute('data-render-complete', 'false');
+    this.renderComplete.dispatchInProgress();
     this.updateOutput({ loading: true, error: undefined });
   };
 
-  onContainerRender = (count: number) => {
-    this.domNode.setAttribute('data-render-complete', 'true');
-    this.domNode.setAttribute('data-rendering-count', count.toString());
+  onContainerRender = () => {
+    this.renderComplete.dispatchComplete();
     this.updateOutput({ loading: false, error: undefined });
-    dispatchRenderComplete(this.domNode);
   };
 
   onContainerError = (error: ExpressionRenderError) => {
     if (this.abortController) {
       this.abortController.abort();
     }
-    this.domNode.setAttribute(
-      'data-rendering-count',
-      this.domNode.getAttribute('data-rendering-count') + 1
-    );
-    this.domNode.setAttribute('data-render-complete', 'false');
+    this.renderComplete.dispatchError();
     this.updateOutput({ loading: false, error });
   };
 
@@ -274,7 +256,6 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
    * @param {Element} domNode
    */
   public async render(domNode: HTMLElement) {
-    super.render(domNode);
     this.timeRange = _.cloneDeep(this.input.timeRange);
 
     this.transferCustomizationsToUiState();
@@ -284,6 +265,7 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
     domNode.appendChild(div);
 
     this.domNode = div;
+    super.render(this.domNode);
 
     const expressions = getExpressions();
     this.handler = new expressions.ExpressionLoader(this.domNode, undefined, {
@@ -332,19 +314,14 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
       })
     );
 
-    div.setAttribute('data-title', this.output.title || '');
-
     if (this.vis.description) {
       div.setAttribute('data-description', this.vis.description);
     }
 
     div.setAttribute('data-test-subj', 'visualizationLoader');
     div.setAttribute('data-shared-item', '');
-    div.setAttribute('data-rendering-count', '0');
-    div.setAttribute('data-render-complete', 'false');
 
     this.subscriptions.push(this.handler.loading$.subscribe(this.onContainerLoading));
-
     this.subscriptions.push(this.handler.render$.subscribe(this.onContainerRender));
 
     this.updateHandler();

From 4dd5d63484f867705c38194eb9b5071e62f9c1a6 Mon Sep 17 00:00:00 2001
From: Joe Portner <5295965+jportner@users.noreply.github.com>
Date: Thu, 20 Aug 2020 08:35:33 -0400
Subject: [PATCH 57/85] Change response for Saved Objects share/unshare
 operations (#74995)

---
 .../core/server/kibana-plugin-core-server.md  |  2 ++
 ...ver.savedobjectsaddtonamespacesresponse.md | 19 ++++++++++++
 ...jectsaddtonamespacesresponse.namespaces.md | 13 ++++++++
 ...rver.savedobjectsclient.addtonamespaces.md |  4 +--
 ...savedobjectsclient.deletefromnamespaces.md |  4 +--
 ...avedobjectsdeletefromnamespacesresponse.md | 19 ++++++++++++
 ...deletefromnamespacesresponse.namespaces.md | 13 ++++++++
 ....savedobjectsrepository.addtonamespaces.md |  4 +--
 ...dobjectsrepository.deletefromnamespaces.md |  4 +--
 src/core/server/index.ts                      |  2 ++
 .../service/lib/repository.test.js            | 16 +++++-----
 .../saved_objects/service/lib/repository.ts   | 12 ++++---
 .../service/saved_objects_client.ts           | 22 +++++++++++--
 src/core/server/server.api.md                 | 18 ++++++++---
 ...ecure_saved_objects_client_wrapper.test.ts | 31 +++++++++++++++----
 .../secure_saved_objects_client_wrapper.ts    |  6 ++--
 .../spaces_saved_objects_client.test.ts       |  4 +--
 17 files changed, 156 insertions(+), 37 deletions(-)
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsaddtonamespacesresponse.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsaddtonamespacesresponse.namespaces.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsdeletefromnamespacesresponse.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsdeletefromnamespacesresponse.namespaces.md

diff --git a/docs/development/core/server/kibana-plugin-core-server.md b/docs/development/core/server/kibana-plugin-core-server.md
index 5347f0b55e19b..98d7b0610abea 100644
--- a/docs/development/core/server/kibana-plugin-core-server.md
+++ b/docs/development/core/server/kibana-plugin-core-server.md
@@ -153,6 +153,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [SavedObjectMigrationMap](./kibana-plugin-core-server.savedobjectmigrationmap.md) | A map of [migration functions](./kibana-plugin-core-server.savedobjectmigrationfn.md) to be used for a given type. The map's keys must be valid semver versions.<!-- -->For a given document, only migrations with a higher version number than that of the document will be applied. Migrations are executed in order, starting from the lowest version and ending with the highest one. |
 |  [SavedObjectReference](./kibana-plugin-core-server.savedobjectreference.md) | A reference to another saved object. |
 |  [SavedObjectsAddToNamespacesOptions](./kibana-plugin-core-server.savedobjectsaddtonamespacesoptions.md) |  |
+|  [SavedObjectsAddToNamespacesResponse](./kibana-plugin-core-server.savedobjectsaddtonamespacesresponse.md) |  |
 |  [SavedObjectsBaseOptions](./kibana-plugin-core-server.savedobjectsbaseoptions.md) |  |
 |  [SavedObjectsBulkCreateObject](./kibana-plugin-core-server.savedobjectsbulkcreateobject.md) |  |
 |  [SavedObjectsBulkGetObject](./kibana-plugin-core-server.savedobjectsbulkgetobject.md) |  |
@@ -167,6 +168,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [SavedObjectsCreateOptions](./kibana-plugin-core-server.savedobjectscreateoptions.md) |  |
 |  [SavedObjectsDeleteByNamespaceOptions](./kibana-plugin-core-server.savedobjectsdeletebynamespaceoptions.md) |  |
 |  [SavedObjectsDeleteFromNamespacesOptions](./kibana-plugin-core-server.savedobjectsdeletefromnamespacesoptions.md) |  |
+|  [SavedObjectsDeleteFromNamespacesResponse](./kibana-plugin-core-server.savedobjectsdeletefromnamespacesresponse.md) |  |
 |  [SavedObjectsDeleteOptions](./kibana-plugin-core-server.savedobjectsdeleteoptions.md) |  |
 |  [SavedObjectsExportOptions](./kibana-plugin-core-server.savedobjectsexportoptions.md) | Options controlling the export operation. |
 |  [SavedObjectsExportResultDetails](./kibana-plugin-core-server.savedobjectsexportresultdetails.md) | Structure of the export result details entry |
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsaddtonamespacesresponse.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsaddtonamespacesresponse.md
new file mode 100644
index 0000000000000..306f502f0b0b3
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsaddtonamespacesresponse.md
@@ -0,0 +1,19 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsAddToNamespacesResponse](./kibana-plugin-core-server.savedobjectsaddtonamespacesresponse.md)
+
+## SavedObjectsAddToNamespacesResponse interface
+
+
+<b>Signature:</b>
+
+```typescript
+export interface SavedObjectsAddToNamespacesResponse 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [namespaces](./kibana-plugin-core-server.savedobjectsaddtonamespacesresponse.namespaces.md) | <code>string[]</code> | The namespaces the object exists in after this operation is complete. |
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsaddtonamespacesresponse.namespaces.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsaddtonamespacesresponse.namespaces.md
new file mode 100644
index 0000000000000..4fc2e376304d4
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsaddtonamespacesresponse.namespaces.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsAddToNamespacesResponse](./kibana-plugin-core-server.savedobjectsaddtonamespacesresponse.md) &gt; [namespaces](./kibana-plugin-core-server.savedobjectsaddtonamespacesresponse.namespaces.md)
+
+## SavedObjectsAddToNamespacesResponse.namespaces property
+
+The namespaces the object exists in after this operation is complete.
+
+<b>Signature:</b>
+
+```typescript
+namespaces: string[];
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsclient.addtonamespaces.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsclient.addtonamespaces.md
index 45c9c39f9626a..567390faba9b2 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsclient.addtonamespaces.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsclient.addtonamespaces.md
@@ -9,7 +9,7 @@ Adds namespaces to a SavedObject
 <b>Signature:</b>
 
 ```typescript
-addToNamespaces(type: string, id: string, namespaces: string[], options?: SavedObjectsAddToNamespacesOptions): Promise<{}>;
+addToNamespaces(type: string, id: string, namespaces: string[], options?: SavedObjectsAddToNamespacesOptions): Promise<SavedObjectsAddToNamespacesResponse>;
 ```
 
 ## Parameters
@@ -23,5 +23,5 @@ addToNamespaces(type: string, id: string, namespaces: string[], options?: SavedO
 
 <b>Returns:</b>
 
-`Promise<{}>`
+`Promise<SavedObjectsAddToNamespacesResponse>`
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsclient.deletefromnamespaces.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsclient.deletefromnamespaces.md
index 80b58d29d393b..18ef5c3e6350c 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsclient.deletefromnamespaces.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsclient.deletefromnamespaces.md
@@ -9,7 +9,7 @@ Removes namespaces from a SavedObject
 <b>Signature:</b>
 
 ```typescript
-deleteFromNamespaces(type: string, id: string, namespaces: string[], options?: SavedObjectsDeleteFromNamespacesOptions): Promise<{}>;
+deleteFromNamespaces(type: string, id: string, namespaces: string[], options?: SavedObjectsDeleteFromNamespacesOptions): Promise<SavedObjectsDeleteFromNamespacesResponse>;
 ```
 
 ## Parameters
@@ -23,5 +23,5 @@ deleteFromNamespaces(type: string, id: string, namespaces: string[], options?: S
 
 <b>Returns:</b>
 
-`Promise<{}>`
+`Promise<SavedObjectsDeleteFromNamespacesResponse>`
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsdeletefromnamespacesresponse.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsdeletefromnamespacesresponse.md
new file mode 100644
index 0000000000000..6021c8866f018
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsdeletefromnamespacesresponse.md
@@ -0,0 +1,19 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsDeleteFromNamespacesResponse](./kibana-plugin-core-server.savedobjectsdeletefromnamespacesresponse.md)
+
+## SavedObjectsDeleteFromNamespacesResponse interface
+
+
+<b>Signature:</b>
+
+```typescript
+export interface SavedObjectsDeleteFromNamespacesResponse 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [namespaces](./kibana-plugin-core-server.savedobjectsdeletefromnamespacesresponse.namespaces.md) | <code>string[]</code> | The namespaces the object exists in after this operation is complete. An empty array indicates the object was deleted. |
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsdeletefromnamespacesresponse.namespaces.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsdeletefromnamespacesresponse.namespaces.md
new file mode 100644
index 0000000000000..9600a9e891380
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsdeletefromnamespacesresponse.namespaces.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsDeleteFromNamespacesResponse](./kibana-plugin-core-server.savedobjectsdeletefromnamespacesresponse.md) &gt; [namespaces](./kibana-plugin-core-server.savedobjectsdeletefromnamespacesresponse.namespaces.md)
+
+## SavedObjectsDeleteFromNamespacesResponse.namespaces property
+
+The namespaces the object exists in after this operation is complete. An empty array indicates the object was deleted.
+
+<b>Signature:</b>
+
+```typescript
+namespaces: string[];
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.addtonamespaces.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.addtonamespaces.md
index bbb20d2bc3b96..4b69b10318ed3 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.addtonamespaces.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.addtonamespaces.md
@@ -9,7 +9,7 @@ Adds one or more namespaces to a given multi-namespace saved object. This method
 <b>Signature:</b>
 
 ```typescript
-addToNamespaces(type: string, id: string, namespaces: string[], options?: SavedObjectsAddToNamespacesOptions): Promise<{}>;
+addToNamespaces(type: string, id: string, namespaces: string[], options?: SavedObjectsAddToNamespacesOptions): Promise<SavedObjectsAddToNamespacesResponse>;
 ```
 
 ## Parameters
@@ -23,5 +23,5 @@ addToNamespaces(type: string, id: string, namespaces: string[], options?: SavedO
 
 <b>Returns:</b>
 
-`Promise<{}>`
+`Promise<SavedObjectsAddToNamespacesResponse>`
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.deletefromnamespaces.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.deletefromnamespaces.md
index 471c3e3c5092d..d5ffb6d9ff9d8 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.deletefromnamespaces.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.deletefromnamespaces.md
@@ -9,7 +9,7 @@ Removes one or more namespaces from a given multi-namespace saved object. If no
 <b>Signature:</b>
 
 ```typescript
-deleteFromNamespaces(type: string, id: string, namespaces: string[], options?: SavedObjectsDeleteFromNamespacesOptions): Promise<{}>;
+deleteFromNamespaces(type: string, id: string, namespaces: string[], options?: SavedObjectsDeleteFromNamespacesOptions): Promise<SavedObjectsDeleteFromNamespacesResponse>;
 ```
 
 ## Parameters
@@ -23,5 +23,5 @@ deleteFromNamespaces(type: string, id: string, namespaces: string[], options?: S
 
 <b>Returns:</b>
 
-`Promise<{}>`
+`Promise<SavedObjectsDeleteFromNamespacesResponse>`
 
diff --git a/src/core/server/index.ts b/src/core/server/index.ts
index 382318ea86a34..76bcf5f7df665 100644
--- a/src/core/server/index.ts
+++ b/src/core/server/index.ts
@@ -274,7 +274,9 @@ export {
   SavedObjectsUpdateOptions,
   SavedObjectsUpdateResponse,
   SavedObjectsAddToNamespacesOptions,
+  SavedObjectsAddToNamespacesResponse,
   SavedObjectsDeleteFromNamespacesOptions,
+  SavedObjectsDeleteFromNamespacesResponse,
   SavedObjectsServiceStart,
   SavedObjectsServiceSetup,
   SavedObjectStatusMeta,
diff --git a/src/core/server/saved_objects/service/lib/repository.test.js b/src/core/server/saved_objects/service/lib/repository.test.js
index 941c4091a66a7..6d85223d1fc88 100644
--- a/src/core/server/saved_objects/service/lib/repository.test.js
+++ b/src/core/server/saved_objects/service/lib/repository.test.js
@@ -393,14 +393,14 @@ describe('SavedObjectsRepository', () => {
     });
 
     describe('returns', () => {
-      it(`returns an empty object on success`, async () => {
+      it(`returns all existing and new namespaces on success`, async () => {
         const result = await addToNamespacesSuccess(type, id, [newNs1, newNs2]);
-        expect(result).toEqual({});
+        expect(result).toEqual({ namespaces: [currentNs1, currentNs2, newNs1, newNs2] });
       });
 
       it(`succeeds when adding existing namespaces`, async () => {
         const result = await addToNamespacesSuccess(type, id, [currentNs1]);
-        expect(result).toEqual({});
+        expect(result).toEqual({ namespaces: [currentNs1, currentNs2] });
       });
     });
   });
@@ -3102,17 +3102,17 @@ describe('SavedObjectsRepository', () => {
     });
 
     describe('returns', () => {
-      it(`returns an empty object on success (delete)`, async () => {
+      it(`returns an empty namespaces array on success (delete)`, async () => {
         const test = async (namespaces) => {
           const result = await deleteFromNamespacesSuccess(type, id, namespaces, namespaces);
-          expect(result).toEqual({});
+          expect(result).toEqual({ namespaces: [] });
           client.delete.mockClear();
         };
         await test([namespace1]);
         await test([namespace1, namespace2]);
       });
 
-      it(`returns an empty object on success (update)`, async () => {
+      it(`returns remaining namespaces on success (update)`, async () => {
         const test = async (remaining) => {
           const currentNamespaces = [namespace1].concat(remaining);
           const result = await deleteFromNamespacesSuccess(
@@ -3121,7 +3121,7 @@ describe('SavedObjectsRepository', () => {
             [namespace1],
             currentNamespaces
           );
-          expect(result).toEqual({});
+          expect(result).toEqual({ namespaces: remaining });
           client.delete.mockClear();
         };
         await test([namespace2]);
@@ -3132,7 +3132,7 @@ describe('SavedObjectsRepository', () => {
         const namespaces = [namespace2];
         const currentNamespaces = [namespace1];
         const result = await deleteFromNamespacesSuccess(type, id, namespaces, currentNamespaces);
-        expect(result).toEqual({});
+        expect(result).toEqual({ namespaces: currentNamespaces });
       });
     });
   });
diff --git a/src/core/server/saved_objects/service/lib/repository.ts b/src/core/server/saved_objects/service/lib/repository.ts
index 9f6db446ea195..28d409f7b65bb 100644
--- a/src/core/server/saved_objects/service/lib/repository.ts
+++ b/src/core/server/saved_objects/service/lib/repository.ts
@@ -52,7 +52,9 @@ import {
   SavedObjectsBulkUpdateOptions,
   SavedObjectsDeleteOptions,
   SavedObjectsAddToNamespacesOptions,
+  SavedObjectsAddToNamespacesResponse,
   SavedObjectsDeleteFromNamespacesOptions,
+  SavedObjectsDeleteFromNamespacesResponse,
 } from '../saved_objects_client';
 import {
   SavedObject,
@@ -947,7 +949,7 @@ export class SavedObjectsRepository {
     id: string,
     namespaces: string[],
     options: SavedObjectsAddToNamespacesOptions = {}
-  ): Promise<{}> {
+  ): Promise<SavedObjectsAddToNamespacesResponse> {
     if (!this._allowedTypes.includes(type)) {
       throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
     }
@@ -996,7 +998,7 @@ export class SavedObjectsRepository {
       throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
     }
 
-    return {};
+    return { namespaces: doc.namespaces };
   }
 
   /**
@@ -1009,7 +1011,7 @@ export class SavedObjectsRepository {
     id: string,
     namespaces: string[],
     options: SavedObjectsDeleteFromNamespacesOptions = {}
-  ): Promise<{}> {
+  ): Promise<SavedObjectsDeleteFromNamespacesResponse> {
     if (!this._allowedTypes.includes(type)) {
       throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
     }
@@ -1063,7 +1065,7 @@ export class SavedObjectsRepository {
         // see "404s from missing index" above
         throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
       }
-      return {};
+      return { namespaces: doc.namespaces };
     } else {
       // if there are no namespaces remaining, delete the saved object
       const { body, statusCode } = await this.client.delete<DeleteDocumentResponse>(
@@ -1080,7 +1082,7 @@ export class SavedObjectsRepository {
 
       const deleted = body.result === 'deleted';
       if (deleted) {
-        return {};
+        return { namespaces: [] };
       }
 
       const deleteDocNotFound = body.result === 'not_found';
diff --git a/src/core/server/saved_objects/service/saved_objects_client.ts b/src/core/server/saved_objects/service/saved_objects_client.ts
index 6a9f4f5143e84..812669ee108a2 100644
--- a/src/core/server/saved_objects/service/saved_objects_client.ts
+++ b/src/core/server/saved_objects/service/saved_objects_client.ts
@@ -135,6 +135,15 @@ export interface SavedObjectsAddToNamespacesOptions extends SavedObjectsBaseOpti
   refresh?: MutatingOperationRefreshSetting;
 }
 
+/**
+ *
+ * @public
+ */
+export interface SavedObjectsAddToNamespacesResponse {
+  /** The namespaces the object exists in after this operation is complete. */
+  namespaces: string[];
+}
+
 /**
  *
  * @public
@@ -144,6 +153,15 @@ export interface SavedObjectsDeleteFromNamespacesOptions extends SavedObjectsBas
   refresh?: MutatingOperationRefreshSetting;
 }
 
+/**
+ *
+ * @public
+ */
+export interface SavedObjectsDeleteFromNamespacesResponse {
+  /** The namespaces the object exists in after this operation is complete. An empty array indicates the object was deleted. */
+  namespaces: string[];
+}
+
 /**
  *
  * @public
@@ -320,7 +338,7 @@ export class SavedObjectsClient {
     id: string,
     namespaces: string[],
     options: SavedObjectsAddToNamespacesOptions = {}
-  ): Promise<{}> {
+  ): Promise<SavedObjectsAddToNamespacesResponse> {
     return await this._repository.addToNamespaces(type, id, namespaces, options);
   }
 
@@ -337,7 +355,7 @@ export class SavedObjectsClient {
     id: string,
     namespaces: string[],
     options: SavedObjectsDeleteFromNamespacesOptions = {}
-  ): Promise<{}> {
+  ): Promise<SavedObjectsDeleteFromNamespacesResponse> {
     return await this._repository.deleteFromNamespaces(type, id, namespaces, options);
   }
 
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index ff178e236a12f..772be68f507d5 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -2023,6 +2023,11 @@ export interface SavedObjectsAddToNamespacesOptions extends SavedObjectsBaseOpti
     version?: string;
 }
 
+// @public (undocumented)
+export interface SavedObjectsAddToNamespacesResponse {
+    namespaces: string[];
+}
+
 // Warning: (ae-forgotten-export) The symbol "SavedObjectDoc" needs to be exported by the entry point index.d.ts
 // Warning: (ae-forgotten-export) The symbol "Referencable" needs to be exported by the entry point index.d.ts
 //
@@ -2092,13 +2097,13 @@ export interface SavedObjectsBulkUpdateResponse<T = unknown> {
 export class SavedObjectsClient {
     // @internal
     constructor(repository: ISavedObjectsRepository);
-    addToNamespaces(type: string, id: string, namespaces: string[], options?: SavedObjectsAddToNamespacesOptions): Promise<{}>;
+    addToNamespaces(type: string, id: string, namespaces: string[], options?: SavedObjectsAddToNamespacesOptions): Promise<SavedObjectsAddToNamespacesResponse>;
     bulkCreate<T = unknown>(objects: Array<SavedObjectsBulkCreateObject<T>>, options?: SavedObjectsCreateOptions): Promise<SavedObjectsBulkResponse<T>>;
     bulkGet<T = unknown>(objects?: SavedObjectsBulkGetObject[], options?: SavedObjectsBaseOptions): Promise<SavedObjectsBulkResponse<T>>;
     bulkUpdate<T = unknown>(objects: Array<SavedObjectsBulkUpdateObject<T>>, options?: SavedObjectsBulkUpdateOptions): Promise<SavedObjectsBulkUpdateResponse<T>>;
     create<T = unknown>(type: string, attributes: T, options?: SavedObjectsCreateOptions): Promise<SavedObject<T>>;
     delete(type: string, id: string, options?: SavedObjectsDeleteOptions): Promise<{}>;
-    deleteFromNamespaces(type: string, id: string, namespaces: string[], options?: SavedObjectsDeleteFromNamespacesOptions): Promise<{}>;
+    deleteFromNamespaces(type: string, id: string, namespaces: string[], options?: SavedObjectsDeleteFromNamespacesOptions): Promise<SavedObjectsDeleteFromNamespacesResponse>;
     // (undocumented)
     static errors: typeof SavedObjectsErrorHelpers;
     // (undocumented)
@@ -2194,6 +2199,11 @@ export interface SavedObjectsDeleteFromNamespacesOptions extends SavedObjectsBas
     refresh?: MutatingOperationRefreshSetting;
 }
 
+// @public (undocumented)
+export interface SavedObjectsDeleteFromNamespacesResponse {
+    namespaces: string[];
+}
+
 // @public (undocumented)
 export interface SavedObjectsDeleteOptions extends SavedObjectsBaseOptions {
     refresh?: MutatingOperationRefreshSetting;
@@ -2492,7 +2502,7 @@ export interface SavedObjectsRawDoc {
 
 // @public (undocumented)
 export class SavedObjectsRepository {
-    addToNamespaces(type: string, id: string, namespaces: string[], options?: SavedObjectsAddToNamespacesOptions): Promise<{}>;
+    addToNamespaces(type: string, id: string, namespaces: string[], options?: SavedObjectsAddToNamespacesOptions): Promise<SavedObjectsAddToNamespacesResponse>;
     bulkCreate<T = unknown>(objects: Array<SavedObjectsBulkCreateObject<T>>, options?: SavedObjectsCreateOptions): Promise<SavedObjectsBulkResponse<T>>;
     bulkGet<T = unknown>(objects?: SavedObjectsBulkGetObject[], options?: SavedObjectsBaseOptions): Promise<SavedObjectsBulkResponse<T>>;
     bulkUpdate<T = unknown>(objects: Array<SavedObjectsBulkUpdateObject<T>>, options?: SavedObjectsBulkUpdateOptions): Promise<SavedObjectsBulkUpdateResponse<T>>;
@@ -2503,7 +2513,7 @@ export class SavedObjectsRepository {
     static createRepository(migrator: KibanaMigrator, typeRegistry: SavedObjectTypeRegistry, indexName: string, client: ElasticsearchClient, includedHiddenTypes?: string[], injectedConstructor?: any): ISavedObjectsRepository;
     delete(type: string, id: string, options?: SavedObjectsDeleteOptions): Promise<{}>;
     deleteByNamespace(namespace: string, options?: SavedObjectsDeleteByNamespaceOptions): Promise<any>;
-    deleteFromNamespaces(type: string, id: string, namespaces: string[], options?: SavedObjectsDeleteFromNamespacesOptions): Promise<{}>;
+    deleteFromNamespaces(type: string, id: string, namespaces: string[], options?: SavedObjectsDeleteFromNamespacesOptions): Promise<SavedObjectsDeleteFromNamespacesResponse>;
     // (undocumented)
     find<T = unknown>({ search, defaultSearchOperator, searchFields, hasReference, page, perPage, sortField, sortOrder, fields, namespaces, type, filter, preference, }: SavedObjectsFindOptions): Promise<SavedObjectsFindResponse<T>>;
     get<T = unknown>(type: string, id: string, options?: SavedObjectsBaseOptions): Promise<SavedObject<T>>;
diff --git a/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.test.ts b/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.test.ts
index 1cf879adc5415..ca191602dcf44 100644
--- a/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.test.ts
+++ b/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.test.ts
@@ -135,26 +135,36 @@ const expectPrivilegeCheck = async (fn: Function, args: Record<string, any>) =>
   );
 };
 
-const expectObjectNamespaceFiltering = async (fn: Function, args: Record<string, any>) => {
-  clientOpts.checkSavedObjectsPrivilegesAsCurrentUser.mockImplementationOnce(
-    getMockCheckPrivilegesSuccess // privilege check for authorization
-  );
+const expectObjectNamespaceFiltering = async (
+  fn: Function,
+  args: Record<string, any>,
+  privilegeChecks = 1
+) => {
+  for (let i = 0; i < privilegeChecks; i++) {
+    clientOpts.checkSavedObjectsPrivilegesAsCurrentUser.mockImplementationOnce(
+      getMockCheckPrivilegesSuccess // privilege check for authorization
+    );
+  }
   clientOpts.checkSavedObjectsPrivilegesAsCurrentUser.mockImplementation(
     getMockCheckPrivilegesFailure // privilege check for namespace filtering
   );
 
-  const authorizedNamespace = args.options.namespace || 'default';
+  const authorizedNamespace = args.options?.namespace || 'default';
   const namespaces = ['some-other-namespace', authorizedNamespace];
   const returnValue = { namespaces, foo: 'bar' };
   // we don't know which base client method will be called; mock them all
   clientOpts.baseClient.create.mockReturnValue(returnValue as any);
   clientOpts.baseClient.get.mockReturnValue(returnValue as any);
   clientOpts.baseClient.update.mockReturnValue(returnValue as any);
+  clientOpts.baseClient.addToNamespaces.mockReturnValue(returnValue as any);
+  clientOpts.baseClient.deleteFromNamespaces.mockReturnValue(returnValue as any);
 
   const result = await fn.bind(client)(...Object.values(args));
   expect(result).toEqual(expect.objectContaining({ namespaces: [authorizedNamespace, '?'] }));
 
-  expect(clientOpts.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledTimes(2);
+  expect(clientOpts.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledTimes(
+    privilegeChecks + 1
+  );
   expect(clientOpts.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenLastCalledWith(
     'login:',
     namespaces
@@ -369,6 +379,11 @@ describe('#addToNamespaces', () => {
       undefined // default namespace
     );
   });
+
+  test(`filters namespaces that the user doesn't have access to`, async () => {
+    // this operation is unique because it requires two privilege checks before it executes
+    await expectObjectNamespaceFiltering(client.addToNamespaces, { type, id, namespaces }, 2);
+  });
 });
 
 describe('#bulkCreate', () => {
@@ -682,6 +697,10 @@ describe('#deleteFromNamespaces', () => {
       namespaces
     );
   });
+
+  test(`filters namespaces that the user doesn't have access to`, async () => {
+    await expectObjectNamespaceFiltering(client.deleteFromNamespaces, { type, id, namespaces });
+  });
 });
 
 describe('#update', () => {
diff --git a/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.ts b/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.ts
index 621299a0f025e..9fd8a732c4eab 100644
--- a/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.ts
+++ b/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.ts
@@ -164,7 +164,8 @@ export class SecureSavedObjectsClientWrapper implements SavedObjectsClientContra
     // result in a 404 error.
     await this.ensureAuthorized(type, 'update', namespace, args, 'addToNamespacesUpdate');
 
-    return await this.baseClient.addToNamespaces(type, id, namespaces, options);
+    const result = await this.baseClient.addToNamespaces(type, id, namespaces, options);
+    return await this.redactSavedObjectNamespaces(result);
   }
 
   public async deleteFromNamespaces(
@@ -177,7 +178,8 @@ export class SecureSavedObjectsClientWrapper implements SavedObjectsClientContra
     // To un-share an object, the user must have the "delete" permission in each of the target namespaces.
     await this.ensureAuthorized(type, 'delete', namespaces, args, 'deleteFromNamespaces');
 
-    return await this.baseClient.deleteFromNamespaces(type, id, namespaces, options);
+    const result = await this.baseClient.deleteFromNamespaces(type, id, namespaces, options);
+    return await this.redactSavedObjectNamespaces(result);
   }
 
   public async bulkUpdate<T = unknown>(
diff --git a/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.test.ts b/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.test.ts
index 4d0d75cd4595c..51c59212bef16 100644
--- a/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.test.ts
+++ b/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.test.ts
@@ -423,7 +423,7 @@ const ERROR_NAMESPACE_SPECIFIED = 'Spaces currently determines the namespaces';
 
       test(`supplements options with the current namespace`, async () => {
         const { client, baseClient } = await createSpacesSavedObjectsClient();
-        const expectedReturnValue = createMockResponse();
+        const expectedReturnValue = { namespaces: ['foo', 'bar'] };
         baseClient.addToNamespaces.mockReturnValue(Promise.resolve(expectedReturnValue));
 
         const type = Symbol();
@@ -453,7 +453,7 @@ const ERROR_NAMESPACE_SPECIFIED = 'Spaces currently determines the namespaces';
 
       test(`supplements options with the current namespace`, async () => {
         const { client, baseClient } = await createSpacesSavedObjectsClient();
-        const expectedReturnValue = createMockResponse();
+        const expectedReturnValue = { namespaces: ['foo', 'bar'] };
         baseClient.deleteFromNamespaces.mockReturnValue(Promise.resolve(expectedReturnValue));
 
         const type = Symbol();

From 020a76bd3a510125180db4d330b81d260d16a314 Mon Sep 17 00:00:00 2001
From: Luke Elmers <luke.elmers@elastic.co>
Date: Thu, 20 Aug 2020 06:38:44 -0600
Subject: [PATCH 58/85] [data.search.SearchSource] Extract dependencies and
 pass them in from the service definition. (#75368)

* Remove injectedMetadata dependency from SearchSource.

* Create common GetConfigFn interface.

* Removed unused service getters.

* Switch all usages of uiSettings to use getConfig.

* Fix circular dependencies.

* Update generated docs.

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 ...ins-data-public.fieldformatsgetconfigfn.md |  2 +-
 ...-data-public.getsearchparamsfromrequest.md |  7 +--
 ...ins-data-server.fieldformatsgetconfigfn.md |  2 +-
 .../ui/public/new_platform/set_services.ts    |  2 -
 .../es_query/es_query/get_es_query_config.ts  |  4 +-
 .../converters/date_nanos_shared.ts           |  3 +-
 .../field_formats/field_formats_registry.ts   |  2 +-
 .../data/common/field_formats/types.ts        |  4 +-
 .../data/common/search/aggs/aggs_service.ts   |  3 +-
 src/plugins/data/common/types.ts              | 13 ++++-
 .../public/field_formats/converters/date.ts   |  8 +--
 src/plugins/data/public/plugin.ts             |  4 --
 src/plugins/data/public/public.api.md         |  9 ++--
 .../collectors/create_usage_collector.test.ts |  2 +-
 .../collectors/create_usage_collector.ts      |  6 +--
 .../search/fetch/get_search_params.test.ts    |  9 ++--
 .../public/search/fetch/get_search_params.ts  | 35 +++++++------
 src/plugins/data/public/search/fetch/types.ts |  4 +-
 .../search/legacy/default_search_strategy.ts  |  4 +-
 .../search/legacy/es_client/get_es_client.ts  | 25 +++++----
 .../public/search/legacy/fetch_soon.test.ts   | 39 +++++++-------
 .../search/legacy/get_msearch_params.test.ts  |  9 ++--
 .../search/legacy/get_msearch_params.ts       |  8 +--
 .../data/public/search/search_service.test.ts |  1 +
 .../data/public/search/search_service.ts      | 35 ++++++++-----
 .../create_search_source.test.ts              | 13 ++---
 .../data/public/search/search_source/mocks.ts |  9 ++--
 .../search_source/search_source.test.ts       | 24 ++++-----
 .../search/search_source/search_source.ts     | 52 ++++++++++++-------
 src/plugins/data/public/services.ts           |  6 ---
 .../converters/date_nanos_server.ts           |  2 +-
 .../field_formats/converters/date_server.ts   |  6 ++-
 src/plugins/data/server/server.api.md         |  3 +-
 .../public/data_model/search_api.ts           |  6 ++-
 34 files changed, 188 insertions(+), 173 deletions(-)

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformatsgetconfigfn.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformatsgetconfigfn.md
index 4233eea42cded..c54e549c42a44 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformatsgetconfigfn.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformatsgetconfigfn.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-export declare type FieldFormatsGetConfigFn = <T = any>(key: string, defaultOverride?: T) => T;
+export declare type FieldFormatsGetConfigFn = GetConfigFn;
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getsearchparamsfromrequest.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getsearchparamsfromrequest.md
index 5bd1694cbeea3..337b4b3302cc3 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getsearchparamsfromrequest.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getsearchparamsfromrequest.md
@@ -4,12 +4,13 @@
 
 ## getSearchParamsFromRequest() function
 
+
 <b>Signature:</b>
 
 ```typescript
 export declare function getSearchParamsFromRequest(searchRequest: SearchRequest, dependencies: {
-    injectedMetadata: CoreStart['injectedMetadata'];
-    uiSettings: IUiSettingsClient;
+    esShardTimeout: number;
+    getConfig: GetConfigFn;
 }): ISearchRequestParams;
 ```
 
@@ -18,7 +19,7 @@ export declare function getSearchParamsFromRequest(searchRequest: SearchRequest,
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  searchRequest | <code>SearchRequest</code> |  |
-|  dependencies | <code>{</code><br/><code>    injectedMetadata: CoreStart['injectedMetadata'];</code><br/><code>    uiSettings: IUiSettingsClient;</code><br/><code>}</code> |  |
+|  dependencies | <code>{</code><br/><code>    esShardTimeout: number;</code><br/><code>    getConfig: GetConfigFn;</code><br/><code>}</code> |  |
 
 <b>Returns:</b>
 
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.fieldformatsgetconfigfn.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.fieldformatsgetconfigfn.md
index c8815ed42d3b3..a3f6c709246ea 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.fieldformatsgetconfigfn.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.fieldformatsgetconfigfn.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-export declare type FieldFormatsGetConfigFn = <T = any>(key: string, defaultOverride?: T) => T;
+export declare type FieldFormatsGetConfigFn = GetConfigFn;
 ```
diff --git a/src/legacy/ui/public/new_platform/set_services.ts b/src/legacy/ui/public/new_platform/set_services.ts
index ee92eda064aa8..036157a9f3fbc 100644
--- a/src/legacy/ui/public/new_platform/set_services.ts
+++ b/src/legacy/ui/public/new_platform/set_services.ts
@@ -41,7 +41,6 @@ interface NpStart {
 export function setSetupServices(npSetup: NpSetup) {
   // Services that need to be set in the legacy platform since the legacy data plugin
   // which previously provided them has been removed.
-  dataServices.setInjectedMetadata(npSetup.core.injectedMetadata);
   visualizationsServices.setUISettings(npSetup.core.uiSettings);
   visualizationsServices.setUsageCollector(npSetup.plugins.usageCollection);
 }
@@ -49,7 +48,6 @@ export function setSetupServices(npSetup: NpSetup) {
 export function setStartServices(npStart: NpStart) {
   // Services that need to be set in the legacy platform since the legacy data plugin
   // which previously provided them has been removed.
-  dataServices.setHttp(npStart.core.http);
   dataServices.setNotifications(npStart.core.notifications);
   dataServices.setOverlays(npStart.core.overlays);
   dataServices.setUiSettings(npStart.core.uiSettings);
diff --git a/src/plugins/data/common/es_query/es_query/get_es_query_config.ts b/src/plugins/data/common/es_query/es_query/get_es_query_config.ts
index ff8fc5b11b26e..87dbbcee03b81 100644
--- a/src/plugins/data/common/es_query/es_query/get_es_query_config.ts
+++ b/src/plugins/data/common/es_query/es_query/get_es_query_config.ts
@@ -18,10 +18,10 @@
  */
 
 import { EsQueryConfig } from './build_es_query';
-import { UI_SETTINGS } from '../../';
+import { GetConfigFn, UI_SETTINGS } from '../../';
 
 interface KibanaConfig {
-  get<T>(key: string): T;
+  get: GetConfigFn;
 }
 
 export function getEsQueryConfig(config: KibanaConfig) {
diff --git a/src/plugins/data/common/field_formats/converters/date_nanos_shared.ts b/src/plugins/data/common/field_formats/converters/date_nanos_shared.ts
index 89a63243c76f0..7a225cd7d1ae7 100644
--- a/src/plugins/data/common/field_formats/converters/date_nanos_shared.ts
+++ b/src/plugins/data/common/field_formats/converters/date_nanos_shared.ts
@@ -20,7 +20,8 @@
 import { i18n } from '@kbn/i18n';
 import { memoize, noop } from 'lodash';
 import moment, { Moment } from 'moment';
-import { FieldFormat, FIELD_FORMAT_IDS, KBN_FIELD_TYPES, TextContextTypeConvert } from '../../';
+import { FieldFormat, FIELD_FORMAT_IDS, KBN_FIELD_TYPES } from '../../';
+import { TextContextTypeConvert } from '../types';
 
 /**
  * Analyse the given moment.js format pattern for the fractional sec part (S,SS,SSS...)
diff --git a/src/plugins/data/common/field_formats/field_formats_registry.ts b/src/plugins/data/common/field_formats/field_formats_registry.ts
index 4b847ebc358d7..32f9f37b9ba53 100644
--- a/src/plugins/data/common/field_formats/field_formats_registry.ts
+++ b/src/plugins/data/common/field_formats/field_formats_registry.ts
@@ -32,7 +32,7 @@ import {
 import { baseFormatters } from './constants/base_formatters';
 import { FieldFormat } from './field_format';
 import { SerializedFieldFormat } from '../../../expressions/common/types';
-import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from '../types';
+import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from '../kbn_field_types/types';
 import { UI_SETTINGS } from '../constants';
 
 export class FieldFormatsRegistry {
diff --git a/src/plugins/data/common/field_formats/types.ts b/src/plugins/data/common/field_formats/types.ts
index 6f773378de08d..daa44b2b0f85b 100644
--- a/src/plugins/data/common/field_formats/types.ts
+++ b/src/plugins/data/common/field_formats/types.ts
@@ -16,6 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
+import { GetConfigFn } from '../types';
 import { FieldFormat } from './field_format';
 import { FieldFormatsRegistry } from './field_formats_registry';
 
@@ -72,7 +74,7 @@ export interface FieldFormatConfig {
   es?: boolean;
 }
 
-export type FieldFormatsGetConfigFn = <T = any>(key: string, defaultOverride?: T) => T;
+export type FieldFormatsGetConfigFn = GetConfigFn;
 
 export type IFieldFormat = PublicMethodsOf<FieldFormat>;
 
diff --git a/src/plugins/data/common/search/aggs/aggs_service.ts b/src/plugins/data/common/search/aggs/aggs_service.ts
index 59c54fcce6838..6f3e3904dbbd5 100644
--- a/src/plugins/data/common/search/aggs/aggs_service.ts
+++ b/src/plugins/data/common/search/aggs/aggs_service.ts
@@ -19,6 +19,7 @@
 
 import { ExpressionsServiceSetup } from 'src/plugins/expressions/common';
 import { UI_SETTINGS } from '../../../common';
+import { GetConfigFn } from '../../types';
 import {
   AggConfigs,
   AggTypesRegistry,
@@ -48,7 +49,7 @@ export interface AggsCommonSetupDependencies {
 
 /** @internal */
 export interface AggsCommonStartDependencies {
-  getConfig: <T = any>(key: string) => T;
+  getConfig: GetConfigFn;
 }
 
 /**
diff --git a/src/plugins/data/common/types.ts b/src/plugins/data/common/types.ts
index e2ec1a031b0ca..a1e1252b3112f 100644
--- a/src/plugins/data/common/types.ts
+++ b/src/plugins/data/common/types.ts
@@ -20,4 +20,15 @@
 export * from './query/types';
 export * from './kbn_field_types/types';
 export * from './index_patterns/types';
-export { TextContextTypeConvert, IFieldFormatMetaParams } from './field_formats/types';
+
+/**
+ * If a service is being shared on both the client and the server, and
+ * the client code requires synchronous access to uiSettings, both client
+ * and server should wrap the core uiSettings services in a function
+ * matching this signature.
+ *
+ * This matches the signature of the public `core.uiSettings.get`, and
+ * should only be used in scenarios where async access to uiSettings is
+ * not possible.
+ */
+export type GetConfigFn = <T = any>(key: string, defaultOverride?: T) => T;
diff --git a/src/plugins/data/public/field_formats/converters/date.ts b/src/plugins/data/public/field_formats/converters/date.ts
index 78ef8b293e8b9..8070633ef2dfe 100644
--- a/src/plugins/data/public/field_formats/converters/date.ts
+++ b/src/plugins/data/public/field_formats/converters/date.ts
@@ -20,12 +20,8 @@
 import { i18n } from '@kbn/i18n';
 import { memoize, noop } from 'lodash';
 import moment from 'moment';
-import {
-  FieldFormat,
-  KBN_FIELD_TYPES,
-  TextContextTypeConvert,
-  FIELD_FORMAT_IDS,
-} from '../../../common';
+import { FieldFormat, KBN_FIELD_TYPES, FIELD_FORMAT_IDS } from '../../../common';
+import { TextContextTypeConvert } from '../../../common/field_formats/types';
 
 export class DateFormat extends FieldFormat {
   static id = FIELD_FORMAT_IDS.DATE;
diff --git a/src/plugins/data/public/plugin.ts b/src/plugins/data/public/plugin.ts
index 564c571b6ccd6..ee0b0714febc0 100644
--- a/src/plugins/data/public/plugin.ts
+++ b/src/plugins/data/public/plugin.ts
@@ -48,9 +48,7 @@ import {
 } from './index_patterns';
 import {
   setFieldFormats,
-  setHttp,
   setIndexPatterns,
-  setInjectedMetadata,
   setNotifications,
   setOverlays,
   setQueryService,
@@ -164,11 +162,9 @@ export class DataPublicPlugin
 
   public start(core: CoreStart, { uiActions }: DataStartDependencies): DataPublicPluginStart {
     const { uiSettings, http, notifications, savedObjects, overlays, application } = core;
-    setHttp(http);
     setNotifications(notifications);
     setOverlays(overlays);
     setUiSettings(uiSettings);
-    setInjectedMetadata(core.injectedMetadata);
 
     const fieldFormats = this.fieldFormatsService.start();
     setFieldFormats(fieldFormats);
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index 7041bcdfa4221..7defddb8f570a 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -34,7 +34,6 @@ import { InjectedIntl } from '@kbn/i18n/react';
 import { ISearchSource as ISearchSource_2 } from 'src/plugins/data/public';
 import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { IUiSettingsClient } from 'src/core/public';
-import { IUiSettingsClient as IUiSettingsClient_3 } from 'kibana/public';
 import { KibanaClient } from '@elastic/elasticsearch/api/kibana';
 import { KibanaConfigType } from 'src/core/server/kibana_config';
 import { Location } from 'history';
@@ -594,10 +593,11 @@ export const fieldFormats: {
 // @public (undocumented)
 export type FieldFormatsContentType = 'html' | 'text';
 
+// Warning: (ae-forgotten-export) The symbol "GetConfigFn" needs to be exported by the entry point index.d.ts
 // Warning: (ae-missing-release-tag) "FieldFormatsGetConfigFn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export type FieldFormatsGetConfigFn = <T = any>(key: string, defaultOverride?: T) => T;
+export type FieldFormatsGetConfigFn = GetConfigFn;
 
 // Warning: (ae-missing-release-tag) "FieldList" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
@@ -727,12 +727,11 @@ export function getEsPreference(uiSettings: IUiSettingsClient_2, sessionId?: str
 export const getKbnTypeNames: () => string[];
 
 // Warning: (ae-forgotten-export) The symbol "ISearchRequestParams" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "getSearchParamsFromRequest" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function getSearchParamsFromRequest(searchRequest: SearchRequest, dependencies: {
-    injectedMetadata: CoreStart['injectedMetadata'];
-    uiSettings: IUiSettingsClient_3;
+    esShardTimeout: number;
+    getConfig: GetConfigFn;
 }): ISearchRequestParams;
 
 // Warning: (ae-missing-release-tag) "getTime" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
diff --git a/src/plugins/data/public/search/collectors/create_usage_collector.test.ts b/src/plugins/data/public/search/collectors/create_usage_collector.test.ts
index aaaac5ae6ff7c..315d4678cabf1 100644
--- a/src/plugins/data/public/search/collectors/create_usage_collector.test.ts
+++ b/src/plugins/data/public/search/collectors/create_usage_collector.test.ts
@@ -42,7 +42,7 @@ describe('Search Usage Collector', () => {
       {} as any,
     ]);
     mockUsageCollectionSetup = usageCollectionPluginMock.createSetupContract();
-    usageCollector = createUsageCollector(mockCoreSetup, mockUsageCollectionSetup);
+    usageCollector = createUsageCollector(mockCoreSetup.getStartServices, mockUsageCollectionSetup);
   });
 
   test('tracks query timeouts', async () => {
diff --git a/src/plugins/data/public/search/collectors/create_usage_collector.ts b/src/plugins/data/public/search/collectors/create_usage_collector.ts
index 7adb0c3caa675..321b2c5b99049 100644
--- a/src/plugins/data/public/search/collectors/create_usage_collector.ts
+++ b/src/plugins/data/public/search/collectors/create_usage_collector.ts
@@ -18,16 +18,16 @@
  */
 
 import { first } from 'rxjs/operators';
-import { CoreSetup } from '../../../../../core/public';
+import { StartServicesAccessor } from '../../../../../core/public';
 import { METRIC_TYPE, UsageCollectionSetup } from '../../../../usage_collection/public';
 import { SEARCH_EVENT_TYPE, SearchUsageCollector } from './types';
 
 export const createUsageCollector = (
-  core: CoreSetup,
+  getStartServices: StartServicesAccessor,
   usageCollection?: UsageCollectionSetup
 ): SearchUsageCollector => {
   const getCurrentApp = async () => {
-    const [{ application }] = await core.getStartServices();
+    const [{ application }] = await getStartServices();
     return application.currentAppId$.pipe(first()).toPromise();
   };
 
diff --git a/src/plugins/data/public/search/fetch/get_search_params.test.ts b/src/plugins/data/public/search/fetch/get_search_params.test.ts
index f9b62fdd4fc61..1ecb879b1602d 100644
--- a/src/plugins/data/public/search/fetch/get_search_params.test.ts
+++ b/src/plugins/data/public/search/fetch/get_search_params.test.ts
@@ -18,13 +18,10 @@
  */
 
 import { getSearchParams } from './get_search_params';
-import { IUiSettingsClient } from 'kibana/public';
-import { UI_SETTINGS } from '../../../common';
+import { GetConfigFn, UI_SETTINGS } from '../../../common';
 
-function getConfigStub(config: any = {}) {
-  return {
-    get: (key) => config[key],
-  } as IUiSettingsClient;
+function getConfigStub(config: any = {}): GetConfigFn {
+  return (key) => config[key];
 }
 
 describe('getSearchParams', () => {
diff --git a/src/plugins/data/public/search/fetch/get_search_params.ts b/src/plugins/data/public/search/fetch/get_search_params.ts
index 3246156b6b37e..5e0395189f647 100644
--- a/src/plugins/data/public/search/fetch/get_search_params.ts
+++ b/src/plugins/data/public/search/fetch/get_search_params.ts
@@ -17,37 +17,36 @@
  * under the License.
  */
 
-import { IUiSettingsClient, CoreStart } from 'kibana/public';
-import { UI_SETTINGS, ISearchRequestParams } from '../../../common';
+import { UI_SETTINGS, ISearchRequestParams, GetConfigFn } from '../../../common';
 import { SearchRequest } from './types';
 
 const sessionId = Date.now();
 
-export function getSearchParams(config: IUiSettingsClient, esShardTimeout: number = 0) {
+export function getSearchParams(getConfig: GetConfigFn, esShardTimeout: number = 0) {
   return {
     rest_total_hits_as_int: true,
     ignore_unavailable: true,
-    ignore_throttled: getIgnoreThrottled(config),
-    max_concurrent_shard_requests: getMaxConcurrentShardRequests(config),
-    preference: getPreference(config),
+    ignore_throttled: getIgnoreThrottled(getConfig),
+    max_concurrent_shard_requests: getMaxConcurrentShardRequests(getConfig),
+    preference: getPreference(getConfig),
     timeout: getTimeout(esShardTimeout),
   };
 }
 
-export function getIgnoreThrottled(config: IUiSettingsClient) {
-  return !config.get(UI_SETTINGS.SEARCH_INCLUDE_FROZEN);
+export function getIgnoreThrottled(getConfig: GetConfigFn) {
+  return !getConfig(UI_SETTINGS.SEARCH_INCLUDE_FROZEN);
 }
 
-export function getMaxConcurrentShardRequests(config: IUiSettingsClient) {
-  const maxConcurrentShardRequests = config.get(UI_SETTINGS.COURIER_MAX_CONCURRENT_SHARD_REQUESTS);
+export function getMaxConcurrentShardRequests(getConfig: GetConfigFn) {
+  const maxConcurrentShardRequests = getConfig(UI_SETTINGS.COURIER_MAX_CONCURRENT_SHARD_REQUESTS);
   return maxConcurrentShardRequests > 0 ? maxConcurrentShardRequests : undefined;
 }
 
-export function getPreference(config: IUiSettingsClient) {
-  const setRequestPreference = config.get(UI_SETTINGS.COURIER_SET_REQUEST_PREFERENCE);
+export function getPreference(getConfig: GetConfigFn) {
+  const setRequestPreference = getConfig(UI_SETTINGS.COURIER_SET_REQUEST_PREFERENCE);
   if (setRequestPreference === 'sessionId') return sessionId;
   return setRequestPreference === 'custom'
-    ? config.get(UI_SETTINGS.COURIER_CUSTOM_REQUEST_PREFERENCE)
+    ? getConfig(UI_SETTINGS.COURIER_CUSTOM_REQUEST_PREFERENCE)
     : undefined;
 }
 
@@ -55,13 +54,15 @@ export function getTimeout(esShardTimeout: number) {
   return esShardTimeout > 0 ? `${esShardTimeout}ms` : undefined;
 }
 
+/** @public */
+// TODO: Could provide this on runtime contract with dependencies
+// already wired up.
 export function getSearchParamsFromRequest(
   searchRequest: SearchRequest,
-  dependencies: { injectedMetadata: CoreStart['injectedMetadata']; uiSettings: IUiSettingsClient }
+  dependencies: { esShardTimeout: number; getConfig: GetConfigFn }
 ): ISearchRequestParams {
-  const { injectedMetadata, uiSettings } = dependencies;
-  const esShardTimeout = injectedMetadata.getInjectedVar('esShardTimeout') as number;
-  const searchParams = getSearchParams(uiSettings, esShardTimeout);
+  const { esShardTimeout, getConfig } = dependencies;
+  const searchParams = getSearchParams(getConfig, esShardTimeout);
 
   return {
     index: searchRequest.index.title || searchRequest.index,
diff --git a/src/plugins/data/public/search/fetch/types.ts b/src/plugins/data/public/search/fetch/types.ts
index dda66d6b5238d..18d277204815b 100644
--- a/src/plugins/data/public/search/fetch/types.ts
+++ b/src/plugins/data/public/search/fetch/types.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { IUiSettingsClient } from '../../../../../core/public';
+import { GetConfigFn } from '../../../common';
 import { ISearchStartLegacy } from '../types';
 
 export type SearchRequest = any;
@@ -30,7 +30,7 @@ export interface FetchOptions {
 
 export interface FetchHandlers {
   legacySearchService: ISearchStartLegacy;
-  config: IUiSettingsClient;
+  config: { get: GetConfigFn };
   esShardTimeout: number;
 }
 
diff --git a/src/plugins/data/public/search/legacy/default_search_strategy.ts b/src/plugins/data/public/search/legacy/default_search_strategy.ts
index 284768bc5a1cc..6ccb0a01cf898 100644
--- a/src/plugins/data/public/search/legacy/default_search_strategy.ts
+++ b/src/plugins/data/public/search/legacy/default_search_strategy.ts
@@ -42,7 +42,7 @@ function msearch({
       index: index.title || index,
       search_type: searchType,
       ignore_unavailable: true,
-      preference: getPreference(config),
+      preference: getPreference(config.get),
     };
     const inlineBody = {
       ...body,
@@ -52,7 +52,7 @@ function msearch({
   });
 
   const searching = es.msearch({
-    ...getMSearchParams(config),
+    ...getMSearchParams(config.get),
     body: `${inlineRequests.join('\n')}\n`,
   });
 
diff --git a/src/plugins/data/public/search/legacy/es_client/get_es_client.ts b/src/plugins/data/public/search/legacy/es_client/get_es_client.ts
index 93d9d24920271..4367544ad9ff4 100644
--- a/src/plugins/data/public/search/legacy/es_client/get_es_client.ts
+++ b/src/plugins/data/public/search/legacy/es_client/get_es_client.ts
@@ -22,17 +22,20 @@ import { default as es } from 'elasticsearch-browser/elasticsearch';
 import { CoreStart, PackageInfo } from 'kibana/public';
 import { BehaviorSubject } from 'rxjs';
 
-export function getEsClient(
-  injectedMetadata: CoreStart['injectedMetadata'],
-  http: CoreStart['http'],
-  packageInfo: PackageInfo
-) {
-  const esRequestTimeout = injectedMetadata.getInjectedVar('esRequestTimeout') as number;
-  const esApiVersion = injectedMetadata.getInjectedVar('esApiVersion') as string;
-
+export function getEsClient({
+  esRequestTimeout,
+  esApiVersion,
+  http,
+  packageVersion,
+}: {
+  esRequestTimeout: number;
+  esApiVersion: string;
+  http: CoreStart['http'];
+  packageVersion: PackageInfo['version'];
+}) {
   // Use legacy es client for msearch.
   const client = es.Client({
-    host: getEsUrl(http, packageInfo),
+    host: getEsUrl(http, packageVersion),
     log: 'info',
     requestTimeout: esRequestTimeout,
     apiVersion: esApiVersion,
@@ -78,7 +81,7 @@ function wrapEsClientMethod(esClient: any, method: string, loadingCount$: Behavi
   };
 }
 
-function getEsUrl(http: CoreStart['http'], packageInfo: PackageInfo) {
+function getEsUrl(http: CoreStart['http'], packageVersion: PackageInfo['version']) {
   const a = document.createElement('a');
   a.href = http.basePath.prepend('/elasticsearch');
   const protocolPort = /https/.test(a.protocol) ? 443 : 80;
@@ -89,7 +92,7 @@ function getEsUrl(http: CoreStart['http'], packageInfo: PackageInfo) {
     protocol: a.protocol,
     pathname: a.pathname,
     headers: {
-      'kbn-version': packageInfo.version,
+      'kbn-version': packageVersion,
     },
   };
 }
diff --git a/src/plugins/data/public/search/legacy/fetch_soon.test.ts b/src/plugins/data/public/search/legacy/fetch_soon.test.ts
index 61d3568350b6b..d375398af1add 100644
--- a/src/plugins/data/public/search/legacy/fetch_soon.test.ts
+++ b/src/plugins/data/public/search/legacy/fetch_soon.test.ts
@@ -19,15 +19,12 @@
 
 import { fetchSoon } from './fetch_soon';
 import { callClient } from './call_client';
-import { IUiSettingsClient } from 'kibana/public';
 import { FetchHandlers, FetchOptions } from '../fetch/types';
 import { SearchRequest, SearchResponse } from '../index';
-import { UI_SETTINGS } from '../../../common';
+import { GetConfigFn, UI_SETTINGS } from '../../../common';
 
-function getConfigStub(config: any = {}) {
-  return {
-    get: (key) => config[key],
-  } as IUiSettingsClient;
+function getConfigStub(config: any = {}): GetConfigFn {
+  return (key) => config[key];
 }
 
 const mockResponses: Record<string, SearchResponse> = {
@@ -60,9 +57,9 @@ describe('fetchSoon', () => {
   });
 
   test('should execute asap if config is set to not batch searches', () => {
-    const config = getConfigStub({
-      [UI_SETTINGS.COURIER_BATCH_SEARCHES]: false,
-    });
+    const config = {
+      get: getConfigStub({ [UI_SETTINGS.COURIER_BATCH_SEARCHES]: false }),
+    };
     const request = {};
     const options = {};
 
@@ -72,9 +69,9 @@ describe('fetchSoon', () => {
   });
 
   test('should delay by 50ms if config is set to batch searches', () => {
-    const config = getConfigStub({
-      [UI_SETTINGS.COURIER_BATCH_SEARCHES]: true,
-    });
+    const config = {
+      get: getConfigStub({ [UI_SETTINGS.COURIER_BATCH_SEARCHES]: true }),
+    };
     const request = {};
     const options = {};
 
@@ -88,9 +85,9 @@ describe('fetchSoon', () => {
   });
 
   test('should send a batch of requests to callClient', () => {
-    const config = getConfigStub({
-      [UI_SETTINGS.COURIER_BATCH_SEARCHES]: true,
-    });
+    const config = {
+      get: getConfigStub({ [UI_SETTINGS.COURIER_BATCH_SEARCHES]: true }),
+    };
     const requests = [{ foo: 1 }, { foo: 2 }];
     const options = [{ bar: 1 }, { bar: 2 }];
 
@@ -105,9 +102,9 @@ describe('fetchSoon', () => {
   });
 
   test('should return the response to the corresponding call for multiple batched requests', async () => {
-    const config = getConfigStub({
-      [UI_SETTINGS.COURIER_BATCH_SEARCHES]: true,
-    });
+    const config = {
+      get: getConfigStub({ [UI_SETTINGS.COURIER_BATCH_SEARCHES]: true }),
+    };
     const requests = [{ _mockResponseId: 'foo' }, { _mockResponseId: 'bar' }];
 
     const promises = requests.map((request) => {
@@ -120,9 +117,9 @@ describe('fetchSoon', () => {
   });
 
   test('should wait for the previous batch to start before starting a new batch', () => {
-    const config = getConfigStub({
-      [UI_SETTINGS.COURIER_BATCH_SEARCHES]: true,
-    });
+    const config = {
+      get: getConfigStub({ [UI_SETTINGS.COURIER_BATCH_SEARCHES]: true }),
+    };
     const firstBatch = [{ foo: 1 }, { foo: 2 }];
     const secondBatch = [{ bar: 1 }, { bar: 2 }];
 
diff --git a/src/plugins/data/public/search/legacy/get_msearch_params.test.ts b/src/plugins/data/public/search/legacy/get_msearch_params.test.ts
index dc61e19406631..d3206950174c8 100644
--- a/src/plugins/data/public/search/legacy/get_msearch_params.test.ts
+++ b/src/plugins/data/public/search/legacy/get_msearch_params.test.ts
@@ -18,13 +18,10 @@
  */
 
 import { getMSearchParams } from './get_msearch_params';
-import { IUiSettingsClient } from '../../../../../core/public';
-import { UI_SETTINGS } from '../../../common';
+import { GetConfigFn, UI_SETTINGS } from '../../../common';
 
-function getConfigStub(config: any = {}) {
-  return {
-    get: (key) => config[key],
-  } as IUiSettingsClient;
+function getConfigStub(config: any = {}): GetConfigFn {
+  return (key) => config[key];
 }
 
 describe('getMSearchParams', () => {
diff --git a/src/plugins/data/public/search/legacy/get_msearch_params.ts b/src/plugins/data/public/search/legacy/get_msearch_params.ts
index 48d13903c972f..c4f77b25078cd 100644
--- a/src/plugins/data/public/search/legacy/get_msearch_params.ts
+++ b/src/plugins/data/public/search/legacy/get_msearch_params.ts
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-import { IUiSettingsClient } from 'kibana/public';
+import { GetConfigFn } from '../../../common';
 import { getIgnoreThrottled, getMaxConcurrentShardRequests } from '../fetch';
 
-export function getMSearchParams(config: IUiSettingsClient) {
+export function getMSearchParams(getConfig: GetConfigFn) {
   return {
     rest_total_hits_as_int: true,
-    ignore_throttled: getIgnoreThrottled(config),
-    max_concurrent_shard_requests: getMaxConcurrentShardRequests(config),
+    ignore_throttled: getIgnoreThrottled(getConfig),
+    max_concurrent_shard_requests: getMaxConcurrentShardRequests(getConfig),
   };
 }
diff --git a/src/plugins/data/public/search/search_service.test.ts b/src/plugins/data/public/search/search_service.test.ts
index 4360a0caa7cde..738f1e8ffbca0 100644
--- a/src/plugins/data/public/search/search_service.test.ts
+++ b/src/plugins/data/public/search/search_service.test.ts
@@ -52,6 +52,7 @@ describe('Search service', () => {
       } as any);
       expect(start).toHaveProperty('aggs');
       expect(start).toHaveProperty('search');
+      expect(start).toHaveProperty('searchSource');
     });
   });
 });
diff --git a/src/plugins/data/public/search/search_service.ts b/src/plugins/data/public/search/search_service.ts
index 04e1a46c84652..a65b2b4b71f20 100644
--- a/src/plugins/data/public/search/search_service.ts
+++ b/src/plugins/data/public/search/search_service.ts
@@ -51,11 +51,22 @@ export class SearchService implements Plugin<ISearchSetup, ISearchStart> {
   private usageCollector?: SearchUsageCollector;
 
   public setup(
-    core: CoreSetup,
-    { packageInfo, usageCollection, expressions }: SearchServiceSetupDependencies
+    { http, getStartServices, injectedMetadata, notifications, uiSettings }: CoreSetup,
+    { expressions, packageInfo, usageCollection }: SearchServiceSetupDependencies
   ): ISearchSetup {
-    this.usageCollector = createUsageCollector(core, usageCollection);
-    this.esClient = getEsClient(core.injectedMetadata, core.http, packageInfo);
+    const esApiVersion = injectedMetadata.getInjectedVar('esApiVersion') as string;
+    const esRequestTimeout = injectedMetadata.getInjectedVar('esRequestTimeout') as number;
+    const packageVersion = packageInfo.version;
+
+    this.usageCollector = createUsageCollector(getStartServices, usageCollection);
+
+    this.esClient = getEsClient({
+      esRequestTimeout,
+      esApiVersion,
+      http,
+      packageVersion,
+    });
+
     /**
      * A global object that intercepts all searches and provides convenience methods for cancelling
      * all pending search requests, as well as getting the number of pending search requests.
@@ -64,13 +75,13 @@ export class SearchService implements Plugin<ISearchSetup, ISearchStart> {
      */
     this.searchInterceptor = new SearchInterceptor(
       {
-        toasts: core.notifications.toasts,
-        http: core.http,
-        uiSettings: core.uiSettings,
-        startServices: core.getStartServices(),
+        toasts: notifications.toasts,
+        http,
+        uiSettings,
+        startServices: getStartServices(),
         usageCollector: this.usageCollector!,
       },
-      core.injectedMetadata.getInjectedVar('esRequestTimeout') as number
+      esRequestTimeout
     );
 
     expressions.registerFunction(esdsl);
@@ -79,7 +90,7 @@ export class SearchService implements Plugin<ISearchSetup, ISearchStart> {
     return {
       aggs: this.aggsService.setup({
         registerFunction: expressions.registerFunction,
-        uiSettings: core.uiSettings,
+        uiSettings,
       }),
       usageCollector: this.usageCollector!,
       __enhance: (enhancements: SearchEnhancements) => {
@@ -101,8 +112,8 @@ export class SearchService implements Plugin<ISearchSetup, ISearchStart> {
     };
 
     const searchSourceDependencies: SearchSourceDependencies = {
-      uiSettings,
-      injectedMetadata,
+      getConfig: uiSettings.get.bind(uiSettings),
+      esShardTimeout: injectedMetadata.getInjectedVar('esShardTimeout') as number,
       search,
       legacySearch,
     };
diff --git a/src/plugins/data/public/search/search_source/create_search_source.test.ts b/src/plugins/data/public/search/search_source/create_search_source.test.ts
index 23ab5979595af..56f6ca6c56270 100644
--- a/src/plugins/data/public/search/search_source/create_search_source.test.ts
+++ b/src/plugins/data/public/search/search_source/create_search_source.test.ts
@@ -16,27 +16,28 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 import { createSearchSource as createSearchSourceFactory } from './create_search_source';
+import { SearchSourceDependencies } from './search_source';
 import { IIndexPattern } from '../../../common/index_patterns';
 import { IndexPatternsContract } from '../../index_patterns/index_patterns';
 import { Filter } from '../../../common/es_query/filters';
-import { coreMock } from '../../../../../core/public/mocks';
 import { dataPluginMock } from '../../mocks';
 
 describe('createSearchSource', () => {
   const indexPatternMock: IIndexPattern = {} as IIndexPattern;
   let indexPatternContractMock: jest.Mocked<IndexPatternsContract>;
-  let dependencies: any;
+  let dependencies: SearchSourceDependencies;
   let createSearchSource: ReturnType<typeof createSearchSourceFactory>;
 
   beforeEach(() => {
-    const core = coreMock.createStart();
     const data = dataPluginMock.createStartContract();
 
     dependencies = {
-      searchService: data.search,
-      uiSettings: core.uiSettings,
-      injectedMetadata: core.injectedMetadata,
+      getConfig: jest.fn(),
+      search: jest.fn(),
+      legacySearch: data.search.__LEGACY,
+      esShardTimeout: 30000,
     };
 
     indexPatternContractMock = ({
diff --git a/src/plugins/data/public/search/search_source/mocks.ts b/src/plugins/data/public/search/search_source/mocks.ts
index cf2d009e41b54..4e1c35557ffa6 100644
--- a/src/plugins/data/public/search/search_source/mocks.ts
+++ b/src/plugins/data/public/search/search_source/mocks.ts
@@ -17,10 +17,7 @@
  * under the License.
  */
 
-import {
-  injectedMetadataServiceMock,
-  uiSettingsServiceMock,
-} from '../../../../../core/public/mocks';
+import { uiSettingsServiceMock } from '../../../../../core/public/mocks';
 
 import { ISearchSource, SearchSource } from './search_source';
 import { SearchSourceFields } from './types';
@@ -54,6 +51,8 @@ export const searchSourceMock = {
 
 export const createSearchSourceMock = (fields?: SearchSourceFields) =>
   new SearchSource(fields, {
+    getConfig: uiSettingsServiceMock.createStartContract().get,
+    esShardTimeout: 30000,
     search: jest.fn(),
     legacySearch: {
       esClient: {
@@ -61,6 +60,4 @@ export const createSearchSourceMock = (fields?: SearchSourceFields) =>
         msearch: jest.fn(),
       },
     },
-    uiSettings: uiSettingsServiceMock.createStartContract(),
-    injectedMetadata: injectedMetadataServiceMock.createStartContract(),
   });
diff --git a/src/plugins/data/public/search/search_source/search_source.test.ts b/src/plugins/data/public/search/search_source/search_source.test.ts
index 6d53b8dfc4b4e..2f0fa0765e25a 100644
--- a/src/plugins/data/public/search/search_source/search_source.test.ts
+++ b/src/plugins/data/public/search/search_source/search_source.test.ts
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 import { Observable } from 'rxjs';
-import { SearchSource } from './search_source';
+import { GetConfigFn } from 'src/plugins/data/common';
+import { SearchSource, SearchSourceDependencies } from './search_source';
 import { IndexPattern, SortDirection } from '../..';
 import { fetchSoon } from '../legacy';
-import { IUiSettingsClient } from '../../../../../core/public';
 import { dataPluginMock } from '../../../../data/public/mocks';
-import { coreMock } from '../../../../../core/public/mocks';
 
 jest.mock('../legacy', () => ({
   fetchSoon: jest.fn().mockResolvedValue({}),
@@ -51,10 +51,9 @@ const indexPattern2 = ({
 
 describe('SearchSource', () => {
   let mockSearchMethod: any;
-  let searchSourceDependencies: any;
+  let searchSourceDependencies: SearchSourceDependencies;
 
   beforeEach(() => {
-    const core = coreMock.createStart();
     const data = dataPluginMock.createStartContract();
 
     mockSearchMethod = jest.fn(() => {
@@ -69,10 +68,10 @@ describe('SearchSource', () => {
     });
 
     searchSourceDependencies = {
+      getConfig: jest.fn(),
       search: mockSearchMethod,
       legacySearch: data.search.__LEGACY,
-      injectedMetadata: core.injectedMetadata,
-      uiSettings: core.uiSettings,
+      esShardTimeout: 30000,
     };
   });
 
@@ -184,16 +183,11 @@ describe('SearchSource', () => {
 
   describe('#legacy fetch()', () => {
     beforeEach(() => {
-      const core = coreMock.createStart();
-
       searchSourceDependencies = {
         ...searchSourceDependencies,
-        uiSettings: {
-          ...core.uiSettings,
-          get: jest.fn(() => {
-            return true; // batchSearches = true
-          }),
-        } as IUiSettingsClient,
+        getConfig: jest.fn(() => {
+          return true; // batchSearches = true
+        }) as GetConfigFn,
       };
     });
 
diff --git a/src/plugins/data/public/search/search_source/search_source.ts b/src/plugins/data/public/search/search_source/search_source.ts
index 847dc8853d6ba..06ad13bfcfdf5 100644
--- a/src/plugins/data/public/search/search_source/search_source.ts
+++ b/src/plugins/data/public/search/search_source/search_source.ts
@@ -72,7 +72,6 @@
 import { setWith } from '@elastic/safer-lodash-set';
 import { uniqueId, uniq, extend, pick, difference, omit, isObject, keys, isFunction } from 'lodash';
 import { map } from 'rxjs/operators';
-import { CoreStart } from 'kibana/public';
 import { normalizeSortRequest } from './normalize_sort_request';
 import { filterDocvalueFields } from './filter_docvalue_fields';
 import { fieldWildcardFilter } from '../../../../kibana_utils/common';
@@ -82,15 +81,32 @@ import { FetchOptions, RequestFailure, handleResponse, getSearchParamsFromReques
 
 import { getEsQueryConfig, buildEsQuery, Filter, UI_SETTINGS } from '../../../common';
 import { getHighlightRequest } from '../../../common/field_formats';
+import { GetConfigFn } from '../../../common/types';
 import { fetchSoon } from '../legacy';
 import { extractReferences } from './extract_references';
 import { ISearchStartLegacy } from '../types';
 
+/** @internal */
+export const searchSourceRequiredUiSettings = [
+  'dateFormat:tz',
+  UI_SETTINGS.COURIER_BATCH_SEARCHES,
+  UI_SETTINGS.COURIER_CUSTOM_REQUEST_PREFERENCE,
+  UI_SETTINGS.COURIER_IGNORE_FILTER_IF_FIELD_NOT_IN_INDEX,
+  UI_SETTINGS.COURIER_MAX_CONCURRENT_SHARD_REQUESTS,
+  UI_SETTINGS.COURIER_SET_REQUEST_PREFERENCE,
+  UI_SETTINGS.DOC_HIGHLIGHT,
+  UI_SETTINGS.META_FIELDS,
+  UI_SETTINGS.QUERY_ALLOW_LEADING_WILDCARDS,
+  UI_SETTINGS.QUERY_STRING_OPTIONS,
+  UI_SETTINGS.SEARCH_INCLUDE_FROZEN,
+  UI_SETTINGS.SORT_OPTIONS,
+];
+
 export interface SearchSourceDependencies {
-  uiSettings: CoreStart['uiSettings'];
+  getConfig: GetConfigFn;
   search: ISearchGeneric;
   legacySearch: ISearchStartLegacy;
-  injectedMetadata: CoreStart['injectedMetadata'];
+  esShardTimeout: number;
 }
 
 /** @public **/
@@ -204,11 +220,11 @@ export class SearchSource {
    * @return {Observable<SearchResponse<unknown>>}
    */
   private fetch$(searchRequest: SearchRequest, signal?: AbortSignal) {
-    const { search, injectedMetadata, uiSettings } = this.dependencies;
+    const { search, esShardTimeout, getConfig } = this.dependencies;
 
     const params = getSearchParamsFromRequest(searchRequest, {
-      injectedMetadata,
-      uiSettings,
+      esShardTimeout,
+      getConfig,
     });
 
     return search({ params, indexType: searchRequest.indexType }, { signal }).pipe(
@@ -221,8 +237,7 @@ export class SearchSource {
    * @return {Promise<SearchResponse<unknown>>}
    */
   private async legacyFetch(searchRequest: SearchRequest, options: FetchOptions) {
-    const { injectedMetadata, legacySearch, uiSettings } = this.dependencies;
-    const esShardTimeout = injectedMetadata.getInjectedVar('esShardTimeout') as number;
+    const { esShardTimeout, legacySearch, getConfig } = this.dependencies;
 
     return await fetchSoon(
       searchRequest,
@@ -232,7 +247,7 @@ export class SearchSource {
       },
       {
         legacySearchService: legacySearch,
-        config: uiSettings,
+        config: { get: getConfig },
         esShardTimeout,
       }
     );
@@ -243,14 +258,14 @@ export class SearchSource {
    * @async
    */
   async fetch(options: FetchOptions = {}) {
-    const { uiSettings } = this.dependencies;
+    const { getConfig } = this.dependencies;
     await this.requestIsStarting(options);
 
     const searchRequest = await this.flatten();
     this.history = [searchRequest];
 
     let response;
-    if (uiSettings.get(UI_SETTINGS.COURIER_BATCH_SEARCHES)) {
+    if (getConfig(UI_SETTINGS.COURIER_BATCH_SEARCHES)) {
       response = await this.legacyFetch(searchRequest, options);
     } else {
       response = this.fetch$(searchRequest, options.abortSignal).toPromise();
@@ -342,7 +357,7 @@ export class SearchSource {
       }
     };
 
-    const { uiSettings } = this.dependencies;
+    const { getConfig } = this.dependencies;
 
     switch (key) {
       case 'filter':
@@ -364,7 +379,7 @@ export class SearchSource {
         const sort = normalizeSortRequest(
           val,
           this.getField('index'),
-          uiSettings.get(UI_SETTINGS.SORT_OPTIONS)
+          getConfig(UI_SETTINGS.SORT_OPTIONS)
         );
         return addToBody(key, sort);
       default:
@@ -418,14 +433,11 @@ export class SearchSource {
       body._source = index.getSourceFiltering();
     }
 
-    const { uiSettings } = this.dependencies;
+    const { getConfig } = this.dependencies;
 
     if (body._source) {
       // exclude source fields for this index pattern specified by the user
-      const filter = fieldWildcardFilter(
-        body._source.excludes,
-        uiSettings.get(UI_SETTINGS.META_FIELDS)
-      );
+      const filter = fieldWildcardFilter(body._source.excludes, getConfig(UI_SETTINGS.META_FIELDS));
       body.docvalue_fields = body.docvalue_fields.filter((docvalueField: any) =>
         filter(docvalueField.field)
       );
@@ -445,11 +457,11 @@ export class SearchSource {
       );
     }
 
-    const esQueryConfigs = getEsQueryConfig(uiSettings);
+    const esQueryConfigs = getEsQueryConfig({ get: getConfig });
     body.query = buildEsQuery(index, query, filters, esQueryConfigs);
 
     if (highlightAll && body.query) {
-      body.highlight = getHighlightRequest(body.query, uiSettings.get(UI_SETTINGS.DOC_HIGHLIGHT));
+      body.highlight = getHighlightRequest(body.query, getConfig(UI_SETTINGS.DOC_HIGHLIGHT));
       delete searchRequest.highlightAll;
     }
 
diff --git a/src/plugins/data/public/services.ts b/src/plugins/data/public/services.ts
index ba0b2de393bde..032bce6d8d2aa 100644
--- a/src/plugins/data/public/services.ts
+++ b/src/plugins/data/public/services.ts
@@ -31,8 +31,6 @@ export const [getUiSettings, setUiSettings] = createGetterSetter<CoreStart['uiSe
   'UiSettings'
 );
 
-export const [getHttp, setHttp] = createGetterSetter<CoreStart['http']>('Http');
-
 export const [getFieldFormats, setFieldFormats] = createGetterSetter<FieldFormatsStart>(
   'FieldFormats'
 );
@@ -47,10 +45,6 @@ export const [getQueryService, setQueryService] = createGetterSetter<
   DataPublicPluginStart['query']
 >('Query');
 
-export const [getInjectedMetadata, setInjectedMetadata] = createGetterSetter<
-  CoreStart['injectedMetadata']
->('InjectedMetadata');
-
 export const [getSearchService, setSearchService] = createGetterSetter<
   DataPublicPluginStart['search']
 >('Search');
diff --git a/src/plugins/data/server/field_formats/converters/date_nanos_server.ts b/src/plugins/data/server/field_formats/converters/date_nanos_server.ts
index 299b2aac93d49..b99febf0c7e73 100644
--- a/src/plugins/data/server/field_formats/converters/date_nanos_server.ts
+++ b/src/plugins/data/server/field_formats/converters/date_nanos_server.ts
@@ -24,7 +24,7 @@ import {
   DateNanosFormat,
   formatWithNanos,
 } from '../../../common/field_formats/converters/date_nanos_shared';
-import { TextContextTypeConvert } from '../../../common';
+import { TextContextTypeConvert } from '../../../common/field_formats/types';
 
 class DateNanosFormatServer extends DateNanosFormat {
   textConvert: TextContextTypeConvert = (val) => {
diff --git a/src/plugins/data/server/field_formats/converters/date_server.ts b/src/plugins/data/server/field_formats/converters/date_server.ts
index 85eb65dfc6a8d..19c4adc90bade 100644
--- a/src/plugins/data/server/field_formats/converters/date_server.ts
+++ b/src/plugins/data/server/field_formats/converters/date_server.ts
@@ -23,11 +23,13 @@ import moment from 'moment-timezone';
 import {
   FieldFormat,
   KBN_FIELD_TYPES,
-  TextContextTypeConvert,
   FIELD_FORMAT_IDS,
   FieldFormatsGetConfigFn,
-  IFieldFormatMetaParams,
 } from '../../../common';
+import {
+  IFieldFormatMetaParams,
+  TextContextTypeConvert,
+} from '../../../common/field_formats/types';
 
 export class DateFormat extends FieldFormat {
   static id = FIELD_FORMAT_IDS.DATE;
diff --git a/src/plugins/data/server/server.api.md b/src/plugins/data/server/server.api.md
index e259a7878398d..f0a0d2763ff23 100644
--- a/src/plugins/data/server/server.api.md
+++ b/src/plugins/data/server/server.api.md
@@ -419,10 +419,11 @@ export const fieldFormats: {
     TruncateFormat: typeof TruncateFormat;
 };
 
+// Warning: (ae-forgotten-export) The symbol "GetConfigFn" needs to be exported by the entry point index.d.ts
 // Warning: (ae-missing-release-tag) "FieldFormatsGetConfigFn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export type FieldFormatsGetConfigFn = <T = any>(key: string, defaultOverride?: T) => T;
+export type FieldFormatsGetConfigFn = GetConfigFn;
 
 // Warning: (ae-missing-release-tag) "Filter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
diff --git a/src/plugins/vis_type_vega/public/data_model/search_api.ts b/src/plugins/vis_type_vega/public/data_model/search_api.ts
index a213b59be2ad0..d2ce8c95b9f90 100644
--- a/src/plugins/vis_type_vega/public/data_model/search_api.ts
+++ b/src/plugins/vis_type_vega/public/data_model/search_api.ts
@@ -51,8 +51,10 @@ export class SearchAPI {
       searchRequests.map((request) => {
         const requestId = request.name;
         const params = getSearchParamsFromRequest(request, {
-          uiSettings: this.dependencies.uiSettings,
-          injectedMetadata: this.dependencies.injectedMetadata,
+          esShardTimeout: this.dependencies.injectedMetadata.getInjectedVar(
+            'esShardTimeout'
+          ) as number,
+          getConfig: this.dependencies.uiSettings.get.bind(this.dependencies.uiSettings),
         });
 
         if (this.inspectorAdapters) {

From 3fb639f986efd166b0a8f23b31e740047c391be3 Mon Sep 17 00:00:00 2001
From: Chris Roberson <chrisronline@gmail.com>
Date: Thu, 20 Aug 2020 09:23:20 -0400
Subject: [PATCH 59/85] [Monitoring] Fix bug where kibana crashes with
 collection disabled (#75335)

* Fix bug where kibana crashes with collection disabled

* Do not set this to an empty object by default

* Always create the bulk uploader, and fix this misplaced license check

* Fix type issue

* Add a couple basic tests

* Fix type issue
---
 .../monitoring/server/license_service.ts      |  11 +-
 .../plugins/monitoring/server/plugin.test.ts  | 140 ++++++++++++++++++
 x-pack/plugins/monitoring/server/plugin.ts    |  44 +++---
 3 files changed, 169 insertions(+), 26 deletions(-)
 create mode 100644 x-pack/plugins/monitoring/server/plugin.test.ts

diff --git a/x-pack/plugins/monitoring/server/license_service.ts b/x-pack/plugins/monitoring/server/license_service.ts
index fb45abc22afa4..ecadf9d2d85db 100644
--- a/x-pack/plugins/monitoring/server/license_service.ts
+++ b/x-pack/plugins/monitoring/server/license_service.ts
@@ -33,14 +33,13 @@ export class LicenseService {
     let rawLicense: Readonly<ILicense> | undefined;
     let licenseSubscription: Subscription | undefined = license$.subscribe((nextRawLicense) => {
       rawLicense = nextRawLicense;
+      if (!rawLicense?.isAvailable) {
+        log.warn(
+          `X-Pack Monitoring Cluster Alerts will not be available: ${rawLicense?.getUnavailableReason()}`
+        );
+      }
     });
 
-    if (!rawLicense?.isAvailable) {
-      log.warn(
-        `X-Pack Monitoring Cluster Alerts will not be available: ${rawLicense?.getUnavailableReason()}`
-      );
-    }
-
     return {
       refresh,
       license$,
diff --git a/x-pack/plugins/monitoring/server/plugin.test.ts b/x-pack/plugins/monitoring/server/plugin.test.ts
new file mode 100644
index 0000000000000..13da0a3c9242e
--- /dev/null
+++ b/x-pack/plugins/monitoring/server/plugin.test.ts
@@ -0,0 +1,140 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { Plugin } from './plugin';
+import { combineLatest } from 'rxjs';
+// @ts-ignore
+import { initBulkUploader } from './kibana_monitoring';
+import { AlertsFactory } from './alerts';
+
+jest.mock('rxjs', () => ({
+  // @ts-ignore
+  ...jest.requireActual('rxjs'),
+  combineLatest: jest.fn(),
+}));
+
+jest.mock('./es_client/instantiate_client', () => ({
+  instantiateClient: jest.fn(),
+}));
+
+jest.mock('./license_service', () => ({
+  LicenseService: jest.fn().mockImplementation(() => ({
+    setup: jest.fn().mockImplementation(() => ({
+      refresh: jest.fn(),
+    })),
+  })),
+}));
+
+jest.mock('./kibana_monitoring', () => ({
+  initBulkUploader: jest.fn(),
+}));
+
+describe('Monitoring plugin', () => {
+  const initializerContext = {
+    logger: {
+      get: jest.fn().mockImplementation(() => ({
+        info: jest.fn(),
+      })),
+    },
+    config: {
+      create: jest.fn().mockImplementation(() => ({
+        pipe: jest.fn().mockImplementation(() => ({
+          toPromise: jest.fn(),
+        })),
+      })),
+      legacy: {
+        globalConfig$: {},
+      },
+    },
+    env: {
+      packageInfo: {
+        version: '1.0.0',
+      },
+    },
+  };
+
+  const coreSetup = {
+    http: {
+      createRouter: jest.fn(),
+      getServerInfo: jest.fn().mockImplementation(() => ({
+        port: 5601,
+      })),
+      basePath: {
+        serverBasePath: '',
+      },
+    },
+    uuid: {
+      getInstanceUuid: jest.fn(),
+    },
+    elasticsearch: {
+      legacy: {
+        client: {},
+        createClient: jest.fn(),
+      },
+    },
+  };
+
+  const setupPlugins = {
+    usageCollection: {
+      getCollectorByType: jest.fn(),
+      makeStatsCollector: jest.fn(),
+      registerCollector: jest.fn(),
+    },
+    alerts: {
+      registerType: jest.fn(),
+    },
+  };
+
+  let config = {};
+  const defaultConfig = {
+    ui: {
+      elasticsearch: {},
+    },
+    kibana: {
+      collection: {
+        interval: 30000,
+      },
+    },
+  };
+
+  beforeEach(() => {
+    config = defaultConfig;
+    (combineLatest as jest.Mock).mockImplementation(() => {
+      return {
+        pipe: jest.fn().mockImplementation(() => {
+          return {
+            toPromise: jest.fn().mockImplementation(() => {
+              return [config, 2];
+            }),
+          };
+        }),
+      };
+    });
+  });
+
+  afterEach(() => {
+    (setupPlugins.alerts.registerType as jest.Mock).mockReset();
+  });
+
+  it('always create the bulk uploader', async () => {
+    const setKibanaStatusGetter = jest.fn();
+    (initBulkUploader as jest.Mock).mockImplementation(() => {
+      return {
+        setKibanaStatusGetter,
+      };
+    });
+    const plugin = new Plugin(initializerContext as any);
+    const contract = await plugin.setup(coreSetup as any, setupPlugins as any);
+    contract.registerLegacyAPI(null as any);
+    expect(setKibanaStatusGetter).toHaveBeenCalled();
+  });
+
+  it('should register all alerts', async () => {
+    const alerts = AlertsFactory.getAll();
+    const plugin = new Plugin(initializerContext as any);
+    await plugin.setup(coreSetup as any, setupPlugins as any);
+    expect(setupPlugins.alerts.registerType).toHaveBeenCalledTimes(alerts.length);
+  });
+});
diff --git a/x-pack/plugins/monitoring/server/plugin.ts b/x-pack/plugins/monitoring/server/plugin.ts
index 3aedb6831e7ab..043435c48a211 100644
--- a/x-pack/plugins/monitoring/server/plugin.ts
+++ b/x-pack/plugins/monitoring/server/plugin.ts
@@ -71,7 +71,7 @@ export class Plugin {
   private licenseService = {} as MonitoringLicenseService;
   private monitoringCore = {} as MonitoringCore;
   private legacyShimDependencies = {} as LegacyShimDependencies;
-  private bulkUploader = {} as IBulkUploader;
+  private bulkUploader: IBulkUploader = {} as IBulkUploader;
 
   constructor(initializerContext: PluginInitializerContext) {
     this.initializerContext = initializerContext;
@@ -152,28 +152,28 @@ export class Plugin {
       registerCollectors(plugins.usageCollection, config);
     }
 
-    // If collection is enabled, create the bulk uploader
+    // Always create the bulk uploader
     const kibanaMonitoringLog = this.getLogger(KIBANA_MONITORING_LOGGING_TAG);
+    const bulkUploader = (this.bulkUploader = initBulkUploader({
+      elasticsearch: core.elasticsearch,
+      config,
+      log: kibanaMonitoringLog,
+      kibanaStats: {
+        uuid: core.uuid.getInstanceUuid(),
+        name: serverInfo.name,
+        index: get(legacyConfig, 'kibana.index'),
+        host: serverInfo.hostname,
+        locale: i18n.getLocale(),
+        port: serverInfo.port.toString(),
+        transport_address: `${serverInfo.hostname}:${serverInfo.port}`,
+        version: this.initializerContext.env.packageInfo.version,
+        snapshot: snapshotRegex.test(this.initializerContext.env.packageInfo.version),
+      },
+    }));
+
+    // If collection is enabled, start it
     const kibanaCollectionEnabled = config.kibana.collection.enabled;
     if (kibanaCollectionEnabled) {
-      // Start kibana internal collection
-      const bulkUploader = (this.bulkUploader = initBulkUploader({
-        elasticsearch: core.elasticsearch,
-        config,
-        log: kibanaMonitoringLog,
-        kibanaStats: {
-          uuid: core.uuid.getInstanceUuid(),
-          name: serverInfo.name,
-          index: get(legacyConfig, 'kibana.index'),
-          host: serverInfo.hostname,
-          locale: i18n.getLocale(),
-          port: serverInfo.port.toString(),
-          transport_address: `${serverInfo.hostname}:${serverInfo.port}`,
-          version: this.initializerContext.env.packageInfo.version,
-          snapshot: snapshotRegex.test(this.initializerContext.env.packageInfo.version),
-        },
-      }));
-
       // Do not use `this.licenseService` as that looks at the monitoring cluster
       // whereas we want to check the production cluster here
       if (plugins.licensing) {
@@ -188,6 +188,10 @@ export class Plugin {
             bulkUploader.handleNotEnabled();
           }
         });
+      } else {
+        kibanaMonitoringLog.warn(
+          'Internal collection for Kibana monitoring is disabled due to missing license information.'
+        );
       }
     } else {
       kibanaMonitoringLog.info(

From 954b5b5224d297438473f90286502bf5feb139cf Mon Sep 17 00:00:00 2001
From: Thomas Neirynck <thomas@elastic.co>
Date: Thu, 20 Aug 2020 09:28:19 -0400
Subject: [PATCH 60/85] [Maps] Move elasticsearch_geo_utils to common (#75508)

---
 .../elasticsearch_geo_utils.d.ts              |  6 +++-
 .../elasticsearch_geo_utils.js                |  6 ++--
 .../elasticsearch_geo_utils.test.js           | 29 +++++--------------
 .../public/actions/data_request_actions.ts    |  2 +-
 .../maps/public/actions/map_actions.ts        |  2 +-
 .../es_geo_grid_source/convert_to_geojson.js  |  2 +-
 .../es_geo_grid_source/es_geo_grid_source.js  |  2 +-
 .../es_geo_grid_source/geo_tile_utils.js      |  2 +-
 .../es_pew_pew_source/es_pew_pew_source.js    |  2 +-
 .../es_search_source/es_search_source.js      |  2 +-
 .../classes/sources/es_source/es_source.js    |  2 +-
 .../feature_geometry_filter_form.js           |  2 +-
 .../map/mb/draw_control/draw_control.js       |  2 +-
 .../connected_components/map/mb/view.js       |  2 +-
 x-pack/plugins/maps/public/kibana_services.ts |  3 --
 .../maps/public/selectors/map_selectors.ts    |  2 +-
 16 files changed, 29 insertions(+), 39 deletions(-)
 rename x-pack/plugins/maps/{public => common}/elasticsearch_geo_utils.d.ts (70%)
 rename x-pack/plugins/maps/{public => common}/elasticsearch_geo_utils.js (98%)
 rename x-pack/plugins/maps/{public => common}/elasticsearch_geo_utils.test.js (97%)

diff --git a/x-pack/plugins/maps/public/elasticsearch_geo_utils.d.ts b/x-pack/plugins/maps/common/elasticsearch_geo_utils.d.ts
similarity index 70%
rename from x-pack/plugins/maps/public/elasticsearch_geo_utils.d.ts
rename to x-pack/plugins/maps/common/elasticsearch_geo_utils.d.ts
index 964afb589187f..44250360e9d00 100644
--- a/x-pack/plugins/maps/public/elasticsearch_geo_utils.d.ts
+++ b/x-pack/plugins/maps/common/elasticsearch_geo_utils.d.ts
@@ -4,8 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { MapExtent } from '../common/descriptor_types';
+import { MapExtent } from './descriptor_types';
 
 export function scaleBounds(bounds: MapExtent, scaleFactor: number): MapExtent;
 
 export function turfBboxToBounds(turfBbox: unknown): MapExtent;
+
+export function clampToLatBounds(lat: number): number;
+
+export function clampToLonBounds(lon: number): number;
diff --git a/x-pack/plugins/maps/public/elasticsearch_geo_utils.js b/x-pack/plugins/maps/common/elasticsearch_geo_utils.js
similarity index 98%
rename from x-pack/plugins/maps/public/elasticsearch_geo_utils.js
rename to x-pack/plugins/maps/common/elasticsearch_geo_utils.js
index b32125e6eb614..f2bf83ae18bb0 100644
--- a/x-pack/plugins/maps/public/elasticsearch_geo_utils.js
+++ b/x-pack/plugins/maps/common/elasticsearch_geo_utils.js
@@ -16,10 +16,12 @@ import {
   LON_INDEX,
   LAT_INDEX,
 } from '../common/constants';
-import { getEsSpatialRelationLabel } from '../common/i18n_getters';
-import { SPATIAL_FILTER_TYPE } from './kibana_services';
+import { getEsSpatialRelationLabel } from './i18n_getters';
+import { FILTERS } from '../../../../src/plugins/data/common';
 import turfCircle from '@turf/circle';
 
+const SPATIAL_FILTER_TYPE = FILTERS.SPATIAL_FILTER;
+
 function ensureGeoField(type) {
   const expectedTypes = [ES_GEO_FIELD_TYPE.GEO_POINT, ES_GEO_FIELD_TYPE.GEO_SHAPE];
   if (!expectedTypes.includes(type)) {
diff --git a/x-pack/plugins/maps/public/elasticsearch_geo_utils.test.js b/x-pack/plugins/maps/common/elasticsearch_geo_utils.test.js
similarity index 97%
rename from x-pack/plugins/maps/public/elasticsearch_geo_utils.test.js
rename to x-pack/plugins/maps/common/elasticsearch_geo_utils.test.js
index 6a4b4b78c829e..a8d5d650740cd 100644
--- a/x-pack/plugins/maps/public/elasticsearch_geo_utils.test.js
+++ b/x-pack/plugins/maps/common/elasticsearch_geo_utils.test.js
@@ -4,14 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-jest.mock('ui/new_platform');
-
-jest.mock('./kibana_services', () => {
-  return {
-    SPATIAL_FILTER_TYPE: 'spatial_filter',
-  };
-});
-
 import {
   hitsToGeoJson,
   geoPointToGeometry,
@@ -22,7 +14,7 @@ import {
   makeESBbox,
   scaleBounds,
 } from './elasticsearch_geo_utils';
-import { indexPatterns } from '../../../../src/plugins/data/public';
+import _ from 'lodash';
 
 const geoFieldName = 'location';
 
@@ -173,19 +165,14 @@ describe('hitsToGeoJson', () => {
   });
 
   describe('dot in geoFieldName', () => {
-    const indexPatternMock = {
-      fields: {
-        getByName: (name) => {
-          const fields = {
-            ['my.location']: {
-              type: 'geo_point',
-            },
-          };
-          return fields[name];
-        },
-      },
+    // This essentially should test the implmentation of index-pattern.flattenHit, rather than anything in geo_utils.
+    // Leaving this here for reference.
+    const geoFieldName = 'my.location';
+    const indexPatternFlattenHit = (hit) => {
+      return {
+        [geoFieldName]: _.get(hit._source, geoFieldName),
+      };
     };
-    const indexPatternFlattenHit = indexPatterns.flattenHitWrapper(indexPatternMock);
 
     it('Should handle geoField being an object', () => {
       const hits = [
diff --git a/x-pack/plugins/maps/public/actions/data_request_actions.ts b/x-pack/plugins/maps/public/actions/data_request_actions.ts
index a22e8d582bc5e..6f5ed680ac64f 100644
--- a/x-pack/plugins/maps/public/actions/data_request_actions.ts
+++ b/x-pack/plugins/maps/public/actions/data_request_actions.ts
@@ -41,7 +41,7 @@ import { ILayer } from '../classes/layers/layer';
 import { IVectorLayer } from '../classes/layers/vector_layer/vector_layer';
 import { DataMeta, MapExtent, MapFilters } from '../../common/descriptor_types';
 import { DataRequestAbortError } from '../classes/util/data_request';
-import { scaleBounds, turfBboxToBounds } from '../elasticsearch_geo_utils';
+import { scaleBounds, turfBboxToBounds } from '../../common/elasticsearch_geo_utils';
 
 const FIT_TO_BOUNDS_SCALE_FACTOR = 0.1;
 
diff --git a/x-pack/plugins/maps/public/actions/map_actions.ts b/x-pack/plugins/maps/public/actions/map_actions.ts
index 7ba58307e1952..f408896853155 100644
--- a/x-pack/plugins/maps/public/actions/map_actions.ts
+++ b/x-pack/plugins/maps/public/actions/map_actions.ts
@@ -54,7 +54,7 @@ import {
   MapRefreshConfig,
 } from '../../common/descriptor_types';
 import { INITIAL_LOCATION } from '../../common/constants';
-import { scaleBounds } from '../elasticsearch_geo_utils';
+import { scaleBounds } from '../../common/elasticsearch_geo_utils';
 
 export function setMapInitError(errorMessage: string) {
   return {
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/convert_to_geojson.js b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/convert_to_geojson.js
index a95a8be4b24c8..35dbebdfd3c8a 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/convert_to_geojson.js
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/convert_to_geojson.js
@@ -8,7 +8,7 @@ import _ from 'lodash';
 import { RENDER_AS } from '../../../../common/constants';
 import { getTileBoundingBox } from './geo_tile_utils';
 import { extractPropertiesFromBucket } from '../../util/es_agg_utils';
-import { clamp } from '../../../elasticsearch_geo_utils';
+import { clamp } from '../../../../common/elasticsearch_geo_utils';
 
 const GRID_BUCKET_KEYS_TO_IGNORE = ['key', 'gridCentroid'];
 
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.js b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.js
index a4dba71307b71..a6322ff3ba784 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.js
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.js
@@ -21,7 +21,7 @@ import { getDataSourceLabel } from '../../../../common/i18n_getters';
 import { AbstractESAggSource, DEFAULT_METRIC } from '../es_agg_source';
 import { DataRequestAbortError } from '../../util/data_request';
 import { registerSource } from '../source_registry';
-import { makeESBbox } from '../../../elasticsearch_geo_utils';
+import { makeESBbox } from '../../../../common/elasticsearch_geo_utils';
 
 export const MAX_GEOTILE_LEVEL = 29;
 
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/geo_tile_utils.js b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/geo_tile_utils.js
index 251e33b9579cb..89b24522e4275 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/geo_tile_utils.js
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/geo_tile_utils.js
@@ -6,7 +6,7 @@
 
 import _ from 'lodash';
 import { DECIMAL_DEGREES_PRECISION } from '../../../../common/constants';
-import { clampToLatBounds } from '../../../elasticsearch_geo_utils';
+import { clampToLatBounds } from '../../../../common/elasticsearch_geo_utils';
 
 const ZOOM_TILE_KEY_INDEX = 0;
 const X_TILE_KEY_INDEX = 1;
diff --git a/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/es_pew_pew_source.js b/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/es_pew_pew_source.js
index 79eccf09b2888..92b0c717f6724 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/es_pew_pew_source.js
+++ b/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/es_pew_pew_source.js
@@ -16,7 +16,7 @@ import { getDataSourceLabel } from '../../../../common/i18n_getters';
 import { convertToLines } from './convert_to_lines';
 import { AbstractESAggSource, DEFAULT_METRIC } from '../es_agg_source';
 import { registerSource } from '../source_registry';
-import { turfBboxToBounds } from '../../../elasticsearch_geo_utils';
+import { turfBboxToBounds } from '../../../../common/elasticsearch_geo_utils';
 import { DataRequestAbortError } from '../../util/data_request';
 
 const MAX_GEOTILE_LEVEL = 29;
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.js b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.js
index 256becf70ffb0..6d61c4a7455b2 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.js
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.js
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { AbstractESSource } from '../es_source';
 import { getSearchService } from '../../../kibana_services';
-import { hitsToGeoJson } from '../../../elasticsearch_geo_utils';
+import { hitsToGeoJson } from '../../../../common/elasticsearch_geo_utils';
 import { UpdateSourceEditor } from './update_source_editor';
 import {
   SOURCE_TYPES,
diff --git a/x-pack/plugins/maps/public/classes/sources/es_source/es_source.js b/x-pack/plugins/maps/public/classes/sources/es_source/es_source.js
index 866e3c76c2a3f..8cc2aa018979b 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_source/es_source.js
+++ b/x-pack/plugins/maps/public/classes/sources/es_source/es_source.js
@@ -11,7 +11,7 @@ import {
   getTimeFilter,
   getSearchService,
 } from '../../../kibana_services';
-import { createExtentFilter } from '../../../elasticsearch_geo_utils';
+import { createExtentFilter } from '../../../../common/elasticsearch_geo_utils';
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
 import uuid from 'uuid/v4';
diff --git a/x-pack/plugins/maps/public/connected_components/map/features_tooltip/feature_geometry_filter_form.js b/x-pack/plugins/maps/public/connected_components/map/features_tooltip/feature_geometry_filter_form.js
index e1779c1afbf47..b0ce52b4db7ab 100644
--- a/x-pack/plugins/maps/public/connected_components/map/features_tooltip/feature_geometry_filter_form.js
+++ b/x-pack/plugins/maps/public/connected_components/map/features_tooltip/feature_geometry_filter_form.js
@@ -10,7 +10,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 
 import { URL_MAX_LENGTH } from '../../../../../../../src/core/public';
-import { createSpatialFilterWithGeometry } from '../../../elasticsearch_geo_utils';
+import { createSpatialFilterWithGeometry } from '../../../../common/elasticsearch_geo_utils';
 import { GEO_JSON_TYPE } from '../../../../common/constants';
 import { GeometryFilterForm } from '../../../components/geometry_filter_form';
 
diff --git a/x-pack/plugins/maps/public/connected_components/map/mb/draw_control/draw_control.js b/x-pack/plugins/maps/public/connected_components/map/mb/draw_control/draw_control.js
index 2daa4b2c900f5..6de936fa4a8f1 100644
--- a/x-pack/plugins/maps/public/connected_components/map/mb/draw_control/draw_control.js
+++ b/x-pack/plugins/maps/public/connected_components/map/mb/draw_control/draw_control.js
@@ -15,7 +15,7 @@ import {
   createSpatialFilterWithGeometry,
   getBoundingBoxGeometry,
   roundCoordinates,
-} from '../../../../elasticsearch_geo_utils';
+} from '../../../../../common/elasticsearch_geo_utils';
 import { DrawTooltip } from './draw_tooltip';
 
 const DRAW_RECTANGLE = 'draw_rectangle';
diff --git a/x-pack/plugins/maps/public/connected_components/map/mb/view.js b/x-pack/plugins/maps/public/connected_components/map/mb/view.js
index d85959c3a08a4..5a38f6039ae4b 100644
--- a/x-pack/plugins/maps/public/connected_components/map/mb/view.js
+++ b/x-pack/plugins/maps/public/connected_components/map/mb/view.js
@@ -19,7 +19,7 @@ import sprites1 from '@elastic/maki/dist/sprite@1.png';
 import sprites2 from '@elastic/maki/dist/sprite@2.png';
 import { DrawControl } from './draw_control';
 import { TooltipControl } from './tooltip_control';
-import { clampToLatBounds, clampToLonBounds } from '../../../elasticsearch_geo_utils';
+import { clampToLatBounds, clampToLonBounds } from '../../../../common/elasticsearch_geo_utils';
 import { getInitialView } from './get_initial_view';
 import { getPreserveDrawingBuffer } from '../../../kibana_services';
 
diff --git a/x-pack/plugins/maps/public/kibana_services.ts b/x-pack/plugins/maps/public/kibana_services.ts
index f8f89ebaed102..239a2898a06fc 100644
--- a/x-pack/plugins/maps/public/kibana_services.ts
+++ b/x-pack/plugins/maps/public/kibana_services.ts
@@ -5,14 +5,11 @@
  */
 
 import _ from 'lodash';
-import { esFilters } from '../../../../src/plugins/data/public';
 import { MapsLegacyConfigType } from '../../../../src/plugins/maps_legacy/public';
 import { MapsConfigType } from '../config';
 import { MapsPluginStartDependencies } from './plugin';
 import { CoreStart } from '../../../../src/core/public';
 
-export const SPATIAL_FILTER_TYPE = esFilters.FILTERS.SPATIAL_FILTER;
-
 let licenseId: string | undefined;
 export const setLicenseId = (latestLicenseId: string | undefined) => (licenseId = latestLicenseId);
 export const getLicenseId = () => licenseId;
diff --git a/x-pack/plugins/maps/public/selectors/map_selectors.ts b/x-pack/plugins/maps/public/selectors/map_selectors.ts
index 40ffda3f31c26..d48ee24027561 100644
--- a/x-pack/plugins/maps/public/selectors/map_selectors.ts
+++ b/x-pack/plugins/maps/public/selectors/map_selectors.ts
@@ -32,7 +32,7 @@ import {
   SPATIAL_FILTERS_LAYER_ID,
 } from '../../common/constants';
 // @ts-ignore
-import { extractFeaturesFromFilters } from '../elasticsearch_geo_utils';
+import { extractFeaturesFromFilters } from '../../common/elasticsearch_geo_utils';
 import { MapStoreState } from '../reducers/store';
 import {
   DataRequestDescriptor,

From 056038caa99efb0232cf4c1c3b7ffd898a668f7b Mon Sep 17 00:00:00 2001
From: Devon Thomson <devon.thomson@hotmail.com>
Date: Thu, 20 Aug 2020 10:26:53 -0400
Subject: [PATCH 61/85] [Dashboard First] Add to Library Action (#75098)

* created an add to library action that turns 'by value' embeddables into 'by reference' embeddables
---
 .../public/book/book_embeddable.tsx           |  10 +-
 .../actions/add_to_library_action.test.tsx    | 162 ++++++++++++++++++
 .../actions/add_to_library_action.tsx         |  93 ++++++++++
 .../public/application/actions/index.ts       |   7 +-
 .../attribute_service/attribute_service.tsx   |  54 +++++-
 src/plugins/dashboard/public/plugin.tsx       |  14 +-
 src/plugins/embeddable/public/mocks.tsx       |   4 +-
 7 files changed, 328 insertions(+), 16 deletions(-)
 create mode 100644 src/plugins/dashboard/public/application/actions/add_to_library_action.test.tsx
 create mode 100644 src/plugins/dashboard/public/application/actions/add_to_library_action.tsx

diff --git a/examples/embeddable_examples/public/book/book_embeddable.tsx b/examples/embeddable_examples/public/book/book_embeddable.tsx
index 73b1629d985b7..33876ab24414e 100644
--- a/examples/embeddable_examples/public/book/book_embeddable.tsx
+++ b/examples/embeddable_examples/public/book/book_embeddable.tsx
@@ -26,7 +26,6 @@ import {
   EmbeddableOutput,
   SavedObjectEmbeddableInput,
   ReferenceOrValueEmbeddable,
-  Container,
 } from '../../../../src/plugins/embeddable/public';
 import { BookSavedObjectAttributes } from '../../common';
 import { BookEmbeddableComponent } from './book_component';
@@ -104,16 +103,13 @@ export class BookEmbeddable extends Embeddable<BookEmbeddableInput, BookEmbeddab
   };
 
   getInputAsValueType = async (): Promise<BookByValueInput> => {
-    const input =
-      this.getRoot() && (this.getRoot() as Container).getInput().panels[this.id].explicitInput
-        ? ((this.getRoot() as Container).getInput().panels[this.id]
-            .explicitInput as BookEmbeddableInput)
-        : this.input;
+    const input = this.attributeService.getExplicitInputFromEmbeddable(this);
     return this.attributeService.getInputAsValueType(input);
   };
 
   getInputAsRefType = async (): Promise<BookByReferenceInput> => {
-    return this.attributeService.getInputAsRefType(this.input, { showSaveModal: true });
+    const input = this.attributeService.getExplicitInputFromEmbeddable(this);
+    return this.attributeService.getInputAsRefType(input, { showSaveModal: true });
   };
 
   public render(node: HTMLElement) {
diff --git a/src/plugins/dashboard/public/application/actions/add_to_library_action.test.tsx b/src/plugins/dashboard/public/application/actions/add_to_library_action.test.tsx
new file mode 100644
index 0000000000000..9fa7fff9ad087
--- /dev/null
+++ b/src/plugins/dashboard/public/application/actions/add_to_library_action.test.tsx
@@ -0,0 +1,162 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { isErrorEmbeddable, IContainer, ReferenceOrValueEmbeddable } from '../../embeddable_plugin';
+import { DashboardContainer } from '../embeddable';
+import { getSampleDashboardInput } from '../test_helpers';
+import {
+  CONTACT_CARD_EMBEDDABLE,
+  ContactCardEmbeddableFactory,
+  ContactCardEmbeddable,
+  ContactCardEmbeddableInput,
+  ContactCardEmbeddableOutput,
+} from '../../embeddable_plugin_test_samples';
+import { coreMock } from '../../../../../core/public/mocks';
+import { CoreStart } from 'kibana/public';
+import { AddToLibraryAction } from '.';
+import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
+import { ViewMode } from '../../../../embeddable/public';
+
+const { setup, doStart } = embeddablePluginMock.createInstance();
+setup.registerEmbeddableFactory(
+  CONTACT_CARD_EMBEDDABLE,
+  new ContactCardEmbeddableFactory((() => null) as any, {} as any)
+);
+const start = doStart();
+
+let container: DashboardContainer;
+let embeddable: ContactCardEmbeddable & ReferenceOrValueEmbeddable;
+let coreStart: CoreStart;
+beforeEach(async () => {
+  coreStart = coreMock.createStart();
+
+  const containerOptions = {
+    ExitFullScreenButton: () => null,
+    SavedObjectFinder: () => null,
+    application: {} as any,
+    embeddable: start,
+    inspector: {} as any,
+    notifications: {} as any,
+    overlays: coreStart.overlays,
+    savedObjectMetaData: {} as any,
+    uiActions: {} as any,
+  };
+
+  container = new DashboardContainer(getSampleDashboardInput(), containerOptions);
+
+  const contactCardEmbeddable = await container.addNewEmbeddable<
+    ContactCardEmbeddableInput,
+    ContactCardEmbeddableOutput,
+    ContactCardEmbeddable
+  >(CONTACT_CARD_EMBEDDABLE, {
+    firstName: 'Kibanana',
+  });
+
+  if (isErrorEmbeddable(contactCardEmbeddable)) {
+    throw new Error('Failed to create embeddable');
+  } else {
+    embeddable = embeddablePluginMock.mockRefOrValEmbeddable<
+      ContactCardEmbeddable,
+      ContactCardEmbeddableInput
+    >(contactCardEmbeddable, {
+      mockedByReferenceInput: { savedObjectId: 'testSavedObjectId', id: contactCardEmbeddable.id },
+      mockedByValueInput: { firstName: 'Kibanana', id: contactCardEmbeddable.id },
+    });
+    embeddable.updateInput({ viewMode: ViewMode.EDIT });
+  }
+});
+
+test('Add to library is compatible when embeddable on dashboard has value type input', async () => {
+  const action = new AddToLibraryAction();
+  embeddable.updateInput(await embeddable.getInputAsValueType());
+  expect(await action.isCompatible({ embeddable })).toBe(true);
+});
+
+test('Add to library is not compatible when embeddable input is by reference', async () => {
+  const action = new AddToLibraryAction();
+  embeddable.updateInput(await embeddable.getInputAsRefType());
+  expect(await action.isCompatible({ embeddable })).toBe(false);
+});
+
+test('Add to library is not compatible when view mode is set to view', async () => {
+  const action = new AddToLibraryAction();
+  embeddable.updateInput(await embeddable.getInputAsRefType());
+  embeddable.updateInput({ viewMode: ViewMode.VIEW });
+  expect(await action.isCompatible({ embeddable })).toBe(false);
+});
+
+test('Add to library is not compatible when embeddable is not in a dashboard container', async () => {
+  let orphanContactCard = await container.addNewEmbeddable<
+    ContactCardEmbeddableInput,
+    ContactCardEmbeddableOutput,
+    ContactCardEmbeddable
+  >(CONTACT_CARD_EMBEDDABLE, {
+    firstName: 'Orphan',
+  });
+  orphanContactCard = embeddablePluginMock.mockRefOrValEmbeddable<
+    ContactCardEmbeddable,
+    ContactCardEmbeddableInput
+  >(orphanContactCard, {
+    mockedByReferenceInput: { savedObjectId: 'test', id: orphanContactCard.id },
+    mockedByValueInput: { firstName: 'Kibanana', id: orphanContactCard.id },
+  });
+  const action = new AddToLibraryAction();
+  expect(await action.isCompatible({ embeddable: orphanContactCard })).toBe(false);
+});
+
+test('Add to library replaces embeddableId but retains panel count', async () => {
+  const dashboard = embeddable.getRoot() as IContainer;
+  const originalPanelCount = Object.keys(dashboard.getInput().panels).length;
+  const originalPanelKeySet = new Set(Object.keys(dashboard.getInput().panels));
+  const action = new AddToLibraryAction();
+  await action.execute({ embeddable });
+  expect(Object.keys(container.getInput().panels).length).toEqual(originalPanelCount);
+
+  const newPanelId = Object.keys(container.getInput().panels).find(
+    (key) => !originalPanelKeySet.has(key)
+  );
+  expect(newPanelId).toBeDefined();
+  const newPanel = container.getInput().panels[newPanelId!];
+  expect(newPanel.type).toEqual(embeddable.type);
+});
+
+test('Add to library returns reference type input', async () => {
+  const complicatedAttributes = {
+    attribute1: 'The best attribute',
+    attribute2: 22,
+    attribute3: ['array', 'of', 'strings'],
+    attribute4: { nestedattribute: 'hello from the nest' },
+  };
+
+  embeddable = embeddablePluginMock.mockRefOrValEmbeddable<ContactCardEmbeddable>(embeddable, {
+    mockedByReferenceInput: { savedObjectId: 'testSavedObjectId', id: embeddable.id },
+    mockedByValueInput: { attributes: complicatedAttributes, id: embeddable.id },
+  });
+  const dashboard = embeddable.getRoot() as IContainer;
+  const originalPanelKeySet = new Set(Object.keys(dashboard.getInput().panels));
+  const action = new AddToLibraryAction();
+  await action.execute({ embeddable });
+  const newPanelId = Object.keys(container.getInput().panels).find(
+    (key) => !originalPanelKeySet.has(key)
+  );
+  expect(newPanelId).toBeDefined();
+  const newPanel = container.getInput().panels[newPanelId!];
+  expect(newPanel.type).toEqual(embeddable.type);
+  expect(newPanel.explicitInput.attributes).toBeUndefined();
+  expect(newPanel.explicitInput.savedObjectId).toBe('testSavedObjectId');
+});
diff --git a/src/plugins/dashboard/public/application/actions/add_to_library_action.tsx b/src/plugins/dashboard/public/application/actions/add_to_library_action.tsx
new file mode 100644
index 0000000000000..3cc1a8a1dffe1
--- /dev/null
+++ b/src/plugins/dashboard/public/application/actions/add_to_library_action.tsx
@@ -0,0 +1,93 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import _ from 'lodash';
+import uuid from 'uuid';
+import { ActionByType, IncompatibleActionError } from '../../ui_actions_plugin';
+import { ViewMode, PanelState, IEmbeddable } from '../../embeddable_plugin';
+import {
+  PanelNotFoundError,
+  EmbeddableInput,
+  isReferenceOrValueEmbeddable,
+} from '../../../../embeddable/public';
+import { DashboardPanelState, DASHBOARD_CONTAINER_TYPE, DashboardContainer } from '..';
+
+export const ACTION_ADD_TO_LIBRARY = 'addToFromLibrary';
+
+export interface AddToLibraryActionContext {
+  embeddable: IEmbeddable;
+}
+
+export class AddToLibraryAction implements ActionByType<typeof ACTION_ADD_TO_LIBRARY> {
+  public readonly type = ACTION_ADD_TO_LIBRARY;
+  public readonly id = ACTION_ADD_TO_LIBRARY;
+  public order = 15;
+
+  constructor() {}
+
+  public getDisplayName({ embeddable }: AddToLibraryActionContext) {
+    if (!embeddable.getRoot() || !embeddable.getRoot().isContainer) {
+      throw new IncompatibleActionError();
+    }
+    return i18n.translate('dashboard.panel.AddToLibrary', {
+      defaultMessage: 'Add to library',
+    });
+  }
+
+  public getIconType({ embeddable }: AddToLibraryActionContext) {
+    if (!embeddable.getRoot() || !embeddable.getRoot().isContainer) {
+      throw new IncompatibleActionError();
+    }
+    return 'folderCheck';
+  }
+
+  public async isCompatible({ embeddable }: AddToLibraryActionContext) {
+    return Boolean(
+      embeddable.getInput()?.viewMode !== ViewMode.VIEW &&
+        embeddable.getRoot() &&
+        embeddable.getRoot().isContainer &&
+        embeddable.getRoot().type === DASHBOARD_CONTAINER_TYPE &&
+        isReferenceOrValueEmbeddable(embeddable) &&
+        !embeddable.inputIsRefType(embeddable.getInput())
+    );
+  }
+
+  public async execute({ embeddable }: AddToLibraryActionContext) {
+    if (!isReferenceOrValueEmbeddable(embeddable)) {
+      throw new IncompatibleActionError();
+    }
+
+    const newInput = await embeddable.getInputAsRefType();
+
+    embeddable.updateInput(newInput);
+
+    const dashboard = embeddable.getRoot() as DashboardContainer;
+    const panelToReplace = dashboard.getInput().panels[embeddable.id] as DashboardPanelState;
+    if (!panelToReplace) {
+      throw new PanelNotFoundError();
+    }
+
+    const newPanel: PanelState<EmbeddableInput> = {
+      type: embeddable.type,
+      explicitInput: { ...newInput, id: uuid.v4() },
+    };
+    dashboard.replacePanel(panelToReplace, newPanel);
+  }
+}
diff --git a/src/plugins/dashboard/public/application/actions/index.ts b/src/plugins/dashboard/public/application/actions/index.ts
index be183976c676f..4343a3409b696 100644
--- a/src/plugins/dashboard/public/application/actions/index.ts
+++ b/src/plugins/dashboard/public/application/actions/index.ts
@@ -33,7 +33,12 @@ export {
   ACTION_CLONE_PANEL,
 } from './clone_panel_action';
 export {
+  AddToLibraryAction,
+  AddToLibraryActionContext,
+  ACTION_ADD_TO_LIBRARY,
+} from './add_to_library_action';
+export {
+  UnlinkFromLibraryAction,
   UnlinkFromLibraryActionContext,
   ACTION_UNLINK_FROM_LIBRARY,
-  UnlinkFromLibraryAction,
 } from './unlink_from_library_action';
diff --git a/src/plugins/dashboard/public/attribute_service/attribute_service.tsx b/src/plugins/dashboard/public/attribute_service/attribute_service.tsx
index c2f529fe399f3..fe5f6a0c8e2bd 100644
--- a/src/plugins/dashboard/public/attribute_service/attribute_service.tsx
+++ b/src/plugins/dashboard/public/attribute_service/attribute_service.tsx
@@ -30,13 +30,21 @@ import {
   SimpleSavedObject,
   I18nStart,
   NotificationsStart,
+  OverlayStart,
 } from '../../../../core/public';
 import {
   SavedObjectSaveModal,
   showSaveModal,
   OnSaveProps,
   SaveResult,
+  checkForDuplicateTitle,
 } from '../../../saved_objects/public';
+import {
+  EmbeddableStart,
+  EmbeddableFactory,
+  EmbeddableFactoryNotFoundError,
+  Container,
+} from '../../../embeddable/public';
 
 /**
  * The attribute service is a shared, generic service that embeddables can use to provide the functionality
@@ -49,12 +57,22 @@ export class AttributeService<
   ValType extends EmbeddableInput & { attributes: SavedObjectAttributes },
   RefType extends SavedObjectEmbeddableInput
 > {
+  private embeddableFactory: EmbeddableFactory;
+
   constructor(
     private type: string,
     private savedObjectsClient: SavedObjectsClientContract,
+    private overlays: OverlayStart,
     private i18nContext: I18nStart['Context'],
-    private toasts: NotificationsStart['toasts']
-  ) {}
+    private toasts: NotificationsStart['toasts'],
+    getEmbeddableFactory: EmbeddableStart['getEmbeddableFactory']
+  ) {
+    const factory = getEmbeddableFactory(this.type);
+    if (!factory) {
+      throw new EmbeddableFactoryNotFoundError(this.type);
+    }
+    this.embeddableFactory = factory;
+  }
 
   public async unwrapAttributes(input: RefType | ValType): Promise<SavedObjectAttributes> {
     if (this.inputIsRefType(input)) {
@@ -105,6 +123,15 @@ export class AttributeService<
     return isSavedObjectEmbeddableInput(input);
   };
 
+  public getExplicitInputFromEmbeddable(embeddable: IEmbeddable): ValType | RefType {
+    return embeddable.getRoot() &&
+      (embeddable.getRoot() as Container).getInput().panels[embeddable.id].explicitInput
+      ? ((embeddable.getRoot() as Container).getInput().panels[embeddable.id].explicitInput as
+          | ValType
+          | RefType)
+      : (embeddable.getInput() as ValType | RefType);
+  }
+
   getInputAsValueType = async (input: ValType | RefType): Promise<ValType> => {
     if (!this.inputIsRefType(input)) {
       return input;
@@ -124,16 +151,31 @@ export class AttributeService<
     if (this.inputIsRefType(input)) {
       return input;
     }
-
     return new Promise<RefType>((resolve, reject) => {
       const onSave = async (props: OnSaveProps): Promise<SaveResult> => {
+        await checkForDuplicateTitle(
+          {
+            title: props.newTitle,
+            copyOnSave: false,
+            lastSavedTitle: '',
+            getEsType: () => this.type,
+            getDisplayName: this.embeddableFactory.getDisplayName,
+          },
+          props.isTitleDuplicateConfirmed,
+          props.onTitleDuplicate,
+          {
+            savedObjectsClient: this.savedObjectsClient,
+            overlays: this.overlays,
+          }
+        );
         try {
-          input.attributes.title = props.newTitle;
-          const wrappedInput = (await this.wrapAttributes(input.attributes, true)) as RefType;
+          const newAttributes = { ...input.attributes };
+          newAttributes.title = props.newTitle;
+          const wrappedInput = (await this.wrapAttributes(newAttributes, true)) as RefType;
           resolve(wrappedInput);
           return { id: wrappedInput.savedObjectId };
         } catch (error) {
-          reject();
+          reject(error);
           return { error };
         }
       };
diff --git a/src/plugins/dashboard/public/plugin.tsx b/src/plugins/dashboard/public/plugin.tsx
index 2a36f2d801850..a788b06f91905 100644
--- a/src/plugins/dashboard/public/plugin.tsx
+++ b/src/plugins/dashboard/public/plugin.tsx
@@ -95,6 +95,11 @@ import { addEmbeddableToDashboardUrl } from './url_utils/url_helper';
 import { PlaceholderEmbeddableFactory } from './application/embeddable/placeholder';
 import { UrlGeneratorState } from '../../share/public';
 import { AttributeService } from '.';
+import {
+  AddToLibraryAction,
+  ACTION_ADD_TO_LIBRARY,
+  AddToLibraryActionContext,
+} from './application/actions/add_to_library_action';
 
 declare module '../../share/public' {
   export interface UrlGeneratorStateMapping {
@@ -155,6 +160,7 @@ declare module '../../../plugins/ui_actions/public' {
     [ACTION_EXPAND_PANEL]: ExpandPanelActionContext;
     [ACTION_REPLACE_PANEL]: ReplacePanelActionContext;
     [ACTION_CLONE_PANEL]: ClonePanelActionContext;
+    [ACTION_ADD_TO_LIBRARY]: AddToLibraryActionContext;
     [ACTION_UNLINK_FROM_LIBRARY]: UnlinkFromLibraryActionContext;
   }
 }
@@ -406,6 +412,7 @@ export class DashboardPlugin
     const {
       uiActions,
       data: { indexPatterns, search },
+      embeddable,
     } = plugins;
 
     const SavedObjectFinder = getSavedObjectFinder(core.savedObjects, core.uiSettings);
@@ -424,6 +431,9 @@ export class DashboardPlugin
     uiActions.attachAction(CONTEXT_MENU_TRIGGER, clonePanelAction.id);
 
     if (this.dashboardFeatureFlagConfig?.allowByValueEmbeddables) {
+      const addToLibraryAction = new AddToLibraryAction();
+      uiActions.registerAction(addToLibraryAction);
+      uiActions.attachAction(CONTEXT_MENU_TRIGGER, addToLibraryAction.id);
       const unlinkFromLibraryAction = new UnlinkFromLibraryAction();
       uiActions.registerAction(unlinkFromLibraryAction);
       uiActions.attachAction(CONTEXT_MENU_TRIGGER, unlinkFromLibraryAction.id);
@@ -452,8 +462,10 @@ export class DashboardPlugin
         new AttributeService(
           type,
           core.savedObjects.client,
+          core.overlays,
           core.i18n.Context,
-          core.notifications.toasts
+          core.notifications.toasts,
+          embeddable.getEmbeddableFactory
         ),
     };
   }
diff --git a/src/plugins/embeddable/public/mocks.tsx b/src/plugins/embeddable/public/mocks.tsx
index 7ec03ba659cda..2064236e9ae7f 100644
--- a/src/plugins/embeddable/public/mocks.tsx
+++ b/src/plugins/embeddable/public/mocks.tsx
@@ -25,6 +25,9 @@ import {
   EmbeddableStateTransfer,
   IEmbeddable,
   EmbeddablePanel,
+  EmbeddableInput,
+  SavedObjectEmbeddableInput,
+  ReferenceOrValueEmbeddable,
 } from '.';
 import { EmbeddablePublicPlugin } from './plugin';
 import { coreMock } from '../../../core/public/mocks';
@@ -35,7 +38,6 @@ import { dataPluginMock } from '../../data/public/mocks';
 
 import { inspectorPluginMock } from '../../inspector/public/mocks';
 import { uiActionsPluginMock } from '../../ui_actions/public/mocks';
-import { SavedObjectEmbeddableInput, ReferenceOrValueEmbeddable, EmbeddableInput } from './lib';
 
 export type Setup = jest.Mocked<EmbeddableSetup>;
 export type Start = jest.Mocked<EmbeddableStart>;

From 6d8d802b3fa1b3b52a5b195c386f9be3b7f048cb Mon Sep 17 00:00:00 2001
From: Jean-Louis Leysens <jloleysens@gmail.com>
Date: Thu, 20 Aug 2020 16:55:08 +0200
Subject: [PATCH 62/85] [Console] Update extract string literal logic (#72628)

* initial version of string extraction by parser

* refine comments and add function description

* - Added parser specific test
- Added 5 megabyte limit to string size for expansion

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../json_xjson_translation_tools.test.ts      | 27 ++++++
 .../__tests__/utils_string_expanding.txt      | 19 +++-
 .../lib/json_xjson_translation_tools/index.ts | 81 +++++++++-------
 .../json_xjson_translation_tools/parser.ts    | 97 +++++++++++++++++++
 4 files changed, 187 insertions(+), 37 deletions(-)
 create mode 100644 src/plugins/es_ui_shared/public/console_lang/lib/json_xjson_translation_tools/parser.ts

diff --git a/src/plugins/es_ui_shared/public/console_lang/lib/json_xjson_translation_tools/__tests__/json_xjson_translation_tools.test.ts b/src/plugins/es_ui_shared/public/console_lang/lib/json_xjson_translation_tools/__tests__/json_xjson_translation_tools.test.ts
index 419e80ad1608f..8c66a87adbaa1 100644
--- a/src/plugins/es_ui_shared/public/console_lang/lib/json_xjson_translation_tools/__tests__/json_xjson_translation_tools.test.ts
+++ b/src/plugins/es_ui_shared/public/console_lang/lib/json_xjson_translation_tools/__tests__/json_xjson_translation_tools.test.ts
@@ -23,6 +23,7 @@ import collapsingTests from './utils_string_collapsing.txt';
 import expandingTests from './utils_string_expanding.txt';
 
 import * as utils from '../index';
+import { extractJSONStringValues } from '../parser';
 
 describe('JSON to XJSON conversion tools', () => {
   it('will collapse multiline strings', () => {
@@ -34,6 +35,32 @@ describe('JSON to XJSON conversion tools', () => {
     const multiline = '{ "foo": """bar\r\nbaz""" }';
     expect(utils.collapseLiteralStrings(multiline)).toEqual('{ "foo": "bar\\r\\nbaz" }');
   });
+
+  describe('JSON string values parser', () => {
+    test('correctly extracts JSON string values', () => {
+      const json = {
+        myString: 'string',
+        notAString: 1,
+        myStringArray: ['a', 1, 'test', { nestedString: 'string' }],
+      };
+      const jsonString = JSON.stringify(json);
+      const { stringValues } = extractJSONStringValues(jsonString);
+      expect(stringValues.length).toBe(4);
+
+      expect(jsonString.substring(stringValues[0].startIndex, stringValues[0].endIndex + 1)).toBe(
+        '"string"'
+      );
+      expect(jsonString.substring(stringValues[1].startIndex, stringValues[1].endIndex + 1)).toBe(
+        '"a"'
+      );
+      expect(jsonString.substring(stringValues[2].startIndex, stringValues[2].endIndex + 1)).toBe(
+        '"test"'
+      );
+      expect(jsonString.substring(stringValues[3].startIndex, stringValues[3].endIndex + 1)).toBe(
+        '"string"'
+      );
+    });
+  });
 });
 
 _.each(collapsingTests.split(/^=+$/m), function (fixture) {
diff --git a/src/plugins/es_ui_shared/public/console_lang/lib/json_xjson_translation_tools/__tests__/utils_string_expanding.txt b/src/plugins/es_ui_shared/public/console_lang/lib/json_xjson_translation_tools/__tests__/utils_string_expanding.txt
index 7de874c244e74..d157ed73817c2 100644
--- a/src/plugins/es_ui_shared/public/console_lang/lib/json_xjson_translation_tools/__tests__/utils_string_expanding.txt
+++ b/src/plugins/es_ui_shared/public/console_lang/lib/json_xjson_translation_tools/__tests__/utils_string_expanding.txt
@@ -1,8 +1,9 @@
+
 ==========
 Scripts in requests
 -------------------------------------
 {
-  "f": { "script": { "source": "\ntest\ntest\\\\\\\\\\\\\\\\2\n" } },
+  "f": { "script": { "source": "\ntest\ntest\\2\n" } },
   "g": { "script": "second + \"\\\";" },
   "a": "short with \\",
   "\\\\h": 1,
@@ -12,7 +13,7 @@ Scripts in requests
 {
   "f": { "script": { "source": """
 test
-test\\\\\\\\2
+test\2
 """ } },
   "g": { "script": """second + "\";""" },
   "a": """short with \""",
@@ -23,11 +24,11 @@ test\\\\\\\\2
 Preserve triple quotes
 -------------------------------------
 {
-  "content\\\": "tri\"ple",
+  "content\\": "tri\"ple",
 }
 -------------------------------------
 {
-  "content\\\": """tri"ple""",
+  "content\\": """tri"ple""",
 }
 ==========
 Correctly parse with JSON embedded inside values
@@ -82,3 +83,13 @@ Single quotes escaped special case, end
 {
   "query": "test\""
 }
+==========
+Strings in Arrays
+-------------------------------------
+{
+  "array": ["expand \\ me", "do not expand", "do expand \\"]
+}
+-------------------------------------
+{
+  "array": ["""expand \ me""", "do not expand", """do expand \"""]
+}
diff --git a/src/plugins/es_ui_shared/public/console_lang/lib/json_xjson_translation_tools/index.ts b/src/plugins/es_ui_shared/public/console_lang/lib/json_xjson_translation_tools/index.ts
index 28f1aca95efab..86fe9535a9619 100644
--- a/src/plugins/es_ui_shared/public/console_lang/lib/json_xjson_translation_tools/index.ts
+++ b/src/plugins/es_ui_shared/public/console_lang/lib/json_xjson_translation_tools/index.ts
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+import { extractJSONStringValues } from './parser';
+
 export function collapseLiteralStrings(data: string) {
   const splitData = data.split(`"""`);
   for (let idx = 1; idx < splitData.length - 1; idx += 2) {
@@ -25,47 +27,60 @@ export function collapseLiteralStrings(data: string) {
   return splitData.join('');
 }
 
-/*
-  The following regex describes global match on:
-  1. one colon followed by any number of space characters
-  2. one double quote (not escaped, special case for JSON in JSON).
-  3. greedily match any non double quote and non newline char OR any escaped double quote char (non-capturing).
-  4. handle a special case where an escaped slash may be the last character
-  5. one double quote
-
-  For instance: `: "some characters \" here"`
-  Will match and be expanded to: `"""some characters " here"""`
+// 5 megabytes
+const MAX_EXPANDABLE_JSON_SIZE = 5 * 1024 * 1024;
 
+/**
+ * Takes in a string representing some JSON data and expands strings,
+ * where needed, to a string literal representation.
+ *
+ * For example; given a value like: "{ "my_string": "\nhey!\n" }"
+ *
+ * Will return: "{ "my_string": """
+ * hey!
+ * """
+ * }"
  */
+export function expandLiteralStrings(data: string) {
+  // Assuming 1 byte per char
+  if (data.length > MAX_EXPANDABLE_JSON_SIZE) {
+    return data;
+  }
 
-const LITERAL_STRING_CANDIDATES = /((:[\s\r\n]*)([^\\])"(\\"|[^"\n])*\\?")/g;
+  const { stringValues } = extractJSONStringValues(data);
 
-export function expandLiteralStrings(data: string) {
-  return data.replace(LITERAL_STRING_CANDIDATES, (match, string) => {
-    // Expand to triple quotes if there are _any_ slashes
-    if (string.match(/\\./)) {
-      const firstDoubleQuoteIdx = string.indexOf('"');
-      const lastDoubleQuoteIdx = string.lastIndexOf('"');
+  if (stringValues.length === 0) {
+    return data;
+  }
 
-      // Handle a special case where we may have a value like "\"test\"". We don't
-      // want to expand this to """"test"""" - so we terminate before processing the string
-      // further if we detect this either at the start or end of the double quote section.
+  // Include JSON before our first string value
+  let result = data.substring(0, stringValues[0].startIndex);
 
-      if (string[firstDoubleQuoteIdx + 1] === '\\' && string[firstDoubleQuoteIdx + 2] === '"') {
-        return string;
-      }
+  for (let x = 0; x < stringValues.length; x++) {
+    const { startIndex, endIndex } = stringValues[x];
+    const candidate = data.substring(startIndex, endIndex + 1);
 
-      if (string[lastDoubleQuoteIdx - 1] === '"' && string[lastDoubleQuoteIdx - 2] === '\\') {
-        return string;
-      }
+    // Handle a special case where we may have a value like "\"test\"". We don't
+    // want to expand this to """"test"""" - so we terminate before processing the string
+    // further if we detect this either at the start or end of the double quote section.
+    const skip =
+      (candidate[1] === '\\' && candidate[2] === '"') ||
+      (candidate[candidate.length - 2] === '"' && candidate[candidate.length - 3] === '\\');
 
-      const colonAndAnySpacing = string.slice(0, firstDoubleQuoteIdx);
-      const rawStringifiedValue = string.slice(firstDoubleQuoteIdx, string.length);
-      // Remove one level of JSON stringification
-      const jsonValue = JSON.parse(rawStringifiedValue);
-      return `${colonAndAnySpacing}"""${jsonValue}"""`;
+    if (!skip && candidate.match(/\\./)) {
+      result += `"""${JSON.parse(candidate)}"""`;
     } else {
-      return string;
+      result += candidate;
+    }
+
+    if (stringValues[x + 1]) {
+      // Add any JSON between string values
+      result += data.substring(endIndex + 1, stringValues[x + 1].startIndex);
     }
-  });
+  }
+
+  // Add any remaining JSON after all string values
+  result += data.substring(stringValues[stringValues.length - 1].endIndex + 1);
+
+  return result;
 }
diff --git a/src/plugins/es_ui_shared/public/console_lang/lib/json_xjson_translation_tools/parser.ts b/src/plugins/es_ui_shared/public/console_lang/lib/json_xjson_translation_tools/parser.ts
new file mode 100644
index 0000000000000..2cbd886860a07
--- /dev/null
+++ b/src/plugins/es_ui_shared/public/console_lang/lib/json_xjson_translation_tools/parser.ts
@@ -0,0 +1,97 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+type StringValues = Array<{ startIndex: number; endIndex: number }>;
+
+interface ParseResult {
+  stringValues: StringValues;
+}
+
+const JSON_COLON = ':';
+const JSON_STRING_DELIMITER = '"';
+const JSON_STRING_ESCAPE = '\\';
+
+/**
+ * Accepts JSON (as a string) and extracts the positions of all JSON string
+ * values.
+ *
+ * For example:
+ *
+ * '{ "my_string_value": "is this", "my_number_value": 42 }'
+ *
+ * Would extract one result:
+ *
+ * [ { startIndex: 21, endIndex: 29 } ]
+ *
+ * This result maps to `"is this"` from the example JSON.
+ *
+ */
+export const extractJSONStringValues = (input: string): ParseResult => {
+  let position = 0;
+  let currentStringStartPos: number;
+  let isInsideString = false;
+  const stringValues: StringValues = [];
+
+  function read() {
+    return input[position];
+  }
+
+  function peekNextNonWhitespace(): string | undefined {
+    let peekPosition = position + 1;
+
+    while (peekPosition < input.length) {
+      const peekChar = input[peekPosition];
+      if (peekChar.match(/[^\s\r\n]/)) {
+        return peekChar;
+      }
+      ++peekPosition;
+    }
+  }
+
+  function advance() {
+    ++position;
+  }
+
+  while (position < input.length) {
+    const char = read();
+    if (!isInsideString) {
+      if (char === JSON_STRING_DELIMITER) {
+        currentStringStartPos = position;
+        isInsideString = true;
+      }
+      // else continue scanning for JSON_STRING_DELIMITER
+    } else {
+      if (char === JSON_STRING_ESCAPE) {
+        // skip ahead - we are still inside of a string
+        advance();
+      } else if (char === JSON_STRING_DELIMITER) {
+        if (peekNextNonWhitespace() !== JSON_COLON) {
+          stringValues.push({
+            startIndex: currentStringStartPos!,
+            endIndex: position,
+          });
+        }
+        isInsideString = false;
+      }
+    }
+    advance();
+  }
+
+  return { stringValues };
+};

From 0f494f420f29e09db0a84f87d3ebacd7cf31e893 Mon Sep 17 00:00:00 2001
From: John Schulz <john.schulz@elastic.co>
Date: Thu, 20 Aug 2020 11:07:54 -0400
Subject: [PATCH 63/85] Retry network errors on registry requests (#74507)

---
 .../services/epm/registry/requests.test.ts    | 108 ++++++++++++++++++
 .../server/services/epm/registry/requests.ts  |  58 ++++++++--
 .../server/services/epm/registry/streams.ts   |   3 +-
 3 files changed, 159 insertions(+), 10 deletions(-)
 create mode 100644 x-pack/plugins/ingest_manager/server/services/epm/registry/requests.test.ts

diff --git a/x-pack/plugins/ingest_manager/server/services/epm/registry/requests.test.ts b/x-pack/plugins/ingest_manager/server/services/epm/registry/requests.test.ts
new file mode 100644
index 0000000000000..f836a133a78a0
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/server/services/epm/registry/requests.test.ts
@@ -0,0 +1,108 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { fetchUrl } from './requests';
+import { RegistryError } from '../../../errors';
+jest.mock('node-fetch');
+
+const { Response, FetchError } = jest.requireActual('node-fetch');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const fetchMock = require('node-fetch') as jest.Mock;
+
+jest.setTimeout(120 * 1000);
+describe('setupIngestManager', () => {
+  beforeEach(async () => {});
+
+  afterEach(async () => {
+    jest.clearAllMocks();
+  });
+
+  describe('fetchUrl / getResponse errors', () => {
+    it('regular Errors do not retry. Becomes RegistryError', async () => {
+      fetchMock.mockImplementationOnce(() => {
+        throw new Error('mocked');
+      });
+      const promise = fetchUrl('');
+      await expect(promise).rejects.toThrow(RegistryError);
+      expect(fetchMock).toHaveBeenCalledTimes(1);
+    });
+
+    it('TypeErrors do not retry. Becomes RegistryError', async () => {
+      fetchMock.mockImplementationOnce(() => {
+        // @ts-expect-error
+        null.f();
+      });
+      const promise = fetchUrl('');
+      await expect(promise).rejects.toThrow(RegistryError);
+      expect(fetchMock).toHaveBeenCalledTimes(1);
+    });
+
+    describe('only system errors retry (like ECONNRESET)', () => {
+      it('they eventually succeed', async () => {
+        const successValue = JSON.stringify({ name: 'attempt 4 works', version: '1.2.3' });
+        fetchMock
+          .mockImplementationOnce(() => {
+            throw new FetchError('message 1', 'system', { code: 'ESOMETHING' });
+          })
+          .mockImplementationOnce(() => {
+            throw new FetchError('message 2', 'system', { code: 'ESOMETHING' });
+          })
+          .mockImplementationOnce(() => {
+            throw new FetchError('message 3', 'system', { code: 'ESOMETHING' });
+          })
+          // this one succeeds
+          .mockImplementationOnce(() => Promise.resolve(new Response(successValue)))
+          .mockImplementationOnce(() => {
+            throw new FetchError('message 5', 'system', { code: 'ESOMETHING' });
+          })
+          .mockImplementationOnce(() => {
+            throw new FetchError('message 6', 'system', { code: 'ESOMETHING' });
+          });
+
+        const promise = fetchUrl('');
+        await expect(promise).resolves.toEqual(successValue);
+        // doesn't retry after success
+        expect(fetchMock).toHaveBeenCalledTimes(4);
+        const actualResultsOrder = fetchMock.mock.results.map(({ type }: { type: string }) => type);
+        expect(actualResultsOrder).toEqual(['throw', 'throw', 'throw', 'return']);
+      });
+
+      it('or error after 1 failure & 5 retries with RegistryError', async () => {
+        fetchMock
+          .mockImplementationOnce(() => {
+            throw new FetchError('message 1', 'system', { code: 'ESOMETHING' });
+          })
+          .mockImplementationOnce(() => {
+            throw new FetchError('message 2', 'system', { code: 'ESOMETHING' });
+          })
+          .mockImplementationOnce(() => {
+            throw new FetchError('message 3', 'system', { code: 'ESOMETHING' });
+          })
+          .mockImplementationOnce(() => {
+            throw new FetchError('message 4', 'system', { code: 'ESOMETHING' });
+          })
+          .mockImplementationOnce(() => {
+            throw new FetchError('message 5', 'system', { code: 'ESOMETHING' });
+          })
+          .mockImplementationOnce(() => {
+            throw new FetchError('message 6', 'system', { code: 'ESOMETHING' });
+          })
+          .mockImplementationOnce(() => {
+            throw new FetchError('message 7', 'system', { code: 'ESOMETHING' });
+          })
+          .mockImplementationOnce(() => {
+            throw new FetchError('message 8', 'system', { code: 'ESOMETHING' });
+          });
+
+        const promise = fetchUrl('');
+        await expect(promise).rejects.toThrow(RegistryError);
+        // doesn't retry after 1 failure & 5 failed retries
+        expect(fetchMock).toHaveBeenCalledTimes(6);
+        const actualResultsOrder = fetchMock.mock.results.map(({ type }: { type: string }) => type);
+        expect(actualResultsOrder).toEqual(['throw', 'throw', 'throw', 'throw', 'throw', 'throw']);
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/registry/requests.ts b/x-pack/plugins/ingest_manager/server/services/epm/registry/requests.ts
index abf77ddddfd7a..5939dc204aae6 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/registry/requests.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/registry/requests.ts
@@ -4,20 +4,49 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import fetch, { Response } from 'node-fetch';
+import fetch, { FetchError, Response } from 'node-fetch';
+import pRetry from 'p-retry';
 import { streamToString } from './streams';
 import { RegistryError } from '../../../errors';
 
+type FailedAttemptErrors = pRetry.FailedAttemptError | FetchError | Error;
+
+// not sure what to call this function, but we're not exporting it
+async function registryFetch(url: string) {
+  const response = await fetch(url);
+
+  if (response.ok) {
+    return response;
+  } else {
+    // 4xx & 5xx responses
+    // exit without retry & throw RegistryError
+    throw new pRetry.AbortError(
+      new RegistryError(`Error connecting to package registry at ${url}: ${response.statusText}`)
+    );
+  }
+}
+
 export async function getResponse(url: string): Promise<Response> {
   try {
-    const response = await fetch(url);
-    if (response.ok) {
-      return response;
-    } else {
-      throw new RegistryError(
-        `Error connecting to package registry at ${url}: ${response.statusText}`
-      );
-    }
+    // we only want to retry certain failures like network issues
+    // the rest should only try the one time then fail as they do now
+    const response = await pRetry(() => registryFetch(url), {
+      factor: 2,
+      retries: 5,
+      onFailedAttempt: (error) => {
+        // we only want to retry certain types of errors, like `ECONNREFUSED` and other operational errors
+        // and let the others through without retrying
+        //
+        // throwing in onFailedAttempt will abandon all retries & fail the request
+        // we only want to retry system errors, so throw a RegistryError for everything else
+        if (!isSystemError(error)) {
+          throw new RegistryError(
+            `Error connecting to package registry at ${url}: ${error.message}`
+          );
+        }
+      },
+    });
+    return response;
   } catch (e) {
     throw new RegistryError(`Error connecting to package registry at ${url}: ${e.message}`);
   }
@@ -31,3 +60,14 @@ export async function getResponseStream(url: string): Promise<NodeJS.ReadableStr
 export async function fetchUrl(url: string): Promise<string> {
   return getResponseStream(url).then(streamToString);
 }
+
+// node-fetch throws a FetchError for those types of errors and
+// "All errors originating from Node.js core are marked with error.type = 'system'"
+// https://github.com/node-fetch/node-fetch/blob/master/docs/ERROR-HANDLING.md#error-handling-with-node-fetch
+function isFetchError(error: FailedAttemptErrors): error is FetchError {
+  return error instanceof FetchError || error.name === 'FetchError';
+}
+
+function isSystemError(error: FailedAttemptErrors): boolean {
+  return isFetchError(error) && error.type === 'system';
+}
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/registry/streams.ts b/x-pack/plugins/ingest_manager/server/services/epm/registry/streams.ts
index 97d6f7b40a588..3801303cf726f 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/registry/streams.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/registry/streams.ts
@@ -11,7 +11,8 @@ export function bufferToStream(buffer: Buffer): PassThrough {
   return stream;
 }
 
-export function streamToString(stream: NodeJS.ReadableStream): Promise<string> {
+export function streamToString(stream: NodeJS.ReadableStream | Buffer): Promise<string> {
+  if (stream instanceof Buffer) return Promise.resolve(stream.toString());
   return new Promise((resolve, reject) => {
     const body: string[] = [];
     stream.on('data', (chunk: string) => body.push(chunk));

From caf3bac6d6b360d6a53b5cb5a9b45014c5558d9a Mon Sep 17 00:00:00 2001
From: John Schulz <john.schulz@elastic.co>
Date: Thu, 20 Aug 2020 11:09:09 -0400
Subject: [PATCH 64/85] [Ingest Manager] Don't retain POST /setup results.
 fixes #74587 (#75372)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add retries for registry requests.

works, afaict. no tests. one TS issue.

* Fix TS issue. Add link to node-fetch error docs

* Restore some accidentally deleted code.

* Add more comments. Remove logging.

* Add tests for plugin setup service & handlers

* Add tests for Registry retry logic

* Extract setup retry logic to separate function/file

* Add tests for setup retry logic

```
  firstSuccessOrTryAgain
    ✓ reject/throws is called again & its value returned (18ms)
    ✓ the first success value is cached (2ms)
```

* More straightforward(?) tests for setup caching

* Revert cached setup. Still limit 1 call at a time

Terrible tests. Committing & pushing to see if it fixes failures like https://github.com/elastic/kibana/pull/74507/checks?check_run_id=980178887

https://kibana-ci.elastic.co/job/elastic+kibana+pipeline-pull-request/67892/execution/node/663/log/

```
07:36:56               └-> "before all" hook
07:36:56               └-> should not allow to enroll an agent with a invalid enrollment
07:36:56                 └-> "before each" hook: global before each
07:36:56                 └-> "before each" hook: beforeSetupWithDockerRegistry
07:36:56                 │ proc [kibana]  error  [11:36:56.369]  Error: Internal Server Error
07:36:56                 │ proc [kibana]     at HapiResponseAdapter.toError (/dev/shm/workspace/parallel/5/kibana/build/kibana-build-xpack/src/core/server/http/router/response_adapter.js:132:19)
07:36:56                 │ proc [kibana]     at HapiResponseAdapter.toHapiResponse (/dev/shm/workspace/parallel/5/kibana/build/kibana-build-xpack/src/core/server/http/router/response_adapter.js:86:19)
07:36:56                 │ proc [kibana]     at HapiResponseAdapter.handle (/dev/shm/workspace/parallel/5/kibana/build/kibana-build-xpack/src/core/server/http/router/response_adapter.js:81:17)
07:36:56                 │ proc [kibana]     at Router.handle (/dev/shm/workspace/parallel/5/kibana/build/kibana-build-xpack/src/core/server/http/router/router.js:164:34)
07:36:56                 │ proc [kibana]     at process._tickCallback (internal/process/next_tick.js:68:7)
07:36:56                 │ proc [kibana]   log   [11:36:56.581] [info][authentication][plugins][security] Authentication attempt failed: [security_exception] missing authentication credentials for REST request [/_security/_authenticate], with { header={ WWW-Authenticate={ 0="ApiKey" & 1="Basic realm=\"security\" charset=\"UTF-8\"" } } }
07:36:56                 └- ✓ pass  (60ms) "Ingest Manager Endpoints Fleet Endpoints fleet_agents_enroll should not allow to enroll an agent with a invalid enrollment"
07:36:56               └-> should not allow to enroll an agent with a shared id if it already exists
07:36:56                 └-> "before each" hook: global before each
07:36:56                 └-> "before each" hook: beforeSetupWithDockerRegistry
07:36:56                 └- ✓ pass  (111ms) "Ingest Manager Endpoints Fleet Endpoints fleet_agents_enroll should not allow to enroll an agent with a shared id if it already exists "
07:36:56               └-> should not allow to enroll an agent with a version > kibana
07:36:56                 └-> "before each" hook: global before each
07:36:56                 └-> "before each" hook: beforeSetupWithDockerRegistry
07:36:56                 └- ✓ pass  (58ms) "Ingest Manager Endpoints Fleet Endpoints fleet_agents_enroll should not allow to enroll an agent with a version > kibana"
07:36:56               └-> should allow to enroll an agent with a valid enrollment token
07:36:56                 └-> "before each" hook: global before each
07:36:56                 └-> "before each" hook: beforeSetupWithDockerRegistry
07:36:56                 └- ✖ fail: Ingest Manager Endpoints Fleet Endpoints fleet_agents_enroll should allow to enroll an agent with a valid enrollment token
07:36:56                 │      Error: expected 200 "OK", got 500 "Internal Server Error"
07:36:56                 │       at Test._assertStatus (/dev/shm/workspace/kibana/node_modules/supertest/lib/test.js:268:12)
07:36:56                 │       at Test._assertFunction (/dev/shm/workspace/kibana/node_modules/supertest/lib/test.js:283:11)
07:36:56                 │       at Test.assert (/dev/shm/workspace/kibana/node_modules/supertest/lib/test.js:173:18)
07:36:56                 │       at assert (/dev/shm/workspace/kibana/node_modules/supertest/lib/test.js:131:12)
07:36:56                 │       at /dev/shm/workspace/kibana/node_modules/supertest/lib/test.js:128:5
07:36:56                 │       at Test.Request.callback (/dev/shm/workspace/kibana/node_modules/superagent/lib/node/index.js:718:3)
07:36:56                 │       at parser (/dev/shm/workspace/kibana/node_modules/superagent/lib/node/index.js:906:18)
07:36:56                 │       at IncomingMessage.res.on (/dev/shm/workspace/kibana/node_modules/superagent/lib/node/parsers/json.js:19:7)
07:36:56                 │       at endReadableNT (_stream_readable.js:1145:12)
07:36:56                 │       at process._tickCallback (internal/process/next_tick.js:63:19)
07:36:56                 │
07:36:56                 │
```

* New name & tests for one-at-a-time /setup behavior

`firstPromiseBlocksAndFufills` for "the first promise created blocks others from being created, then fufills all with that first result"

* More (better?) renaming

* Fix name in test description

* Fix spelling typo.

* Remove registry retry code & tests

* Use async fn's .catch to avoid unhandled rejection

Add explicit `isPending` value instead of overloading role of `status`. Could probably do without it, but it makes the intent more clear.

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../server/routes/setup/handlers.test.ts      |  83 +++++++++
 .../server/routes/setup/index.ts              |  40 ++--
 .../server/services/setup.test.ts             |  76 +++++---
 .../ingest_manager/server/services/setup.ts   | 171 ++++++++----------
 .../server/services/setup_utils.test.ts       | 149 +++++++++++++++
 .../server/services/setup_utils.ts            |  37 ++++
 6 files changed, 420 insertions(+), 136 deletions(-)
 create mode 100644 x-pack/plugins/ingest_manager/server/routes/setup/handlers.test.ts
 create mode 100644 x-pack/plugins/ingest_manager/server/services/setup_utils.test.ts
 create mode 100644 x-pack/plugins/ingest_manager/server/services/setup_utils.ts

diff --git a/x-pack/plugins/ingest_manager/server/routes/setup/handlers.test.ts b/x-pack/plugins/ingest_manager/server/routes/setup/handlers.test.ts
new file mode 100644
index 0000000000000..ce826e78c454d
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/server/routes/setup/handlers.test.ts
@@ -0,0 +1,83 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { xpackMocks } from '../../../../../../x-pack/mocks';
+import { httpServerMock } from 'src/core/server/mocks';
+import { PostIngestSetupResponse } from '../../../common';
+import { RegistryError } from '../../errors';
+import { createAppContextStartContractMock } from '../../mocks';
+import { ingestManagerSetupHandler } from './handlers';
+import { appContextService } from '../../services/app_context';
+import { setupIngestManager } from '../../services/setup';
+
+jest.mock('../../services/setup', () => {
+  return {
+    setupIngestManager: jest.fn(),
+  };
+});
+
+const mockSetupIngestManager = setupIngestManager as jest.MockedFunction<typeof setupIngestManager>;
+
+describe('ingestManagerSetupHandler', () => {
+  let context: ReturnType<typeof xpackMocks.createRequestHandlerContext>;
+  let response: ReturnType<typeof httpServerMock.createResponseFactory>;
+  let request: ReturnType<typeof httpServerMock.createKibanaRequest>;
+
+  beforeEach(async () => {
+    context = xpackMocks.createRequestHandlerContext();
+    response = httpServerMock.createResponseFactory();
+    request = httpServerMock.createKibanaRequest({
+      method: 'post',
+      path: '/api/ingest_manager/setup',
+    });
+    // prevents `Logger not set.` and other appContext errors
+    appContextService.start(createAppContextStartContractMock());
+  });
+
+  afterEach(async () => {
+    jest.clearAllMocks();
+    appContextService.stop();
+  });
+
+  it('POST /setup succeeds w/200 and body of resolved value', async () => {
+    mockSetupIngestManager.mockImplementation(() => Promise.resolve({ isIntialized: true }));
+    await ingestManagerSetupHandler(context, request, response);
+
+    const expectedBody: PostIngestSetupResponse = { isInitialized: true };
+    expect(response.customError).toHaveBeenCalledTimes(0);
+    expect(response.ok).toHaveBeenCalledWith({ body: expectedBody });
+  });
+
+  it('POST /setup fails w/500 on custom error', async () => {
+    mockSetupIngestManager.mockImplementation(() =>
+      Promise.reject(new Error('SO method mocked to throw'))
+    );
+    await ingestManagerSetupHandler(context, request, response);
+
+    expect(response.customError).toHaveBeenCalledTimes(1);
+    expect(response.customError).toHaveBeenCalledWith({
+      statusCode: 500,
+      body: {
+        message: 'SO method mocked to throw',
+      },
+    });
+  });
+
+  it('POST /setup fails w/502 on RegistryError', async () => {
+    mockSetupIngestManager.mockImplementation(() =>
+      Promise.reject(new RegistryError('Registry method mocked to throw'))
+    );
+
+    await ingestManagerSetupHandler(context, request, response);
+    expect(response.customError).toHaveBeenCalledTimes(1);
+    expect(response.customError).toHaveBeenCalledWith({
+      statusCode: 502,
+      body: {
+        message: 'Registry method mocked to throw',
+      },
+    });
+  });
+});
diff --git a/x-pack/plugins/ingest_manager/server/routes/setup/index.ts b/x-pack/plugins/ingest_manager/server/routes/setup/index.ts
index 1d1e7a2d721c9..fe51abec45b23 100644
--- a/x-pack/plugins/ingest_manager/server/routes/setup/index.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/setup/index.ts
@@ -14,8 +14,7 @@ import {
 } from './handlers';
 import { PostFleetSetupRequestSchema } from '../../types';
 
-export const registerRoutes = (router: IRouter, config: IngestManagerConfigType) => {
-  // Ingest manager setup
+export const registerIngestManagerSetupRoute = (router: IRouter) => {
   router.post(
     {
       path: SETUP_API_ROUTE,
@@ -26,12 +25,20 @@ export const registerRoutes = (router: IRouter, config: IngestManagerConfigType)
     },
     ingestManagerSetupHandler
   );
+};
 
-  if (!config.fleet.enabled) {
-    return;
-  }
+export const registerCreateFleetSetupRoute = (router: IRouter) => {
+  router.post(
+    {
+      path: FLEET_SETUP_API_ROUTES.CREATE_PATTERN,
+      validate: PostFleetSetupRequestSchema,
+      options: { tags: [`access:${PLUGIN_ID}-all`] },
+    },
+    createFleetSetupHandler
+  );
+};
 
-  // Get Fleet setup
+export const registerGetFleetStatusRoute = (router: IRouter) => {
   router.get(
     {
       path: FLEET_SETUP_API_ROUTES.INFO_PATTERN,
@@ -40,14 +47,19 @@ export const registerRoutes = (router: IRouter, config: IngestManagerConfigType)
     },
     getFleetStatusHandler
   );
+};
+
+export const registerRoutes = (router: IRouter, config: IngestManagerConfigType) => {
+  // Ingest manager setup
+  registerIngestManagerSetupRoute(router);
+
+  if (!config.fleet.enabled) {
+    return;
+  }
+
+  // Get Fleet setup
+  registerGetFleetStatusRoute(router);
 
   // Create Fleet setup
-  router.post(
-    {
-      path: FLEET_SETUP_API_ROUTES.CREATE_PATTERN,
-      validate: PostFleetSetupRequestSchema,
-      options: { tags: [`access:${PLUGIN_ID}-all`] },
-    },
-    createFleetSetupHandler
-  );
+  registerCreateFleetSetupRoute(router);
 };
diff --git a/x-pack/plugins/ingest_manager/server/services/setup.test.ts b/x-pack/plugins/ingest_manager/server/services/setup.test.ts
index 474b2fde23c81..bb01862aaf317 100644
--- a/x-pack/plugins/ingest_manager/server/services/setup.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/setup.test.ts
@@ -4,41 +4,59 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { xpackMocks } from '../../../../../x-pack/mocks';
+import { createAppContextStartContractMock } from '../mocks';
+import { appContextService } from './app_context';
 import { setupIngestManager } from './setup';
-import { savedObjectsClientMock } from 'src/core/server/mocks';
 
-describe('setupIngestManager', () => {
-  it('returned promise should reject if errors thrown', async () => {
-    const { savedObjectsClient, callClusterMock } = makeErrorMocks();
-    const setupPromise = setupIngestManager(savedObjectsClient, callClusterMock);
-    await expect(setupPromise).rejects.toThrow('mocked');
+const mockedMethodThrowsError = () =>
+  jest.fn().mockImplementation(() => {
+    throw new Error('SO method mocked to throw');
   });
-});
 
-function makeErrorMocks() {
-  jest.mock('./app_context'); // else fails w/"Logger not set."
-  jest.mock('./epm/registry/registry_url', () => {
-    return {
-      fetchUrl: () => {
-        throw new Error('mocked registry#fetchUrl');
-      },
-    };
+class CustomTestError extends Error {}
+const mockedMethodThrowsCustom = () =>
+  jest.fn().mockImplementation(() => {
+    throw new CustomTestError('method mocked to throw');
   });
 
-  const callClusterMock = jest.fn();
-  const savedObjectsClient = savedObjectsClientMock.create();
-  savedObjectsClient.find = jest.fn().mockImplementation(() => {
-    throw new Error('mocked SO#find');
-  });
-  savedObjectsClient.get = jest.fn().mockImplementation(() => {
-    throw new Error('mocked SO#get');
+describe('setupIngestManager', () => {
+  let context: ReturnType<typeof xpackMocks.createRequestHandlerContext>;
+
+  beforeEach(async () => {
+    context = xpackMocks.createRequestHandlerContext();
+    // prevents `Logger not set.` and other appContext errors
+    appContextService.start(createAppContextStartContractMock());
   });
-  savedObjectsClient.update = jest.fn().mockImplementation(() => {
-    throw new Error('mocked SO#update');
+
+  afterEach(async () => {
+    jest.clearAllMocks();
+    appContextService.stop();
   });
 
-  return {
-    savedObjectsClient,
-    callClusterMock,
-  };
-}
+  describe('should reject with any error thrown underneath', () => {
+    it('SO client throws plain Error', async () => {
+      const soClient = context.core.savedObjects.client;
+      soClient.create = mockedMethodThrowsError();
+      soClient.find = mockedMethodThrowsError();
+      soClient.get = mockedMethodThrowsError();
+      soClient.update = mockedMethodThrowsError();
+
+      const setupPromise = setupIngestManager(soClient, jest.fn());
+      await expect(setupPromise).rejects.toThrow('SO method mocked to throw');
+      await expect(setupPromise).rejects.toThrow(Error);
+    });
+
+    it('SO client throws other error', async () => {
+      const soClient = context.core.savedObjects.client;
+      soClient.create = mockedMethodThrowsCustom();
+      soClient.find = mockedMethodThrowsCustom();
+      soClient.get = mockedMethodThrowsCustom();
+      soClient.update = mockedMethodThrowsCustom();
+
+      const setupPromise = setupIngestManager(soClient, jest.fn());
+      await expect(setupPromise).rejects.toThrow('method mocked to throw');
+      await expect(setupPromise).rejects.toThrow(CustomTestError);
+    });
+  });
+});
diff --git a/x-pack/plugins/ingest_manager/server/services/setup.ts b/x-pack/plugins/ingest_manager/server/services/setup.ts
index 727b49cebc608..fb4430f8cf727 100644
--- a/x-pack/plugins/ingest_manager/server/services/setup.ts
+++ b/x-pack/plugins/ingest_manager/server/services/setup.ts
@@ -26,116 +26,101 @@ import { packagePolicyService } from './package_policy';
 import { generateEnrollmentAPIKey } from './api_keys';
 import { settingsService } from '.';
 import { appContextService } from './app_context';
+import { awaitIfPending } from './setup_utils';
 
 const FLEET_ENROLL_USERNAME = 'fleet_enroll';
 const FLEET_ENROLL_ROLE = 'fleet_enroll';
 
-// the promise which tracks the setup
-let setupIngestStatus: Promise<void> | undefined;
-// default resolve & reject to guard against "undefined is not a function" errors
-let onSetupResolve = () => {};
-let onSetupReject = (error: Error) => {};
+export interface SetupStatus {
+  isIntialized: true | undefined;
+}
 
 export async function setupIngestManager(
   soClient: SavedObjectsClientContract,
   callCluster: CallESAsCurrentUser
-) {
-  // installation in progress
-  if (setupIngestStatus) {
-    await setupIngestStatus;
-  } else {
-    // create the initial promise
-    setupIngestStatus = new Promise((res, rej) => {
-      onSetupResolve = res;
-      onSetupReject = rej;
-    });
+): Promise<SetupStatus> {
+  return awaitIfPending(async () => createSetupSideEffects(soClient, callCluster));
+}
+
+async function createSetupSideEffects(
+  soClient: SavedObjectsClientContract,
+  callCluster: CallESAsCurrentUser
+): Promise<SetupStatus> {
+  const [installedPackages, defaultOutput, defaultAgentPolicy] = await Promise.all([
+    // packages installed by default
+    ensureInstalledDefaultPackages(soClient, callCluster),
+    outputService.ensureDefaultOutput(soClient),
+    agentPolicyService.ensureDefaultAgentPolicy(soClient),
+    ensureDefaultIndices(callCluster),
+    settingsService.getSettings(soClient).catch((e: any) => {
+      if (e.isBoom && e.output.statusCode === 404) {
+        const http = appContextService.getHttpSetup();
+        const serverInfo = http.getServerInfo();
+        const basePath = http.basePath;
+
+        const cloud = appContextService.getCloud();
+        const cloudId = cloud?.isCloudEnabled && cloud.cloudId;
+        const cloudUrl = cloudId && decodeCloudId(cloudId)?.kibanaUrl;
+        const flagsUrl = appContextService.getConfig()?.fleet?.kibana?.host;
+        const defaultUrl = url.format({
+          protocol: serverInfo.protocol,
+          hostname: serverInfo.hostname,
+          port: serverInfo.port,
+          pathname: basePath.serverBasePath,
+        });
+
+        return settingsService.saveSettings(soClient, {
+          agent_auto_upgrade: true,
+          package_auto_upgrade: true,
+          kibana_url: cloudUrl || flagsUrl || defaultUrl,
+        });
+      }
+
+      return Promise.reject(e);
+    }),
+  ]);
+
+  // ensure default packages are added to the default conifg
+  const agentPolicyWithPackagePolicies = await agentPolicyService.get(
+    soClient,
+    defaultAgentPolicy.id,
+    true
+  );
+  if (!agentPolicyWithPackagePolicies) {
+    throw new Error('Policy not found');
+  }
+  if (
+    agentPolicyWithPackagePolicies.package_policies.length &&
+    typeof agentPolicyWithPackagePolicies.package_policies[0] === 'string'
+  ) {
+    throw new Error('Policy not found');
   }
-  try {
-    const [installedPackages, defaultOutput, defaultAgentPolicy] = await Promise.all([
-      // packages installed by default
-      ensureInstalledDefaultPackages(soClient, callCluster),
-      outputService.ensureDefaultOutput(soClient),
-      agentPolicyService.ensureDefaultAgentPolicy(soClient),
-      ensureDefaultIndices(callCluster),
-      settingsService.getSettings(soClient).catch((e: any) => {
-        if (e.isBoom && e.output.statusCode === 404) {
-          const http = appContextService.getHttpSetup();
-          const serverInfo = http.getServerInfo();
-          const basePath = http.basePath;
-
-          const cloud = appContextService.getCloud();
-          const cloudId = cloud?.isCloudEnabled && cloud.cloudId;
-          const cloudUrl = cloudId && decodeCloudId(cloudId)?.kibanaUrl;
-          const flagsUrl = appContextService.getConfig()?.fleet?.kibana?.host;
-          const defaultUrl = url.format({
-            protocol: serverInfo.protocol,
-            hostname: serverInfo.hostname,
-            port: serverInfo.port,
-            pathname: basePath.serverBasePath,
-          });
-
-          return settingsService.saveSettings(soClient, {
-            agent_auto_upgrade: true,
-            package_auto_upgrade: true,
-            kibana_url: cloudUrl || flagsUrl || defaultUrl,
-          });
-        }
-
-        return Promise.reject(e);
-      }),
-    ]);
-
-    // ensure default packages are added to the default conifg
-    const agentPolicyWithPackagePolicies = await agentPolicyService.get(
-      soClient,
-      defaultAgentPolicy.id,
-      true
+  for (const installedPackage of installedPackages) {
+    const packageShouldBeInstalled = DEFAULT_AGENT_POLICIES_PACKAGES.some(
+      (packageName) => installedPackage.name === packageName
     );
-    if (!agentPolicyWithPackagePolicies) {
-      throw new Error('Policy not found');
-    }
-    if (
-      agentPolicyWithPackagePolicies.package_policies.length &&
-      typeof agentPolicyWithPackagePolicies.package_policies[0] === 'string'
-    ) {
-      throw new Error('Policy not found');
+    if (!packageShouldBeInstalled) {
+      continue;
     }
-    for (const installedPackage of installedPackages) {
-      const packageShouldBeInstalled = DEFAULT_AGENT_POLICIES_PACKAGES.some(
-        (packageName) => installedPackage.name === packageName
-      );
-      if (!packageShouldBeInstalled) {
-        continue;
+
+    const isInstalled = agentPolicyWithPackagePolicies.package_policies.some(
+      (d: PackagePolicy | string) => {
+        return typeof d !== 'string' && d.package?.name === installedPackage.name;
       }
+    );
 
-      const isInstalled = agentPolicyWithPackagePolicies.package_policies.some(
-        (d: PackagePolicy | string) => {
-          return typeof d !== 'string' && d.package?.name === installedPackage.name;
-        }
+    if (!isInstalled) {
+      await addPackageToAgentPolicy(
+        soClient,
+        callCluster,
+        installedPackage,
+        agentPolicyWithPackagePolicies,
+        defaultOutput
       );
-
-      if (!isInstalled) {
-        await addPackageToAgentPolicy(
-          soClient,
-          callCluster,
-          installedPackage,
-          agentPolicyWithPackagePolicies,
-          defaultOutput
-        );
-      }
     }
-
-    // if everything works, resolve/succeed
-    onSetupResolve();
-  } catch (error) {
-    // if anything errors, reject/fail
-    onSetupReject(error);
   }
 
-  // be sure to return the promise because it has the resolved/rejected status attached to it
-  // otherwise, we effectively return success every time even if there are errors
-  // because `return undefined` -> `Promise.resolve(undefined)` in an `async` function
-  return setupIngestStatus;
+  return { isIntialized: true };
 }
 
 export async function setupFleet(
diff --git a/x-pack/plugins/ingest_manager/server/services/setup_utils.test.ts b/x-pack/plugins/ingest_manager/server/services/setup_utils.test.ts
new file mode 100644
index 0000000000000..8d71fc48a2129
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/server/services/setup_utils.test.ts
@@ -0,0 +1,149 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { awaitIfPending } from './setup_utils';
+
+async function sleep(ms: number) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+describe('awaitIfPending', () => {
+  it('first promise called blocks others', async () => {
+    const fnA = jest.fn().mockImplementation(async () => {});
+    const fnB = jest.fn().mockImplementation(async () => {});
+    const fnC = jest.fn().mockImplementation(async () => {});
+    const fnD = jest.fn().mockImplementation(async () => {});
+    const promises = [
+      awaitIfPending(fnA),
+      awaitIfPending(fnB),
+      awaitIfPending(fnC),
+      awaitIfPending(fnD),
+    ];
+    await Promise.all(promises);
+
+    expect(fnA).toHaveBeenCalledTimes(1);
+    expect(fnB).toHaveBeenCalledTimes(0);
+    expect(fnC).toHaveBeenCalledTimes(0);
+    expect(fnD).toHaveBeenCalledTimes(0);
+  });
+
+  describe('first promise created, not necessarily first fulfilled, sets value for all in queue', () => {
+    it('succeeds', async () => {
+      const fnA = jest.fn().mockImplementation(async () => {
+        await sleep(1000);
+        return 'called first';
+      });
+      const fnB = jest.fn().mockImplementation(async () => 'called second');
+      const fnC = jest.fn().mockImplementation(async () => 'called third');
+      const fnD = jest.fn().mockImplementation(async () => 'called fourth');
+      const promises = [
+        awaitIfPending(fnA),
+        awaitIfPending(fnB),
+        awaitIfPending(fnC),
+        awaitIfPending(fnD),
+      ];
+
+      expect(fnA).toHaveBeenCalledTimes(1);
+      expect(fnB).toHaveBeenCalledTimes(0);
+      expect(fnC).toHaveBeenCalledTimes(0);
+      expect(fnD).toHaveBeenCalledTimes(0);
+      await expect(Promise.all(promises)).resolves.toEqual([
+        'called first',
+        'called first',
+        'called first',
+        'called first',
+      ]);
+    });
+
+    it('throws', async () => {
+      const expectedError = new Error('error is called first');
+      const fnA = jest.fn().mockImplementation(async () => {
+        await sleep(1000);
+        throw expectedError;
+      });
+      const fnB = jest.fn().mockImplementation(async () => 'called second');
+      const fnC = jest.fn().mockImplementation(async () => 'called third');
+      const fnD = jest.fn().mockImplementation(async () => 'called fourth');
+      const promises = [
+        awaitIfPending(fnA),
+        awaitIfPending(fnB),
+        awaitIfPending(fnC),
+        awaitIfPending(fnD),
+      ];
+
+      await expect(Promise.all(promises)).rejects.toThrow(expectedError);
+      await expect(Promise.allSettled(promises)).resolves.toEqual([
+        { status: 'rejected', reason: expectedError },
+        { status: 'rejected', reason: expectedError },
+        { status: 'rejected', reason: expectedError },
+        { status: 'rejected', reason: expectedError },
+      ]);
+
+      expect(fnA).toHaveBeenCalledTimes(1);
+      expect(fnB).toHaveBeenCalledTimes(0);
+      expect(fnC).toHaveBeenCalledTimes(0);
+      expect(fnD).toHaveBeenCalledTimes(0);
+    });
+  });
+
+  it('does not block other calls after batch is fulfilled. can call again for a new result', async () => {
+    const fnA = jest
+      .fn()
+      .mockImplementationOnce(async () => 'fnA first')
+      .mockImplementationOnce(async () => 'fnA second')
+      .mockImplementation(async () => 'fnA default/2+');
+    const fnB = jest.fn().mockImplementation(async () => {});
+    const fnC = jest.fn().mockImplementation(async () => {});
+    const fnD = jest.fn().mockImplementation(async () => {});
+    let promises = [
+      awaitIfPending(fnA),
+      awaitIfPending(fnB),
+      awaitIfPending(fnC),
+      awaitIfPending(fnD),
+    ];
+    let results = await Promise.all(promises);
+
+    expect(fnA).toHaveBeenCalledTimes(1);
+    expect(fnB).toHaveBeenCalledTimes(0);
+    expect(fnC).toHaveBeenCalledTimes(0);
+    expect(fnD).toHaveBeenCalledTimes(0);
+    expect(results).toEqual(['fnA first', 'fnA first', 'fnA first', 'fnA first']);
+
+    promises = [awaitIfPending(fnA), awaitIfPending(fnB), awaitIfPending(fnC), awaitIfPending(fnD)];
+    results = await Promise.all(promises);
+    expect(fnA).toHaveBeenCalledTimes(2);
+    expect(fnB).toHaveBeenCalledTimes(0);
+    expect(fnC).toHaveBeenCalledTimes(0);
+    expect(fnD).toHaveBeenCalledTimes(0);
+    expect(results).toEqual(['fnA second', 'fnA second', 'fnA second', 'fnA second']);
+
+    promises = [awaitIfPending(fnA), awaitIfPending(fnB), awaitIfPending(fnC), awaitIfPending(fnD)];
+    results = await Promise.all(promises);
+    expect(fnA).toHaveBeenCalledTimes(3);
+    expect(fnB).toHaveBeenCalledTimes(0);
+    expect(fnC).toHaveBeenCalledTimes(0);
+    expect(fnD).toHaveBeenCalledTimes(0);
+    expect(results).toEqual([
+      'fnA default/2+',
+      'fnA default/2+',
+      'fnA default/2+',
+      'fnA default/2+',
+    ]);
+
+    promises = [awaitIfPending(fnA), awaitIfPending(fnB), awaitIfPending(fnC), awaitIfPending(fnD)];
+    results = await Promise.all(promises);
+    expect(fnA).toHaveBeenCalledTimes(4);
+    expect(fnB).toHaveBeenCalledTimes(0);
+    expect(fnC).toHaveBeenCalledTimes(0);
+    expect(fnD).toHaveBeenCalledTimes(0);
+    expect(results).toEqual([
+      'fnA default/2+',
+      'fnA default/2+',
+      'fnA default/2+',
+      'fnA default/2+',
+    ]);
+  });
+});
diff --git a/x-pack/plugins/ingest_manager/server/services/setup_utils.ts b/x-pack/plugins/ingest_manager/server/services/setup_utils.ts
new file mode 100644
index 0000000000000..3c752bd410c5a
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/server/services/setup_utils.ts
@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+// the promise which tracks the setup
+let status: Promise<any> | undefined;
+let isPending = false;
+// default resolve to guard against "undefined is not a function" errors
+let onResolve = (value?: unknown) => {};
+let onReject = (reason: any) => {};
+
+export async function awaitIfPending<T>(asyncFunction: Function): Promise<T> {
+  // pending successful or failed attempt
+  if (isPending) {
+    // don't run concurrent installs
+    // return a promise which will eventually resolve/reject
+    return status;
+  } else {
+    // create the initial promise
+    status = new Promise((res, rej) => {
+      isPending = true;
+      onResolve = res;
+      onReject = rej;
+    });
+  }
+  try {
+    const result = await asyncFunction().catch(onReject);
+    onResolve(result);
+  } catch (error) {
+    // if something fails
+    onReject(error);
+  }
+  isPending = false;
+  return status;
+}

From 8e8f8d6e57555f95422429be27c8214e482ff683 Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Thu, 20 Aug 2020 17:16:41 +0200
Subject: [PATCH 65/85] Fixing functional test user roles (#75547)

---
 test/functional/apps/dashboard/embeddable_rendering.js | 3 +++
 test/functional/apps/dashboard/legacy_urls.ts          | 3 +++
 test/functional/config.js                              | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/functional/apps/dashboard/embeddable_rendering.js b/test/functional/apps/dashboard/embeddable_rendering.js
index c00f01d060f4a..73c36c7562e8b 100644
--- a/test/functional/apps/dashboard/embeddable_rendering.js
+++ b/test/functional/apps/dashboard/embeddable_rendering.js
@@ -33,6 +33,7 @@ export default function ({ getService, getPageObjects }) {
   const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
   const pieChart = getService('pieChart');
+  const security = getService('security');
   const dashboardExpect = getService('dashboardExpect');
   const dashboardAddPanel = getService('dashboardAddPanel');
   const PageObjects = getPageObjects([
@@ -100,6 +101,7 @@ export default function ({ getService, getPageObjects }) {
 
   describe('dashboard embeddable rendering', function describeIndexTests() {
     before(async () => {
+      await security.testUser.setRoles(['kibana_admin', 'animals', 'test_logstash_reader']);
       await esArchiver.load('dashboard/current/kibana');
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
@@ -118,6 +120,7 @@ export default function ({ getService, getPageObjects }) {
       const currentUrl = await browser.getCurrentUrl();
       const newUrl = currentUrl.replace(/\?.*$/, '');
       await browser.get(newUrl, false);
+      await security.testUser.restoreDefaults();
     });
 
     it('adding visualizations', async () => {
diff --git a/test/functional/apps/dashboard/legacy_urls.ts b/test/functional/apps/dashboard/legacy_urls.ts
index e606649c1df9f..6bb8d808e8daa 100644
--- a/test/functional/apps/dashboard/legacy_urls.ts
+++ b/test/functional/apps/dashboard/legacy_urls.ts
@@ -35,6 +35,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const dashboardAddPanel = getService('dashboardAddPanel');
   const listingTable = getService('listingTable');
   const esArchiver = getService('esArchiver');
+  const security = getService('security');
 
   let kibanaLegacyBaseUrl: string;
   let kibanaVisualizeBaseUrl: string;
@@ -42,6 +43,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('legacy urls', function describeIndexTests() {
     before(async function () {
+      await security.testUser.setRoles(['kibana_admin', 'animals']);
       await esArchiver.load('dashboard/current/kibana');
       await PageObjects.common.navigateToApp('dashboard');
       await PageObjects.dashboard.clickNewDashboard();
@@ -61,6 +63,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     after(async function () {
       await PageObjects.dashboard.gotoDashboardLandingPage();
       await listingTable.deleteItem('legacyTest', testDashboardId);
+      await security.testUser.restoreDefaults();
     });
 
     describe('kibana link redirect', () => {
diff --git a/test/functional/config.js b/test/functional/config.js
index 95e0c689089ef..15097d9346471 100644
--- a/test/functional/config.js
+++ b/test/functional/config.js
@@ -264,7 +264,7 @@ export default async function ({ readConfigFile }) {
             cluster: [],
             indices: [
               {
-                names: ['animals-*'],
+                names: ['animals-*', 'dogbreeds'],
                 privileges: ['read', 'view_index_metadata'],
                 field_security: { grant: ['*'], except: [] },
               },

From 3a66bb58512a0d2dc24ea769d83dfd159e7d12a0 Mon Sep 17 00:00:00 2001
From: Alison Goryachev <alison.goryachev@elastic.co>
Date: Thu, 20 Aug 2020 11:52:58 -0400
Subject: [PATCH 66/85] [Ingest pipelines] Test pipeline enhancements (#74964)

---
 .../helpers/pipeline_form.helpers.ts          |   7 +-
 .../ingest_pipelines_create.test.tsx          |   2 +-
 .../on_failure_processors_title.tsx           |  74 +++---
 .../pipeline_form/pipeline_form.scss          |   8 +
 .../pipeline_form/pipeline_form_fields.tsx    |  11 +-
 .../pipeline_form/processors_header.tsx       |  33 +--
 .../documents_dropdown.scss                   |   3 +
 .../documents_dropdown/documents_dropdown.tsx |  69 ++++++
 .../components/documents_dropdown/index.ts    |   7 +
 .../components/index.ts                       |   4 +-
 .../components/load_from_json/button.tsx      |   8 +-
 .../manage_processor_form.tsx                 |  51 +++-
 .../processor_output.tsx                      | 217 ++++++++++++++++++
 .../pipeline_processors_editor_item.scss      |   5 +
 .../pipeline_processors_editor_item.tsx       |  21 ++
 ...pipeline_processors_editor_item_status.tsx |  85 +++++++
 .../processors_tree/processors_tree.scss      |   1 -
 .../{button.tsx => add_documents_button.tsx}  |  29 +--
 .../test_pipeline/flyout_provider.tsx         | 172 --------------
 .../components/test_pipeline/index.ts         |   2 +-
 .../test_pipeline/test_output_button.tsx      |  60 +++++
 .../test_pipeline/test_pipeline_actions.tsx   |  84 +++++++
 .../test_pipeline/test_pipeline_flyout.tsx    | 197 ++++++++++++++++
 .../documents_schema.tsx}                     |   0
 .../index.ts                                  |   2 +-
 .../tab_documents.tsx                         |  56 +++--
 .../tab_output.tsx                            |  45 ++--
 .../test_pipeline_tabs.tsx}                   |  14 +-
 .../context/context.tsx                       |   6 +-
 .../context/index.ts                          |   7 +-
 .../context/processors_context.tsx            |  22 +-
 .../context/test_config_context.tsx           |  57 -----
 .../context/test_pipeline_context.tsx         | 189 +++++++++++++++
 .../pipeline_processors_editor/deserialize.ts |  47 +++-
 .../pipeline_processors_editor/index.ts       |   7 +-
 .../pipeline_processors_editor/serialize.ts   |  44 +++-
 .../pipeline_processors_editor/types.ts       |  32 +++
 .../public/application/services/api.ts        |   4 +-
 .../translations/translations/ja-JP.json      |   1 -
 .../translations/translations/zh-CN.json      |   1 -
 40 files changed, 1291 insertions(+), 393 deletions(-)
 create mode 100644 x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/documents_dropdown/documents_dropdown.scss
 create mode 100644 x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/documents_dropdown/documents_dropdown.tsx
 create mode 100644 x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/documents_dropdown/index.ts
 create mode 100644 x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processor_output.tsx
 create mode 100644 x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/pipeline_processors_editor_item_status.tsx
 rename x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/{button.tsx => add_documents_button.tsx} (51%)
 delete mode 100644 x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/flyout_provider.tsx
 create mode 100644 x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_output_button.tsx
 create mode 100644 x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_actions.tsx
 create mode 100644 x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout.tsx
 rename x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/{flyout_tabs/schema.tsx => test_pipeline_flyout_tabs/documents_schema.tsx} (100%)
 rename x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/{flyout_tabs => test_pipeline_flyout_tabs}/index.ts (83%)
 rename x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/{flyout_tabs => test_pipeline_flyout_tabs}/tab_documents.tsx (68%)
 rename x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/{flyout_tabs => test_pipeline_flyout_tabs}/tab_output.tsx (68%)
 rename x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/{flyout_tabs/pipeline_test_tabs.tsx => test_pipeline_flyout_tabs/test_pipeline_tabs.tsx} (77%)
 delete mode 100644 x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/context/test_config_context.tsx
 create mode 100644 x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/context/test_pipeline_context.tsx

diff --git a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipeline_form.helpers.ts b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipeline_form.helpers.ts
index 85848b3d2f73c..752ffef51b43b 100644
--- a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipeline_form.helpers.ts
+++ b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipeline_form.helpers.ts
@@ -13,8 +13,8 @@ export const getFormActions = (testBed: TestBed) => {
     find('submitButton').simulate('click');
   };
 
-  const clickTestPipelineButton = () => {
-    find('testPipelineButton').simulate('click');
+  const clickAddDocumentsButton = () => {
+    find('addDocumentsButton').simulate('click');
   };
 
   const clickShowRequestLink = () => {
@@ -34,11 +34,12 @@ export const getFormActions = (testBed: TestBed) => {
     clickShowRequestLink,
     toggleVersionSwitch,
     toggleOnFailureSwitch,
-    clickTestPipelineButton,
+    clickAddDocumentsButton,
   };
 };
 
 export type PipelineFormTestSubjects =
+  | 'addDocumentsButton'
   | 'submitButton'
   | 'pageTitle'
   | 'savePipelineError'
diff --git a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/ingest_pipelines_create.test.tsx b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/ingest_pipelines_create.test.tsx
index 813057813f139..6074c64d2bdb0 100644
--- a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/ingest_pipelines_create.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/ingest_pipelines_create.test.tsx
@@ -201,7 +201,7 @@ describe('<PipelinesCreate />', () => {
         const { actions, exists, find, waitFor } = testBed;
 
         await act(async () => {
-          actions.clickTestPipelineButton();
+          actions.clickAddDocumentsButton();
           await waitFor('testPipelineFlyout');
         });
 
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_form/on_failure_processors_title.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_form/on_failure_processors_title.tsx
index d2c001b0aaa13..0beb5657b54cb 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_form/on_failure_processors_title.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_form/on_failure_processors_title.tsx
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { EuiFlexGroup, EuiFlexItem, EuiLink, EuiText, EuiTitle } from '@elastic/eui';
+import { EuiLink, EuiText, EuiTitle } from '@elastic/eui';
 import React, { FunctionComponent } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -12,47 +12,41 @@ import { useKibana } from '../../../shared_imports';
 
 export const OnFailureProcessorsTitle: FunctionComponent = () => {
   const { services } = useKibana();
+
   return (
-    <EuiFlexGroup
-      alignItems="center"
-      gutterSize="none"
-      justifyContent="spaceBetween"
-      responsive={false}
-    >
-      <EuiFlexItem>
-        <EuiTitle size="s">
-          <h3>
-            <FormattedMessage
-              id="xpack.ingestPipelines.pipelineEditor.onFailureTreeTitle"
-              defaultMessage="Failure processors"
-            />
-          </h3>
-        </EuiTitle>
-        <EuiText size="s" color="subdued">
+    <div className="pipelineProcessorsEditor__onFailureTitle">
+      <EuiTitle size="xs">
+        <h4>
           <FormattedMessage
-            id="xpack.ingestPipelines.pipelineEditor.onFailureTreeDescription"
-            defaultMessage="The processors used to handle exceptions in this pipeline. {learnMoreLink}"
-            values={{
-              learnMoreLink: (
-                <EuiLink
-                  href={
-                    services.documentation.getEsDocsBasePath() +
-                    '/handling-failure-in-pipelines.html'
-                  }
-                  target="_blank"
-                >
-                  {i18n.translate(
-                    'xpack.ingestPipelines.pipelineEditor.onFailureProcessorsDocumentationLink',
-                    {
-                      defaultMessage: 'Learn more.',
-                    }
-                  )}
-                </EuiLink>
-              ),
-            }}
+            id="xpack.ingestPipelines.pipelineEditor.onFailureTreeTitle"
+            defaultMessage="Failure processors"
           />
-        </EuiText>
-      </EuiFlexItem>
-    </EuiFlexGroup>
+        </h4>
+      </EuiTitle>
+      <EuiText size="s" color="subdued">
+        <FormattedMessage
+          id="xpack.ingestPipelines.pipelineEditor.onFailureTreeDescription"
+          defaultMessage="The processors used to handle exceptions in this pipeline. {learnMoreLink}"
+          values={{
+            learnMoreLink: (
+              <EuiLink
+                href={
+                  services.documentation.getEsDocsBasePath() + '/handling-failure-in-pipelines.html'
+                }
+                target="_blank"
+                external
+              >
+                {i18n.translate(
+                  'xpack.ingestPipelines.pipelineEditor.onFailureProcessorsDocumentationLink',
+                  {
+                    defaultMessage: 'Learn more.',
+                  }
+                )}
+              </EuiLink>
+            ),
+          }}
+        />
+      </EuiText>
+    </div>
   );
 };
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_form/pipeline_form.scss b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_form/pipeline_form.scss
index 73eb54827e04f..d5592b87dda51 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_form/pipeline_form.scss
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_form/pipeline_form.scss
@@ -1,3 +1,11 @@
 .pipelineProcessorsEditor {
   margin-bottom: $euiSizeXL;
+
+  &__container {
+    background-color: $euiColorLightestShade;
+  }
+
+  &__onFailureTitle {
+    padding-left: $euiSizeS;
+  }
 }
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_form/pipeline_form_fields.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_form/pipeline_form_fields.tsx
index 3a97e6408b144..6033f34af6825 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_form/pipeline_form_fields.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_form/pipeline_form_fields.tsx
@@ -129,16 +129,13 @@ export const PipelineFormFields: React.FunctionComponent<Props> = ({
             <EuiFlexItem grow={false}>
               <ProcessorsHeader onLoadJson={onLoadJson} />
             </EuiFlexItem>
-            <EuiFlexItem grow={false}>
+            <EuiFlexItem grow={false} className="pipelineProcessorsEditor__container">
               <ProcessorsEditor />
-            </EuiFlexItem>
-            <EuiFlexItem>
+
               <EuiSpacer size="s" />
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
+
               <OnFailureProcessorsTitle />
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
+
               <GlobalOnFailureProcessorsEditor />
             </EuiFlexItem>
           </EuiFlexGroup>
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_form/processors_header.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_form/processors_header.tsx
index 1f27d611e54d4..43477affa8d94 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_form/processors_header.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_form/processors_header.tsx
@@ -14,7 +14,7 @@ import { useKibana } from '../../../shared_imports';
 import {
   LoadFromJsonButton,
   OnDoneLoadJsonHandler,
-  TestPipelineButton,
+  TestPipelineActions,
 } from '../pipeline_processors_editor';
 
 export interface Props {
@@ -23,6 +23,7 @@ export interface Props {
 
 export const ProcessorsHeader: FunctionComponent<Props> = ({ onLoadJson }) => {
   const { services } = useKibana();
+
   return (
     <EuiFlexGroup
       alignItems="center"
@@ -30,14 +31,22 @@ export const ProcessorsHeader: FunctionComponent<Props> = ({ onLoadJson }) => {
       justifyContent="spaceBetween"
       responsive={false}
     >
-      <EuiFlexItem>
-        <EuiTitle size="s">
-          <h3>
-            {i18n.translate('xpack.ingestPipelines.pipelineEditor.processorsTreeTitle', {
-              defaultMessage: 'Processors',
-            })}
-          </h3>
-        </EuiTitle>
+      <EuiFlexItem grow={false}>
+        <EuiFlexGroup gutterSize="xs">
+          <EuiFlexItem grow={false}>
+            <EuiTitle size="s">
+              <h3>
+                {i18n.translate('xpack.ingestPipelines.pipelineEditor.processorsTreeTitle', {
+                  defaultMessage: 'Processors',
+                })}
+              </h3>
+            </EuiTitle>
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <LoadFromJsonButton onDone={onLoadJson} />
+          </EuiFlexItem>
+        </EuiFlexGroup>
+
         <EuiText size="s" color="subdued">
           <FormattedMessage
             id="xpack.ingestPipelines.pipelineEditor.processorsTreeDescription"
@@ -47,6 +56,7 @@ export const ProcessorsHeader: FunctionComponent<Props> = ({ onLoadJson }) => {
                 <EuiLink
                   href={services.documentation.getEsDocsBasePath() + '/ingest-processors.html'}
                   target="_blank"
+                  external
                 >
                   {i18n.translate(
                     'xpack.ingestPipelines.pipelineEditor.processorsDocumentationLink',
@@ -61,10 +71,7 @@ export const ProcessorsHeader: FunctionComponent<Props> = ({ onLoadJson }) => {
         </EuiText>
       </EuiFlexItem>
       <EuiFlexItem grow={false}>
-        <LoadFromJsonButton onDone={onLoadJson} />
-      </EuiFlexItem>
-      <EuiFlexItem grow={false}>
-        <TestPipelineButton />
+        <TestPipelineActions />
       </EuiFlexItem>
     </EuiFlexGroup>
   );
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/documents_dropdown/documents_dropdown.scss b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/documents_dropdown/documents_dropdown.scss
new file mode 100644
index 0000000000000..c5b14dc129b0e
--- /dev/null
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/documents_dropdown/documents_dropdown.scss
@@ -0,0 +1,3 @@
+.documentsDropdown__selectContainer {
+ max-width: 200px;
+}
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/documents_dropdown/documents_dropdown.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/documents_dropdown/documents_dropdown.tsx
new file mode 100644
index 0000000000000..e9aa5c1d56f73
--- /dev/null
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/documents_dropdown/documents_dropdown.tsx
@@ -0,0 +1,69 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { i18n } from '@kbn/i18n';
+import React, { FunctionComponent } from 'react';
+import { EuiSelect, EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
+
+import { Document } from '../../types';
+
+import './documents_dropdown.scss';
+
+const i18nTexts = {
+  ariaLabel: i18n.translate(
+    'xpack.ingestPipelines.pipelineEditor.testPipeline.documentsDropdownAriaLabel',
+    {
+      defaultMessage: 'Select documents',
+    }
+  ),
+  dropdownLabel: i18n.translate(
+    'xpack.ingestPipelines.pipelineEditor.testPipeline.documentsdropdownLabel',
+    {
+      defaultMessage: 'Documents:',
+    }
+  ),
+  buttonLabel: i18n.translate('xpack.ingestPipelines.pipelineEditor.testPipeline.buttonLabel', {
+    defaultMessage: 'Add documents',
+  }),
+};
+
+const getDocumentOptions = (documents: Document[]) =>
+  documents.map((doc, index) => ({
+    value: index,
+    text: doc._id,
+  }));
+
+interface Props {
+  documents: Document[];
+  selectedDocumentIndex: number;
+  updateSelectedDocument: (index: number) => void;
+}
+
+export const DocumentsDropdown: FunctionComponent<Props> = ({
+  documents,
+  selectedDocumentIndex,
+  updateSelectedDocument,
+}) => {
+  return (
+    <EuiFlexGroup alignItems="baseline" gutterSize="s" className="documentsDropdown">
+      <EuiFlexItem grow={false}>
+        <EuiText>
+          <span>{i18nTexts.dropdownLabel}</span>
+        </EuiText>
+      </EuiFlexItem>
+      <EuiFlexItem grow={false} className="documentsDropdown__selectContainer">
+        <EuiSelect
+          compressed
+          options={getDocumentOptions(documents)}
+          value={selectedDocumentIndex}
+          onChange={(e) => {
+            updateSelectedDocument(Number(e.target.value));
+          }}
+          aria-label={i18nTexts.ariaLabel}
+        />
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+};
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/documents_dropdown/index.ts b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/documents_dropdown/index.ts
new file mode 100644
index 0000000000000..a8b55788647fb
--- /dev/null
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/documents_dropdown/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { DocumentsDropdown } from './documents_dropdown';
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/index.ts b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/index.ts
index 3b0ae477c871f..435d0ed66c4b0 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/index.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/index.ts
@@ -20,6 +20,8 @@ export { ProcessorRemoveModal } from './processor_remove_modal';
 
 export { OnDoneLoadJsonHandler, LoadFromJsonButton } from './load_from_json';
 
-export { TestPipelineButton } from './test_pipeline';
+export { TestPipelineActions } from './test_pipeline';
+
+export { DocumentsDropdown } from './documents_dropdown';
 
 export { PipelineProcessorsItemTooltip, Position } from './pipeline_processors_editor_item_tooltip';
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/load_from_json/button.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/load_from_json/button.tsx
index 482878d1bda58..21d15fc86a0ce 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/load_from_json/button.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/load_from_json/button.tsx
@@ -5,7 +5,7 @@
  */
 import { i18n } from '@kbn/i18n';
 import React, { FunctionComponent } from 'react';
-import { EuiButton } from '@elastic/eui';
+import { EuiButtonEmpty } from '@elastic/eui';
 
 import { ModalProvider, OnDoneLoadJsonHandler } from './modal_provider';
 
@@ -15,7 +15,7 @@ interface Props {
 
 const i18nTexts = {
   buttonLabel: i18n.translate('xpack.ingestPipelines.pipelineEditor.loadFromJson.buttonLabel', {
-    defaultMessage: 'Load JSON',
+    defaultMessage: 'Import',
   }),
 };
 
@@ -24,9 +24,9 @@ export const LoadFromJsonButton: FunctionComponent<Props> = ({ onDone }) => {
     <ModalProvider onDone={onDone}>
       {(openModal) => {
         return (
-          <EuiButton size="s" onClick={openModal}>
+          <EuiButtonEmpty size="s" onClick={openModal} iconType="importAction">
             {i18nTexts.buttonLabel}
-          </EuiButton>
+          </EuiButtonEmpty>
         );
       }}
     </ModalProvider>
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/manage_processor_form.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/manage_processor_form.tsx
index ad6d191be802d..ee8ca71e58446 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/manage_processor_form.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/manage_processor_form.tsx
@@ -24,10 +24,12 @@ import {
 
 import { Form, FormDataProvider, FormHook } from '../../../../../shared_imports';
 import { ProcessorInternal } from '../../types';
+import { useTestPipelineContext } from '../../context';
 import { getProcessorDescriptor } from '../shared';
 
 import { ProcessorSettingsFields } from './processor_settings_fields';
 import { DocumentationButton } from './documentation_button';
+import { ProcessorOutput } from './processor_output';
 
 export interface Props {
   isOnFailure: boolean;
@@ -53,7 +55,7 @@ const cancelButtonLabel = i18n.translate(
   { defaultMessage: 'Cancel' }
 );
 
-export type TabType = 'configuration';
+export type TabType = 'configuration' | 'output';
 
 interface Tab {
   id: TabType;
@@ -70,6 +72,12 @@ const tabs: Tab[] = [
       }
     ),
   },
+  {
+    id: 'output',
+    name: i18n.translate('xpack.ingestPipelines.settingsFormOnFailureFlyout.outputTabTitle', {
+      defaultMessage: 'Output',
+    }),
+  },
 ];
 
 const getFlyoutTitle = (isOnFailure: boolean, isExistingProcessor: boolean) => {
@@ -102,6 +110,28 @@ const getFlyoutTitle = (isOnFailure: boolean, isExistingProcessor: boolean) => {
 
 export const ManageProcessorForm: FunctionComponent<Props> = memo(
   ({ processor, form, isOnFailure, onClose, onOpen, esDocsBasePath }) => {
+    const { testPipelineData, setCurrentTestPipelineData } = useTestPipelineContext();
+    const {
+      testOutputPerProcessor,
+      config: { selectedDocumentIndex, documents },
+    } = testPipelineData;
+
+    const processorOutput =
+      processor &&
+      testOutputPerProcessor &&
+      testOutputPerProcessor[selectedDocumentIndex][processor.id];
+
+    const updateSelectedDocument = (index: number) => {
+      setCurrentTestPipelineData({
+        type: 'updateActiveDocument',
+        payload: {
+          config: {
+            selectedDocumentIndex: index,
+          },
+        },
+      });
+    };
+
     useEffect(
       () => {
         onOpen();
@@ -111,7 +141,20 @@ export const ManageProcessorForm: FunctionComponent<Props> = memo(
 
     const [activeTab, setActiveTab] = useState<TabType>('configuration');
 
-    const flyoutContent = <ProcessorSettingsFields processor={processor} />;
+    let flyoutContent: React.ReactNode;
+
+    if (activeTab === 'output') {
+      flyoutContent = (
+        <ProcessorOutput
+          processorOutput={processorOutput}
+          documents={documents!}
+          selectedDocumentIndex={selectedDocumentIndex}
+          updateSelectedDocument={updateSelectedDocument}
+        />
+      );
+    } else {
+      flyoutContent = <ProcessorSettingsFields processor={processor} />;
+    }
 
     return (
       <Form data-test-subj="processorSettingsForm" form={form}>
@@ -156,6 +199,10 @@ export const ManageProcessorForm: FunctionComponent<Props> = memo(
                       isSelected={tab.id === activeTab}
                       key={tab.id}
                       data-test-subj={`${tab.id}Tab`}
+                      disabled={
+                        (tab.id === 'output' && Boolean(testOutputPerProcessor) === false) ||
+                        Boolean(processorOutput) === false
+                      }
                     >
                       {tab.name}
                     </EuiTab>
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processor_output.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processor_output.tsx
new file mode 100644
index 0000000000000..c081f69fd41fe
--- /dev/null
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processor_output.tsx
@@ -0,0 +1,217 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+
+import {
+  EuiAccordion,
+  EuiCallOut,
+  EuiCodeBlock,
+  EuiText,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiSpacer,
+} from '@elastic/eui';
+
+import { ProcessorResult, Document } from '../../types';
+import { DocumentsDropdown } from '../documents_dropdown';
+
+export interface Props {
+  processorOutput?: ProcessorResult;
+  documents: Document[];
+  selectedDocumentIndex: number;
+  updateSelectedDocument: (index: number) => void;
+}
+
+const i18nTexts = {
+  noOutputCalloutTitle: i18n.translate(
+    'xpack.ingestPipelines.processorOutput.noOutputCalloutTitle',
+    {
+      defaultMessage: 'Unable to load the processor output.',
+    }
+  ),
+  tabDescription: i18n.translate('xpack.ingestPipelines.processorOutput.descriptionText', {
+    defaultMessage:
+      'View how the processor affects the ingest document as it passes through the pipeline.',
+  }),
+  skippedCalloutTitle: i18n.translate('xpack.ingestPipelines.processorOutput.skippedCalloutTitle', {
+    defaultMessage: 'The processor was not run.',
+  }),
+  droppedCalloutTitle: i18n.translate('xpack.ingestPipelines.processorOutput.droppedCalloutTitle', {
+    defaultMessage: 'The document was dropped.',
+  }),
+  processorOutputLabel: i18n.translate(
+    'xpack.ingestPipelines.processorOutput.processorOutputCodeBlockLabel',
+    {
+      defaultMessage: 'Processor output',
+    }
+  ),
+  processorErrorLabel: i18n.translate(
+    'xpack.ingestPipelines.processorOutput.processorErrorCodeBlockLabel',
+    {
+      defaultMessage: 'Processor error',
+    }
+  ),
+  prevProcessorLabel: i18n.translate(
+    'xpack.ingestPipelines.processorOutput.previousOutputCodeBlockLabel',
+    {
+      defaultMessage: 'View previous processor output',
+    }
+  ),
+  processorIgnoredErrorLabel: i18n.translate(
+    'xpack.ingestPipelines.processorOutput.ignoredErrorCodeBlockLabel',
+    {
+      defaultMessage: 'View ignored error',
+    }
+  ),
+};
+
+export const ProcessorOutput: React.FunctionComponent<Props> = ({
+  processorOutput,
+  documents,
+  selectedDocumentIndex,
+  updateSelectedDocument,
+}) => {
+  // This code should not be reached,
+  // but if for some reason the output is undefined, we render a callout message
+  if (!processorOutput) {
+    return <EuiCallOut title={i18nTexts.noOutputCalloutTitle} color="danger" iconType="alert" />;
+  }
+
+  const {
+    prevProcessorResult,
+    doc: currentResult,
+    ignored_error: ignoredError,
+    error,
+    status,
+  } = processorOutput!;
+
+  return (
+    <>
+      <EuiText>
+        <p>{i18nTexts.tabDescription}</p>
+      </EuiText>
+
+      {/* There is no output for "skipped" status, so we render an info callout */}
+      {status === 'skipped' && (
+        <>
+          <EuiSpacer />
+          <EuiCallOut size="s" title={i18nTexts.skippedCalloutTitle} iconType="pin" />
+        </>
+      )}
+
+      {/* There is no output for "dropped status", so we render a warning callout */}
+      {status === 'dropped' && (
+        <>
+          <EuiSpacer />
+          <EuiCallOut
+            size="s"
+            title={i18nTexts.droppedCalloutTitle}
+            iconType="pin"
+            color="warning"
+          />
+        </>
+      )}
+
+      {currentResult && (
+        <>
+          <EuiSpacer />
+
+          <EuiFlexGroup justifyContent="spaceBetween" gutterSize="s" alignItems="baseline">
+            <EuiFlexItem>
+              <p>{i18nTexts.processorOutputLabel}</p>
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <DocumentsDropdown
+                documents={documents}
+                selectedDocumentIndex={selectedDocumentIndex}
+                updateSelectedDocument={updateSelectedDocument}
+              />
+            </EuiFlexItem>
+          </EuiFlexGroup>
+
+          <EuiSpacer size="xs" />
+
+          <EuiCodeBlock paddingSize="s" language="json" isCopyable>
+            {JSON.stringify(currentResult, null, 2)}
+          </EuiCodeBlock>
+        </>
+      )}
+
+      {error && (
+        <>
+          <EuiSpacer />
+
+          <EuiFlexGroup justifyContent="spaceBetween" gutterSize="s" alignItems="baseline">
+            <EuiFlexItem>
+              <p>{i18nTexts.processorErrorLabel}</p>
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <DocumentsDropdown
+                documents={documents}
+                selectedDocumentIndex={selectedDocumentIndex}
+                updateSelectedDocument={updateSelectedDocument}
+              />
+            </EuiFlexItem>
+          </EuiFlexGroup>
+
+          <EuiSpacer size="xs" />
+
+          <EuiCodeBlock paddingSize="s" language="json" isCopyable>
+            {JSON.stringify(error, null, 2)}
+          </EuiCodeBlock>
+        </>
+      )}
+
+      {prevProcessorResult?.doc && (
+        <>
+          <EuiSpacer />
+
+          <EuiAccordion
+            id="prev_accordion"
+            buttonContent={
+              <EuiText>
+                <p>{i18nTexts.prevProcessorLabel}</p>
+              </EuiText>
+            }
+          >
+            <>
+              <EuiSpacer />
+
+              <EuiCodeBlock paddingSize="s" language="json" isCopyable>
+                {JSON.stringify(prevProcessorResult.doc, null, 2)}
+              </EuiCodeBlock>
+            </>
+          </EuiAccordion>
+        </>
+      )}
+
+      {ignoredError && (
+        <>
+          <EuiSpacer />
+
+          <EuiAccordion
+            id="ignored_error_accordion"
+            buttonContent={
+              <EuiText>
+                <p>{i18nTexts.processorIgnoredErrorLabel}</p>
+              </EuiText>
+            }
+          >
+            <>
+              <EuiSpacer />
+
+              <EuiCodeBlock paddingSize="s" language="json" isCopyable>
+                {JSON.stringify(ignoredError, null, 2)}
+              </EuiCodeBlock>
+            </>
+          </EuiAccordion>
+        </>
+      )}
+    </>
+  );
+};
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/pipeline_processors_editor_item/pipeline_processors_editor_item.scss b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/pipeline_processors_editor_item/pipeline_processors_editor_item.scss
index 85a123b421975..d9c3d84eec082 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/pipeline_processors_editor_item/pipeline_processors_editor_item.scss
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/pipeline_processors_editor_item/pipeline_processors_editor_item.scss
@@ -60,4 +60,9 @@
       z-index: $cancelButtonZIndex;
     }
   }
+
+  &__statusContainer {
+    // Prevent content jump when spinner renders
+    min-width: 12px;
+  }
 }
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/pipeline_processors_editor_item/pipeline_processors_editor_item.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/pipeline_processors_editor_item/pipeline_processors_editor_item.tsx
index a13321c38c193..4a67e27d2ebe6 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/pipeline_processors_editor_item/pipeline_processors_editor_item.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/pipeline_processors_editor_item/pipeline_processors_editor_item.tsx
@@ -11,6 +11,7 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
   EuiLink,
+  EuiLoadingSpinner,
   EuiPanel,
   EuiText,
   EuiToolTip,
@@ -21,6 +22,8 @@ import { selectorToDataTestSubject } from '../../utils';
 import { ProcessorsDispatch } from '../../processors_reducer';
 
 import { ProcessorInfo } from '../processors_tree';
+import { PipelineProcessorsItemStatus } from '../pipeline_processors_editor_item_status';
+import { useTestPipelineContext } from '../../context';
 
 import { getProcessorDescriptor } from '../shared';
 
@@ -63,6 +66,17 @@ export const PipelineProcessorsEditorItem: FunctionComponent<Props> = memo(
     const isMovingOtherProcessor = editor.mode.id === 'movingProcessor' && !isMovingThisProcessor;
     const isDimmed = isEditingOtherProcessor || isMovingOtherProcessor;
 
+    const { testPipelineData } = useTestPipelineContext();
+    const {
+      config: { selectedDocumentIndex },
+      testOutputPerProcessor,
+      isExecutingPipeline,
+    } = testPipelineData;
+
+    const processorOutput =
+      testOutputPerProcessor && testOutputPerProcessor[selectedDocumentIndex][processor.id];
+    const processorStatus = processorOutput?.status ?? 'inactive';
+
     const panelClasses = classNames('pipelineProcessorsEditor__item', {
       // eslint-disable-next-line @typescript-eslint/naming-convention
       'pipelineProcessorsEditor__item--selected': isMovingThisProcessor || isEditingThisProcessor,
@@ -131,6 +145,13 @@ export const PipelineProcessorsEditorItem: FunctionComponent<Props> = memo(
           <EuiFlexItem>
             <EuiFlexGroup gutterSize="m" alignItems="center" responsive={false}>
               <EuiFlexItem grow={false}>{renderMoveButton()}</EuiFlexItem>
+              <EuiFlexItem grow={false} className="pipelineProcessorsEditor__item__statusContainer">
+                {isExecutingPipeline ? (
+                  <EuiLoadingSpinner size="s" />
+                ) : (
+                  <PipelineProcessorsItemStatus processorStatus={processorStatus} />
+                )}
+              </EuiFlexItem>
               <EuiFlexItem grow={false}>
                 <EuiText
                   className="pipelineProcessorsEditor__item__processorTypeLabel"
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/pipeline_processors_editor_item_status.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/pipeline_processors_editor_item_status.tsx
new file mode 100644
index 0000000000000..26ff113b97440
--- /dev/null
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/pipeline_processors_editor_item_status.tsx
@@ -0,0 +1,85 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FunctionComponent } from 'react';
+import { i18n } from '@kbn/i18n';
+import { EuiToolTip, EuiIcon } from '@elastic/eui';
+import { ProcessorStatus } from '../types';
+
+interface ProcessorStatusIcon {
+  icon: string;
+  iconColor: string;
+  label: string;
+}
+
+const processorStatusToIconMap: Record<ProcessorStatus, ProcessorStatusIcon> = {
+  success: {
+    icon: 'checkInCircleFilled',
+    iconColor: 'success',
+    label: i18n.translate('xpack.ingestPipelines.pipelineEditorItem.successStatusAriaLabel', {
+      defaultMessage: 'Success',
+    }),
+  },
+  error: {
+    icon: 'crossInACircleFilled',
+    iconColor: 'danger',
+    label: i18n.translate('xpack.ingestPipelines.pipelineEditorItem.errorStatusAriaLabel', {
+      defaultMessage: 'Error',
+    }),
+  },
+  error_ignored: {
+    icon: 'alert',
+    iconColor: 'warning',
+    label: i18n.translate('xpack.ingestPipelines.pipelineEditorItem.errorIgnoredStatusAriaLabel', {
+      defaultMessage: 'Error ignored',
+    }),
+  },
+  dropped: {
+    icon: 'alert',
+    iconColor: 'warning',
+    label: i18n.translate('xpack.ingestPipelines.pipelineEditorItem.droppedStatusAriaLabel', {
+      defaultMessage: 'Dropped',
+    }),
+  },
+  skipped: {
+    icon: 'dot',
+    iconColor: 'subdued',
+    label: i18n.translate('xpack.ingestPipelines.pipelineEditorItem.skippedStatusAriaLabel', {
+      defaultMessage: 'Skipped',
+    }),
+  },
+  inactive: {
+    icon: 'dot',
+    iconColor: 'subdued',
+    label: i18n.translate('xpack.ingestPipelines.pipelineEditorItem.inactiveStatusAriaLabel', {
+      defaultMessage: 'Not run',
+    }),
+  },
+};
+
+// This is a fallback in case ES returns a status we do not support
+// This is not expected and likely means we need to modify the code to support a new status
+const unknownStatus = {
+  icon: 'dot',
+  iconColor: 'subdued',
+  label: i18n.translate('xpack.ingestPipelines.pipelineEditorItem.unknownStatusAriaLabel', {
+    defaultMessage: 'Unknown',
+  }),
+};
+
+interface Props {
+  processorStatus: ProcessorStatus;
+}
+
+export const PipelineProcessorsItemStatus: FunctionComponent<Props> = ({ processorStatus }) => {
+  const { icon, iconColor, label } = processorStatusToIconMap[processorStatus] || unknownStatus;
+
+  return (
+    <EuiToolTip position="top" content={<p>{label}</p>}>
+      <EuiIcon color={iconColor} type={icon} aria-label={label} size="s" />
+    </EuiToolTip>
+  );
+};
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/processors_tree/processors_tree.scss b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/processors_tree/processors_tree.scss
index 061c9adb5d443..a54cc994ab730 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/processors_tree/processors_tree.scss
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/processors_tree/processors_tree.scss
@@ -3,7 +3,6 @@
 
 .pipelineProcessorsEditor__tree {
   &__container {
-    background-color: $euiColorLightestShade;
     padding: $euiSizeS;
   }
 
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/button.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/add_documents_button.tsx
similarity index 51%
rename from x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/button.tsx
rename to x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/add_documents_button.tsx
index 0e8e23ba80ea8..e3ef9a9ee5390 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/button.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/add_documents_button.tsx
@@ -5,26 +5,27 @@
  */
 import { i18n } from '@kbn/i18n';
 import React, { FunctionComponent } from 'react';
-import { EuiButton } from '@elastic/eui';
-
-import { FlyoutProvider } from './flyout_provider';
+import { EuiButtonEmpty } from '@elastic/eui';
 
 const i18nTexts = {
   buttonLabel: i18n.translate('xpack.ingestPipelines.pipelineEditor.testPipeline.buttonLabel', {
-    defaultMessage: 'Test pipeline',
+    defaultMessage: 'Add documents',
   }),
 };
 
-export const TestPipelineButton: FunctionComponent = () => {
+interface Props {
+  openTestPipelineFlyout: () => void;
+}
+
+export const AddDocumentsButton: FunctionComponent<Props> = ({ openTestPipelineFlyout }) => {
   return (
-    <FlyoutProvider>
-      {(openFlyout) => {
-        return (
-          <EuiButton size="s" onClick={openFlyout} data-test-subj="testPipelineButton">
-            {i18nTexts.buttonLabel}
-          </EuiButton>
-        );
-      }}
-    </FlyoutProvider>
+    <EuiButtonEmpty
+      size="s"
+      onClick={openTestPipelineFlyout}
+      data-test-subj="addDocumentsButton"
+      iconType="plusInCircleFilled"
+    >
+      {i18nTexts.buttonLabel}
+    </EuiButtonEmpty>
   );
 };
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/flyout_provider.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/flyout_provider.tsx
deleted file mode 100644
index 53aeb9fdc08ba..0000000000000
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/flyout_provider.tsx
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { useState, useEffect, useCallback } from 'react';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
-
-import {
-  EuiFlyout,
-  EuiFlyoutBody,
-  EuiFlyoutHeader,
-  EuiSpacer,
-  EuiTitle,
-  EuiCallOut,
-} from '@elastic/eui';
-
-import { useKibana } from '../../../../../shared_imports';
-
-import { usePipelineProcessorsContext, useTestConfigContext } from '../../context';
-import { serialize } from '../../serialize';
-
-import { Tabs, Tab, OutputTab, DocumentsTab } from './flyout_tabs';
-
-export interface Props {
-  children: (openFlyout: () => void) => React.ReactNode;
-}
-
-export const FlyoutProvider: React.FunctionComponent<Props> = ({ children }) => {
-  const { services } = useKibana();
-  const {
-    state: { processors },
-  } = usePipelineProcessorsContext();
-
-  const serializedProcessors = serialize(processors.state);
-
-  const { testConfig } = useTestConfigContext();
-  const { documents: cachedDocuments, verbose: cachedVerbose } = testConfig;
-
-  const [isFlyoutVisible, setIsFlyoutVisible] = useState(false);
-
-  const initialSelectedTab = cachedDocuments ? 'output' : 'documents';
-  const [selectedTab, setSelectedTab] = useState<Tab>(initialSelectedTab);
-
-  const [shouldExecuteImmediately, setShouldExecuteImmediately] = useState<boolean>(false);
-  const [isExecuting, setIsExecuting] = useState<boolean>(false);
-  const [executeError, setExecuteError] = useState<any>(null);
-  const [executeOutput, setExecuteOutput] = useState<any>(undefined);
-
-  const handleExecute = useCallback(
-    async (documents: object[], verbose?: boolean) => {
-      setIsExecuting(true);
-      setExecuteError(null);
-
-      const { error, data: output } = await services.api.simulatePipeline({
-        documents,
-        verbose,
-        pipeline: { ...serializedProcessors },
-      });
-
-      setIsExecuting(false);
-
-      if (error) {
-        setExecuteError(error);
-        return;
-      }
-
-      setExecuteOutput(output);
-
-      services.notifications.toasts.addSuccess(
-        i18n.translate('xpack.ingestPipelines.testPipelineFlyout.successNotificationText', {
-          defaultMessage: 'Pipeline executed',
-        }),
-        {
-          toastLifeTimeMs: 1000,
-        }
-      );
-
-      setSelectedTab('output');
-    },
-    [services.api, services.notifications.toasts, serializedProcessors]
-  );
-
-  useEffect(() => {
-    if (isFlyoutVisible === false && cachedDocuments) {
-      setShouldExecuteImmediately(true);
-    }
-  }, [isFlyoutVisible, cachedDocuments]);
-
-  useEffect(() => {
-    // If the user has already tested the pipeline once,
-    // use the cached test config and automatically execute the pipeline
-    if (isFlyoutVisible && shouldExecuteImmediately && cachedDocuments) {
-      setShouldExecuteImmediately(false);
-      handleExecute(cachedDocuments!, cachedVerbose);
-    }
-  }, [handleExecute, cachedDocuments, cachedVerbose, isFlyoutVisible, shouldExecuteImmediately]);
-
-  let tabContent;
-
-  if (selectedTab === 'output') {
-    tabContent = (
-      <OutputTab
-        executeOutput={executeOutput}
-        handleExecute={handleExecute}
-        isExecuting={isExecuting}
-      />
-    );
-  } else {
-    // default to "Documents" tab
-    tabContent = <DocumentsTab isExecuting={isExecuting} handleExecute={handleExecute} />;
-  }
-
-  return (
-    <>
-      {children(() => setIsFlyoutVisible(true))}
-
-      {isFlyoutVisible && (
-        <EuiFlyout
-          maxWidth={550}
-          onClose={() => setIsFlyoutVisible(false)}
-          data-test-subj="testPipelineFlyout"
-        >
-          <EuiFlyoutHeader>
-            <EuiTitle>
-              <h2 data-test-subj="title">
-                <FormattedMessage
-                  id="xpack.ingestPipelines.testPipelineFlyout.title"
-                  defaultMessage="Test pipeline"
-                />
-              </h2>
-            </EuiTitle>
-          </EuiFlyoutHeader>
-
-          <EuiFlyoutBody>
-            <Tabs
-              onTabChange={setSelectedTab}
-              selectedTab={selectedTab}
-              getIsDisabled={(tabId) => !executeOutput && tabId === 'output'}
-            />
-
-            <EuiSpacer />
-
-            {/* Execute error */}
-            {executeError ? (
-              <>
-                <EuiCallOut
-                  title={
-                    <FormattedMessage
-                      id="xpack.ingestPipelines.testPipelineFlyout.executePipelineError"
-                      defaultMessage="Unable to execute pipeline"
-                    />
-                  }
-                  color="danger"
-                  iconType="alert"
-                >
-                  <p>{executeError.message}</p>
-                </EuiCallOut>
-                <EuiSpacer size="m" />
-              </>
-            ) : null}
-
-            {/* Documents or output tab content */}
-            {tabContent}
-          </EuiFlyoutBody>
-        </EuiFlyout>
-      )}
-    </>
-  );
-};
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/index.ts b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/index.ts
index 8e5037c15bac4..4050971d0930a 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/index.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/index.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { TestPipelineButton } from './button';
+export { TestPipelineActions } from './test_pipeline_actions';
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_output_button.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_output_button.tsx
new file mode 100644
index 0000000000000..361e32c77d59b
--- /dev/null
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_output_button.tsx
@@ -0,0 +1,60 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { i18n } from '@kbn/i18n';
+import React, { FunctionComponent } from 'react';
+import { EuiButton, EuiToolTip } from '@elastic/eui';
+
+const i18nTexts = {
+  buttonLabel: i18n.translate(
+    'xpack.ingestPipelines.pipelineEditor.testPipeline.outputButtonLabel',
+    {
+      defaultMessage: 'View output',
+    }
+  ),
+  disabledButtonTooltipLabel: i18n.translate(
+    'xpack.ingestPipelines.pipelineEditor.testPipeline.outputButtonTooltipLabel',
+    {
+      defaultMessage: 'Add documents to view the output',
+    }
+  ),
+};
+
+interface Props {
+  isDisabled: boolean;
+  openTestPipelineFlyout: () => void;
+}
+
+export const TestOutputButton: FunctionComponent<Props> = ({
+  isDisabled,
+  openTestPipelineFlyout,
+}) => {
+  if (isDisabled) {
+    return (
+      <EuiToolTip position="top" content={<p>{i18nTexts.disabledButtonTooltipLabel}</p>}>
+        <EuiButton
+          size="s"
+          onClick={openTestPipelineFlyout}
+          data-test-subj="outputButton"
+          iconType="crossInACircleFilled"
+          isDisabled={isDisabled}
+        >
+          {i18nTexts.buttonLabel}
+        </EuiButton>
+      </EuiToolTip>
+    );
+  }
+
+  return (
+    <EuiButton
+      size="s"
+      onClick={openTestPipelineFlyout}
+      data-test-subj="outputButton"
+      iconType="checkInCircleFilled"
+    >
+      {i18nTexts.buttonLabel}
+    </EuiButton>
+  );
+};
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_actions.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_actions.tsx
new file mode 100644
index 0000000000000..eb9d9352e4b90
--- /dev/null
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_actions.tsx
@@ -0,0 +1,84 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React, { FunctionComponent, useState } from 'react';
+
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { useTestPipelineContext, usePipelineProcessorsContext } from '../../context';
+
+import { DocumentsDropdown } from '../documents_dropdown';
+import { TestPipelineFlyoutTab } from './test_pipeline_flyout_tabs';
+import { AddDocumentsButton } from './add_documents_button';
+import { TestOutputButton } from './test_output_button';
+import { TestPipelineFlyout } from './test_pipeline_flyout';
+
+export const TestPipelineActions: FunctionComponent = () => {
+  const { testPipelineData, setCurrentTestPipelineData } = useTestPipelineContext();
+
+  const {
+    state: { processors },
+  } = usePipelineProcessorsContext();
+
+  const {
+    testOutputPerProcessor,
+    config: { documents, selectedDocumentIndex },
+  } = testPipelineData;
+
+  const [openTestPipelineFlyout, setOpenTestPipelineFlyout] = useState(false);
+  const [activeFlyoutTab, setActiveFlyoutTab] = useState<TestPipelineFlyoutTab>('documents');
+
+  const updateSelectedDocument = (index: number) => {
+    setCurrentTestPipelineData({
+      type: 'updateActiveDocument',
+      payload: {
+        config: {
+          selectedDocumentIndex: index,
+        },
+      },
+    });
+  };
+
+  return (
+    <>
+      <EuiFlexGroup gutterSize="s">
+        <EuiFlexItem grow={false}>
+          {documents ? (
+            <DocumentsDropdown
+              documents={documents}
+              selectedDocumentIndex={selectedDocumentIndex}
+              updateSelectedDocument={updateSelectedDocument}
+            />
+          ) : (
+            <AddDocumentsButton
+              openTestPipelineFlyout={() => {
+                setOpenTestPipelineFlyout(true);
+                setActiveFlyoutTab('documents');
+              }}
+            />
+          )}
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <TestOutputButton
+            isDisabled={Boolean(testOutputPerProcessor) === false}
+            openTestPipelineFlyout={() => {
+              setOpenTestPipelineFlyout(true);
+              setActiveFlyoutTab('output');
+            }}
+          />
+        </EuiFlexItem>
+      </EuiFlexGroup>
+      {openTestPipelineFlyout && (
+        <TestPipelineFlyout
+          activeTab={activeFlyoutTab}
+          processors={{
+            processors: processors.state.processors,
+            onFailure: processors.state.onFailure,
+          }}
+          onClose={() => setOpenTestPipelineFlyout(false)}
+        />
+      )}
+    </>
+  );
+};
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout.tsx
new file mode 100644
index 0000000000000..e8bb1aa1d357f
--- /dev/null
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout.tsx
@@ -0,0 +1,197 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useState, useCallback, useEffect } from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
+
+import {
+  EuiFlyout,
+  EuiFlyoutBody,
+  EuiFlyoutHeader,
+  EuiSpacer,
+  EuiTitle,
+  EuiCallOut,
+} from '@elastic/eui';
+
+import { useKibana } from '../../../../../shared_imports';
+import { useTestPipelineContext } from '../../context';
+import { serialize } from '../../serialize';
+import { DeserializeResult } from '../../deserialize';
+import { Document } from '../../types';
+
+import { Tabs, TestPipelineFlyoutTab, OutputTab, DocumentsTab } from './test_pipeline_flyout_tabs';
+
+export interface Props {
+  activeTab: TestPipelineFlyoutTab;
+  onClose: () => void;
+  processors: DeserializeResult;
+}
+
+export interface HandleTestPipelineArgs {
+  documents: Document[];
+  verbose?: boolean;
+}
+
+export const TestPipelineFlyout: React.FunctionComponent<Props> = ({
+  onClose,
+  activeTab,
+  processors,
+}) => {
+  const { services } = useKibana();
+
+  const {
+    testPipelineData,
+    setCurrentTestPipelineData,
+    updateTestOutputPerProcessor,
+  } = useTestPipelineContext();
+
+  const {
+    config: { documents: cachedDocuments, verbose: cachedVerbose },
+  } = testPipelineData;
+
+  const [selectedTab, setSelectedTab] = useState<TestPipelineFlyoutTab>(activeTab);
+
+  const [shouldTestImmediately, setShouldTestImmediately] = useState<boolean>(false);
+  const [isRunningTest, setIsRunningTest] = useState<boolean>(false);
+  const [testingError, setTestingError] = useState<any>(null);
+  const [testOutput, setTestOutput] = useState<any>(undefined);
+
+  const handleTestPipeline = useCallback(
+    async ({ documents, verbose }: HandleTestPipelineArgs) => {
+      const serializedProcessors = serialize({ pipeline: processors });
+
+      setIsRunningTest(true);
+      setTestingError(null);
+
+      const { error, data: currentTestOutput } = await services.api.simulatePipeline({
+        documents,
+        verbose,
+        pipeline: { ...serializedProcessors },
+      });
+
+      setIsRunningTest(false);
+
+      if (error) {
+        setTestingError(error);
+        return;
+      }
+
+      setCurrentTestPipelineData({
+        type: 'updateConfig',
+        payload: {
+          config: {
+            documents,
+            verbose,
+          },
+        },
+      });
+
+      setTestOutput(currentTestOutput);
+
+      services.notifications.toasts.addSuccess(
+        i18n.translate('xpack.ingestPipelines.testPipelineFlyout.successNotificationText', {
+          defaultMessage: 'Pipeline executed',
+        }),
+        {
+          toastLifeTimeMs: 1000,
+        }
+      );
+
+      setSelectedTab('output');
+    },
+    [services.api, processors, setCurrentTestPipelineData, services.notifications.toasts]
+  );
+
+  useEffect(() => {
+    if (cachedDocuments) {
+      setShouldTestImmediately(true);
+    }
+    // We only want to know on initial mount if there are cached documents
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  useEffect(() => {
+    // If the user has already tested the pipeline once,
+    // use the cached test config and automatically execute the pipeline
+    if (shouldTestImmediately) {
+      setShouldTestImmediately(false);
+      handleTestPipeline({ documents: cachedDocuments!, verbose: cachedVerbose });
+    }
+  }, [handleTestPipeline, cachedDocuments, cachedVerbose, shouldTestImmediately]);
+
+  let tabContent;
+
+  if (selectedTab === 'output') {
+    tabContent = (
+      <OutputTab
+        handleTestPipeline={handleTestPipeline}
+        isRunningTest={isRunningTest}
+        cachedVerbose={cachedVerbose}
+        cachedDocuments={cachedDocuments!}
+        testOutput={testOutput}
+      />
+    );
+  } else {
+    // default to "Documents" tab
+    tabContent = (
+      <DocumentsTab
+        isRunningTest={isRunningTest}
+        handleTestPipeline={handleTestPipeline}
+        setPerProcessorOutput={updateTestOutputPerProcessor}
+        processors={processors}
+        testPipelineData={testPipelineData}
+      />
+    );
+  }
+
+  return (
+    <EuiFlyout maxWidth={550} onClose={onClose} data-test-subj="testPipelineFlyout">
+      <EuiFlyoutHeader>
+        <EuiTitle>
+          <h2 data-test-subj="title">
+            <FormattedMessage
+              id="xpack.ingestPipelines.testPipelineFlyout.title"
+              defaultMessage="Test pipeline"
+            />
+          </h2>
+        </EuiTitle>
+      </EuiFlyoutHeader>
+
+      <EuiFlyoutBody>
+        <Tabs
+          onTabChange={setSelectedTab}
+          selectedTab={selectedTab}
+          getIsDisabled={(tabId) => !testOutput && tabId === 'output'}
+        />
+
+        <EuiSpacer />
+
+        {/* Testing error callout */}
+        {testingError ? (
+          <>
+            <EuiCallOut
+              title={
+                <FormattedMessage
+                  id="xpack.ingestPipelines.testPipelineFlyout.executePipelineError"
+                  defaultMessage="Unable to execute pipeline"
+                />
+              }
+              color="danger"
+              iconType="alert"
+            >
+              <p>{testingError.message}</p>
+            </EuiCallOut>
+            <EuiSpacer size="m" />
+          </>
+        ) : null}
+
+        {/* Documents or output tab content */}
+        {tabContent}
+      </EuiFlyoutBody>
+    </EuiFlyout>
+  );
+};
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/flyout_tabs/schema.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout_tabs/documents_schema.tsx
similarity index 100%
rename from x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/flyout_tabs/schema.tsx
rename to x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout_tabs/documents_schema.tsx
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/flyout_tabs/index.ts b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout_tabs/index.ts
similarity index 83%
rename from x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/flyout_tabs/index.ts
rename to x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout_tabs/index.ts
index ea8fe2cd92350..1f306f96b4bd6 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/flyout_tabs/index.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout_tabs/index.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { Tabs, Tab } from './pipeline_test_tabs';
+export { Tabs, TestPipelineFlyoutTab } from './test_pipeline_tabs';
 
 export { DocumentsTab } from './tab_documents';
 
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/flyout_tabs/tab_documents.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout_tabs/tab_documents.tsx
similarity index 68%
rename from x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/flyout_tabs/tab_documents.tsx
rename to x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout_tabs/tab_documents.tsx
index 794d935571210..8968416683c3e 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/flyout_tabs/tab_documents.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout_tabs/tab_documents.tsx
@@ -16,50 +16,59 @@ import {
   JsonEditorField,
   Form,
   useForm,
-  FormConfig,
   useKibana,
 } from '../../../../../../shared_imports';
 
-import { useTestConfigContext, TestConfig } from '../../../context';
-
-import { documentsSchema } from './schema';
+import { TestPipelineContext } from '../../../context';
+import { Document } from '../../../types';
+import { DeserializeResult } from '../../../deserialize';
+import { HandleTestPipelineArgs } from '../test_pipeline_flyout';
+import { documentsSchema } from './documents_schema';
 
 const UseField = getUseField({ component: Field });
 
 interface Props {
-  handleExecute: (documents: object[], verbose: boolean) => void;
-  isExecuting: boolean;
+  handleTestPipeline: (data: HandleTestPipelineArgs) => void;
+  setPerProcessorOutput: (documents: Document[] | undefined, processors: DeserializeResult) => void;
+  isRunningTest: boolean;
+  processors: DeserializeResult;
+  testPipelineData: TestPipelineContext['testPipelineData'];
 }
 
-export const DocumentsTab: React.FunctionComponent<Props> = ({ handleExecute, isExecuting }) => {
+export const DocumentsTab: React.FunctionComponent<Props> = ({
+  handleTestPipeline,
+  isRunningTest,
+  setPerProcessorOutput,
+  processors,
+  testPipelineData,
+}) => {
   const { services } = useKibana();
 
-  const { setCurrentTestConfig, testConfig } = useTestConfigContext();
-  const { verbose: cachedVerbose, documents: cachedDocuments } = testConfig;
+  const {
+    config: { documents: cachedDocuments, verbose: cachedVerbose },
+  } = testPipelineData;
+
+  const testPipeline = async () => {
+    const { isValid, data } = await form.submit();
 
-  const executePipeline: FormConfig['onSubmit'] = async (formData, isValid) => {
     if (!isValid) {
       return;
     }
 
-    const { documents } = formData as TestConfig;
+    const { documents } = data as { documents: Document[] };
 
-    // Update context
-    setCurrentTestConfig({
-      ...testConfig,
-      documents,
-    });
+    await handleTestPipeline({ documents: documents!, verbose: cachedVerbose });
 
-    handleExecute(documents!, cachedVerbose);
+    // This is necessary to update the status and output of each processor
+    // as verbose may not be enabled
+    setPerProcessorOutput(documents, processors);
   };
 
   const { form } = useForm({
     schema: documentsSchema,
     defaultValue: {
       documents: cachedDocuments || '',
-      verbose: cachedVerbose || false,
     },
-    onSubmit: executePipeline,
   });
 
   return (
@@ -79,7 +88,7 @@ export const DocumentsTab: React.FunctionComponent<Props> = ({ handleExecute, is
                   {i18n.translate(
                     'xpack.ingestPipelines.testPipelineFlyout.documentsTab.simulateDocumentionLink',
                     {
-                      defaultMessage: 'Learn more',
+                      defaultMessage: 'Learn more.',
                     }
                   )}
                 </EuiLink>
@@ -95,6 +104,7 @@ export const DocumentsTab: React.FunctionComponent<Props> = ({ handleExecute, is
         form={form}
         data-test-subj="testPipelineForm"
         isInvalid={form.isSubmitted && !form.isValid}
+        onSubmit={testPipeline}
         error={form.getErrors()}
       >
         {/* Documents editor */}
@@ -118,12 +128,12 @@ export const DocumentsTab: React.FunctionComponent<Props> = ({ handleExecute, is
         <EuiSpacer size="m" />
 
         <EuiButton
-          onClick={form.submit}
+          onClick={testPipeline}
           size="s"
-          isLoading={isExecuting}
+          isLoading={isRunningTest}
           disabled={form.isSubmitted && !form.isValid}
         >
-          {isExecuting ? (
+          {isRunningTest ? (
             <FormattedMessage
               id="xpack.ingestPipelines.testPipelineFlyout.documentsTab.runningButtonLabel"
               defaultMessage="Running"
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/flyout_tabs/tab_output.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout_tabs/tab_output.tsx
similarity index 68%
rename from x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/flyout_tabs/tab_output.tsx
rename to x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout_tabs/tab_output.tsx
index 7abde03a2f605..586fc9e60017a 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/flyout_tabs/tab_output.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout_tabs/tab_output.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
+import React, { useState } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import {
   EuiCodeBlock,
@@ -17,39 +17,40 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 
-import { useTestConfigContext } from '../../../context';
+import { Document } from '../../../types';
+import { HandleTestPipelineArgs } from '../test_pipeline_flyout';
 
 interface Props {
-  executeOutput?: { docs: object[] };
-  handleExecute: (documents: object[], verbose: boolean) => void;
-  isExecuting: boolean;
+  handleTestPipeline: (data: HandleTestPipelineArgs) => void;
+  isRunningTest: boolean;
+  cachedVerbose?: boolean;
+  cachedDocuments: Document[];
+  testOutput?: any;
 }
 
 export const OutputTab: React.FunctionComponent<Props> = ({
-  executeOutput,
-  handleExecute,
-  isExecuting,
+  handleTestPipeline,
+  isRunningTest,
+  cachedVerbose,
+  cachedDocuments,
+  testOutput,
 }) => {
-  const { setCurrentTestConfig, testConfig } = useTestConfigContext();
-  const { verbose: cachedVerbose, documents: cachedDocuments } = testConfig;
+  const [isVerboseEnabled, setIsVerboseEnabled] = useState(Boolean(cachedVerbose));
 
-  const onEnableVerbose = (isVerboseEnabled: boolean) => {
-    setCurrentTestConfig({
-      ...testConfig,
-      verbose: isVerboseEnabled,
-    });
+  const onEnableVerbose = (isVerbose: boolean) => {
+    setIsVerboseEnabled(isVerbose);
 
-    handleExecute(cachedDocuments!, isVerboseEnabled);
+    handleTestPipeline({ documents: cachedDocuments!, verbose: isVerbose });
   };
 
   let content: React.ReactNode | undefined;
 
-  if (isExecuting) {
+  if (isRunningTest) {
     content = <EuiLoadingSpinner size="m" />;
-  } else if (executeOutput) {
+  } else if (testOutput) {
     content = (
       <EuiCodeBlock language="json" isCopyable>
-        {JSON.stringify(executeOutput, null, 2)}
+        {JSON.stringify(testOutput, null, 2)}
       </EuiCodeBlock>
     );
   }
@@ -76,14 +77,16 @@ export const OutputTab: React.FunctionComponent<Props> = ({
                 defaultMessage="View verbose output"
               />
             }
-            checked={cachedVerbose}
+            checked={isVerboseEnabled}
             onChange={(e) => onEnableVerbose(e.target.checked)}
           />
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
           <EuiButton
             size="s"
-            onClick={() => handleExecute(cachedDocuments!, cachedVerbose)}
+            onClick={() =>
+              handleTestPipeline({ documents: cachedDocuments!, verbose: isVerboseEnabled })
+            }
             iconType="refresh"
           >
             <FormattedMessage
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/flyout_tabs/pipeline_test_tabs.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout_tabs/test_pipeline_tabs.tsx
similarity index 77%
rename from x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/flyout_tabs/pipeline_test_tabs.tsx
rename to x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout_tabs/test_pipeline_tabs.tsx
index 4d378db169574..d0ea226e8db80 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/flyout_tabs/pipeline_test_tabs.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout_tabs/test_pipeline_tabs.tsx
@@ -8,12 +8,12 @@ import React from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiTab, EuiTabs } from '@elastic/eui';
 
-export type Tab = 'documents' | 'output';
+export type TestPipelineFlyoutTab = 'documents' | 'output';
 
 interface Props {
-  onTabChange: (tab: Tab) => void;
-  selectedTab: Tab;
-  getIsDisabled: (tab: Tab) => boolean;
+  onTabChange: (tab: TestPipelineFlyoutTab) => void;
+  selectedTab: TestPipelineFlyoutTab;
+  getIsDisabled: (tab: TestPipelineFlyoutTab) => boolean;
 }
 
 export const Tabs: React.FunctionComponent<Props> = ({
@@ -22,15 +22,15 @@ export const Tabs: React.FunctionComponent<Props> = ({
   getIsDisabled,
 }) => {
   const tabs: Array<{
-    id: Tab;
+    id: TestPipelineFlyoutTab;
     name: React.ReactNode;
   }> = [
     {
       id: 'documents',
       name: (
         <FormattedMessage
-          id="xpack.ingestPipelines.tabs.documentsTabTitle"
-          defaultMessage="Documents"
+          id="xpack.ingestPipelines.tabs.configurationTabTitle"
+          defaultMessage="Configuration"
         />
       ),
     },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/context/context.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/context/context.tsx
index a1ea0fd9d0b9e..1023385ccc299 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/context/context.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/context/context.tsx
@@ -10,7 +10,7 @@ import {
   PipelineProcessorsContextProvider,
   Props as ProcessorsContextProps,
 } from './processors_context';
-import { TestConfigContextProvider } from './test_config_context';
+import { TestPipelineContextProvider } from './test_pipeline_context';
 
 interface Props extends ProcessorsContextProps {
   children: React.ReactNode;
@@ -23,7 +23,7 @@ export const ProcessorsEditorContextProvider: FunctionComponent<Props> = ({
   onFlyoutOpen,
 }: Props) => {
   return (
-    <TestConfigContextProvider>
+    <TestPipelineContextProvider>
       <PipelineProcessorsContextProvider
         onFlyoutOpen={onFlyoutOpen}
         onUpdate={onUpdate}
@@ -31,6 +31,6 @@ export const ProcessorsEditorContextProvider: FunctionComponent<Props> = ({
       >
         {children}
       </PipelineProcessorsContextProvider>
-    </TestConfigContextProvider>
+    </TestPipelineContextProvider>
   );
 };
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/context/index.ts b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/context/index.ts
index 1664b3410c1c0..5b152f074f9cd 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/context/index.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/context/index.ts
@@ -6,7 +6,12 @@
 
 export { ProcessorsEditorContextProvider } from './context';
 
-export { TestConfigContextProvider, useTestConfigContext, TestConfig } from './test_config_context';
+export {
+  TestPipelineContextProvider,
+  useTestPipelineContext,
+  TestPipelineData,
+  TestPipelineContext,
+} from './test_pipeline_context';
 
 export {
   PipelineProcessorsContextProvider,
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/context/processors_context.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/context/processors_context.tsx
index f83803da7bf91..8c59d484acd08 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/context/processors_context.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/context/processors_context.tsx
@@ -44,6 +44,8 @@ import {
 
 import { getValue } from '../utils';
 
+import { useTestPipelineContext } from './test_pipeline_context';
+
 const PipelineProcessorsContext = createContext<ContextValue>({} as any);
 
 export interface Props {
@@ -79,6 +81,12 @@ export const PipelineProcessorsContextProvider: FunctionComponent<Props> = ({
   );
   const [processorsState, processorsDispatch] = useProcessorsState(deserializedResult);
 
+  const { updateTestOutputPerProcessor, testPipelineData } = useTestPipelineContext();
+
+  const {
+    config: { documents },
+  } = testPipelineData;
+
   useEffect(() => {
     if (initRef.current) {
       processorsDispatch({
@@ -120,8 +128,10 @@ export const PipelineProcessorsContextProvider: FunctionComponent<Props> = ({
       },
       getData: () =>
         serialize({
-          onFailure: onFailureProcessors,
-          processors,
+          pipeline: {
+            onFailure: onFailureProcessors,
+            processors,
+          },
         }),
     });
   }, [processors, onFailureProcessors, onUpdate, formState, mode]);
@@ -183,7 +193,7 @@ export const PipelineProcessorsContextProvider: FunctionComponent<Props> = ({
           break;
       }
     },
-    [processorsDispatch, setMode]
+    [processorsDispatch]
   );
 
   // Memoize the state object to ensure we do not trigger unnecessary re-renders and so
@@ -198,6 +208,12 @@ export const PipelineProcessorsContextProvider: FunctionComponent<Props> = ({
     };
   }, [mode, setMode, processorsState, processorsDispatch]);
 
+  // Update the test output whenever the processorsState changes (e.g., on move, update, delete)
+  // Note: updateTestOutputPerProcessor() will only simulate if the user has added sample documents
+  useEffect(() => {
+    updateTestOutputPerProcessor(documents, processorsState);
+  }, [documents, processorsState, updateTestOutputPerProcessor]);
+
   return (
     <PipelineProcessorsContext.Provider
       value={{
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/context/test_config_context.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/context/test_config_context.tsx
deleted file mode 100644
index 6840ebef28796..0000000000000
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/context/test_config_context.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { useState, useCallback, useContext } from 'react';
-
-export interface TestConfig {
-  documents?: object[] | undefined;
-  verbose: boolean;
-}
-
-interface TestConfigContext {
-  testConfig: TestConfig;
-  setCurrentTestConfig: (config: TestConfig) => void;
-}
-
-const TEST_CONFIG_DEFAULT_VALUE = {
-  testConfig: {
-    verbose: false,
-  },
-  setCurrentTestConfig: () => {},
-};
-
-const TestConfigContext = React.createContext<TestConfigContext>(TEST_CONFIG_DEFAULT_VALUE);
-
-export const useTestConfigContext = () => {
-  const ctx = useContext(TestConfigContext);
-  if (!ctx) {
-    throw new Error(
-      '"useTestConfigContext" can only be called inside of TestConfigContext.Provider!'
-    );
-  }
-  return ctx;
-};
-
-export const TestConfigContextProvider = ({ children }: { children: React.ReactNode }) => {
-  const [testConfig, setTestConfig] = useState<TestConfig>({
-    verbose: false,
-  });
-
-  const setCurrentTestConfig = useCallback((currentTestConfig: TestConfig): void => {
-    setTestConfig(currentTestConfig);
-  }, []);
-
-  return (
-    <TestConfigContext.Provider
-      value={{
-        testConfig,
-        setCurrentTestConfig,
-      }}
-    >
-      {children}
-    </TestConfigContext.Provider>
-  );
-};
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/context/test_pipeline_context.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/context/test_pipeline_context.tsx
new file mode 100644
index 0000000000000..f764f403de79b
--- /dev/null
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/context/test_pipeline_context.tsx
@@ -0,0 +1,189 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useCallback, useContext, useReducer, Reducer } from 'react';
+import { useKibana } from '../../../../shared_imports';
+import {
+  DeserializedProcessorResult,
+  deserializeVerboseTestOutput,
+  DeserializeResult,
+} from '../deserialize';
+import { serialize } from '../serialize';
+import { Document } from '../types';
+
+export interface TestPipelineData {
+  config: {
+    documents?: Document[];
+    verbose?: boolean;
+    selectedDocumentIndex: number;
+  };
+  testOutputPerProcessor?: DeserializedProcessorResult[];
+  isExecutingPipeline?: boolean;
+}
+
+type Action =
+  | {
+      type: 'updateOutputPerProcessor';
+      payload: {
+        testOutputPerProcessor?: DeserializedProcessorResult[];
+        isExecutingPipeline: boolean;
+      };
+    }
+  | {
+      type: 'updateConfig';
+      payload: {
+        config: {
+          documents: Document[];
+          verbose?: boolean;
+        };
+      };
+    }
+  | {
+      type: 'updateActiveDocument';
+      payload: Pick<TestPipelineData, 'config'>;
+    }
+  | {
+      type: 'updateIsExecutingPipeline';
+      payload: Pick<TestPipelineData, 'isExecutingPipeline'>;
+    };
+
+export interface TestPipelineContext {
+  testPipelineData: TestPipelineData;
+  setCurrentTestPipelineData: (data: Action) => void;
+  updateTestOutputPerProcessor: (
+    documents: Document[] | undefined,
+    processors: DeserializeResult
+  ) => void;
+}
+
+const DEFAULT_TEST_PIPELINE_CONTEXT = {
+  testPipelineData: {
+    config: {
+      selectedDocumentIndex: 0,
+    },
+    isExecutingPipeline: false,
+  },
+  setCurrentTestPipelineData: () => {},
+  updateTestOutputPerProcessor: () => {},
+};
+
+const TestPipelineContext = React.createContext<TestPipelineContext>(DEFAULT_TEST_PIPELINE_CONTEXT);
+
+export const useTestPipelineContext = () => {
+  const ctx = useContext(TestPipelineContext);
+  if (!ctx) {
+    throw new Error(
+      '"useTestPipelineContext" can only be called inside of TestPipelineContextProvider.Provider!'
+    );
+  }
+  return ctx;
+};
+
+export const reducer: Reducer<TestPipelineData, Action> = (state, action) => {
+  if (action.type === 'updateOutputPerProcessor') {
+    return {
+      ...state,
+      testOutputPerProcessor: action.payload.testOutputPerProcessor,
+      isExecutingPipeline: false,
+    };
+  }
+
+  if (action.type === 'updateConfig') {
+    return {
+      ...action.payload,
+      config: {
+        ...action.payload.config,
+        selectedDocumentIndex: state.config.selectedDocumentIndex,
+      },
+      testOutputPerProcessor: state.testOutputPerProcessor,
+    };
+  }
+
+  if (action.type === 'updateActiveDocument') {
+    return {
+      ...state,
+      config: {
+        ...state.config,
+        selectedDocumentIndex: action.payload.config.selectedDocumentIndex,
+      },
+    };
+  }
+
+  if (action.type === 'updateIsExecutingPipeline') {
+    return {
+      ...state,
+      isExecutingPipeline: action.payload.isExecutingPipeline,
+    };
+  }
+
+  return state;
+};
+
+export const TestPipelineContextProvider = ({ children }: { children: React.ReactNode }) => {
+  const [state, dispatch] = useReducer(reducer, DEFAULT_TEST_PIPELINE_CONTEXT.testPipelineData);
+  const { services } = useKibana();
+
+  const updateTestOutputPerProcessor = useCallback(
+    async (documents: Document[] | undefined, processors: DeserializeResult) => {
+      if (!documents) {
+        return;
+      }
+
+      dispatch({
+        type: 'updateIsExecutingPipeline',
+        payload: {
+          isExecutingPipeline: true,
+        },
+      });
+
+      const serializedProcessorsWithTag = serialize({
+        pipeline: { processors: processors.processors, onFailure: processors.onFailure },
+        copyIdToTag: true,
+      });
+
+      const { data: verboseResults, error } = await services.api.simulatePipeline({
+        documents,
+        verbose: true,
+        pipeline: { ...serializedProcessorsWithTag },
+      });
+
+      if (error) {
+        dispatch({
+          type: 'updateOutputPerProcessor',
+          payload: {
+            isExecutingPipeline: false,
+            // reset the output if there is an error
+            // this will result to the status changing to "inactive"
+            testOutputPerProcessor: undefined,
+          },
+        });
+
+        return;
+      }
+
+      dispatch({
+        type: 'updateOutputPerProcessor',
+        payload: {
+          testOutputPerProcessor: deserializeVerboseTestOutput(verboseResults),
+          isExecutingPipeline: false,
+        },
+      });
+    },
+    [services.api]
+  );
+
+  return (
+    <TestPipelineContext.Provider
+      value={{
+        testPipelineData: state,
+        setCurrentTestPipelineData: dispatch,
+        updateTestOutputPerProcessor,
+      }}
+    >
+      {children}
+    </TestPipelineContext.Provider>
+  );
+};
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/deserialize.ts b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/deserialize.ts
index 1e9a97e189a5e..01788c49ec2f1 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/deserialize.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/deserialize.ts
@@ -5,7 +5,7 @@
  */
 import uuid from 'uuid';
 import { Processor } from '../../../../common/types';
-import { ProcessorInternal } from './types';
+import { ProcessorInternal, VerboseTestOutput, ProcessorResult } from './types';
 
 export interface DeserializeArgs {
   processors: Processor[];
@@ -58,3 +58,48 @@ export const deserialize = ({ processors, onFailure }: DeserializeArgs): Deseria
     onFailure: onFailure ? convertProcessors(onFailure) : undefined,
   };
 };
+
+export interface DeserializedProcessorResult {
+  [key: string]: ProcessorResult;
+}
+/**
+ * This function takes the verbose response of the simulate API
+ * and maps the results to each processor in the pipeline by the "tag" field
+ */
+export const deserializeVerboseTestOutput = (
+  output: VerboseTestOutput
+): DeserializedProcessorResult[] => {
+  const { docs } = output;
+
+  const deserializedOutput = docs.map((doc) => {
+    return doc.processor_results.reduce(
+      (
+        processorResultsById: DeserializedProcessorResult,
+        currentResult: ProcessorResult,
+        index: number
+      ) => {
+        const result = { ...currentResult };
+        const resultId = result.tag;
+
+        if (index !== 0) {
+          // Add the result from the previous processor so that the user
+          // can easily compare current output to the previous output
+          // This may be a result from an on_failure processor
+          result.prevProcessorResult = doc.processor_results[index - 1];
+        }
+
+        // The tag is added programatically as a way to map
+        // the results to each processor
+        // It is not something we need to surface to the user, so we delete it
+        delete result.tag;
+
+        processorResultsById[resultId] = result;
+
+        return processorResultsById;
+      },
+      {}
+    );
+  });
+
+  return deserializedOutput;
+};
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/index.ts b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/index.ts
index d2342bbd2ab1a..71b2e2fa8f7f1 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/index.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/index.ts
@@ -14,4 +14,9 @@ export { OnUpdateHandlerArg, OnUpdateHandler } from './types';
 
 export { SerializeResult } from './serialize';
 
-export { LoadFromJsonButton, OnDoneLoadJsonHandler, TestPipelineButton } from './components';
+export {
+  LoadFromJsonButton,
+  OnDoneLoadJsonHandler,
+  TestPipelineActions,
+  DocumentsDropdown,
+} from './components';
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/serialize.ts b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/serialize.ts
index 153c9e252ccc0..edf787f12620c 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/serialize.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/serialize.ts
@@ -5,18 +5,32 @@
  */
 import { Processor } from '../../../../common/types';
 
-import { DeserializeResult } from './deserialize';
 import { ProcessorInternal } from './types';
 
-type SerializeArgs = DeserializeResult;
+interface SerializeArgs {
+  /**
+   * The deserialized pipeline to convert
+   */
+  pipeline: {
+    processors: ProcessorInternal[];
+    onFailure?: ProcessorInternal[];
+  };
+  /**
+   * For simulation, we add the "tag" field equal to the internal processor id so that we can map the simulate results to each processor
+   */
+  copyIdToTag?: boolean;
+}
 
 export interface SerializeResult {
   processors: Processor[];
   on_failure?: Processor[];
 }
 
-const convertProcessorInternalToProcessor = (processor: ProcessorInternal): Processor => {
-  const { options, onFailure, type } = processor;
+const convertProcessorInternalToProcessor = (
+  processor: ProcessorInternal,
+  copyIdToTag?: boolean
+): Processor => {
+  const { options, onFailure, type, id } = processor;
   const outProcessor = {
     [type]: {
       ...options,
@@ -24,26 +38,32 @@ const convertProcessorInternalToProcessor = (processor: ProcessorInternal): Proc
   };
 
   if (onFailure?.length) {
-    outProcessor[type].on_failure = convertProcessors(onFailure);
-  } else if (onFailure) {
-    outProcessor[type].on_failure = [];
+    outProcessor[type].on_failure = convertProcessors(onFailure, copyIdToTag);
+  }
+
+  if (copyIdToTag) {
+    outProcessor[type].tag = id;
   }
 
   return outProcessor;
 };
 
-const convertProcessors = (processors: ProcessorInternal[]) => {
+const convertProcessors = (processors: ProcessorInternal[], copyIdToTag?: boolean) => {
   const convertedProcessors = [];
 
   for (const processor of processors) {
-    convertedProcessors.push(convertProcessorInternalToProcessor(processor));
+    convertedProcessors.push(convertProcessorInternalToProcessor(processor, copyIdToTag));
   }
+
   return convertedProcessors;
 };
 
-export const serialize = ({ processors, onFailure }: SerializeArgs): SerializeResult => {
+export const serialize = ({
+  pipeline: { processors, onFailure },
+  copyIdToTag = false,
+}: SerializeArgs): SerializeResult => {
   return {
-    processors: convertProcessors(processors),
-    on_failure: onFailure?.length ? convertProcessors(onFailure) : undefined,
+    processors: convertProcessors(processors, copyIdToTag),
+    on_failure: onFailure?.length ? convertProcessors(onFailure, copyIdToTag) : undefined,
   };
 };
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/types.ts b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/types.ts
index 67920ffafb71a..9083985b0ff2e 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/types.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/types.ts
@@ -73,3 +73,35 @@ export interface ContextValue {
   onTreeAction: OnActionHandler;
   state: ContextValueState;
 }
+
+export interface Document {
+  _id: string;
+  [key: string]: any;
+}
+
+export type ProcessorStatus =
+  | 'success'
+  | 'error'
+  | 'error_ignored'
+  | 'dropped'
+  | 'skipped'
+  | 'inactive';
+
+export interface ProcessorResult {
+  processor_type: string;
+  status: ProcessorStatus;
+  doc: Document;
+  tag: string;
+  ignored_error?: any;
+  error?: any;
+  prevProcessorResult?: ProcessorResult;
+  [key: string]: any;
+}
+
+export interface ProcessorResults {
+  processor_results: ProcessorResult[];
+}
+
+export interface VerboseTestOutput {
+  docs: ProcessorResults[];
+}
diff --git a/x-pack/plugins/ingest_pipelines/public/application/services/api.ts b/x-pack/plugins/ingest_pipelines/public/application/services/api.ts
index 0ca1bc328987f..552e0ed0c41b2 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/services/api.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/services/api.ts
@@ -105,7 +105,7 @@ export class ApiService {
     return result;
   }
 
-  public async simulatePipeline(testConfig: {
+  public async simulatePipeline(reqBody: {
     documents: object[];
     verbose?: boolean;
     pipeline: Pick<Pipeline, 'processors' | 'on_failure'>;
@@ -113,7 +113,7 @@ export class ApiService {
     const result = await this.sendRequest({
       path: `${API_BASE_PATH}/simulate`,
       method: 'post',
-      body: JSON.stringify(testConfig),
+      body: JSON.stringify(reqBody),
     });
 
     this.trackUiMetric(UIM_PIPELINE_SIMULATE);
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index db77dfa150f03..0fd9e437a5c3d 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -9817,7 +9817,6 @@
     "xpack.ingestPipelines.requestFlyout.unnamedTitle": "リクエスト",
     "xpack.ingestPipelines.settingsFormOnFailureFlyout.addButtonLabel": "追加",
     "xpack.ingestPipelines.settingsFormOnFailureFlyout.cancelButtonLabel": "キャンセル",
-    "xpack.ingestPipelines.tabs.documentsTabTitle": "ドキュメント",
     "xpack.ingestPipelines.tabs.outputTabTitle": "アウトプット",
     "xpack.ingestPipelines.testPipelineFlyout.documentsForm.documentsFieldLabel": "ドキュメント",
     "xpack.ingestPipelines.testPipelineFlyout.documentsForm.documentsJsonError": "ドキュメントJSONが無効です。",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index c8b8fbeaa723e..02e6da8c3f812 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -9820,7 +9820,6 @@
     "xpack.ingestPipelines.requestFlyout.unnamedTitle": "请求",
     "xpack.ingestPipelines.settingsFormOnFailureFlyout.addButtonLabel": "添加",
     "xpack.ingestPipelines.settingsFormOnFailureFlyout.cancelButtonLabel": "取消",
-    "xpack.ingestPipelines.tabs.documentsTabTitle": "文档",
     "xpack.ingestPipelines.tabs.outputTabTitle": "输出",
     "xpack.ingestPipelines.testPipelineFlyout.documentsForm.documentsFieldLabel": "文档",
     "xpack.ingestPipelines.testPipelineFlyout.documentsForm.documentsJsonError": "文档 JSON 无效。",

From afd90b04df4e9cc640d4060ee03bfd7169a03832 Mon Sep 17 00:00:00 2001
From: Davis Plumlee <56367316+dplumlee@users.noreply.github.com>
Date: Thu, 20 Aug 2020 12:00:41 -0400
Subject: [PATCH 67/85] Fixes viewer overflow bug (#75489)

---
 .../viewer/exception_item/exception_entries.tsx   | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_entries.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_entries.tsx
index bcc4adf54c9d7..f441baaec7d80 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_entries.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_entries.tsx
@@ -13,6 +13,7 @@ import {
   EuiTableFieldDataColumnType,
   EuiHideFor,
   EuiBadge,
+  EuiBadgeGroup,
 } from '@elastic/eui';
 import React, { useMemo } from 'react';
 import styled, { css } from 'styled-components';
@@ -60,6 +61,10 @@ const MyNestedValue = styled.span`
   margin-left: ${({ theme }) => theme.eui.euiSizeS};
 `;
 
+const ValueBadgeGroup = styled(EuiBadgeGroup)`
+  width: 100%;
+`;
+
 interface ExceptionEntriesComponentProps {
   entries: FormattedEntry[];
   disableDelete: boolean;
@@ -115,15 +120,11 @@ const ExceptionEntriesComponent = ({
         render: (values: string | string[] | null) => {
           if (Array.isArray(values)) {
             return (
-              <EuiFlexGroup gutterSize="xs" direction="row" justifyContent="flexStart">
+              <ValueBadgeGroup gutterSize="xs">
                 {values.map((value) => {
-                  return (
-                    <EuiFlexItem key={value} grow={false}>
-                      <EuiBadge color="#DDD">{value}</EuiBadge>
-                    </EuiFlexItem>
-                  );
+                  return <EuiBadge color="#DDD">{value}</EuiBadge>;
                 })}
-              </EuiFlexGroup>
+              </ValueBadgeGroup>
             );
           } else {
             return values ?? getEmptyValue();

From 94beed1b79e75c89813c30cae80053055699ee45 Mon Sep 17 00:00:00 2001
From: Luke Elmers <luke.elmers@elastic.co>
Date: Thu, 20 Aug 2020 10:08:31 -0600
Subject: [PATCH 68/85] [expressions] Remove legacy APIs. (#75517)

---
 .../new_platform/new_platform.karma_mock.js   |  11 --
 src/plugins/expressions/kibana.json           |   3 -
 src/plugins/expressions/public/loader.test.ts |   9 +-
 src/plugins/expressions/public/mocks.tsx      |  27 +---
 src/plugins/expressions/public/plugin.ts      | 123 ++--------------
 src/plugins/expressions/public/services.ts    |  13 +-
 src/plugins/expressions/server/index.ts       |   2 +-
 src/plugins/expressions/server/legacy.ts      | 134 ------------------
 src/plugins/expressions/server/mocks.ts       |  14 +-
 src/plugins/expressions/server/plugin.ts      |  54 ++-----
 .../core/create_kibana_utils_core.test.ts     |  39 -----
 .../public/core/create_kibana_utils_core.ts   |  39 -----
 src/plugins/kibana_utils/public/core/index.ts |   1 -
 .../public/core/saved_objects_client.ts       |  35 -----
 src/plugins/kibana_utils/public/core/state.ts |  23 ---
 .../public/services/stubs/expressions.ts      |   4 +-
 16 files changed, 27 insertions(+), 504 deletions(-)
 delete mode 100644 src/plugins/expressions/server/legacy.ts
 delete mode 100644 src/plugins/kibana_utils/public/core/create_kibana_utils_core.test.ts
 delete mode 100644 src/plugins/kibana_utils/public/core/create_kibana_utils_core.ts
 delete mode 100644 src/plugins/kibana_utils/public/core/saved_objects_client.ts
 delete mode 100644 src/plugins/kibana_utils/public/core/state.ts

diff --git a/src/legacy/ui/public/new_platform/new_platform.karma_mock.js b/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
index 5ef1149146afe..b8d48b784dba7 100644
--- a/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
+++ b/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
@@ -221,17 +221,6 @@ export const npSetup = {
       registerFunction: sinon.fake(),
       registerRenderer: sinon.fake(),
       registerType: sinon.fake(),
-      __LEGACY: {
-        renderers: {
-          register: () => undefined,
-          get: () => null,
-        },
-        getExecutor: () => ({
-          interpreter: {
-            interpretAst: () => {},
-          },
-        }),
-      },
     },
     data: {
       autocomplete: {
diff --git a/src/plugins/expressions/kibana.json b/src/plugins/expressions/kibana.json
index 5163331088103..67bbf4b6e5454 100644
--- a/src/plugins/expressions/kibana.json
+++ b/src/plugins/expressions/kibana.json
@@ -3,9 +3,6 @@
   "version": "kibana",
   "server": true,
   "ui": true,
-  "requiredPlugins": [
-    "bfetch"
-  ],
   "extraPublicDirs": ["common", "common/fonts"],
   "requiredBundles": [
     "kibanaUtils",
diff --git a/src/plugins/expressions/public/loader.test.ts b/src/plugins/expressions/public/loader.test.ts
index e07a22a5e1d60..bf8b442769563 100644
--- a/src/plugins/expressions/public/loader.test.ts
+++ b/src/plugins/expressions/public/loader.test.ts
@@ -20,7 +20,7 @@
 import { first, skip, toArray } from 'rxjs/operators';
 import { loader, ExpressionLoader } from './loader';
 import { Observable } from 'rxjs';
-import { ExpressionAstExpression, parseExpression, IInterpreterRenderHandlers } from '../common';
+import { parseExpression, IInterpreterRenderHandlers } from '../common';
 
 // eslint-disable-next-line
 const { __getLastExecution } = require('./services');
@@ -42,13 +42,6 @@ jest.mock('./services', () => {
   const moduleMock = {
     __execution: undefined,
     __getLastExecution: () => moduleMock.__execution,
-    getInterpreter: () => {
-      return {
-        interpretAst: async (expression: ExpressionAstExpression) => {
-          return { type: 'render', as: 'test' };
-        },
-      };
-    },
     getRenderersRegistry: () => ({
       get: (id: string) => renderers[id],
     }),
diff --git a/src/plugins/expressions/public/mocks.tsx b/src/plugins/expressions/public/mocks.tsx
index 6e649c29ead7d..3865b4d20620a 100644
--- a/src/plugins/expressions/public/mocks.tsx
+++ b/src/plugins/expressions/public/mocks.tsx
@@ -21,7 +21,6 @@ import React from 'react';
 import { ExpressionsSetup, ExpressionsStart, plugin as pluginInitializer } from '.';
 
 import { coreMock } from '../../../core/public/mocks';
-import { bfetchPluginMock } from '../../bfetch/public/mocks';
 
 export type Setup = jest.Mocked<ExpressionsSetup>;
 export type Start = jest.Mocked<ExpressionsStart>;
@@ -39,23 +38,6 @@ const createSetupContract = (): Setup => {
     registerRenderer: jest.fn(),
     registerType: jest.fn(),
     run: jest.fn(),
-    __LEGACY: {
-      functions: {
-        register: () => {},
-      } as any,
-      renderers: {
-        register: () => {},
-      } as any,
-      types: {
-        register: () => {},
-      } as any,
-      getExecutor: () => ({
-        interpreter: {
-          interpretAst: (() => {}) as any,
-        },
-      }),
-      loadLegacyServerFunctionWrappers: () => Promise.resolve(),
-    },
   };
   return setupContract;
 };
@@ -84,9 +66,7 @@ const createPlugin = async () => {
   const coreSetup = coreMock.createSetup();
   const coreStart = coreMock.createStart();
   const plugin = pluginInitializer(pluginInitializerContext);
-  const setup = await plugin.setup(coreSetup, {
-    bfetch: bfetchPluginMock.createSetupContract(),
-  });
+  const setup = await plugin.setup(coreSetup);
 
   return {
     pluginInitializerContext,
@@ -94,10 +74,7 @@ const createPlugin = async () => {
     coreStart,
     plugin,
     setup,
-    doStart: async () =>
-      await plugin.start(coreStart, {
-        bfetch: bfetchPluginMock.createStartContract(),
-      }),
+    doStart: async () => await plugin.start(coreStart),
   };
 };
 
diff --git a/src/plugins/expressions/public/plugin.ts b/src/plugins/expressions/public/plugin.ts
index ec60fbdf44c3a..9768ece899dd4 100644
--- a/src/plugins/expressions/public/plugin.ts
+++ b/src/plugins/expressions/public/plugin.ts
@@ -17,75 +17,19 @@
  * under the License.
  */
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { ExpressionExecutor } from './types';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'src/core/public';
 import {
-  ExpressionRendererRegistry,
-  FunctionsRegistry,
-  serializeProvider,
-  TypesRegistry,
   ExpressionsService,
   ExpressionsServiceSetup,
   ExpressionsServiceStart,
   ExecutionContext,
 } from '../common';
-import { BfetchPublicSetup, BfetchPublicStart } from '../../bfetch/public';
-import {
-  setCoreStart,
-  setInterpreter,
-  setRenderersRegistry,
-  setNotifications,
-  setExpressionsService,
-} from './services';
+import { setRenderersRegistry, setNotifications, setExpressionsService } from './services';
 import { ReactExpressionRenderer } from './react_expression_renderer';
 import { ExpressionLoader, loader } from './loader';
 import { render, ExpressionRenderHandler } from './render';
 
-export interface ExpressionsSetupDeps {
-  bfetch: BfetchPublicSetup;
-}
-
-export interface ExpressionsStartDeps {
-  bfetch: BfetchPublicStart;
-}
-
-export interface ExpressionsSetup extends ExpressionsServiceSetup {
-  /**
-   * @todo Get rid of these `__LEGACY` APIs.
-   *
-   * `__LEGACY` APIs are used by Canvas. It should be possible to stop
-   * using all of them (except `loadLegacyServerFunctionWrappers`) and use
-   * Kibana Platform plugin contracts instead.
-   */
-  __LEGACY: {
-    /**
-     * Use `registerType` and `getTypes` instead.
-     */
-    types: TypesRegistry;
-
-    /**
-     * Use `registerFunction` and `getFunctions` instead.
-     */
-    functions: FunctionsRegistry;
-
-    /**
-     * Use `registerRenderer` and `getRenderers`, and `getRenderer` instead.
-     */
-    renderers: ExpressionRendererRegistry;
-
-    /**
-     * Use `run` function instead.
-     */
-    getExecutor: () => ExpressionExecutor;
-
-    /**
-     * This function is used by Canvas to load server-side function and create
-     * browser-side "wrapper" for each one. This function can be removed once
-     * we enable expressions on server-side: https://github.com/elastic/kibana/issues/46906
-     */
-    loadLegacyServerFunctionWrappers: () => Promise<void>;
-  };
-}
+export type ExpressionsSetup = ExpressionsServiceSetup;
 
 export interface ExpressionsStart extends ExpressionsServiceStart {
   ExpressionLoader: typeof ExpressionLoader;
@@ -95,9 +39,7 @@ export interface ExpressionsStart extends ExpressionsServiceStart {
   render: typeof render;
 }
 
-export class ExpressionsPublicPlugin
-  implements
-    Plugin<ExpressionsSetup, ExpressionsStart, ExpressionsSetupDeps, ExpressionsStartDeps> {
+export class ExpressionsPublicPlugin implements Plugin<ExpressionsSetup, ExpressionsStart> {
   private readonly expressions: ExpressionsService = new ExpressionsService();
 
   constructor(initializerContext: PluginInitializerContext) {}
@@ -116,68 +58,21 @@ export class ExpressionsPublicPlugin
     });
   }
 
-  public setup(core: CoreSetup, { bfetch }: ExpressionsSetupDeps): ExpressionsSetup {
+  public setup(core: CoreSetup): ExpressionsSetup {
     this.configureExecutor(core);
 
     const { expressions } = this;
-    const { executor, renderers } = expressions;
+    const { renderers } = expressions;
 
     setRenderersRegistry(renderers);
-    setExpressionsService(this.expressions);
+    setExpressionsService(expressions);
 
-    const expressionsSetup = expressions.setup();
-
-    // This is legacy. Should go away when we get rid of __LEGACY.
-    const getExecutor = (): ExpressionExecutor => {
-      return { interpreter: { interpretAst: expressionsSetup.run } };
-    };
-
-    setInterpreter(getExecutor().interpreter);
-
-    let cached: Promise<void> | null = null;
-    const loadLegacyServerFunctionWrappers = async () => {
-      if (!cached) {
-        cached = (async () => {
-          const serverFunctionList = await core.http.get(`/api/interpreter/fns`);
-          const batchedFunction = bfetch.batchedFunction({ url: `/api/interpreter/fns` });
-          const { serialize } = serializeProvider(executor.getTypes());
-
-          // For every sever-side function, register a client-side
-          // function that matches its definition, but which simply
-          // calls the server-side function endpoint.
-          Object.keys(serverFunctionList).forEach((functionName) => {
-            if (expressionsSetup.getFunction(functionName)) {
-              return;
-            }
-            const fn = () => ({
-              ...serverFunctionList[functionName],
-              fn: (input: any, args: any) => {
-                return batchedFunction({ functionName, args, context: serialize(input) });
-              },
-            });
-            expressionsSetup.registerFunction(fn);
-          });
-        })();
-      }
-      return cached;
-    };
-
-    const setup: ExpressionsSetup = {
-      ...expressionsSetup,
-      __LEGACY: {
-        types: executor.types,
-        functions: executor.functions,
-        renderers,
-        getExecutor,
-        loadLegacyServerFunctionWrappers,
-      },
-    };
+    const setup = expressions.setup();
 
     return Object.freeze(setup);
   }
 
-  public start(core: CoreStart, { bfetch }: ExpressionsStartDeps): ExpressionsStart {
-    setCoreStart(core);
+  public start(core: CoreStart): ExpressionsStart {
     setNotifications(core.notifications);
 
     const { expressions } = this;
diff --git a/src/plugins/expressions/public/services.ts b/src/plugins/expressions/public/services.ts
index 016456c956666..e296566e661cd 100644
--- a/src/plugins/expressions/public/services.ts
+++ b/src/plugins/expressions/public/services.ts
@@ -18,22 +18,15 @@
  */
 
 import { NotificationsStart } from 'kibana/public';
-import { createKibanaUtilsCore, createGetterSetter } from '../../kibana_utils/public';
-import { ExpressionInterpreter } from './types';
-import { ExpressionsSetup } from './plugin';
-import { ExpressionsService } from '../common';
+import { createGetterSetter } from '../../kibana_utils/public';
+import { ExpressionsService, ExpressionRendererRegistry } from '../common';
 
-export const { getCoreStart, setCoreStart } = createKibanaUtilsCore();
-
-export const [getInterpreter, setInterpreter] = createGetterSetter<ExpressionInterpreter>(
-  'Interpreter'
-);
 export const [getNotifications, setNotifications] = createGetterSetter<NotificationsStart>(
   'Notifications'
 );
 
 export const [getRenderersRegistry, setRenderersRegistry] = createGetterSetter<
-  ExpressionsSetup['__LEGACY']['renderers']
+  ExpressionRendererRegistry
 >('Renderers registry');
 
 export const [getExpressionsService, setExpressionsService] = createGetterSetter<
diff --git a/src/plugins/expressions/server/index.ts b/src/plugins/expressions/server/index.ts
index 9b2f0b794258b..6785457321595 100644
--- a/src/plugins/expressions/server/index.ts
+++ b/src/plugins/expressions/server/index.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { PluginInitializerContext } from '../../../core/server';
+import { PluginInitializerContext } from 'src/core/server';
 import { ExpressionsServerPlugin } from './plugin';
 
 export { ExpressionsServerSetup, ExpressionsServerStart } from './plugin';
diff --git a/src/plugins/expressions/server/legacy.ts b/src/plugins/expressions/server/legacy.ts
deleted file mode 100644
index 8ff08542f18f8..0000000000000
--- a/src/plugins/expressions/server/legacy.ts
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/* eslint-disable max-classes-per-file */
-
-// TODO: Remove this file once https://github.com/elastic/kibana/issues/46906 is complete.
-
-// @ts-ignore
-import { register, registryFactory, Registry, Fn } from '@kbn/interpreter/common';
-
-import Boom from 'boom';
-import { schema } from '@kbn/config-schema';
-import { CoreSetup, Logger, LegacyAPICaller } from 'src/core/server';
-import { ExpressionsServerSetupDependencies } from './plugin';
-import { typeSpecs, ExpressionType } from '../common';
-import { serializeProvider } from '../common';
-
-export class TypesRegistry extends Registry<any, any> {
-  wrapper(obj: any) {
-    return new (ExpressionType as any)(obj);
-  }
-}
-
-export class FunctionsRegistry extends Registry<any, any> {
-  wrapper(obj: any) {
-    return new Fn(obj);
-  }
-}
-
-export const registries = {
-  types: new TypesRegistry(),
-  serverFunctions: new FunctionsRegistry(),
-};
-
-export interface LegacyInterpreterServerApi {
-  registries(): typeof registries;
-  register(specs: Record<keyof typeof registries, any[]>): typeof registries;
-}
-
-export const createLegacyServerInterpreterApi = (): LegacyInterpreterServerApi => {
-  const api = registryFactory(registries);
-
-  register(registries, {
-    types: typeSpecs,
-  });
-
-  return api;
-};
-
-export const createLegacyServerEndpoints = (
-  api: LegacyInterpreterServerApi,
-  logger: Logger,
-  core: CoreSetup,
-  plugins: ExpressionsServerSetupDependencies
-) => {
-  const router = core.http.createRouter();
-
-  /**
-   * Register the endpoint that returns the list of server-only functions.
-   */
-  router.get(
-    {
-      path: `/api/interpreter/fns`,
-      validate: {
-        body: schema.any(),
-      },
-    },
-    async (context, request, response) => {
-      const functions = api.registries().serverFunctions.toJS();
-      const body = JSON.stringify(functions);
-      return response.ok({
-        body,
-      });
-    }
-  );
-
-  /**
-   * Run a single Canvas function.
-   *
-   * @param {*} server - The Kibana server object
-   * @param {*} handlers - The Canvas handlers
-   * @param {*} fnCall - Describes the function being run `{ functionName, args, context }`
-   */
-  async function runFunction(
-    handlers: { environment: string; elasticsearchClient: LegacyAPICaller },
-    fnCall: any
-  ) {
-    const { functionName, args, context } = fnCall;
-    const { deserialize } = serializeProvider(registries.types.toJS());
-    const fnDef = registries.serverFunctions.toJS()[functionName];
-    if (!fnDef) throw Boom.notFound(`Function "${functionName}" could not be found.`);
-    const deserialized = deserialize(context);
-    const result = fnDef.fn(deserialized, args, handlers);
-    return result;
-  }
-
-  /**
-   * Register an endpoint that executes a batch of functions, and streams the
-   * results back using ND-JSON.
-   */
-  plugins.bfetch.addBatchProcessingRoute(`/api/interpreter/fns`, (request) => {
-    return {
-      onBatchItem: async (fnCall: any) => {
-        const [coreStart] = await core.getStartServices();
-        const handlers = {
-          environment: 'server',
-          elasticsearchClient: coreStart.elasticsearch.legacy.client.asScoped(request)
-            .callAsCurrentUser,
-        };
-        const result = await runFunction(handlers, fnCall);
-        if (typeof result === 'undefined') {
-          throw new Error(`Function ${fnCall.functionName} did not return anything.`);
-        }
-        return result;
-      },
-    };
-  });
-};
diff --git a/src/plugins/expressions/server/mocks.ts b/src/plugins/expressions/server/mocks.ts
index e6b883e38f244..0512789d76ab0 100644
--- a/src/plugins/expressions/server/mocks.ts
+++ b/src/plugins/expressions/server/mocks.ts
@@ -20,7 +20,6 @@
 import { ExpressionsServerSetup, ExpressionsServerStart } from '.';
 import { plugin as pluginInitializer } from '.';
 import { coreMock } from '../../../core/server/mocks';
-import { bfetchPluginMock } from '../../bfetch/server/mocks';
 
 export type Setup = jest.Mocked<ExpressionsServerSetup>;
 export type Start = jest.Mocked<ExpressionsServerStart>;
@@ -38,10 +37,6 @@ const createSetupContract = (): Setup => {
     registerRenderer: jest.fn(),
     registerType: jest.fn(),
     run: jest.fn(),
-    __LEGACY: {
-      register: jest.fn(),
-      registries: jest.fn(),
-    },
   };
   return setupContract;
 };
@@ -67,9 +62,7 @@ const createPlugin = async () => {
   const coreSetup = coreMock.createSetup();
   const coreStart = coreMock.createStart();
   const plugin = pluginInitializer(pluginInitializerContext);
-  const setup = await plugin.setup(coreSetup, {
-    bfetch: bfetchPluginMock.createSetupContract(),
-  });
+  const setup = await plugin.setup(coreSetup);
 
   return {
     pluginInitializerContext,
@@ -77,10 +70,7 @@ const createPlugin = async () => {
     coreStart,
     plugin,
     setup,
-    doStart: async () =>
-      await plugin.start(coreStart, {
-        bfetch: bfetchPluginMock.createStartContract(),
-      }),
+    doStart: async () => await plugin.start(coreStart),
   };
 };
 
diff --git a/src/plugins/expressions/server/plugin.ts b/src/plugins/expressions/server/plugin.ts
index b99958262c542..9e412f9b33342 100644
--- a/src/plugins/expressions/server/plugin.ts
+++ b/src/plugins/expressions/server/plugin.ts
@@ -17,68 +17,30 @@
  * under the License.
  */
 
-import { CoreStart, PluginInitializerContext, CoreSetup, Plugin } from 'src/core/server';
-import { BfetchServerSetup, BfetchServerStart } from '../../bfetch/server';
-import {
-  LegacyInterpreterServerApi,
-  createLegacyServerInterpreterApi,
-  createLegacyServerEndpoints,
-} from './legacy';
+import { CoreStart, CoreSetup, Plugin, PluginInitializerContext } from 'src/core/server';
 import { ExpressionsService, ExpressionsServiceSetup, ExpressionsServiceStart } from '../common';
 
-export interface ExpressionsServerSetupDependencies {
-  bfetch: BfetchServerSetup;
-}
-
-export interface ExpressionsServerStartDependencies {
-  bfetch: BfetchServerStart;
-}
-
-export interface ExpressionsServerSetup extends ExpressionsServiceSetup {
-  __LEGACY: LegacyInterpreterServerApi;
-}
+export type ExpressionsServerSetup = ExpressionsServiceSetup;
 
 export type ExpressionsServerStart = ExpressionsServiceStart;
 
 export class ExpressionsServerPlugin
-  implements
-    Plugin<
-      ExpressionsServerSetup,
-      ExpressionsServerStart,
-      ExpressionsServerSetupDependencies,
-      ExpressionsServerStartDependencies
-    > {
+  implements Plugin<ExpressionsServerSetup, ExpressionsServerStart> {
   readonly expressions: ExpressionsService = new ExpressionsService();
 
-  constructor(private readonly initializerContext: PluginInitializerContext) {}
-
-  public setup(
-    core: CoreSetup,
-    plugins: ExpressionsServerSetupDependencies
-  ): ExpressionsServerSetup {
-    const logger = this.initializerContext.logger.get();
-    const { expressions } = this;
-    const { executor } = expressions;
+  constructor(initializerContext: PluginInitializerContext) {}
 
-    executor.extendContext({
+  public setup(core: CoreSetup): ExpressionsServerSetup {
+    this.expressions.executor.extendContext({
       environment: 'server',
     });
 
-    const legacyApi = createLegacyServerInterpreterApi();
-    createLegacyServerEndpoints(legacyApi, logger, core, plugins);
-
-    const setup = {
-      ...this.expressions.setup(),
-      __LEGACY: legacyApi,
-    };
+    const setup = this.expressions.setup();
 
     return Object.freeze(setup);
   }
 
-  public start(
-    core: CoreStart,
-    plugins: ExpressionsServerStartDependencies
-  ): ExpressionsServerStart {
+  public start(core: CoreStart): ExpressionsServerStart {
     const start = this.expressions.start();
 
     return Object.freeze(start);
diff --git a/src/plugins/kibana_utils/public/core/create_kibana_utils_core.test.ts b/src/plugins/kibana_utils/public/core/create_kibana_utils_core.test.ts
deleted file mode 100644
index c5b23bdf0055f..0000000000000
--- a/src/plugins/kibana_utils/public/core/create_kibana_utils_core.test.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { createKibanaUtilsCore } from './create_kibana_utils_core';
-import { CoreStart } from 'kibana/public';
-
-describe('createKibanaUtilsCore', () => {
-  it('should allows to work with multiple instances', () => {
-    const core1 = {} as CoreStart;
-    const core2 = {} as CoreStart;
-
-    const { setCoreStart: setCoreStart1, getCoreStart: getCoreStart1 } = createKibanaUtilsCore();
-    const { setCoreStart: setCoreStart2, getCoreStart: getCoreStart2 } = createKibanaUtilsCore();
-
-    setCoreStart1(core1);
-    setCoreStart2(core2);
-
-    expect(getCoreStart1()).toBe(core1);
-    expect(getCoreStart2()).toBe(core2);
-
-    expect(getCoreStart1() !== getCoreStart2()).toBeTruthy();
-  });
-});
diff --git a/src/plugins/kibana_utils/public/core/create_kibana_utils_core.ts b/src/plugins/kibana_utils/public/core/create_kibana_utils_core.ts
deleted file mode 100644
index c528c68f29edb..0000000000000
--- a/src/plugins/kibana_utils/public/core/create_kibana_utils_core.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { createGetterSetter, Get, Set } from '../../common';
-import { CoreStart } from '../../../../core/public';
-import { KUSavedObjectClient, createSavedObjectsClient } from './saved_objects_client';
-
-interface Return {
-  getCoreStart: Get<CoreStart>;
-  setCoreStart: Set<CoreStart>;
-  savedObjects: KUSavedObjectClient;
-}
-
-export const createKibanaUtilsCore = (): Return => {
-  const [getCoreStart, setCoreStart] = createGetterSetter<CoreStart>('CoreStart');
-  const savedObjects = createSavedObjectsClient(getCoreStart);
-
-  return {
-    getCoreStart,
-    setCoreStart,
-    savedObjects,
-  };
-};
diff --git a/src/plugins/kibana_utils/public/core/index.ts b/src/plugins/kibana_utils/public/core/index.ts
index 8bbb2129071f5..5fb557f651e3a 100644
--- a/src/plugins/kibana_utils/public/core/index.ts
+++ b/src/plugins/kibana_utils/public/core/index.ts
@@ -17,5 +17,4 @@
  * under the License.
  */
 
-export * from './create_kibana_utils_core';
 export * from './create_start_service_getter';
diff --git a/src/plugins/kibana_utils/public/core/saved_objects_client.ts b/src/plugins/kibana_utils/public/core/saved_objects_client.ts
deleted file mode 100644
index 5262755a6a3ab..0000000000000
--- a/src/plugins/kibana_utils/public/core/saved_objects_client.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { CoreStart } from '../../../../core/public';
-import { Get } from '../../common';
-
-type CoreSavedObjectClient = CoreStart['savedObjects']['client'];
-
-export interface KUSavedObjectClient {
-  get: CoreSavedObjectClient['get'];
-}
-
-export const createSavedObjectsClient = (getCoreStart: Get<CoreStart>) => {
-  const savedObjectsClient: KUSavedObjectClient = {
-    get: (...args) => getCoreStart().savedObjects.client.get(...args),
-  };
-
-  return savedObjectsClient;
-};
diff --git a/src/plugins/kibana_utils/public/core/state.ts b/src/plugins/kibana_utils/public/core/state.ts
deleted file mode 100644
index 52c4d166d737e..0000000000000
--- a/src/plugins/kibana_utils/public/core/state.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { createGetterSetter } from '../../common';
-import { CoreStart } from '../../../../core/public';
-
-export const [getCoreStart, setCoreStart] = createGetterSetter<CoreStart>('CoreStart');
diff --git a/x-pack/plugins/canvas/public/services/stubs/expressions.ts b/x-pack/plugins/canvas/public/services/stubs/expressions.ts
index ee332e20c4ca3..fd9b083964cb6 100644
--- a/x-pack/plugins/canvas/public/services/stubs/expressions.ts
+++ b/x-pack/plugins/canvas/public/services/stubs/expressions.ts
@@ -12,9 +12,7 @@ import { renderFunctions } from '../../../canvas_plugin_src/renderers/core';
 
 const placeholder = {} as any;
 const expressionsPlugin = plugin(placeholder);
-const setup = expressionsPlugin.setup(placeholder, {
-  inspector: {},
-} as any);
+const setup = expressionsPlugin.setup(placeholder);
 
 export const expressionsService: ExpressionsService = setup.fork();
 

From 6376bab559f46178e0d8fabc1b3f0fe6dd0901cd Mon Sep 17 00:00:00 2001
From: Bhavya RM <bhavya@elastic.co>
Date: Thu, 20 Aug 2020 12:40:18 -0400
Subject: [PATCH 69/85] adding additional tests for the awesome new nav by core
 ui team and checking off a flaky test' (#75494)

---
 test/functional/page_objects/home_page.ts | 15 +++++++++++++++
 x-pack/test/accessibility/apps/home.ts    | 21 +++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/test/functional/page_objects/home_page.ts b/test/functional/page_objects/home_page.ts
index 2d78de49a4f94..bf0e0dd7f56f2 100644
--- a/test/functional/page_objects/home_page.ts
+++ b/test/functional/page_objects/home_page.ts
@@ -118,6 +118,21 @@ export function HomePageProvider({ getService, getPageObjects }: FtrProviderCont
       await testSubjects.click('onCloudTutorial');
     }
 
+    // click on side nav toggle button to see all of side nav
+    async clickOnToggleNavButton() {
+      await testSubjects.click('toggleNavButton');
+    }
+
+    // collapse the observability side nav details
+    async collapseObservabibilitySideNav() {
+      await testSubjects.click('collapsibleNavGroup-observability');
+    }
+
+    // dock the side nav
+    async dockTheSideNav() {
+      await testSubjects.click('collapsible-nav-lock');
+    }
+
     async loadSavedObjects() {
       await retry.try(async () => {
         await testSubjects.click('loadSavedObjects');
diff --git a/x-pack/test/accessibility/apps/home.ts b/x-pack/test/accessibility/apps/home.ts
index 1f05ff676e3a0..6018c4da2ddff 100644
--- a/x-pack/test/accessibility/apps/home.ts
+++ b/x-pack/test/accessibility/apps/home.ts
@@ -68,5 +68,26 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await PageObjects.home.clickOnCloudTutorial();
       await a11y.testAppSnapshot();
     });
+
+    it('click on side nav to see all the side nav menu', async () => {
+      await PageObjects.home.clickOnLogo();
+      await PageObjects.home.clickOnToggleNavButton();
+      await a11y.testAppSnapshot();
+    });
+
+    it('Dock the side nav', async () => {
+      await PageObjects.home.dockTheSideNav();
+      await a11y.testAppSnapshot();
+    });
+
+    it('click on collapse on observability in side nav to test a11y of collapse button', async () => {
+      await PageObjects.home.collapseObservabibilitySideNav();
+      await a11y.testAppSnapshot();
+    });
+
+    it('unDock the side nav', async () => {
+      await PageObjects.home.dockTheSideNav();
+      await a11y.testAppSnapshot();
+    });
   });
 }

From 7699f1c29a54d5665fb8324c2e1b23c95604fe4f Mon Sep 17 00:00:00 2001
From: Constance <constancecchen@users.noreply.github.com>
Date: Thu, 20 Aug 2020 09:41:43 -0700
Subject: [PATCH 70/85] [Enterprise Search][bug/tech debt] Fix route navigation
 (#75369)

* Set up navigateToUrl context

* Update RR link helpers to use navigateToUrl

* Update breadcrumbs to use navigateToUrl + refactor

generate_breadcrumbs:
- Change base breadcrumb generator to a custom React useHook instead of passing history/context around
- Change use{Product}Breadcrumbs helpers to mainly involve merging arrays
- Update + simplify tests accordingly (test link behavior in main useBreadcrumb suite, not in subsequent helpers)

set_chrome:
- Update to use new breadcrumb hooks (requires pulling out of useEffect, hooks can't be used inside another hook)
- Clean up/refactor tests

* Update route redirects now that navigation works correctly
---
 .../__mocks__/kibana_context.mock.ts          |   1 +
 .../public/applications/app_search/index.tsx  |   4 +-
 .../public/applications/index.tsx             |  10 +-
 .../generate_breadcrumbs.test.ts              | 246 +++++++-----------
 .../kibana_chrome/generate_breadcrumbs.ts     |  61 +++--
 .../shared/kibana_chrome/set_chrome.test.tsx  |  99 ++++---
 .../shared/kibana_chrome/set_chrome.tsx       |  23 +-
 .../react_router_helpers/eui_link.test.tsx    |  10 +-
 .../shared/react_router_helpers/eui_link.tsx  |  14 +-
 .../applications/workplace_search/index.tsx   |   1 -
 10 files changed, 209 insertions(+), 260 deletions(-)

diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kibana_context.mock.ts b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kibana_context.mock.ts
index ef3bf54053b5c..890072ab42eb9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kibana_context.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kibana_context.mock.ts
@@ -13,6 +13,7 @@ import { ExternalUrl } from '../shared/enterprise_search_url';
  */
 export const mockKibanaContext = {
   http: httpServiceMock.createSetupContract(),
+  navigateToUrl: jest.fn(),
   setBreadcrumbs: jest.fn(),
   setDocTitle: jest.fn(),
   config: { host: 'http://localhost:3002' },
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx
index 7ebd35ff35ee1..5856a13bf75b7 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx
@@ -36,7 +36,6 @@ export const AppSearch: React.FC = () => {
         </Route>
         <Route>
           <Redirect to={SETUP_GUIDE_PATH} />
-          <SetupGuide /> {/* Kibana displays a blank page on redirect if this isn't included */}
         </Route>
       </Switch>
     );
@@ -50,8 +49,7 @@ export const AppSearch: React.FC = () => {
         <Layout navigation={<AppSearchNav />}>
           <Switch>
             <Route exact path={ROOT_PATH}>
-              {/* For some reason a Redirect to /engines just doesn't work here - it shows a blank page */}
-              <EngineOverview />
+              <Redirect to={ENGINES_PATH} />
             </Route>
             <Route exact path={ENGINES_PATH}>
               <EngineOverview />
diff --git a/x-pack/plugins/enterprise_search/public/applications/index.tsx b/x-pack/plugins/enterprise_search/public/applications/index.tsx
index f3ccbc126ae62..1b1f9ae43e7c1 100644
--- a/x-pack/plugins/enterprise_search/public/applications/index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/index.tsx
@@ -9,7 +9,13 @@ import ReactDOM from 'react-dom';
 import { Router } from 'react-router-dom';
 
 import { I18nProvider } from '@kbn/i18n/react';
-import { CoreStart, AppMountParameters, HttpSetup, ChromeBreadcrumb } from 'src/core/public';
+import {
+  AppMountParameters,
+  CoreStart,
+  ApplicationStart,
+  HttpSetup,
+  ChromeBreadcrumb,
+} from 'src/core/public';
 import { ClientConfigType, ClientData, PluginsSetup } from '../plugin';
 import { LicenseProvider } from './shared/licensing';
 import { IExternalUrl } from './shared/enterprise_search_url';
@@ -18,6 +24,7 @@ export interface IKibanaContext {
   config: { host?: string };
   externalUrl: IExternalUrl;
   http: HttpSetup;
+  navigateToUrl: ApplicationStart['navigateToUrl'];
   setBreadcrumbs(crumbs: ChromeBreadcrumb[]): void;
   setDocTitle(title: string): void;
 }
@@ -44,6 +51,7 @@ export const renderApp = (
         value={{
           config,
           http: core.http,
+          navigateToUrl: core.application.navigateToUrl,
           externalUrl: data.externalUrl,
           setBreadcrumbs: core.chrome.setBreadcrumbs,
           setDocTitle: core.chrome.docTitle.change,
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_breadcrumbs.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_breadcrumbs.test.ts
index 0f34bbb6b65bc..9e86b239432a7 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_breadcrumbs.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_breadcrumbs.test.ts
@@ -4,140 +4,121 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  generateBreadcrumb,
-  appSearchBreadcrumbs,
-  enterpriseSearchBreadcrumbs,
-  workplaceSearchBreadcrumbs,
-} from './generate_breadcrumbs';
-
-import { mockHistory as mockHistoryUntyped } from '../../__mocks__';
-const mockHistory = mockHistoryUntyped as any;
+import '../../__mocks__/shallow_usecontext.mock';
+import '../../__mocks__/react_router_history.mock';
+import { mockKibanaContext, mockHistory } from '../../__mocks__';
 
 jest.mock('../react_router_helpers', () => ({ letBrowserHandleEvent: jest.fn(() => false) }));
 import { letBrowserHandleEvent } from '../react_router_helpers';
 
-describe('generateBreadcrumb', () => {
+import {
+  useBreadcrumbs,
+  useEnterpriseSearchBreadcrumbs,
+  useAppSearchBreadcrumbs,
+  useWorkplaceSearchBreadcrumbs,
+} from './generate_breadcrumbs';
+
+describe('useBreadcrumbs', () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
 
-  it("creates a breadcrumb object matching EUI's breadcrumb type", () => {
-    const breadcrumb = generateBreadcrumb({
-      text: 'Hello World',
-      path: '/hello_world',
-      history: mockHistory,
-    });
-    expect(breadcrumb).toEqual({
-      text: 'Hello World',
-      href: '/enterprise_search/hello_world',
-      onClick: expect.any(Function),
-    });
+  it('accepts an array of breadcrumbs and to the array correctly injects SPA link navigation props', () => {
+    const breadcrumb = useBreadcrumbs([
+      {
+        text: 'Hello',
+        path: '/hello',
+      },
+      {
+        text: 'World',
+        path: '/world',
+      },
+    ]);
+    expect(breadcrumb).toEqual([
+      {
+        text: 'Hello',
+        href: '/enterprise_search/hello',
+        onClick: expect.any(Function),
+      },
+      {
+        text: 'World',
+        href: '/enterprise_search/world',
+        onClick: expect.any(Function),
+      },
+    ]);
   });
 
   it('prevents default navigation and uses React Router history on click', () => {
-    const breadcrumb = generateBreadcrumb({ text: '', path: '/', history: mockHistory }) as any;
+    const breadcrumb = useBreadcrumbs([{ text: '', path: '/' }])[0] as any;
     const event = { preventDefault: jest.fn() };
     breadcrumb.onClick(event);
 
-    expect(mockHistory.push).toHaveBeenCalled();
+    expect(mockKibanaContext.navigateToUrl).toHaveBeenCalled();
+    expect(mockHistory.createHref).toHaveBeenCalled();
     expect(event.preventDefault).toHaveBeenCalled();
   });
 
   it('does not prevent default browser behavior on new tab/window clicks', () => {
-    const breadcrumb = generateBreadcrumb({ text: '', path: '/', history: mockHistory }) as any;
+    const breadcrumb = useBreadcrumbs([{ text: '', path: '/' }])[0] as any;
 
     (letBrowserHandleEvent as jest.Mock).mockImplementationOnce(() => true);
     breadcrumb.onClick();
 
-    expect(mockHistory.push).not.toHaveBeenCalled();
+    expect(mockKibanaContext.navigateToUrl).not.toHaveBeenCalled();
   });
 
   it('does not generate link behavior if path is excluded', () => {
-    const breadcrumb = generateBreadcrumb({ text: 'Unclickable breadcrumb' });
+    const breadcrumb = useBreadcrumbs([{ text: 'Unclickable breadcrumb' }])[0];
 
     expect(breadcrumb.href).toBeUndefined();
     expect(breadcrumb.onClick).toBeUndefined();
   });
 });
 
-describe('enterpriseSearchBreadcrumbs', () => {
-  const breadCrumbs = [
-    {
-      text: 'Page 1',
-      path: '/page1',
-    },
-    {
-      text: 'Page 2',
-      path: '/page2',
-    },
-  ];
-
+describe('useEnterpriseSearchBreadcrumbs', () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
 
-  const subject = () => enterpriseSearchBreadcrumbs(mockHistory)(breadCrumbs);
+  it('builds a chain of breadcrumbs with Enterprise Search at the root', () => {
+    const breadcrumbs = [
+      {
+        text: 'Page 1',
+        path: '/page1',
+      },
+      {
+        text: 'Page 2',
+        path: '/page2',
+      },
+    ];
 
-  it('Builds a chain of breadcrumbs with Enterprise Search at the root', () => {
-    expect(subject()).toEqual([
+    expect(useEnterpriseSearchBreadcrumbs(breadcrumbs)).toEqual([
       {
         text: 'Enterprise Search',
       },
       {
+        text: 'Page 1',
         href: '/enterprise_search/page1',
         onClick: expect.any(Function),
-        text: 'Page 1',
       },
       {
+        text: 'Page 2',
         href: '/enterprise_search/page2',
         onClick: expect.any(Function),
-        text: 'Page 2',
       },
     ]);
   });
 
   it('shows just the root if breadcrumbs is empty', () => {
-    expect(enterpriseSearchBreadcrumbs(mockHistory)()).toEqual([
+    expect(useEnterpriseSearchBreadcrumbs()).toEqual([
       {
         text: 'Enterprise Search',
       },
     ]);
   });
-
-  describe('links', () => {
-    const eventMock = {
-      preventDefault: jest.fn(),
-    } as any;
-
-    it('has Enterprise Search text first', () => {
-      expect(subject()[0].onClick).toBeUndefined();
-    });
-
-    it('has a link to page 1 second', () => {
-      (subject()[1] as any).onClick(eventMock);
-      expect(mockHistory.push).toHaveBeenCalledWith('/page1');
-    });
-
-    it('has a link to page 2 last', () => {
-      (subject()[2] as any).onClick(eventMock);
-      expect(mockHistory.push).toHaveBeenCalledWith('/page2');
-    });
-  });
 });
 
-describe('appSearchBreadcrumbs', () => {
-  const breadCrumbs = [
-    {
-      text: 'Page 1',
-      path: '/page1',
-    },
-    {
-      text: 'Page 2',
-      path: '/page2',
-    },
-  ];
-
+describe('useAppSearchBreadcrumbs', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     mockHistory.createHref.mockImplementation(
@@ -145,82 +126,55 @@ describe('appSearchBreadcrumbs', () => {
     );
   });
 
-  const subject = () => appSearchBreadcrumbs(mockHistory)(breadCrumbs);
-
   it('Builds a chain of breadcrumbs with Enterprise Search and App Search at the root', () => {
-    expect(subject()).toEqual([
+    const breadcrumbs = [
+      {
+        text: 'Page 1',
+        path: '/page1',
+      },
+      {
+        text: 'Page 2',
+        path: '/page2',
+      },
+    ];
+
+    expect(useAppSearchBreadcrumbs(breadcrumbs)).toEqual([
       {
         text: 'Enterprise Search',
       },
       {
+        text: 'App Search',
         href: '/enterprise_search/app_search/',
         onClick: expect.any(Function),
-        text: 'App Search',
       },
       {
+        text: 'Page 1',
         href: '/enterprise_search/app_search/page1',
         onClick: expect.any(Function),
-        text: 'Page 1',
       },
       {
+        text: 'Page 2',
         href: '/enterprise_search/app_search/page2',
         onClick: expect.any(Function),
-        text: 'Page 2',
       },
     ]);
   });
 
   it('shows just the root if breadcrumbs is empty', () => {
-    expect(appSearchBreadcrumbs(mockHistory)()).toEqual([
+    expect(useAppSearchBreadcrumbs()).toEqual([
       {
         text: 'Enterprise Search',
       },
       {
+        text: 'App Search',
         href: '/enterprise_search/app_search/',
         onClick: expect.any(Function),
-        text: 'App Search',
       },
     ]);
   });
-
-  describe('links', () => {
-    const eventMock = {
-      preventDefault: jest.fn(),
-    } as any;
-
-    it('has Enterprise Search text first', () => {
-      expect(subject()[0].onClick).toBeUndefined();
-    });
-
-    it('has a link to App Search second', () => {
-      (subject()[1] as any).onClick(eventMock);
-      expect(mockHistory.push).toHaveBeenCalledWith('/');
-    });
-
-    it('has a link to page 1 third', () => {
-      (subject()[2] as any).onClick(eventMock);
-      expect(mockHistory.push).toHaveBeenCalledWith('/page1');
-    });
-
-    it('has a link to page 2 last', () => {
-      (subject()[3] as any).onClick(eventMock);
-      expect(mockHistory.push).toHaveBeenCalledWith('/page2');
-    });
-  });
 });
 
-describe('workplaceSearchBreadcrumbs', () => {
-  const breadCrumbs = [
-    {
-      text: 'Page 1',
-      path: '/page1',
-    },
-    {
-      text: 'Page 2',
-      path: '/page2',
-    },
-  ];
-
+describe('useWorkplaceSearchBreadcrumbs', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     mockHistory.createHref.mockImplementation(
@@ -228,66 +182,50 @@ describe('workplaceSearchBreadcrumbs', () => {
     );
   });
 
-  const subject = () => workplaceSearchBreadcrumbs(mockHistory)(breadCrumbs);
-
   it('Builds a chain of breadcrumbs with Enterprise Search and Workplace Search at the root', () => {
-    expect(subject()).toEqual([
+    const breadcrumbs = [
+      {
+        text: 'Page 1',
+        path: '/page1',
+      },
+      {
+        text: 'Page 2',
+        path: '/page2',
+      },
+    ];
+
+    expect(useWorkplaceSearchBreadcrumbs(breadcrumbs)).toEqual([
       {
         text: 'Enterprise Search',
       },
       {
+        text: 'Workplace Search',
         href: '/enterprise_search/workplace_search/',
         onClick: expect.any(Function),
-        text: 'Workplace Search',
       },
       {
+        text: 'Page 1',
         href: '/enterprise_search/workplace_search/page1',
         onClick: expect.any(Function),
-        text: 'Page 1',
       },
       {
+        text: 'Page 2',
         href: '/enterprise_search/workplace_search/page2',
         onClick: expect.any(Function),
-        text: 'Page 2',
       },
     ]);
   });
 
   it('shows just the root if breadcrumbs is empty', () => {
-    expect(workplaceSearchBreadcrumbs(mockHistory)()).toEqual([
+    expect(useWorkplaceSearchBreadcrumbs()).toEqual([
       {
         text: 'Enterprise Search',
       },
       {
+        text: 'Workplace Search',
         href: '/enterprise_search/workplace_search/',
         onClick: expect.any(Function),
-        text: 'Workplace Search',
       },
     ]);
   });
-
-  describe('links', () => {
-    const eventMock = {
-      preventDefault: jest.fn(),
-    } as any;
-
-    it('has Enterprise Search text first', () => {
-      expect(subject()[0].onClick).toBeUndefined();
-    });
-
-    it('has a link to Workplace Search second', () => {
-      (subject()[1] as any).onClick(eventMock);
-      expect(mockHistory.push).toHaveBeenCalledWith('/');
-    });
-
-    it('has a link to page 1 third', () => {
-      (subject()[2] as any).onClick(eventMock);
-      expect(mockHistory.push).toHaveBeenCalledWith('/page1');
-    });
-
-    it('has a link to page 2 last', () => {
-      (subject()[3] as any).onClick(eventMock);
-      expect(mockHistory.push).toHaveBeenCalledWith('/page2');
-    });
-  });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_breadcrumbs.ts b/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_breadcrumbs.ts
index 82c0f78fb853f..6eab936719d01 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_breadcrumbs.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_breadcrumbs.ts
@@ -4,8 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { useContext } from 'react';
+import { useHistory } from 'react-router-dom';
 import { EuiBreadcrumb } from '@elastic/eui';
-import { History } from 'history';
+
+import { KibanaContext, IKibanaContext } from '../../index';
 
 import {
   ENTERPRISE_SEARCH_PLUGIN,
@@ -20,50 +23,46 @@ import { letBrowserHandleEvent } from '../react_router_helpers';
  * https://elastic.github.io/eui/#/navigation/breadcrumbs
  */
 
-interface IGenerateBreadcrumbProps {
+interface IBreadcrumb {
   text: string;
   path?: string;
-  history?: History;
 }
+export type TBreadcrumbs = IBreadcrumb[];
+
+export const useBreadcrumbs = (breadcrumbs: TBreadcrumbs) => {
+  const history = useHistory();
+  const { navigateToUrl } = useContext(KibanaContext) as IKibanaContext;
+
+  return breadcrumbs.map(({ text, path }) => {
+    const breadcrumb = { text } as EuiBreadcrumb;
 
-export const generateBreadcrumb = ({ text, path, history }: IGenerateBreadcrumbProps) => {
-  const breadcrumb = { text } as EuiBreadcrumb;
+    if (path) {
+      const href = history.createHref({ pathname: path }) as string;
 
-  if (path && history) {
-    breadcrumb.href = history.createHref({ pathname: path });
-    breadcrumb.onClick = (event) => {
-      if (letBrowserHandleEvent(event)) return;
-      event.preventDefault();
-      history.push(path);
-    };
-  }
+      breadcrumb.href = href;
+      breadcrumb.onClick = (event) => {
+        if (letBrowserHandleEvent(event)) return;
+        event.preventDefault();
+        navigateToUrl(href);
+      };
+    }
 
-  return breadcrumb;
+    return breadcrumb;
+  });
 };
 
 /**
  * Product-specific breadcrumb helpers
  */
 
-export type TBreadcrumbs = IGenerateBreadcrumbProps[];
+export const useEnterpriseSearchBreadcrumbs = (breadcrumbs: TBreadcrumbs = []) =>
+  useBreadcrumbs([{ text: ENTERPRISE_SEARCH_PLUGIN.NAME }, ...breadcrumbs]);
 
-export const enterpriseSearchBreadcrumbs = (history: History) => (
-  breadcrumbs: TBreadcrumbs = []
-) => [
-  generateBreadcrumb({ text: ENTERPRISE_SEARCH_PLUGIN.NAME }),
-  ...breadcrumbs.map(({ text, path }: IGenerateBreadcrumbProps) =>
-    generateBreadcrumb({ text, path, history })
-  ),
-];
-
-export const appSearchBreadcrumbs = (history: History) => (breadcrumbs: TBreadcrumbs = []) =>
-  enterpriseSearchBreadcrumbs(history)([
-    { text: APP_SEARCH_PLUGIN.NAME, path: '/' },
-    ...breadcrumbs,
-  ]);
+export const useAppSearchBreadcrumbs = (breadcrumbs: TBreadcrumbs = []) =>
+  useEnterpriseSearchBreadcrumbs([{ text: APP_SEARCH_PLUGIN.NAME, path: '/' }, ...breadcrumbs]);
 
-export const workplaceSearchBreadcrumbs = (history: History) => (breadcrumbs: TBreadcrumbs = []) =>
-  enterpriseSearchBreadcrumbs(history)([
+export const useWorkplaceSearchBreadcrumbs = (breadcrumbs: TBreadcrumbs = []) =>
+  useEnterpriseSearchBreadcrumbs([
     { text: WORKPLACE_SEARCH_PLUGIN.NAME, path: '/' },
     ...breadcrumbs,
   ]);
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/set_chrome.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/set_chrome.test.tsx
index aba0b250e56c0..bda816c9a5554 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/set_chrome.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/set_chrome.test.tsx
@@ -4,16 +4,18 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import '../../__mocks__/shallow_usecontext.mock';
+import '../../__mocks__/react_router_history.mock';
+
 import React from 'react';
 
-import '../../__mocks__/react_router_history.mock';
 import { mockKibanaContext, mountWithKibanaContext } from '../../__mocks__';
 
 jest.mock('./generate_breadcrumbs', () => ({
-  appSearchBreadcrumbs: jest.fn(() => (crumbs: any) => crumbs),
-  workplaceSearchBreadcrumbs: jest.fn(() => (crumbs: any) => crumbs),
+  useAppSearchBreadcrumbs: jest.fn(() => (crumbs: any) => crumbs),
+  useWorkplaceSearchBreadcrumbs: jest.fn(() => (crumbs: any) => crumbs),
 }));
-import { appSearchBreadcrumbs, workplaceSearchBreadcrumbs } from './generate_breadcrumbs';
+import { useAppSearchBreadcrumbs, useWorkplaceSearchBreadcrumbs } from './generate_breadcrumbs';
 
 jest.mock('./generate_title', () => ({
   appSearchTitle: jest.fn((title: any) => title),
@@ -23,62 +25,55 @@ import { appSearchTitle, workplaceSearchTitle } from './generate_title';
 
 import { SetAppSearchChrome, SetWorkplaceSearchChrome } from './';
 
-describe('SetAppSearchChrome', () => {
+describe('Set Kibana Chrome helpers', () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
 
   afterEach(() => {
-    expect(appSearchBreadcrumbs).toHaveBeenCalled();
-    expect(appSearchTitle).toHaveBeenCalled();
-  });
-
-  it('sets breadcrumbs and document title', () => {
-    mountWithKibanaContext(<SetAppSearchChrome text="Engines" />);
-
-    expect(mockKibanaContext.setBreadcrumbs).toHaveBeenCalledWith([
-      {
-        text: 'Engines',
-        path: '/current-path',
-      },
-    ]);
-    expect(mockKibanaContext.setDocTitle).toHaveBeenCalledWith(['Engines']);
+    expect(mockKibanaContext.setBreadcrumbs).toHaveBeenCalled();
+    expect(mockKibanaContext.setDocTitle).toHaveBeenCalled();
   });
 
-  it('sets empty breadcrumbs and document title when isRoot is true', () => {
-    mountWithKibanaContext(<SetAppSearchChrome isRoot />);
-
-    expect(mockKibanaContext.setBreadcrumbs).toHaveBeenCalledWith([]);
-    expect(mockKibanaContext.setDocTitle).toHaveBeenCalledWith([]);
+  describe('SetAppSearchChrome', () => {
+    it('sets breadcrumbs and document title', () => {
+      mountWithKibanaContext(<SetAppSearchChrome text="Engines" />);
+
+      expect(appSearchTitle).toHaveBeenCalledWith(['Engines']);
+      expect(useAppSearchBreadcrumbs).toHaveBeenCalledWith([
+        {
+          text: 'Engines',
+          path: '/current-path',
+        },
+      ]);
+    });
+
+    it('sets empty breadcrumbs and document title when isRoot is true', () => {
+      mountWithKibanaContext(<SetAppSearchChrome isRoot />);
+
+      expect(appSearchTitle).toHaveBeenCalledWith([]);
+      expect(useAppSearchBreadcrumbs).toHaveBeenCalledWith([]);
+    });
   });
-});
-
-describe('SetWorkplaceSearchChrome', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  afterEach(() => {
-    expect(workplaceSearchBreadcrumbs).toHaveBeenCalled();
-    expect(workplaceSearchTitle).toHaveBeenCalled();
-  });
-
-  it('sets breadcrumbs and document title', () => {
-    mountWithKibanaContext(<SetWorkplaceSearchChrome text="Sources" />);
-
-    expect(mockKibanaContext.setBreadcrumbs).toHaveBeenCalledWith([
-      {
-        text: 'Sources',
-        path: '/current-path',
-      },
-    ]);
-    expect(mockKibanaContext.setDocTitle).toHaveBeenCalledWith(['Sources']);
-  });
-
-  it('sets empty breadcrumbs and document title when isRoot is true', () => {
-    mountWithKibanaContext(<SetWorkplaceSearchChrome isRoot />);
 
-    expect(mockKibanaContext.setBreadcrumbs).toHaveBeenCalledWith([]);
-    expect(mockKibanaContext.setDocTitle).toHaveBeenCalledWith([]);
+  describe('SetWorkplaceSearchChrome', () => {
+    it('sets breadcrumbs and document title', () => {
+      mountWithKibanaContext(<SetWorkplaceSearchChrome text="Sources" />);
+
+      expect(workplaceSearchTitle).toHaveBeenCalledWith(['Sources']);
+      expect(useWorkplaceSearchBreadcrumbs).toHaveBeenCalledWith([
+        {
+          text: 'Sources',
+          path: '/current-path',
+        },
+      ]);
+    });
+
+    it('sets empty breadcrumbs and document title when isRoot is true', () => {
+      mountWithKibanaContext(<SetWorkplaceSearchChrome isRoot />);
+
+      expect(workplaceSearchTitle).toHaveBeenCalledWith([]);
+      expect(useWorkplaceSearchBreadcrumbs).toHaveBeenCalledWith([]);
+    });
   });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/set_chrome.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/set_chrome.tsx
index 59e83a2cb13c2..43db93c1583d1 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/set_chrome.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/set_chrome.tsx
@@ -7,10 +7,11 @@
 import React, { useContext, useEffect } from 'react';
 import { useHistory } from 'react-router-dom';
 import { EuiBreadcrumb } from '@elastic/eui';
+
 import { KibanaContext, IKibanaContext } from '../../index';
 import {
-  appSearchBreadcrumbs,
-  workplaceSearchBreadcrumbs,
+  useAppSearchBreadcrumbs,
+  useWorkplaceSearchBreadcrumbs,
   TBreadcrumbs,
 } from './generate_breadcrumbs';
 import { appSearchTitle, workplaceSearchTitle, TTitle } from './generate_title';
@@ -36,12 +37,15 @@ export const SetAppSearchChrome: React.FC<TBreadcrumbsProps> = ({ text, isRoot }
   const history = useHistory();
   const { setBreadcrumbs, setDocTitle } = useContext(KibanaContext) as IKibanaContext;
 
-  const crumb = isRoot ? [] : [{ text, path: history.location.pathname }];
   const title = isRoot ? [] : [text];
+  const docTitle = appSearchTitle(title as TTitle | []);
+
+  const crumb = isRoot ? [] : [{ text, path: history.location.pathname }];
+  const breadcrumbs = useAppSearchBreadcrumbs(crumb as TBreadcrumbs | []);
 
   useEffect(() => {
-    setBreadcrumbs(appSearchBreadcrumbs(history)(crumb as TBreadcrumbs | []));
-    setDocTitle(appSearchTitle(title as TTitle | []));
+    setBreadcrumbs(breadcrumbs);
+    setDocTitle(docTitle);
   }, []);
 
   return null;
@@ -51,12 +55,15 @@ export const SetWorkplaceSearchChrome: React.FC<TBreadcrumbsProps> = ({ text, is
   const history = useHistory();
   const { setBreadcrumbs, setDocTitle } = useContext(KibanaContext) as IKibanaContext;
 
-  const crumb = isRoot ? [] : [{ text, path: history.location.pathname }];
   const title = isRoot ? [] : [text];
+  const docTitle = workplaceSearchTitle(title as TTitle | []);
+
+  const crumb = isRoot ? [] : [{ text, path: history.location.pathname }];
+  const breadcrumbs = useWorkplaceSearchBreadcrumbs(crumb as TBreadcrumbs | []);
 
   useEffect(() => {
-    setBreadcrumbs(workplaceSearchBreadcrumbs(history)(crumb as TBreadcrumbs | []));
-    setDocTitle(workplaceSearchTitle(title as TTitle | []));
+    setBreadcrumbs(breadcrumbs);
+    setDocTitle(docTitle);
   }, []);
 
   return null;
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_link.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_link.test.tsx
index 76ee8293f2c8b..063118f94cd19 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_link.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_link.test.tsx
@@ -4,12 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import '../../__mocks__/shallow_usecontext.mock';
+import '../../__mocks__/react_router_history.mock';
+
 import React from 'react';
 import { shallow, mount } from 'enzyme';
 import { EuiLink, EuiButton } from '@elastic/eui';
 
-import '../../__mocks__/react_router_history.mock';
-import { mockHistory } from '../../__mocks__';
+import { mockKibanaContext, mockHistory } from '../../__mocks__';
 
 import { EuiReactRouterLink, EuiReactRouterButton } from './eui_link';
 
@@ -59,7 +61,7 @@ describe('EUI & React Router Component Helpers', () => {
       wrapper.find(EuiLink).simulate('click', simulatedEvent);
 
       expect(simulatedEvent.preventDefault).toHaveBeenCalled();
-      expect(mockHistory.push).toHaveBeenCalled();
+      expect(mockKibanaContext.navigateToUrl).toHaveBeenCalled();
     });
 
     it('does not prevent default browser behavior on new tab/window clicks', () => {
@@ -71,7 +73,7 @@ describe('EUI & React Router Component Helpers', () => {
       };
       wrapper.find(EuiLink).simulate('click', simulatedEvent);
 
-      expect(mockHistory.push).not.toHaveBeenCalled();
+      expect(mockKibanaContext.navigateToUrl).not.toHaveBeenCalled();
     });
 
     it('calls inherited onClick actions in addition to default navigation', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_link.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_link.tsx
index b53b2f2b3b650..7221a61d0997b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_link.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_link.tsx
@@ -4,10 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
+import React, { useContext } from 'react';
 import { useHistory } from 'react-router-dom';
 import { EuiLink, EuiButton, EuiButtonProps, EuiLinkAnchorProps } from '@elastic/eui';
 
+import { KibanaContext, IKibanaContext } from '../../index';
 import { letBrowserHandleEvent } from './link_events';
 
 /**
@@ -24,6 +25,10 @@ interface IEuiReactRouterProps {
 
 export const EuiReactRouterHelper: React.FC<IEuiReactRouterProps> = ({ to, onClick, children }) => {
   const history = useHistory();
+  const { navigateToUrl } = useContext(KibanaContext) as IKibanaContext;
+
+  // Generate the correct link href (with basename etc. accounted for)
+  const href = history.createHref({ pathname: to });
 
   const reactRouterLinkClick = (event: React.MouseEvent) => {
     if (onClick) onClick(); // Run any passed click events (e.g. telemetry)
@@ -32,13 +37,10 @@ export const EuiReactRouterHelper: React.FC<IEuiReactRouterProps> = ({ to, onCli
     // Prevent regular link behavior, which causes a browser refresh.
     event.preventDefault();
 
-    // Push the route to the history.
-    history.push(to);
+    // Perform SPA navigation.
+    navigateToUrl(href);
   };
 
-  // Generate the correct link href (with basename etc. accounted for)
-  const href = history.createHref({ pathname: to });
-
   const reactRouterProps = { href, onClick: reactRouterLinkClick };
   return React.cloneElement(children as React.ReactElement, reactRouterProps);
 };
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx
index ca0d395c0d673..4aa171a5a5762 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx
@@ -33,7 +33,6 @@ export const WorkplaceSearch: React.FC = () => {
         </Route>
         <Route>
           <Redirect to={SETUP_GUIDE_PATH} />
-          <SetupGuide /> {/* Kibana displays a blank page on redirect if this isn't included */}
         </Route>
       </Switch>
     );

From eba482743adce2661d5814cff1e6539730d1e830 Mon Sep 17 00:00:00 2001
From: Devon Thomson <devon.thomson@hotmail.com>
Date: Thu, 20 Aug 2020 13:01:25 -0400
Subject: [PATCH 71/85] [Dashboard First] Use App Title for Display Instead of
 App Id (#75457)

Created app title fetch method in embeddable_state_transfer. Used it instead of the raw app id in a number of places.
---
 .../embeddable_state_transfer.test.ts         | 25 ++++++++++++++++++-
 .../embeddable_state_transfer.ts              | 16 ++++++++++--
 src/plugins/embeddable/public/plugin.tsx      | 23 ++++++++++++++---
 .../saved_object_save_modal_origin.tsx        | 12 ++++-----
 .../components/visualize_top_nav.tsx          |  3 +++
 .../application/utils/get_top_nav_config.tsx  | 11 +++++---
 x-pack/plugins/lens/public/app_plugin/app.tsx |  3 +++
 .../lens/public/app_plugin/mounter.tsx        |  1 +
 .../routes/maps_app/top_nav_config.tsx        |  1 +
 9 files changed, 78 insertions(+), 17 deletions(-)

diff --git a/src/plugins/embeddable/public/lib/state_transfer/embeddable_state_transfer.test.ts b/src/plugins/embeddable/public/lib/state_transfer/embeddable_state_transfer.test.ts
index 42adb9d770e8a..ef79b18acd4f5 100644
--- a/src/plugins/embeddable/public/lib/state_transfer/embeddable_state_transfer.test.ts
+++ b/src/plugins/embeddable/public/lib/state_transfer/embeddable_state_transfer.test.ts
@@ -19,7 +19,7 @@
 
 import { coreMock, scopedHistoryMock } from '../../../../../core/public/mocks';
 import { EmbeddableStateTransfer } from '.';
-import { ApplicationStart } from '../../../../../core/public';
+import { ApplicationStart, PublicAppInfo } from '../../../../../core/public';
 
 function mockHistoryState(state: unknown) {
   return scopedHistoryMock.create({ state });
@@ -37,6 +37,29 @@ describe('embeddable state transfer', () => {
     stateTransfer = new EmbeddableStateTransfer(application.navigateToApp);
   });
 
+  it('cannot fetch app name when given no app list', async () => {
+    expect(stateTransfer.getAppNameFromId('test')).toBeUndefined();
+  });
+
+  it('cannot fetch app name when app id is not in given app list', async () => {
+    const appsList = new Map<string, PublicAppInfo>([
+      ['testId', { title: 'State Transfer Test App Hello' } as PublicAppInfo],
+      ['testId2', { title: 'State Transfer Test App Goodbye' } as PublicAppInfo],
+    ]);
+    stateTransfer = new EmbeddableStateTransfer(application.navigateToApp, undefined, appsList);
+    expect(stateTransfer.getAppNameFromId('kibanana')).toBeUndefined();
+  });
+
+  it('can fetch app titles when given app list', async () => {
+    const appsList = new Map<string, PublicAppInfo>([
+      ['testId', { title: 'State Transfer Test App Hello' } as PublicAppInfo],
+      ['testId2', { title: 'State Transfer Test App Goodbye' } as PublicAppInfo],
+    ]);
+    stateTransfer = new EmbeddableStateTransfer(application.navigateToApp, undefined, appsList);
+    expect(stateTransfer.getAppNameFromId('testId')).toBe('State Transfer Test App Hello');
+    expect(stateTransfer.getAppNameFromId('testId2')).toBe('State Transfer Test App Goodbye');
+  });
+
   it('can send an outgoing originating app state', async () => {
     await stateTransfer.navigateToEditor(destinationApp, { state: { originatingApp } });
     expect(application.navigateToApp).toHaveBeenCalledWith('superUltraVisualize', {
diff --git a/src/plugins/embeddable/public/lib/state_transfer/embeddable_state_transfer.ts b/src/plugins/embeddable/public/lib/state_transfer/embeddable_state_transfer.ts
index 8f70e5a66c478..780cff9f4be7e 100644
--- a/src/plugins/embeddable/public/lib/state_transfer/embeddable_state_transfer.ts
+++ b/src/plugins/embeddable/public/lib/state_transfer/embeddable_state_transfer.ts
@@ -18,7 +18,12 @@
  */
 
 import { cloneDeep } from 'lodash';
-import { ScopedHistory, ApplicationStart } from '../../../../../core/public';
+import {
+  ScopedHistory,
+  ApplicationStart,
+  PublicLegacyAppInfo,
+  PublicAppInfo,
+} from '../../../../../core/public';
 import {
   EmbeddableEditorState,
   isEmbeddableEditorState,
@@ -35,9 +40,16 @@ import {
 export class EmbeddableStateTransfer {
   constructor(
     private navigateToApp: ApplicationStart['navigateToApp'],
-    private scopedHistory?: ScopedHistory
+    private scopedHistory?: ScopedHistory,
+    private appList?: ReadonlyMap<string, PublicAppInfo | PublicLegacyAppInfo> | undefined
   ) {}
 
+  /**
+   * Fetches an internationalized app title when given an appId.
+   * @param appId - The id of the app to fetch the title for
+   */
+  public getAppNameFromId = (appId: string): string | undefined => this.appList?.get(appId)?.title;
+
   /**
    * Fetches an {@link EmbeddableEditorState | originating app} argument from the scoped
    * history's location state.
diff --git a/src/plugins/embeddable/public/plugin.tsx b/src/plugins/embeddable/public/plugin.tsx
index 3cbd49279564f..fb09729ab71c3 100644
--- a/src/plugins/embeddable/public/plugin.tsx
+++ b/src/plugins/embeddable/public/plugin.tsx
@@ -17,6 +17,7 @@
  * under the License.
  */
 import React from 'react';
+import { Subscription } from 'rxjs';
 import { DataPublicPluginSetup, DataPublicPluginStart } from '../../data/public';
 import { getSavedObjectFinder } from '../../saved_objects/public';
 import { UiActionsSetup, UiActionsStart } from '../../ui_actions/public';
@@ -27,6 +28,8 @@ import {
   CoreStart,
   Plugin,
   ScopedHistory,
+  PublicAppInfo,
+  PublicLegacyAppInfo,
 } from '../../../core/public';
 import { EmbeddableFactoryRegistry, EmbeddableFactoryProvider } from './types';
 import { bootstrap } from './bootstrap';
@@ -89,6 +92,8 @@ export class EmbeddablePublicPlugin implements Plugin<EmbeddableSetup, Embeddabl
   private customEmbeddableFactoryProvider?: EmbeddableFactoryProvider;
   private outgoingOnlyStateTransfer: EmbeddableStateTransfer = {} as EmbeddableStateTransfer;
   private isRegistryReady = false;
+  private appList?: ReadonlyMap<string, PublicAppInfo | PublicLegacyAppInfo>;
+  private appListSubscription?: Subscription;
 
   constructor(initializerContext: PluginInitializerContext) {}
 
@@ -121,7 +126,15 @@ export class EmbeddablePublicPlugin implements Plugin<EmbeddableSetup, Embeddabl
       );
     });
 
-    this.outgoingOnlyStateTransfer = new EmbeddableStateTransfer(core.application.navigateToApp);
+    this.appListSubscription = core.application.applications$.subscribe((appList) => {
+      this.appList = appList;
+    });
+
+    this.outgoingOnlyStateTransfer = new EmbeddableStateTransfer(
+      core.application.navigateToApp,
+      undefined,
+      this.appList
+    );
     this.isRegistryReady = true;
 
     const getEmbeddablePanelHoc = (stateTransfer?: EmbeddableStateTransfer) => ({
@@ -151,7 +164,7 @@ export class EmbeddablePublicPlugin implements Plugin<EmbeddableSetup, Embeddabl
       getEmbeddableFactories: this.getEmbeddableFactories,
       getStateTransfer: (history?: ScopedHistory) => {
         return history
-          ? new EmbeddableStateTransfer(core.application.navigateToApp, history)
+          ? new EmbeddableStateTransfer(core.application.navigateToApp, history, this.appList)
           : this.outgoingOnlyStateTransfer;
       },
       EmbeddablePanel: getEmbeddablePanelHoc(),
@@ -159,7 +172,11 @@ export class EmbeddablePublicPlugin implements Plugin<EmbeddableSetup, Embeddabl
     };
   }
 
-  public stop() {}
+  public stop() {
+    if (this.appListSubscription) {
+      this.appListSubscription.unsubscribe();
+    }
+  }
 
   private getEmbeddableFactories = () => {
     this.ensureFactoriesExist();
diff --git a/src/plugins/saved_objects/public/save_modal/saved_object_save_modal_origin.tsx b/src/plugins/saved_objects/public/save_modal/saved_object_save_modal_origin.tsx
index 63863b0826f11..ce08151d37c2c 100644
--- a/src/plugins/saved_objects/public/save_modal/saved_object_save_modal_origin.tsx
+++ b/src/plugins/saved_objects/public/save_modal/saved_object_save_modal_origin.tsx
@@ -32,6 +32,7 @@ interface SaveModalDocumentInfo {
 
 interface OriginSaveModalProps {
   originatingApp?: string;
+  getAppNameFromId?: (appId: string) => string | undefined;
   documentInfo: SaveModalDocumentInfo;
   objectType: string;
   onClose: () => void;
@@ -53,16 +54,13 @@ export function SavedObjectSaveModalOrigin(props: OriginSaveModalProps) {
     if (!props.originatingApp) {
       return;
     }
-    let origin = props.originatingApp!;
-
-    // TODO: Remove this after https://github.com/elastic/kibana/pull/63443
-    if (origin.startsWith('kibana:')) {
-      origin = origin.split(':')[1];
-    }
+    const origin = props.getAppNameFromId
+      ? props.getAppNameFromId(props.originatingApp) || props.originatingApp
+      : props.originatingApp;
 
     if (
       !state.copyOnSave ||
-      origin === 'dashboards' // dashboard supports adding a copied panel on save...
+      props.originatingApp === 'dashboards' // dashboard supports adding a copied panel on save...
     ) {
       const originVerb = !documentInfo.id || state.copyOnSave ? addLabel : returnLabel;
       return (
diff --git a/src/plugins/visualize/public/application/components/visualize_top_nav.tsx b/src/plugins/visualize/public/application/components/visualize_top_nav.tsx
index 12a3d1cdf95b1..130561b6245ae 100644
--- a/src/plugins/visualize/public/application/components/visualize_top_nav.tsx
+++ b/src/plugins/visualize/public/application/components/visualize_top_nav.tsx
@@ -75,6 +75,7 @@ const TopNav = ({
     },
     [visInstance.embeddableHandler]
   );
+  const stateTransfer = services.embeddable.getStateTransfer();
 
   const config = useMemo(() => {
     if (isEmbeddableRendered) {
@@ -89,6 +90,7 @@ const TopNav = ({
           visInstance,
           stateContainer,
           visualizationIdFromUrl,
+          stateTransfer,
           embeddableId,
         },
         services
@@ -107,6 +109,7 @@ const TopNav = ({
     visualizationIdFromUrl,
     services,
     embeddableId,
+    stateTransfer,
   ]);
   const [indexPattern, setIndexPattern] = useState(vis.data.indexPattern);
   const showDatePicker = () => {
diff --git a/src/plugins/visualize/public/application/utils/get_top_nav_config.tsx b/src/plugins/visualize/public/application/utils/get_top_nav_config.tsx
index 43121f2cffc41..0423e48bfb41e 100644
--- a/src/plugins/visualize/public/application/utils/get_top_nav_config.tsx
+++ b/src/plugins/visualize/public/application/utils/get_top_nav_config.tsx
@@ -38,6 +38,7 @@ import {
 } from '../types';
 import { VisualizeConstants } from '../visualize_constants';
 import { getEditBreadcrumbs } from './breadcrumbs';
+import { EmbeddableStateTransfer } from '../../../../embeddable/public';
 
 interface TopNavConfigParams {
   hasUnsavedChanges: boolean;
@@ -49,6 +50,7 @@ interface TopNavConfigParams {
   visInstance: VisualizeEditorVisInstance;
   stateContainer: VisualizeAppStateContainer;
   visualizationIdFromUrl?: string;
+  stateTransfer: EmbeddableStateTransfer;
   embeddableId?: string;
 }
 
@@ -63,12 +65,12 @@ export const getTopNavConfig = (
     visInstance,
     stateContainer,
     visualizationIdFromUrl,
+    stateTransfer,
     embeddableId,
   }: TopNavConfigParams,
   {
     application,
     chrome,
-    embeddable,
     history,
     share,
     setActiveUrl,
@@ -118,8 +120,8 @@ export const getTopNavConfig = (
           history.replace(appPath);
           setActiveUrl(appPath);
 
-          if (newlyCreated && embeddable) {
-            embeddable.getStateTransfer().navigateToWithEmbeddablePackage(originatingApp, {
+          if (newlyCreated && stateTransfer) {
+            stateTransfer.navigateToWithEmbeddablePackage(originatingApp, {
               state: { id, type: VISUALIZE_EMBEDDABLE_TYPE },
             });
           } else {
@@ -174,7 +176,7 @@ export const getTopNavConfig = (
     if (embeddableId) {
       state.embeddableId = embeddableId;
     }
-    embeddable.getStateTransfer().navigateToWithEmbeddablePackage(originatingApp, { state });
+    stateTransfer.navigateToWithEmbeddablePackage(originatingApp, { state });
   };
 
   const topNavMenu: TopNavMenuData[] = [
@@ -284,6 +286,7 @@ export const getTopNavConfig = (
                 <SavedObjectSaveModalOrigin
                   documentInfo={savedVis || { title: '' }}
                   onSave={onSave}
+                  getAppNameFromId={stateTransfer.getAppNameFromId}
                   objectType={'visualization'}
                   onClose={() => {}}
                   originatingApp={originatingApp}
diff --git a/x-pack/plugins/lens/public/app_plugin/app.tsx b/x-pack/plugins/lens/public/app_plugin/app.tsx
index ffab84a51a229..b20fe2f804683 100644
--- a/x-pack/plugins/lens/public/app_plugin/app.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/app.tsx
@@ -70,6 +70,7 @@ export function App({
   navigation,
   onAppLeave,
   history,
+  getAppNameFromId,
 }: {
   editorFrame: EditorFrameInstance;
   data: DataPublicPluginStart;
@@ -82,6 +83,7 @@ export function App({
   originatingApp?: string | undefined;
   onAppLeave: AppMountParameters['onAppLeave'];
   history: History;
+  getAppNameFromId?: (appId: string) => string | undefined;
 }) {
   const [state, setState] = useState<State>(() => {
     const currentRange = data.query.timefilter.timefilter.getTime();
@@ -534,6 +536,7 @@ export function App({
             originatingApp={state.originatingApp}
             onSave={(props) => runSave(props)}
             onClose={() => setState((s) => ({ ...s, isSaveModalVisible: false }))}
+            getAppNameFromId={getAppNameFromId}
             documentInfo={{
               id: lastKnownDoc.id,
               title: lastKnownDoc.title || '',
diff --git a/x-pack/plugins/lens/public/app_plugin/mounter.tsx b/x-pack/plugins/lens/public/app_plugin/mounter.tsx
index 1ee618a31a698..398d01af7f1b3 100644
--- a/x-pack/plugins/lens/public/app_plugin/mounter.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/mounter.tsx
@@ -87,6 +87,7 @@ export async function mountApp(
           redirectTo(routeProps, id, returnToOrigin, newlyCreated)
         }
         originatingApp={originatingApp}
+        getAppNameFromId={stateTransfer.getAppNameFromId}
         onAppLeave={params.onAppLeave}
         history={routeProps.history}
       />
diff --git a/x-pack/plugins/maps/public/routing/routes/maps_app/top_nav_config.tsx b/x-pack/plugins/maps/public/routing/routes/maps_app/top_nav_config.tsx
index 35d8490f1a886..497c87ad533a6 100644
--- a/x-pack/plugins/maps/public/routing/routes/maps_app/top_nav_config.tsx
+++ b/x-pack/plugins/maps/public/routing/routes/maps_app/top_nav_config.tsx
@@ -175,6 +175,7 @@ export function getTopNavConfig({
         const saveModal = (
           <SavedObjectSaveModalOrigin
             originatingApp={originatingApp}
+            getAppNameFromId={stateTransfer?.getAppNameFromId}
             onSave={onSave}
             onClose={() => {}}
             documentInfo={{

From 644e9c25d782b8e9cd54ca05015ab514a7ee429e Mon Sep 17 00:00:00 2001
From: Jean-Louis Leysens <jloleysens@gmail.com>
Date: Thu, 20 Aug 2020 19:04:42 +0200
Subject: [PATCH 72/85] [Ingest Pipelines] Processor forms for processors E-J
 (#75054)

* Added the enrich processor form (big one)

* added fail processor form

* Added foreach processor form

* Added geoip processor form and refactored some deserialization

* added grok processor form and updated comments and some i18n ids

* updated existing gsub processor form to be in line with other forms

* added html_strip processor form

* refactored some serialize and deserialize functions and added inference processor form

* fix copy-pasta mistake in inference form and add join processor form

* Added JSON processor field

- Also factored out target_field field to common field (still have
  to update the all instances)
- Built out special logic for handling add_to_root and
  target_field combo on JSON processor form
- Created another serializer, for default boolean -> undefined.

* remove unused variable

* Refactor to use new shared target_field component, and fix JSON serializer bug

* fix i18n

* address pr feedback

* Fix enrich max fields help text copy

* add link to enrich policy docs in help text

* fix error validation message in enrich policy form and replace space with horizontal rule

* address copy feedback

* fix i18n id typo

* fix i18n

* address additional round of feedback and fix json form help text

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../processor_settings_fields.tsx             |   4 +-
 .../processors/append.tsx                     |   4 +-
 .../processors/bytes.tsx                      |  18 +-
 .../processors/circle.tsx                     |  18 +-
 .../common_fields/common_processor_fields.tsx |   7 +-
 .../common_fields/ignore_missing_field.tsx    |  33 ++-
 .../processors/common_fields/target_field.tsx |  46 +++
 .../processors/convert.tsx                    |  24 +-
 .../manage_processor_form/processors/csv.tsx  |   8 +-
 .../manage_processor_form/processors/date.tsx |  35 +--
 .../processors/date_index_name.tsx            |   6 +-
 .../processors/enrich.tsx                     | 264 ++++++++++++++++++
 .../manage_processor_form/processors/fail.tsx |  40 +++
 .../processors/foreach.tsx                    |  81 ++++++
 .../processors/geoip.tsx                      | 109 ++++++++
 .../manage_processor_form/processors/grok.tsx | 134 +++++++++
 .../manage_processor_form/processors/gsub.tsx | 142 +++++-----
 .../processors/html_strip.tsx                 |  39 +++
 .../manage_processor_form/processors/index.ts |  10 +
 .../processors/inference.tsx                  | 203 ++++++++++++++
 .../manage_processor_form/processors/join.tsx |  71 +++++
 .../manage_processor_form/processors/json.tsx |  87 ++++++
 .../processors/shared.ts                      |  56 +++-
 .../shared/map_processor_type_to_form.tsx     |  44 +--
 .../translations/translations/ja-JP.json      |   4 -
 .../translations/translations/zh-CN.json      |   4 -
 26 files changed, 1300 insertions(+), 191 deletions(-)
 create mode 100644 x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/common_fields/target_field.tsx
 create mode 100644 x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/enrich.tsx
 create mode 100644 x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/fail.tsx
 create mode 100644 x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/foreach.tsx
 create mode 100644 x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/geoip.tsx
 create mode 100644 x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/grok.tsx
 create mode 100644 x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/html_strip.tsx
 create mode 100644 x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/inference.tsx
 create mode 100644 x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/join.tsx
 create mode 100644 x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/json.tsx

diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processor_settings_fields.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processor_settings_fields.tsx
index a6447bc30ac00..6a70592bc2f70 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processor_settings_fields.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processor_settings_fields.tsx
@@ -5,7 +5,7 @@
  */
 
 import React, { FunctionComponent } from 'react';
-import { EuiHorizontalRule, EuiSpacer } from '@elastic/eui';
+import { EuiHorizontalRule } from '@elastic/eui';
 
 import { FormDataProvider } from '../../../../../shared_imports';
 import { ProcessorInternal } from '../../types';
@@ -36,7 +36,7 @@ export const ProcessorSettingsFields: FunctionComponent<Props> = ({ processor })
               return (
                 <>
                   <formDescriptor.FieldsComponent />
-                  <EuiSpacer size="m" />
+                  <EuiHorizontalRule />
                   <CommonProcessorFields />
                 </>
               );
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/append.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/append.tsx
index 8eb484b56bafe..09d0981adf1c2 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/append.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/append.tsx
@@ -14,7 +14,7 @@ import {
   ComboBoxField,
 } from '../../../../../../shared_imports';
 
-import { FieldsConfig } from './shared';
+import { FieldsConfig, to } from './shared';
 import { FieldNameField } from './common_fields/field_name_field';
 
 const { emptyField } = fieldValidators;
@@ -22,7 +22,7 @@ const { emptyField } = fieldValidators;
 const fieldsConfig: FieldsConfig = {
   value: {
     type: FIELD_TYPES.COMBO_BOX,
-    deserializer: (v) => (Array.isArray(v) ? v : [String(v)]),
+    deserializer: to.arrayOfStrings,
     label: i18n.translate('xpack.ingestPipelines.pipelineEditor.appendForm.valueFieldLabel', {
       defaultMessage: 'Value',
     }),
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/bytes.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/bytes.tsx
index 64a501f03d454..a76e1a6f3ce9a 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/bytes.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/bytes.tsx
@@ -7,23 +7,9 @@
 import React, { FunctionComponent } from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { FIELD_TYPES, UseField, Field } from '../../../../../../shared_imports';
-
-import { FieldsConfig } from './shared';
 import { IgnoreMissingField } from './common_fields/ignore_missing_field';
 import { FieldNameField } from './common_fields/field_name_field';
-
-const fieldsConfig: FieldsConfig = {
-  target_field: {
-    type: FIELD_TYPES.TEXT,
-    label: i18n.translate('xpack.ingestPipelines.pipelineEditor.bytesForm.targetFieldLabel', {
-      defaultMessage: 'Target field (optional)',
-    }),
-    helpText: i18n.translate('xpack.ingestPipelines.pipelineEditor.bytesForm.targetFieldHelpText', {
-      defaultMessage: 'The field to assign the converted value to',
-    }),
-  },
-};
+import { TargetField } from './common_fields/target_field';
 
 export const Bytes: FunctionComponent = () => {
   return (
@@ -35,7 +21,7 @@ export const Bytes: FunctionComponent = () => {
         )}
       />
 
-      <UseField config={fieldsConfig.target_field} component={Field} path="fields.target_field" />
+      <TargetField />
 
       <IgnoreMissingField />
     </>
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/circle.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/circle.tsx
index 3a39e597cb8dc..599d2fdbfd413 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/circle.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/circle.tsx
@@ -11,7 +11,6 @@ import {
   FIELD_TYPES,
   fieldValidators,
   UseField,
-  Field,
   SelectField,
   NumericField,
 } from '../../../../../../shared_imports';
@@ -19,22 +18,12 @@ import {
 import { FieldsConfig } from './shared';
 import { IgnoreMissingField } from './common_fields/ignore_missing_field';
 import { FieldNameField } from './common_fields/field_name_field';
+import { TargetField } from './common_fields/target_field';
 
 const { emptyField } = fieldValidators;
 
 const fieldsConfig: FieldsConfig = {
-  target_field: {
-    type: FIELD_TYPES.TEXT,
-    label: i18n.translate('xpack.ingestPipelines.pipelineEditor.circleForm.targetFieldLabel', {
-      defaultMessage: 'Target field (optional)',
-    }),
-    helpText: i18n.translate(
-      'xpack.ingestPipelines.pipelineEditor.circleForm.targetFieldHelpText',
-      {
-        defaultMessage: 'By default field is updated in-place.',
-      }
-    ),
-  },
+  /* Required fields config */
   error_distance: {
     type: FIELD_TYPES.NUMBER,
     deserializer: (v) => (typeof v === 'number' && !isNaN(v) ? v : 1.0),
@@ -71,6 +60,7 @@ const fieldsConfig: FieldsConfig = {
   },
   shape_type: {
     type: FIELD_TYPES.SELECT,
+    serializer: String,
     label: i18n.translate('xpack.ingestPipelines.pipelineEditor.circleForm.shapeTypeFieldLabel', {
       defaultMessage: 'Shape type',
     }),
@@ -132,7 +122,7 @@ export const Circle: FunctionComponent = () => {
         path="fields.shape_type"
       />
 
-      <UseField config={fieldsConfig.target_field} component={Field} path="fields.target_field" />
+      <TargetField />
 
       <IgnoreMissingField />
     </>
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/common_fields/common_processor_fields.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/common_fields/common_processor_fields.tsx
index 7ae7b82c31a43..8089b8e7dfad3 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/common_fields/common_processor_fields.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/common_fields/common_processor_fields.tsx
@@ -16,11 +16,12 @@ import {
 } from '../../../../../../../shared_imports';
 
 import { TextEditor } from '../../field_components';
+import { to, from } from '../shared';
 
 const ignoreFailureConfig: FieldConfig = {
   defaultValue: false,
-  serializer: (v) => (v === false ? undefined : v),
-  deserializer: (v) => (typeof v === 'boolean' ? v : undefined),
+  deserializer: to.booleanOrUndef,
+  serializer: from.defaultBoolToUndef(false),
   label: i18n.translate(
     'xpack.ingestPipelines.pipelineEditor.commonFields.ignoreFailureFieldLabel',
     {
@@ -62,7 +63,7 @@ export const CommonProcessorFields: FunctionComponent = () => {
         component={TextEditor}
         componentProps={{
           editorProps: {
-            language: 'painless',
+            languageId: 'painless',
             height: 75,
             options: { minimap: { enabled: false } },
           },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/common_fields/ignore_missing_field.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/common_fields/ignore_missing_field.tsx
index 08eb0a425ef33..35dd462d88425 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/common_fields/ignore_missing_field.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/common_fields/ignore_missing_field.tsx
@@ -5,32 +5,47 @@
  */
 import React, { FunctionComponent } from 'react';
 import { i18n } from '@kbn/i18n';
-import { FIELD_TYPES, UseField, ToggleField } from '../../../../../../../shared_imports';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiCode } from '@elastic/eui';
 
-import { FieldsConfig } from '../shared';
+import {
+  FIELD_TYPES,
+  UseField,
+  ToggleField,
+  FieldConfig,
+} from '../../../../../../../shared_imports';
+
+import { FieldsConfig, to, from } from '../shared';
 
 export const fieldsConfig: FieldsConfig = {
   ignore_missing: {
     type: FIELD_TYPES.TOGGLE,
     defaultValue: false,
-    serializer: (v) => (v === false ? undefined : v),
-    deserializer: (v) => (typeof v === 'boolean' ? v : undefined),
+    deserializer: to.booleanOrUndef,
+    serializer: from.defaultBoolToUndef(false),
     label: i18n.translate(
       'xpack.ingestPipelines.pipelineEditor.commonFields.ignoreMissingFieldLabel',
       {
         defaultMessage: 'Ignore missing',
       }
     ),
+    helpText: (
+      <FormattedMessage
+        id="xpack.ingestPipelines.pipelineEditor.commonFields.ignoreMissingFieldHelpText"
+        defaultMessage="Ignore documents with a missing {field}"
+        values={{
+          field: <EuiCode>{'field'}</EuiCode>,
+        }}
+      />
+    ),
   },
 };
 
-interface Props {
-  helpText?: string;
-}
+type Props = Partial<FieldConfig>;
 
-export const IgnoreMissingField: FunctionComponent<Props> = ({ helpText }) => (
+export const IgnoreMissingField: FunctionComponent<Props> = (props) => (
   <UseField
-    config={{ ...fieldsConfig.ignore_missing, helpText }}
+    config={{ ...fieldsConfig.ignore_missing, ...props }}
     component={ToggleField}
     path="fields.ignore_missing"
   />
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/common_fields/target_field.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/common_fields/target_field.tsx
new file mode 100644
index 0000000000000..9bf44425a7c5d
--- /dev/null
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/common_fields/target_field.tsx
@@ -0,0 +1,46 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FunctionComponent } from 'react';
+import { i18n } from '@kbn/i18n';
+
+import { Field, FIELD_TYPES, UseField, FieldConfig } from '../../../../../../../shared_imports';
+
+import { FieldsConfig } from '../shared';
+
+const fieldsConfig: FieldsConfig = {
+  target_field: {
+    type: FIELD_TYPES.TEXT,
+    deserializer: String,
+    label: i18n.translate('xpack.ingestPipelines.pipelineEditor.commonFields.targetFieldLabel', {
+      defaultMessage: 'Target field (optional)',
+    }),
+    helpText: i18n.translate(
+      'xpack.ingestPipelines.pipelineEditor.commonFields.targetFieldHelpText',
+      {
+        defaultMessage:
+          'The field to assign the joined value to. If empty, the field is updated in-place.',
+      }
+    ),
+  },
+};
+
+type Props = Partial<FieldConfig>;
+
+export const TARGET_FIELD_PATH = 'fields.target_field';
+
+export const TargetField: FunctionComponent<Props> = (props) => {
+  return (
+    <UseField
+      config={{
+        ...fieldsConfig.target_field,
+        ...props,
+      }}
+      component={Field}
+      path={TARGET_FIELD_PATH}
+    />
+  );
+};
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/convert.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/convert.tsx
index b45f589bf0f92..2bf642dd9b518 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/convert.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/convert.tsx
@@ -11,13 +11,13 @@ import {
   FIELD_TYPES,
   fieldValidators,
   UseField,
-  Field,
   SelectField,
 } from '../../../../../../shared_imports';
 
 import { FieldsConfig } from './shared';
 import { FieldNameField } from './common_fields/field_name_field';
 import { IgnoreMissingField } from './common_fields/ignore_missing_field';
+import { TargetField } from './common_fields/target_field';
 
 const { emptyField } = fieldValidators;
 
@@ -42,19 +42,6 @@ const fieldsConfig: FieldsConfig = {
       },
     ],
   },
-  /* Optional fields config */
-  target_field: {
-    type: FIELD_TYPES.TEXT,
-    label: i18n.translate('xpack.ingestPipelines.pipelineEditor.convertForm.targetFieldLabel', {
-      defaultMessage: 'Target field (optional)',
-    }),
-    helpText: i18n.translate(
-      'xpack.ingestPipelines.pipelineEditor.convertForm.targetFieldHelpText',
-      {
-        defaultMessage: 'The field to assign the converted value to.',
-      }
-    ),
-  },
 };
 
 export const Convert: FunctionComponent = () => {
@@ -128,7 +115,14 @@ export const Convert: FunctionComponent = () => {
         path="fields.type"
       />
 
-      <UseField config={fieldsConfig.target_field} component={Field} path="fields.target_field" />
+      <TargetField
+        helpText={i18n.translate(
+          'xpack.ingestPipelines.pipelineEditor.convertForm.targetFieldHelpText',
+          {
+            defaultMessage: 'The field to assign the converted value to.',
+          }
+        )}
+      />
 
       <IgnoreMissingField />
     </>
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/csv.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/csv.tsx
index 3ac0179ca02a6..835177dd861d5 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/csv.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/csv.tsx
@@ -23,7 +23,7 @@ import { FieldsConfig } from './shared';
 import { IgnoreMissingField } from './common_fields/ignore_missing_field';
 import { FieldNameField } from './common_fields/field_name_field';
 
-import { isArrayOfStrings } from './shared';
+import { to } from './shared';
 
 const { minLengthField } = fieldValidators;
 
@@ -47,9 +47,7 @@ const fieldsConfig: FieldsConfig = {
   /* Required fields config */
   target_fields: {
     type: FIELD_TYPES.COMBO_BOX,
-    deserializer: (v) => {
-      return isArrayOfStrings(v) ? v : [];
-    },
+    deserializer: to.arrayOfStrings,
     label: i18n.translate('xpack.ingestPipelines.pipelineEditor.csvForm.targetFieldsFieldLabel', {
       defaultMessage: 'Target fields',
     }),
@@ -112,7 +110,7 @@ const fieldsConfig: FieldsConfig = {
   trim: {
     type: FIELD_TYPES.TOGGLE,
     defaultValue: false,
-    deserializer: (v) => (typeof v === 'boolean' ? v : undefined),
+    deserializer: to.booleanOrUndef,
     label: i18n.translate('xpack.ingestPipelines.pipelineEditor.csvForm.trimFieldLabel', {
       defaultMessage: 'Trim',
     }),
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/date.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/date.tsx
index 424e84058ac3f..7e3f8e0d7cd70 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/date.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/date.tsx
@@ -17,8 +17,9 @@ import {
   ComboBoxField,
 } from '../../../../../../shared_imports';
 
-import { FieldsConfig, isArrayOfStrings } from './shared';
+import { FieldsConfig, to } from './shared';
 import { FieldNameField } from './common_fields/field_name_field';
+import { TargetField } from './common_fields/target_field';
 
 const { minLengthField } = fieldValidators;
 
@@ -26,9 +27,7 @@ const fieldsConfig: FieldsConfig = {
   /* Required fields config */
   formats: {
     type: FIELD_TYPES.COMBO_BOX,
-    deserializer: (v) => {
-      return isArrayOfStrings(v) ? v : [];
-    },
+    deserializer: to.arrayOfStrings,
     label: i18n.translate('xpack.ingestPipelines.pipelineEditor.dateForm.formatsFieldLabel', {
       defaultMessage: 'Formats',
     }),
@@ -51,22 +50,6 @@ const fieldsConfig: FieldsConfig = {
     ],
   },
   /* Optional fields config */
-  target_field: {
-    type: FIELD_TYPES.TEXT,
-    serializer: (v) => (v ? undefined : v),
-    label: i18n.translate('xpack.ingestPipelines.pipelineEditor.dateForm.targetFieldFieldLabel', {
-      defaultMessage: 'Target field (optional)',
-    }),
-    helpText: (
-      <FormattedMessage
-        id="xpack.ingestPipelines.pipelineEditor.dateForm.targetFieldHelpText"
-        defaultMessage="The field that will hold the parsed date. Default field is {defaultField}."
-        values={{
-          defaultField: <EuiCode inline>{'@timestamp'}</EuiCode>,
-        }}
-      />
-    ),
-  },
   timezone: {
     type: FIELD_TYPES.TEXT,
     serializer: (v) => (v ? v : undefined),
@@ -112,7 +95,17 @@ export const DateProcessor: FunctionComponent = () => {
 
       <UseField config={fieldsConfig.formats} component={ComboBoxField} path="fields.formats" />
 
-      <UseField config={fieldsConfig.target_field} component={Field} path="fields.target_field" />
+      <TargetField
+        helpText={
+          <FormattedMessage
+            id="xpack.ingestPipelines.pipelineEditor.dateForm.targetFieldHelpText"
+            defaultMessage="The field that will hold the parsed date. Default field is {defaultField}."
+            values={{
+              defaultField: <EuiCode inline>{'@timestamp'}</EuiCode>,
+            }}
+          />
+        }
+      />
 
       <UseField config={fieldsConfig.timezone} component={Field} path="fields.timezone" />
 
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/date_index_name.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/date_index_name.tsx
index 387c9ff4e0b46..2a278a251c30f 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/date_index_name.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/date_index_name.tsx
@@ -18,7 +18,7 @@ import {
   SelectField,
 } from '../../../../../../shared_imports';
 
-import { FieldsConfig, isArrayOfStrings } from './shared';
+import { FieldsConfig, to } from './shared';
 import { FieldNameField } from './common_fields/field_name_field';
 
 const { emptyField } = fieldValidators;
@@ -89,9 +89,7 @@ const fieldsConfig: FieldsConfig = {
     serializer: (v: string[]) => {
       return v.length ? v : undefined;
     },
-    deserializer: (v) => {
-      return isArrayOfStrings(v) ? v : [];
-    },
+    deserializer: to.arrayOfStrings,
     label: i18n.translate(
       'xpack.ingestPipelines.pipelineEditor.dateIndexNameForm.dateFormatsFieldLabel',
       {
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/enrich.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/enrich.tsx
new file mode 100644
index 0000000000000..31eac38222afb
--- /dev/null
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/enrich.tsx
@@ -0,0 +1,264 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FunctionComponent } from 'react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiLink } from '@elastic/eui';
+import {
+  FIELD_TYPES,
+  fieldValidators,
+  UseField,
+  Field,
+  ToggleField,
+  NumericField,
+  SelectField,
+  ValidationConfig,
+  useKibana,
+} from '../../../../../../shared_imports';
+
+import { FieldNameField } from './common_fields/field_name_field';
+import { IgnoreMissingField } from './common_fields/ignore_missing_field';
+import { TargetField } from './common_fields/target_field';
+
+import { FieldsConfig, from, to } from './shared';
+
+const { emptyField, numberSmallerThanField, numberGreaterThanField } = fieldValidators;
+
+const maxMatchesValidators = {
+  max: numberSmallerThanField({
+    than: 128,
+    allowEquality: true,
+    message: i18n.translate(
+      'xpack.ingestPipelines.pipelineEditor.enrichForm.maxMatchesMaxNumberError',
+      { defaultMessage: 'This number must be less than 128.' }
+    ),
+  }),
+  min: numberGreaterThanField({
+    than: 0,
+    allowEquality: false,
+    message: i18n.translate(
+      'xpack.ingestPipelines.pipelineEditor.enrichForm.maxMatchesMinNumberError',
+      { defaultMessage: 'This number must be greater than 0.' }
+    ),
+  }),
+};
+
+const targetFieldValidator: ValidationConfig = {
+  validator: emptyField(
+    i18n.translate('xpack.ingestPipelines.pipelineEditor.enrichForm.targetFieldRequiredError', {
+      defaultMessage: 'A target field value is required.',
+    })
+  ),
+};
+
+const fieldsConfig: FieldsConfig = {
+  /* Required fields config */
+  policy_name: {
+    type: FIELD_TYPES.TEXT,
+    label: i18n.translate('xpack.ingestPipelines.pipelineEditor.enrichForm.policyNameFieldLabel', {
+      defaultMessage: 'Policy name',
+    }),
+    validations: [
+      {
+        validator: emptyField(
+          i18n.translate(
+            'xpack.ingestPipelines.pipelineEditor.enrichForm.policyNameRequiredError',
+            {
+              defaultMessage: 'A value is required.',
+            }
+          )
+        ),
+      },
+    ],
+  },
+
+  /* Optional fields config */
+  override: {
+    type: FIELD_TYPES.TOGGLE,
+    defaultValue: true,
+    deserializer: to.booleanOrUndef,
+    serializer: from.defaultBoolToUndef,
+    label: i18n.translate('xpack.ingestPipelines.pipelineEditor.enrichForm.overrideFieldLabel', {
+      defaultMessage: 'Override',
+    }),
+    helpText: i18n.translate(
+      'xpack.ingestPipelines.pipelineEditor.enrichForm.overrideFieldHelpText',
+      {
+        defaultMessage: 'If enabled, the processor can overwrite pre-existing field values.',
+      }
+    ),
+  },
+
+  max_matches: {
+    type: FIELD_TYPES.NUMBER,
+    defaultValue: 1,
+    deserializer: (v) => (typeof v === 'number' && !isNaN(v) ? v : 1),
+    serializer: (v) => {
+      const n = parseInt(v, 10);
+      return n === 1 ? undefined : n;
+    },
+    label: i18n.translate('xpack.ingestPipelines.pipelineEditor.enrichForm.maxMatchesFieldLabel', {
+      defaultMessage: 'Maximum matches (optional)',
+    }),
+    helpText: i18n.translate(
+      'xpack.ingestPipelines.pipelineEditor.enrichForm.maxMatchesFieldHelpText',
+      {
+        defaultMessage:
+          'Number of matching enrich documents to include in the target field. Accepts 1–128.',
+      }
+    ),
+    validations: [
+      {
+        validator: (v) => {
+          if (v.value /* value is a string here */) {
+            return maxMatchesValidators.max(v) ?? maxMatchesValidators.min(v);
+          }
+        },
+      },
+    ],
+  },
+
+  shape_relation: {
+    type: FIELD_TYPES.SELECT,
+    defaultValue: 'INTERSECTS',
+    deserializer: String,
+    serializer: (v) => (v === 'INTERSECTS' ? undefined : v),
+    label: i18n.translate(
+      'xpack.ingestPipelines.pipelineEditor.enrichForm.shapeRelationFieldLabel',
+      {
+        defaultMessage: 'Shape relation (optional)',
+      }
+    ),
+  },
+};
+
+export const Enrich: FunctionComponent = () => {
+  const { services } = useKibana();
+  const esDocUrl = services.documentation.getEsDocsBasePath();
+  return (
+    <>
+      <FieldNameField
+        helpText={i18n.translate(
+          'xpack.ingestPipelines.pipelineEditor.enrichForm.fieldNameHelpText',
+          {
+            defaultMessage:
+              'Field used to match incoming documents to enrich documents. Field values are compared to the match field set in the enrich policy.',
+          }
+        )}
+      />
+
+      <UseField
+        config={{
+          ...fieldsConfig.policy_name,
+          helpText: (
+            <FormattedMessage
+              id="xpack.ingestPipelines.pipelineEditor.enrichForm.policyNameHelpText"
+              defaultMessage="Name of the {enrichPolicyLink}"
+              values={{
+                enrichPolicyLink: (
+                  <EuiLink external target="_blank" href={esDocUrl + '/ingest-enriching-data.html'}>
+                    {i18n.translate(
+                      'xpack.ingestPipelines.pipelineEditor.enrichForm.policyNameHelpText.enrichPolicyLink',
+                      { defaultMessage: 'enrich policy' }
+                    )}
+                  </EuiLink>
+                ),
+              }}
+            />
+          ),
+        }}
+        component={Field}
+        path="fields.policy_name"
+      />
+
+      <TargetField
+        label={i18n.translate('xpack.ingestPipelines.pipelineEditor.enrichForm.targetFieldLabel', {
+          defaultMessage: 'Target field',
+        })}
+        helpText={i18n.translate(
+          'xpack.ingestPipelines.pipelineEditor.enrichForm.targetFieldHelpText',
+          {
+            defaultMessage: 'Field used to contain enrich data',
+          }
+        )}
+        validations={[targetFieldValidator]}
+      />
+
+      <UseField config={fieldsConfig.override} component={ToggleField} path="fields.override" />
+
+      <UseField
+        config={fieldsConfig.max_matches}
+        component={NumericField}
+        path="fields.max_matches"
+      />
+
+      <UseField
+        config={{
+          ...fieldsConfig.shape_relation,
+          helpText: (
+            <FormattedMessage
+              id="xpack.ingestPipelines.pipelineEditor.enrichForm.shapeRelationFieldHelpText"
+              defaultMessage="Operator used to match the geo-shape of incoming documents to enrich documents. Only used for {geoMatchPolicyLink}"
+              values={{
+                geoMatchPolicyLink: (
+                  <EuiLink
+                    external
+                    target="_blank"
+                    href={esDocUrl + '/enrich-policy-definition.html'}
+                  >
+                    {i18n.translate(
+                      'xpack.ingestPipelines.pipelineEditor.enrichForm.shapeRelationFieldHelpText.geoMatchPoliciesLink',
+                      { defaultMessage: 'geo-match enrich policies' }
+                    )}
+                  </EuiLink>
+                ),
+              }}
+            />
+          ),
+        }}
+        component={SelectField}
+        componentProps={{
+          euiFieldProps: {
+            options: [
+              {
+                value: 'INTERSECTS',
+                text: i18n.translate(
+                  'xpack.ingestPipelines.pipelineEditor.enrichForm.intersectsOption',
+                  { defaultMessage: 'Intersects' }
+                ),
+              },
+              {
+                value: 'DISJOINT',
+                text: i18n.translate(
+                  'xpack.ingestPipelines.pipelineEditor.enrichFrom.disjointOption',
+                  { defaultMessage: 'Disjoint' }
+                ),
+              },
+              {
+                value: 'WITHIN',
+                text: i18n.translate(
+                  'xpack.ingestPipelines.pipelineEditor.enrichForm.withinOption',
+                  { defaultMessage: 'Within' }
+                ),
+              },
+              {
+                value: 'CONTAINS',
+                text: i18n.translate(
+                  'xpack.ingestPipelines.pipelineEditor.enrichForm.containsOption',
+                  { defaultMessage: 'Contains' }
+                ),
+              },
+            ],
+          },
+        }}
+        path="fields.shape_relation"
+      />
+
+      <IgnoreMissingField />
+    </>
+  );
+};
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/fail.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/fail.tsx
new file mode 100644
index 0000000000000..3befadc3ca5a3
--- /dev/null
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/fail.tsx
@@ -0,0 +1,40 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FunctionComponent } from 'react';
+import { i18n } from '@kbn/i18n';
+
+import { FIELD_TYPES, fieldValidators, UseField, Field } from '../../../../../../shared_imports';
+
+import { FieldsConfig } from './shared';
+
+const { emptyField } = fieldValidators;
+
+const fieldsConfig: FieldsConfig = {
+  message: {
+    type: FIELD_TYPES.TEXT,
+    deserializer: String,
+    label: i18n.translate('xpack.ingestPipelines.pipelineEditor.failForm.messageFieldLabel', {
+      defaultMessage: 'Message',
+    }),
+    helpText: i18n.translate('xpack.ingestPipelines.pipelineEditor.failForm.messageHelpText', {
+      defaultMessage: 'Error message returned by the processor',
+    }),
+    validations: [
+      {
+        validator: emptyField(
+          i18n.translate('xpack.ingestPipelines.pipelineEditor.failForm.valueRequiredError', {
+            defaultMessage: 'A message is required.',
+          })
+        ),
+      },
+    ],
+  },
+};
+
+export const Fail: FunctionComponent = () => {
+  return <UseField component={Field} config={fieldsConfig.message} path="fields.message" />;
+};
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/foreach.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/foreach.tsx
new file mode 100644
index 0000000000000..e471f8322f164
--- /dev/null
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/foreach.tsx
@@ -0,0 +1,81 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FunctionComponent } from 'react';
+import { i18n } from '@kbn/i18n';
+
+import { FIELD_TYPES, fieldValidators, UseField } from '../../../../../../shared_imports';
+
+import { XJsonEditor } from '../field_components';
+
+import { FieldNameField } from './common_fields/field_name_field';
+import { FieldsConfig, to } from './shared';
+
+const { emptyField, isJsonField } = fieldValidators;
+
+const fieldsConfig: FieldsConfig = {
+  /* Required fields config */
+  processor: {
+    type: FIELD_TYPES.TEXT,
+    deserializer: to.jsonString,
+    serializer: JSON.parse,
+    label: i18n.translate('xpack.ingestPipelines.pipelineEditor.foreachForm.processorFieldLabel', {
+      defaultMessage: 'Processor',
+    }),
+    helpText: i18n.translate('xpack.ingestPipelines.pipelineEditor.foreachForm.processorHelpText', {
+      defaultMessage: 'Ingest processor to run on each array value',
+    }),
+    validations: [
+      {
+        validator: emptyField(
+          i18n.translate('xpack.ingestPipelines.pipelineEditor.failForm.processorRequiredError', {
+            defaultMessage: 'A processor is required.',
+          })
+        ),
+      },
+      {
+        validator: isJsonField(
+          i18n.translate(
+            'xpack.ingestPipelines.pipelineEditor.failForm.processorInvalidJsonError',
+            {
+              defaultMessage: 'Invalid JSON',
+            }
+          )
+        ),
+      },
+    ],
+  },
+};
+
+export const Foreach: FunctionComponent = () => {
+  return (
+    <>
+      <FieldNameField
+        helpText={i18n.translate(
+          'xpack.ingestPipelines.pipelineEditor.failForm.fieldNameHelpText',
+          { defaultMessage: 'Field containing array values' }
+        )}
+      />
+
+      <UseField
+        component={XJsonEditor}
+        componentProps={{
+          editorProps: {
+            height: 200,
+            'aria-label': i18n.translate(
+              'xpack.ingestPipelines.pipelineEditor.customForm.optionsFieldAriaLabel',
+              {
+                defaultMessage: 'Configuration JSON editor',
+              }
+            ),
+          },
+        }}
+        config={fieldsConfig.processor}
+        path="fields.processor"
+      />
+    </>
+  );
+};
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/geoip.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/geoip.tsx
new file mode 100644
index 0000000000000..ef2aa62c4a7de
--- /dev/null
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/geoip.tsx
@@ -0,0 +1,109 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FunctionComponent } from 'react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiCode } from '@elastic/eui';
+
+import {
+  FIELD_TYPES,
+  UseField,
+  Field,
+  ComboBoxField,
+  ToggleField,
+} from '../../../../../../shared_imports';
+
+import { FieldNameField } from './common_fields/field_name_field';
+import { IgnoreMissingField } from './common_fields/ignore_missing_field';
+import { FieldsConfig, from, to } from './shared';
+import { TargetField } from './common_fields/target_field';
+
+const fieldsConfig: FieldsConfig = {
+  /* Optional field config */
+  database_file: {
+    type: FIELD_TYPES.TEXT,
+    serializer: (v) => (v === 'GeoLite2-City.mmdb' ? undefined : v),
+    label: i18n.translate('xpack.ingestPipelines.pipelineEditor.geoIPForm.databaseFileLabel', {
+      defaultMessage: 'Database file (optional)',
+    }),
+    helpText: (
+      <FormattedMessage
+        id="xpack.ingestPipelines.pipelineEditor.geoIPForm.databaseFileHelpText"
+        defaultMessage="GeoIP2 database file in the {ingestGeoIP} configuration directory. Defaults to {databaseFile}."
+        values={{
+          databaseFile: <EuiCode inline>{'GeoLite2-City.mmdb'}</EuiCode>,
+          ingestGeoIP: <EuiCode inline>{'ingest-geoip'}</EuiCode>,
+        }}
+      />
+    ),
+  },
+
+  properties: {
+    type: FIELD_TYPES.COMBO_BOX,
+    deserializer: to.arrayOfStrings,
+    label: i18n.translate('xpack.ingestPipelines.pipelineEditor.geoIPForm.propertiesFieldLabel', {
+      defaultMessage: 'Properties (optional)',
+    }),
+    helpText: i18n.translate(
+      'xpack.ingestPipelines.pipelineEditor.geoIPForm.propertiesFieldHelpText',
+      {
+        defaultMessage:
+          'Properties added to the target field. Valid properties depend on the database file used.',
+      }
+    ),
+  },
+
+  first_only: {
+    type: FIELD_TYPES.TOGGLE,
+    defaultValue: true,
+    deserializer: to.booleanOrUndef,
+    serializer: from.defaultBoolToUndef(true),
+    label: i18n.translate('xpack.ingestPipelines.pipelineEditor.geoIPForm.firstOnlyFieldLabel', {
+      defaultMessage: 'First only',
+    }),
+    helpText: i18n.translate(
+      'xpack.ingestPipelines.pipelineEditor.geoIPForm.firstOnlyFieldHelpText',
+      {
+        defaultMessage: 'Use the first matching geo data, even if the field contains an array.',
+      }
+    ),
+  },
+};
+
+export const GeoIP: FunctionComponent = () => {
+  return (
+    <>
+      <FieldNameField
+        helpText={i18n.translate(
+          'xpack.ingestPipelines.pipelineEditor.geoIPForm.fieldNameHelpText',
+          { defaultMessage: 'Field containing an IP address for the geographical lookup' }
+        )}
+      />
+
+      <TargetField
+        helpText={i18n.translate(
+          'xpack.ingestPipelines.pipelineEditor.geoIPForm.targetFieldHelpText',
+          {
+            defaultMessage: 'Field used to contain geo data properties',
+          }
+        )}
+      />
+
+      <UseField component={Field} config={fieldsConfig.database_file} path="fields.database_file" />
+
+      <UseField
+        component={ComboBoxField}
+        config={fieldsConfig.properties}
+        path="fields.properties"
+      />
+
+      <UseField component={ToggleField} config={fieldsConfig.first_only} path="fields.first_only" />
+
+      <IgnoreMissingField />
+    </>
+  );
+};
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/grok.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/grok.tsx
new file mode 100644
index 0000000000000..1ed9898149a67
--- /dev/null
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/grok.tsx
@@ -0,0 +1,134 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FunctionComponent } from 'react';
+import { i18n } from '@kbn/i18n';
+
+import {
+  FIELD_TYPES,
+  UseField,
+  ComboBoxField,
+  ToggleField,
+  fieldValidators,
+} from '../../../../../../shared_imports';
+
+import { XJsonEditor } from '../field_components';
+
+import { FieldNameField } from './common_fields/field_name_field';
+import { IgnoreMissingField } from './common_fields/ignore_missing_field';
+import { FieldsConfig, to, from } from './shared';
+
+const { emptyField, isJsonField } = fieldValidators;
+
+const fieldsConfig: FieldsConfig = {
+  /* Required field configs */
+  patterns: {
+    type: FIELD_TYPES.COMBO_BOX,
+    deserializer: to.arrayOfStrings,
+    label: i18n.translate('xpack.ingestPipelines.pipelineEditor.grokForm.patternsFieldLabel', {
+      defaultMessage: 'Patterns',
+    }),
+    helpText: i18n.translate('xpack.ingestPipelines.pipelineEditor.grokForm.patternsHelpText', {
+      defaultMessage:
+        'Grok expressions used to match and extract named capture groups. Uses the first matching expression.',
+    }),
+    validations: [
+      {
+        validator: emptyField(
+          i18n.translate(
+            'xpack.ingestPipelines.pipelineEditor.grokForm.patternsValueRequiredError',
+            { defaultMessage: 'A value is required.' }
+          )
+        ),
+      },
+    ],
+  },
+  /* Optional field configs */
+  pattern_definitions: {
+    type: FIELD_TYPES.TEXT,
+    deserializer: to.jsonString,
+    serializer: from.optionalJson,
+    label: i18n.translate('xpack.ingestPipelines.pipelineEditor.grokForm.patternDefinitionsLabel', {
+      defaultMessage: 'Pattern definitions (optional)',
+    }),
+    helpText: i18n.translate(
+      'xpack.ingestPipelines.pipelineEditor.grokForm.patternDefinitionsHelpText',
+      {
+        defaultMessage:
+          'A map of pattern-name and pattern tuples defining custom patterns. Patterns matching existing names will override the pre-existing definition.',
+      }
+    ),
+    validations: [
+      {
+        validator: isJsonField(
+          i18n.translate(
+            'xpack.ingestPipelines.pipelineEditor.grokForm.patternsDefinitionsInvalidJSONError',
+            { defaultMessage: 'Invalid JSON' }
+          ),
+          {
+            allowEmptyString: true,
+          }
+        ),
+      },
+    ],
+  },
+
+  trace_match: {
+    type: FIELD_TYPES.TOGGLE,
+    defaultValue: false,
+    deserializer: to.booleanOrUndef,
+    serializer: from.defaultBoolToUndef(false),
+    label: i18n.translate('xpack.ingestPipelines.pipelineEditor.grokForm.traceMatchFieldLabel', {
+      defaultMessage: 'Trace match',
+    }),
+    helpText: i18n.translate(
+      'xpack.ingestPipelines.pipelineEditor.grokForm.traceMatchFieldHelpText',
+      {
+        defaultMessage: 'Add metadata about the matching expression to the document',
+      }
+    ),
+  },
+};
+
+export const Grok: FunctionComponent = () => {
+  return (
+    <>
+      <FieldNameField
+        helpText={i18n.translate(
+          'xpack.ingestPipelines.pipelineEditor.grokForm.fieldNameHelpText',
+          { defaultMessage: 'Field to search for matches' }
+        )}
+      />
+
+      <UseField component={ComboBoxField} config={fieldsConfig.patterns} path="fields.patterns" />
+
+      <UseField
+        component={XJsonEditor}
+        config={fieldsConfig.pattern_definitions}
+        componentProps={{
+          editorProps: {
+            height: 200,
+            'aria-label': i18n.translate(
+              'xpack.ingestPipelines.pipelineEditor.grokForm.patternDefinitionsAriaLabel',
+              {
+                defaultMessage: 'Pattern definitions editor',
+              }
+            ),
+          },
+        }}
+        path="fields.pattern_definitions"
+      />
+
+      <UseField
+        component={ToggleField}
+        config={fieldsConfig.trace_match}
+        path="fields.trace_match"
+      />
+
+      <IgnoreMissingField />
+    </>
+  );
+};
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/gsub.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/gsub.tsx
index 3148022adaa98..4d3445d469da2 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/gsub.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/gsub.tsx
@@ -6,89 +6,75 @@
 
 import React, { FunctionComponent } from 'react';
 import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiCode } from '@elastic/eui';
 
-import {
-  FieldConfig,
-  FIELD_TYPES,
-  fieldValidators,
-  ToggleField,
-  UseField,
-  Field,
-} from '../../../../../../shared_imports';
-import { TextEditor } from '../field_components';
-
-const { emptyField } = fieldValidators;
+import { FIELD_TYPES, fieldValidators, UseField, Field } from '../../../../../../shared_imports';
 
-const fieldConfig: FieldConfig = {
-  type: FIELD_TYPES.TEXT,
-  label: i18n.translate('xpack.ingestPipelines.pipelineEditor.gsubForm.fieldFieldLabel', {
-    defaultMessage: 'Field',
-  }),
-  validations: [
-    {
-      validator: emptyField(
-        i18n.translate('xpack.ingestPipelines.pipelineEditor.gsubForm.fieldRequiredError', {
-          defaultMessage: 'A field value is required.',
-        })
-      ),
-    },
-  ],
-};
+import { TextEditor } from '../field_components';
 
-const patternConfig: FieldConfig = {
-  type: FIELD_TYPES.TEXT,
-  label: i18n.translate('xpack.ingestPipelines.pipelineEditor.gsubForm.patternFieldLabel', {
-    defaultMessage: 'Pattern',
-  }),
-  validations: [
-    {
-      validator: emptyField(
-        i18n.translate('xpack.ingestPipelines.pipelineEditor.gsubForm.patternRequiredError', {
-          defaultMessage: 'A pattern value is required.',
-        })
-      ),
-    },
-  ],
-};
+import { FieldsConfig } from './shared';
+import { FieldNameField } from './common_fields/field_name_field';
+import { IgnoreMissingField } from './common_fields/ignore_missing_field';
+import { TargetField } from './common_fields/target_field';
 
-const replacementConfig: FieldConfig = {
-  type: FIELD_TYPES.TEXT,
-  label: i18n.translate('xpack.ingestPipelines.pipelineEditor.gsubForm.replacementFieldLabel', {
-    defaultMessage: 'Replacement',
-  }),
-  validations: [
-    {
-      validator: emptyField(
-        i18n.translate('xpack.ingestPipelines.pipelineEditor.gsubForm.replacementRequiredError', {
-          defaultMessage: 'A replacement value is required.',
-        })
-      ),
-    },
-  ],
-};
+const { emptyField } = fieldValidators;
 
-const targetConfig: FieldConfig = {
-  type: FIELD_TYPES.TEXT,
-  label: i18n.translate('xpack.ingestPipelines.pipelineEditor.gsubForm.targetFieldLabel', {
-    defaultMessage: 'Target field (optional)',
-  }),
-};
+const fieldsConfig: FieldsConfig = {
+  /* Required fields config */
+  pattern: {
+    type: FIELD_TYPES.TEXT,
+    label: i18n.translate('xpack.ingestPipelines.pipelineEditor.gsubForm.patternFieldLabel', {
+      defaultMessage: 'Pattern',
+    }),
+    deserializer: String,
+    helpText: i18n.translate('xpack.ingestPipelines.pipelineEditor.gsubForm.patternFieldHelpText', {
+      defaultMessage: 'Regular expression used to match substrings in the field',
+    }),
+    validations: [
+      {
+        validator: emptyField(
+          i18n.translate('xpack.ingestPipelines.pipelineEditor.gsubForm.patternRequiredError', {
+            defaultMessage: 'A value is required.',
+          })
+        ),
+      },
+    ],
+  },
 
-const ignoreMissingConfig: FieldConfig = {
-  defaultValue: false,
-  label: i18n.translate('xpack.ingestPipelines.pipelineEditor.gsubForm.ignoreMissingFieldLabel', {
-    defaultMessage: 'Ignore missing',
-  }),
-  type: FIELD_TYPES.TOGGLE,
+  replacement: {
+    type: FIELD_TYPES.TEXT,
+    label: i18n.translate('xpack.ingestPipelines.pipelineEditor.gsubForm.replacementFieldLabel', {
+      defaultMessage: 'Replacement',
+    }),
+    helpText: i18n.translate(
+      'xpack.ingestPipelines.pipelineEditor.gsubForm.replacementFieldHelpText',
+      { defaultMessage: 'Replacement text for matches' }
+    ),
+    validations: [
+      {
+        validator: emptyField(
+          i18n.translate('xpack.ingestPipelines.pipelineEditor.gsubForm.replacementRequiredError', {
+            defaultMessage: 'A value is required.',
+          })
+        ),
+      },
+    ],
+  },
 };
 
 export const Gsub: FunctionComponent = () => {
   return (
     <>
-      <UseField config={fieldConfig} component={Field} path="fields.field" />
+      <FieldNameField
+        helpText={i18n.translate(
+          'xpack.ingestPipelines.pipelineEditor.gsubForm.fieldNameHelpText',
+          { defaultMessage: 'Field to search for matches' }
+        )}
+      />
 
       <UseField
-        config={patternConfig}
+        config={fieldsConfig.pattern}
         component={TextEditor}
         componentProps={{
           editorProps: {
@@ -99,11 +85,21 @@ export const Gsub: FunctionComponent = () => {
         path="fields.pattern"
       />
 
-      <UseField config={replacementConfig} component={Field} path="fields.replacement" />
+      <UseField config={fieldsConfig.replacement} component={Field} path="fields.replacement" />
 
-      <UseField config={targetConfig} component={Field} path="fields.target_field" />
+      <TargetField
+        helpText={
+          <FormattedMessage
+            id="xpack.ingestPipelines.pipelineEditor.gsubForm.targetFieldHelpText"
+            defaultMessage="Field used to contain updated text. Defaults to {field}."
+            values={{
+              field: <EuiCode>{'field'}</EuiCode>,
+            }}
+          />
+        }
+      />
 
-      <UseField config={ignoreMissingConfig} component={ToggleField} path="fields.ignore_missing" />
+      <IgnoreMissingField />
     </>
   );
 };
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/html_strip.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/html_strip.tsx
new file mode 100644
index 0000000000000..c6ca7df4cc3e7
--- /dev/null
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/html_strip.tsx
@@ -0,0 +1,39 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FunctionComponent } from 'react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiCode } from '@elastic/eui';
+
+import { FieldNameField } from './common_fields/field_name_field';
+import { IgnoreMissingField } from './common_fields/ignore_missing_field';
+import { TargetField } from './common_fields/target_field';
+
+export const HtmlStrip: FunctionComponent = () => {
+  return (
+    <>
+      <FieldNameField
+        helpText={i18n.translate(
+          'xpack.ingestPipelines.pipelineEditor.htmlStripForm.fieldNameHelpText',
+          { defaultMessage: 'Field to remove HTML tags from' }
+        )}
+      />
+
+      <TargetField
+        helpText={
+          <FormattedMessage
+            id="xpack.ingestPipelines.pipelineEditor.htmlStripForm.targetFieldHelpText"
+            defaultMessage="Field used to contain stripped text. Defaults to {field}."
+            values={{ field: <EuiCode>{'field'}</EuiCode> }}
+          />
+        }
+      />
+
+      <IgnoreMissingField />
+    </>
+  );
+};
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/index.ts b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/index.ts
index 6996deb2d861c..4974361bf0410 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/index.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/index.ts
@@ -14,3 +14,13 @@ export { DateIndexName } from './date_index_name';
 export { Dissect } from './dissect';
 export { DotExpander } from './dot_expander';
 export { Drop } from './drop';
+export { Enrich } from './enrich';
+export { Fail } from './fail';
+export { Foreach } from './foreach';
+export { GeoIP } from './geoip';
+export { Grok } from './grok';
+export { Gsub } from './gsub';
+export { HtmlStrip } from './html_strip';
+export { Inference } from './inference';
+export { Join } from './join';
+export { Json } from './json';
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/inference.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/inference.tsx
new file mode 100644
index 0000000000000..ee8d7cc55a9f1
--- /dev/null
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/inference.tsx
@@ -0,0 +1,203 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FunctionComponent } from 'react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiCode, EuiLink } from '@elastic/eui';
+
+import {
+  FIELD_TYPES,
+  fieldValidators,
+  UseField,
+  Field,
+  useKibana,
+} from '../../../../../../shared_imports';
+
+import { XJsonEditor } from '../field_components';
+
+import { TargetField } from './common_fields/target_field';
+
+import { FieldsConfig, to, from } from './shared';
+
+const { emptyField, isJsonField } = fieldValidators;
+
+const INFERENCE_CONFIG_DOCS = {
+  regression: {
+    path: 'inference-processor.html#inference-processor-regression-opt',
+    linkLabel: i18n.translate(
+      'xpack.ingestPipelines.pipelineEditor.inferenceForm.inferenceConfigField.regressionLinkLabel',
+      { defaultMessage: 'regression' }
+    ),
+  },
+  classification: {
+    path: 'inference-processor.html#inference-processor-classification-opt',
+    linkLabel: i18n.translate(
+      'xpack.ingestPipelines.pipelineEditor.inferenceForm.inferenceConfigField.classificationLinkLabel',
+      { defaultMessage: 'classification' }
+    ),
+  },
+};
+
+const getInferenceConfigHelpText = (esDocsBasePath: string): React.ReactNode => {
+  return (
+    <FormattedMessage
+      id="xpack.ingestPipelines.pipelineEditor.inferenceForm.inferenceConfigurationHelpText"
+      defaultMessage="Contains the inference type and its options. There are two types: {regression} and {classification}."
+      values={{
+        regression: (
+          <EuiLink
+            external
+            target="_blank"
+            href={`${esDocsBasePath}/${INFERENCE_CONFIG_DOCS.regression.path}`}
+          >
+            {INFERENCE_CONFIG_DOCS.regression.linkLabel}
+          </EuiLink>
+        ),
+        classification: (
+          <EuiLink
+            external
+            target="_blank"
+            href={`${esDocsBasePath}/${INFERENCE_CONFIG_DOCS.classification.path}`}
+          >
+            {INFERENCE_CONFIG_DOCS.classification.linkLabel}
+          </EuiLink>
+        ),
+      }}
+    />
+  );
+};
+
+const fieldsConfig: FieldsConfig = {
+  /* Required fields config */
+  model_id: {
+    type: FIELD_TYPES.TEXT,
+    label: i18n.translate('xpack.ingestPipelines.pipelineEditor.inferenceForm.modelIDFieldLabel', {
+      defaultMessage: 'Model ID',
+    }),
+    deserializer: String,
+    helpText: i18n.translate(
+      'xpack.ingestPipelines.pipelineEditor.inferenceForm.modelIDFieldHelpText',
+      {
+        defaultMessage: 'ID of the model to infer against',
+      }
+    ),
+    validations: [
+      {
+        validator: emptyField(
+          i18n.translate(
+            'xpack.ingestPipelines.pipelineEditor.inferenceForm.patternRequiredError',
+            {
+              defaultMessage: 'A model ID value is required.',
+            }
+          )
+        ),
+      },
+    ],
+  },
+
+  /* Optional fields config */
+  field_map: {
+    type: FIELD_TYPES.TEXT,
+    deserializer: to.jsonString,
+    serializer: from.optionalJson,
+    label: i18n.translate('xpack.ingestPipelines.pipelineEditor.inferenceForm.fieldMapLabel', {
+      defaultMessage: 'Field map (optional)',
+    }),
+    helpText: i18n.translate(
+      'xpack.ingestPipelines.pipelineEditor.inferenceForm.fieldMapHelpText',
+      {
+        defaultMessage:
+          'Maps document field names to the known field names of the model. Takes precedence over any mappings in the model.',
+      }
+    ),
+    validations: [
+      {
+        validator: isJsonField(
+          i18n.translate(
+            'xpack.ingestPipelines.pipelineEditor.inferenceForm.fieldMapInvalidJSONError',
+            { defaultMessage: 'Invalid JSON' }
+          ),
+          {
+            allowEmptyString: true,
+          }
+        ),
+      },
+    ],
+  },
+
+  inference_config: {
+    type: FIELD_TYPES.TEXT,
+    deserializer: to.jsonString,
+    serializer: from.optionalJson,
+    label: i18n.translate(
+      'xpack.ingestPipelines.pipelineEditor.inferenceForm.inferenceConfigLabel',
+      {
+        defaultMessage: 'Inference configuration (optional)',
+      }
+    ),
+    validations: [
+      {
+        validator: isJsonField(
+          i18n.translate(
+            'xpack.ingestPipelines.pipelineEditor.grokForm.patternsDefinitionsInvalidJSONError',
+            { defaultMessage: 'Invalid JSON' }
+          ),
+          {
+            allowEmptyString: true,
+          }
+        ),
+      },
+    ],
+  },
+};
+
+export const Inference: FunctionComponent = () => {
+  const { services } = useKibana();
+  const esDocUrl = services.documentation.getEsDocsBasePath();
+  return (
+    <>
+      <UseField config={fieldsConfig.model_id} component={Field} path="fields.model_id" />
+
+      <TargetField
+        helpText={
+          <FormattedMessage
+            id="xpack.ingestPipelines.pipelineEditor.inferenceForm.targetFieldHelpText"
+            defaultMessage="Field used to contain inference processor results. Defaults to {targetField}."
+            values={{ targetField: <EuiCode inline>{'ml.inference.<processor_tag>'}</EuiCode> }}
+          />
+        }
+      />
+
+      <UseField
+        config={fieldsConfig.field_map}
+        component={XJsonEditor}
+        componentProps={{
+          editorProps: {
+            height: 200,
+            options: { minimap: { enabled: false } },
+          },
+        }}
+        path="fields.field_map"
+      />
+
+      <UseField
+        config={{
+          ...fieldsConfig.inference_config,
+          helpText: getInferenceConfigHelpText(esDocUrl),
+        }}
+        component={XJsonEditor}
+        componentProps={{
+          editorProps: {
+            height: 200,
+            options: { minimap: { enabled: false } },
+          },
+        }}
+        path="fields.inference_config"
+      />
+    </>
+  );
+};
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/join.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/join.tsx
new file mode 100644
index 0000000000000..712d0106459b1
--- /dev/null
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/join.tsx
@@ -0,0 +1,71 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FunctionComponent } from 'react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiCode } from '@elastic/eui';
+
+import { FIELD_TYPES, fieldValidators, UseField, Field } from '../../../../../../shared_imports';
+
+import { FieldsConfig } from './shared';
+import { FieldNameField } from './common_fields/field_name_field';
+import { TargetField } from './common_fields/target_field';
+
+const { emptyField } = fieldValidators;
+
+const fieldsConfig: FieldsConfig = {
+  /* Required fields config */
+  separator: {
+    type: FIELD_TYPES.TEXT,
+    label: i18n.translate('xpack.ingestPipelines.pipelineEditor.joinForm.separatorFieldLabel', {
+      defaultMessage: 'Separator',
+    }),
+    deserializer: String,
+    helpText: i18n.translate(
+      'xpack.ingestPipelines.pipelineEditor.joinForm.separatorFieldHelpText',
+      {
+        defaultMessage: 'Separator character',
+      }
+    ),
+    validations: [
+      {
+        validator: emptyField(
+          i18n.translate('xpack.ingestPipelines.pipelineEditor.joinForm.separatorRequiredError', {
+            defaultMessage: 'A separator value is required.',
+          })
+        ),
+      },
+    ],
+  },
+};
+
+export const Join: FunctionComponent = () => {
+  return (
+    <>
+      <FieldNameField
+        helpText={i18n.translate(
+          'xpack.ingestPipelines.pipelineEditor.joinForm.fieldNameHelpText',
+          { defaultMessage: 'Field containing array values to join' }
+        )}
+      />
+
+      <UseField config={fieldsConfig.separator} component={Field} path="fields.separator" />
+
+      <TargetField
+        helpText={
+          <FormattedMessage
+            id="xpack.ingestPipelines.pipelineEditor.joinForm.targetFieldHelpText"
+            defaultMessage="Field used to contain the joined value. Defaults to {field}."
+            values={{
+              field: <EuiCode>{'field'}</EuiCode>,
+            }}
+          />
+        }
+      />
+    </>
+  );
+};
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/json.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/json.tsx
new file mode 100644
index 0000000000000..9d62c67460136
--- /dev/null
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/json.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;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FunctionComponent, useEffect, useState } from 'react';
+import { i18n } from '@kbn/i18n';
+
+import {
+  FIELD_TYPES,
+  UseField,
+  ToggleField,
+  useFormContext,
+} from '../../../../../../shared_imports';
+
+import { FieldsConfig, from, to } from './shared';
+import { FieldNameField } from './common_fields/field_name_field';
+import { TargetField, TARGET_FIELD_PATH } from './common_fields/target_field';
+
+const ADD_TO_ROOT_FIELD_PATH = 'fields.add_to_root';
+
+const fieldsConfig: FieldsConfig = {
+  /* Optional fields config */
+  add_to_root: {
+    type: FIELD_TYPES.TOGGLE,
+    defaultValue: false,
+    label: i18n.translate('xpack.ingestPipelines.pipelineEditor.jsonForm.addToRootFieldLabel', {
+      defaultMessage: 'Add to root',
+    }),
+    deserializer: to.booleanOrUndef,
+    serializer: from.defaultBoolToUndef(false),
+    helpText: i18n.translate(
+      'xpack.ingestPipelines.pipelineEditor.jsonForm.addToRootFieldHelpText',
+      {
+        defaultMessage:
+          'Add the JSON object to the top level of the document. Cannot be combined with a target field.',
+      }
+    ),
+  },
+};
+
+export const Json: FunctionComponent = () => {
+  const form = useFormContext();
+  const [isAddToPathDisabled, setIsAddToPathDisabled] = useState<boolean>(false);
+  useEffect(() => {
+    const subscription = form.subscribe(({ data: { raw: rawData } }) => {
+      const hasTargetField = !!rawData[TARGET_FIELD_PATH];
+      if (hasTargetField && !isAddToPathDisabled) {
+        setIsAddToPathDisabled(true);
+        form.getFields()[ADD_TO_ROOT_FIELD_PATH].setValue(false);
+      } else if (!hasTargetField && isAddToPathDisabled) {
+        setIsAddToPathDisabled(false);
+      }
+    });
+    return subscription.unsubscribe;
+  }, [form, isAddToPathDisabled]);
+
+  return (
+    <>
+      <FieldNameField
+        helpText={i18n.translate(
+          'xpack.ingestPipelines.pipelineEditor.jsonForm.fieldNameHelpText',
+          { defaultMessage: 'Field to be parsed' }
+        )}
+      />
+
+      <TargetField
+        helpText={i18n.translate(
+          'xpack.ingestPipelines.pipelineEditor.jsonForm.targetFieldHelpText',
+          { defaultMessage: 'Field used to contain the JSON object.' }
+        )}
+      />
+
+      <UseField
+        config={fieldsConfig.add_to_root}
+        component={ToggleField}
+        componentProps={{
+          euiFieldProps: {
+            disabled: isAddToPathDisabled,
+          },
+        }}
+        path={ADD_TO_ROOT_FIELD_PATH}
+      />
+    </>
+  );
+};
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/shared.ts b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/shared.ts
index a0a31dd3a8e93..84b308dd9cd7a 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/shared.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/shared.ts
@@ -6,11 +6,63 @@
 
 import * as rt from 'io-ts';
 import { isRight } from 'fp-ts/lib/Either';
-import { flow } from 'fp-ts/lib/function';
 
 import { FieldConfig } from '../../../../../../shared_imports';
 
 export const arrayOfStrings = rt.array(rt.string);
-export const isArrayOfStrings = flow(arrayOfStrings.decode, isRight);
+
+export function isArrayOfStrings(v: unknown): v is string[] {
+  const res = arrayOfStrings.decode(v);
+  return isRight(res);
+}
+
+/**
+ * Shared deserializer functions.
+ *
+ * These are intended to be used in @link{FieldsConfig} as the "deserializer".
+ *
+ * Example:
+ * {
+ *   ...
+ *   deserialize: to.booleanOrUndef,
+ *   ...
+ * }
+ *
+ */
+export const to = {
+  booleanOrUndef: (v: unknown): boolean | undefined => (typeof v === 'boolean' ? v : undefined),
+  arrayOfStrings: (v: unknown): string[] => (isArrayOfStrings(v) ? v : []),
+  jsonString: (v: unknown) => (v ? JSON.stringify(v, null, 2) : '{}'),
+};
+
+/**
+ * Shared serializer functions.
+ *
+ * These are intended to be used in @link{FieldsConfig} as the "serializer".
+ *
+ * Example:
+ * {
+ *   ...
+ *   serializer: from.optionalJson,
+ *   ...
+ * }
+ *
+ */
+export const from = {
+  /* Works with `to.jsonString` as deserializer. */
+  optionalJson: (v: string) => {
+    if (v) {
+      try {
+        const json = JSON.parse(v);
+        if (Object.keys(json).length) {
+          return json;
+        }
+      } catch (e) {
+        // Ignore
+      }
+    }
+  },
+  defaultBoolToUndef: (defaultBool: boolean) => (v: boolean) => (v === defaultBool ? undefined : v),
+};
 
 export type FieldsConfig = Record<string, FieldConfig>;
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/shared/map_processor_type_to_form.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/shared/map_processor_type_to_form.tsx
index b5f7df9117f35..854c6632ab94a 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/shared/map_processor_type_to_form.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/shared/map_processor_type_to_form.tsx
@@ -18,6 +18,16 @@ import {
   Dissect,
   DotExpander,
   Drop,
+  Enrich,
+  Fail,
+  Foreach,
+  GeoIP,
+  Grok,
+  Gsub,
+  HtmlStrip,
+  Inference,
+  Join,
+  Json,
 } from '../manage_processor_form/processors';
 
 // import { SetProcessor } from './processors/set';
@@ -106,63 +116,70 @@ export const mapProcessorTypeToDescriptor: MapProcessorTypeToDescriptor = {
     }),
   },
   enrich: {
-    FieldsComponent: undefined, // TODO: Implement
-    docLinkPath: '/enrich-processor.html',
+    FieldsComponent: Enrich,
+    docLinkPath: '/ingest-enriching-data.html',
     label: i18n.translate('xpack.ingestPipelines.processors.label.enrich', {
       defaultMessage: 'Enrich',
     }),
   },
   fail: {
-    FieldsComponent: undefined, // TODO: Implement
+    FieldsComponent: Fail,
     docLinkPath: '/fail-processor.html',
     label: i18n.translate('xpack.ingestPipelines.processors.label.fail', {
       defaultMessage: 'Fail',
     }),
   },
   foreach: {
-    FieldsComponent: undefined, // TODO: Implement
+    FieldsComponent: Foreach,
     docLinkPath: '/foreach-processor.html',
     label: i18n.translate('xpack.ingestPipelines.processors.label.foreach', {
       defaultMessage: 'Foreach',
     }),
   },
   geoip: {
-    FieldsComponent: undefined, // TODO: Implement
+    FieldsComponent: GeoIP,
     docLinkPath: '/geoip-processor.html',
     label: i18n.translate('xpack.ingestPipelines.processors.label.geoip', {
       defaultMessage: 'GeoIP',
     }),
   },
+  grok: {
+    FieldsComponent: Grok,
+    docLinkPath: '/grok-processor.html',
+    label: i18n.translate('xpack.ingestPipelines.processors.label.grok', {
+      defaultMessage: 'Grok',
+    }),
+  },
   gsub: {
-    FieldsComponent: undefined,
+    FieldsComponent: Gsub,
     docLinkPath: '/gsub-processor.html',
     label: i18n.translate('xpack.ingestPipelines.processors.label.gsub', {
       defaultMessage: 'Gsub',
     }),
   },
   html_strip: {
-    FieldsComponent: undefined, // TODO: Implement
+    FieldsComponent: HtmlStrip,
     docLinkPath: '/htmlstrip-processor.html',
     label: i18n.translate('xpack.ingestPipelines.processors.label.htmlStrip', {
       defaultMessage: 'HTML strip',
     }),
   },
   inference: {
-    FieldsComponent: undefined, // TODO: Implement
+    FieldsComponent: Inference,
     docLinkPath: '/inference-processor.html',
     label: i18n.translate('xpack.ingestPipelines.processors.label.inference', {
       defaultMessage: 'Inference',
     }),
   },
   join: {
-    FieldsComponent: undefined, // TODO: Implement
+    FieldsComponent: Join,
     docLinkPath: '/join-processor.html',
     label: i18n.translate('xpack.ingestPipelines.processors.label.join', {
       defaultMessage: 'Join',
     }),
   },
   json: {
-    FieldsComponent: undefined, // TODO: Implement
+    FieldsComponent: Json,
     docLinkPath: '/json-processor.html',
     label: i18n.translate('xpack.ingestPipelines.processors.label.json', {
       defaultMessage: 'JSON',
@@ -268,13 +285,6 @@ export const mapProcessorTypeToDescriptor: MapProcessorTypeToDescriptor = {
       defaultMessage: 'Set',
     }),
   },
-  grok: {
-    FieldsComponent: undefined,
-    docLinkPath: '/grok-processor.html',
-    label: i18n.translate('xpack.ingestPipelines.processors.label.grok', {
-      defaultMessage: 'Grok',
-    }),
-  },
 };
 
 export type ProcessorType = keyof typeof mapProcessorTypeToDescriptor;
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 0fd9e437a5c3d..6a7737d367005 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -9734,14 +9734,10 @@
     "xpack.ingestPipelines.pipelineEditor.deleteModal.deleteDescription": "このプロセッサーとエラーハンドラーを削除します。",
     "xpack.ingestPipelines.pipelineEditor.dropZoneButton.moveHereToolTip": "ここに移動",
     "xpack.ingestPipelines.pipelineEditor.dropZoneButton.unavailableToolTip": "ここに移動できません",
-    "xpack.ingestPipelines.pipelineEditor.gsubForm.fieldFieldLabel": "フィールド",
-    "xpack.ingestPipelines.pipelineEditor.gsubForm.fieldRequiredError": "フィールド値が必要です。",
-    "xpack.ingestPipelines.pipelineEditor.gsubForm.ignoreMissingFieldLabel": "不足しテイル項目を無視",
     "xpack.ingestPipelines.pipelineEditor.gsubForm.patternFieldLabel": "パターン",
     "xpack.ingestPipelines.pipelineEditor.gsubForm.patternRequiredError": "パターン値が必要です。",
     "xpack.ingestPipelines.pipelineEditor.gsubForm.replacementFieldLabel": "置換",
     "xpack.ingestPipelines.pipelineEditor.gsubForm.replacementRequiredError": "置換値が必要です。",
-    "xpack.ingestPipelines.pipelineEditor.gsubForm.targetFieldLabel": "ターゲットフィールド（任意）",
     "xpack.ingestPipelines.pipelineEditor.item.cancelMoveButtonAriaLabel": "移動のキャンセル",
     "xpack.ingestPipelines.pipelineEditor.item.descriptionPlaceholder": "説明なし",
     "xpack.ingestPipelines.pipelineEditor.item.editButtonAriaLabel": "このプロセッサーを編集",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 02e6da8c3f812..4d0186141f38d 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -9737,14 +9737,10 @@
     "xpack.ingestPipelines.pipelineEditor.deleteModal.deleteDescription": "删除此处理器和其失败时处理程序。",
     "xpack.ingestPipelines.pipelineEditor.dropZoneButton.moveHereToolTip": "移到此处",
     "xpack.ingestPipelines.pipelineEditor.dropZoneButton.unavailableToolTip": "无法移到此处",
-    "xpack.ingestPipelines.pipelineEditor.gsubForm.fieldFieldLabel": "字段",
-    "xpack.ingestPipelines.pipelineEditor.gsubForm.fieldRequiredError": "字段值必填。",
-    "xpack.ingestPipelines.pipelineEditor.gsubForm.ignoreMissingFieldLabel": "忽略缺失",
     "xpack.ingestPipelines.pipelineEditor.gsubForm.patternFieldLabel": "模式",
     "xpack.ingestPipelines.pipelineEditor.gsubForm.patternRequiredError": "模式值必填。",
     "xpack.ingestPipelines.pipelineEditor.gsubForm.replacementFieldLabel": "替换",
     "xpack.ingestPipelines.pipelineEditor.gsubForm.replacementRequiredError": "替换值必填。",
-    "xpack.ingestPipelines.pipelineEditor.gsubForm.targetFieldLabel": "目标字段（可选）",
     "xpack.ingestPipelines.pipelineEditor.item.cancelMoveButtonAriaLabel": "取消移动",
     "xpack.ingestPipelines.pipelineEditor.item.descriptionPlaceholder": "无描述",
     "xpack.ingestPipelines.pipelineEditor.item.editButtonAriaLabel": "编辑此处理器",

From 0d8a4613e487faa1becf25152a86c718ed9aad38 Mon Sep 17 00:00:00 2001
From: Zacqary Adam Xeper <Zacqary@users.noreply.github.com>
Date: Thu, 20 Aug 2020 13:22:04 -0500
Subject: [PATCH 73/85] [Metrics UI] Support percentage format in threshold
 alerts (#72701)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../utils/corrected_percent_convert.test.ts   | 52 ++++++++++++
 .../common/utils/corrected_percent_convert.ts | 16 ++++
 .../components/expression_row.test.tsx        | 84 +++++++++++++++++++
 .../components/expression_row.tsx             | 30 +++++--
 .../metric_threshold_executor.test.ts         | 30 +++++++
 .../metric_threshold_executor.ts              | 28 ++++++-
 6 files changed, 232 insertions(+), 8 deletions(-)
 create mode 100644 x-pack/plugins/infra/common/utils/corrected_percent_convert.test.ts
 create mode 100644 x-pack/plugins/infra/common/utils/corrected_percent_convert.ts
 create mode 100644 x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_row.test.tsx

diff --git a/x-pack/plugins/infra/common/utils/corrected_percent_convert.test.ts b/x-pack/plugins/infra/common/utils/corrected_percent_convert.test.ts
new file mode 100644
index 0000000000000..ab608f331b884
--- /dev/null
+++ b/x-pack/plugins/infra/common/utils/corrected_percent_convert.test.ts
@@ -0,0 +1,52 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { decimalToPct, pctToDecimal } from './corrected_percent_convert';
+
+describe('decimalToPct', () => {
+  test('should retain correct floating point precision up to 10 decimal places', () => {
+    // Most of these cases would still work fine just doing x * 100 instead of passing it through
+    // decimalToPct, but the function still needs to work regardless
+    expect(decimalToPct(0)).toBe(0);
+    expect(decimalToPct(0.1)).toBe(10);
+    expect(decimalToPct(0.01)).toBe(1);
+    expect(decimalToPct(0.014)).toBe(1.4);
+    expect(decimalToPct(0.0141)).toBe(1.41);
+    expect(decimalToPct(0.01414)).toBe(1.414);
+    // This case is known to fail without decimalToPct; vanilla JS 0.014141 * 100 === 1.4141000000000001
+    expect(decimalToPct(0.014141)).toBe(1.4141);
+    expect(decimalToPct(0.0141414)).toBe(1.41414);
+    expect(decimalToPct(0.01414141)).toBe(1.414141);
+    expect(decimalToPct(0.014141414)).toBe(1.4141414);
+  });
+  test('should also work with values greater than 1', () => {
+    expect(decimalToPct(2)).toBe(200);
+    expect(decimalToPct(2.1)).toBe(210);
+    expect(decimalToPct(2.14)).toBe(214);
+    expect(decimalToPct(2.14141414)).toBe(214.141414);
+  });
+});
+
+describe('pctToDecimal', () => {
+  test('should retain correct floating point precision up to 10 decimal places', () => {
+    expect(pctToDecimal(0)).toBe(0);
+    expect(pctToDecimal(10)).toBe(0.1);
+    expect(pctToDecimal(1)).toBe(0.01);
+    expect(pctToDecimal(1.4)).toBe(0.014);
+    expect(pctToDecimal(1.41)).toBe(0.0141);
+    expect(pctToDecimal(1.414)).toBe(0.01414);
+    expect(pctToDecimal(1.4141)).toBe(0.014141);
+    expect(pctToDecimal(1.41414)).toBe(0.0141414);
+    expect(pctToDecimal(1.414141)).toBe(0.01414141);
+    expect(pctToDecimal(1.4141414)).toBe(0.014141414);
+  });
+  test('should also work with values greater than 100%', () => {
+    expect(pctToDecimal(200)).toBe(2);
+    expect(pctToDecimal(210)).toBe(2.1);
+    expect(pctToDecimal(214)).toBe(2.14);
+    expect(pctToDecimal(214.141414)).toBe(2.14141414);
+  });
+});
diff --git a/x-pack/plugins/infra/common/utils/corrected_percent_convert.ts b/x-pack/plugins/infra/common/utils/corrected_percent_convert.ts
new file mode 100644
index 0000000000000..a8e3db5133cf5
--- /dev/null
+++ b/x-pack/plugins/infra/common/utils/corrected_percent_convert.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+const correctedPctConvert = (v: number, decimalToPct: boolean) => {
+  // Correct floating point precision
+  const replacementPattern = decimalToPct ? new RegExp(/0?\./) : '.';
+  const numberOfDigits = String(v).replace(replacementPattern, '').length;
+  const multipliedValue = decimalToPct ? v * 100 : v / 100;
+  return parseFloat(multipliedValue.toPrecision(numberOfDigits));
+};
+
+export const decimalToPct = (v: number) => correctedPctConvert(v, true);
+export const pctToDecimal = (v: number) => correctedPctConvert(v, false);
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_row.test.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_row.test.tsx
new file mode 100644
index 0000000000000..d5be8a2ec2675
--- /dev/null
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_row.test.tsx
@@ -0,0 +1,84 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { mountWithIntl, nextTick } from 'test_utils/enzyme_helpers';
+import { MetricExpression } from '../types';
+import React from 'react';
+import { ExpressionRow } from './expression_row';
+import { act } from 'react-dom/test-utils';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { Comparator } from '../../../../server/lib/alerting/metric_threshold/types';
+
+jest.mock('../../../containers/source/use_source_via_http', () => ({
+  useSourceViaHttp: () => ({
+    source: { id: 'default' },
+    createDerivedIndexPattern: () => ({ fields: [], title: 'metricbeat-*' }),
+  }),
+}));
+
+describe('ExpressionRow', () => {
+  async function setup(expression: MetricExpression) {
+    const wrapper = mountWithIntl(
+      <ExpressionRow
+        canDelete={false}
+        fields={[
+          { name: 'system.cpu.user.pct', type: 'test' },
+          { name: 'system.load.1', type: 'test' },
+        ]}
+        remove={() => {}}
+        addExpression={() => {}}
+        key={1}
+        expressionId={1}
+        setAlertParams={() => {}}
+        errors={{
+          aggField: [],
+          timeSizeUnit: [],
+          timeWindowSize: [],
+        }}
+        expression={expression}
+      />
+    );
+
+    const update = async () =>
+      await act(async () => {
+        await nextTick();
+        wrapper.update();
+      });
+
+    await update();
+
+    return { wrapper, update };
+  }
+
+  it('should display thresholds as a percentage for pct metrics', async () => {
+    const expression = {
+      metric: 'system.cpu.user.pct',
+      comparator: Comparator.GT,
+      threshold: [0.5],
+      timeSize: 1,
+      timeUnit: 'm',
+      aggType: 'avg',
+    };
+    const { wrapper } = await setup(expression as MetricExpression);
+    const [valueMatch] = wrapper.html().match('<span class="euiExpression__value">50</span>') ?? [];
+    expect(valueMatch).toBeTruthy();
+  });
+
+  it('should display thresholds as a decimal for all other metrics', async () => {
+    const expression = {
+      metric: 'system.load.1',
+      comparator: Comparator.GT,
+      threshold: [0.5],
+      timeSize: 1,
+      timeUnit: 'm',
+      aggType: 'avg',
+    };
+    const { wrapper } = await setup(expression as MetricExpression);
+    const [valueMatch] =
+      wrapper.html().match('<span class="euiExpression__value">0.5</span>') ?? [];
+    expect(valueMatch).toBeTruthy();
+  });
+});
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_row.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_row.tsx
index 653b9e1d5c308..1487557bde3a0 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_row.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_row.tsx
@@ -3,10 +3,11 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import React, { useCallback, useState } from 'react';
+import React, { useCallback, useState, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
-import { EuiFlexGroup, EuiFlexItem, EuiButtonIcon, EuiSpacer } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiButtonIcon, EuiSpacer, EuiText } from '@elastic/eui';
 import { IFieldType } from 'src/plugins/data/public';
+import { pctToDecimal, decimalToPct } from '../../../../common/utils/corrected_percent_convert';
 import {
   WhenExpression,
   OfExpression,
@@ -76,6 +77,8 @@ export const ExpressionRow: React.FC<ExpressionRowProps> = (props) => {
     threshold = [],
   } = expression;
 
+  const isMetricPct = useMemo(() => metric && metric.endsWith('.pct'), [metric]);
+
   const updateAggType = useCallback(
     (at: string) => {
       setAlertParams(expressionId, {
@@ -102,14 +105,22 @@ export const ExpressionRow: React.FC<ExpressionRowProps> = (props) => {
   );
 
   const updateThreshold = useCallback(
-    (t) => {
+    (enteredThreshold) => {
+      const t = isMetricPct
+        ? enteredThreshold.map((v: number) => pctToDecimal(v))
+        : enteredThreshold;
       if (t.join() !== expression.threshold.join()) {
         setAlertParams(expressionId, { ...expression, threshold: t });
       }
     },
-    [expressionId, expression, setAlertParams]
+    [expressionId, expression, isMetricPct, setAlertParams]
   );
 
+  const displayedThreshold = useMemo(() => {
+    if (isMetricPct) return threshold.map((v) => decimalToPct(v));
+    return threshold;
+  }, [threshold, isMetricPct]);
+
   return (
     <>
       <EuiFlexGroup gutterSize="xs">
@@ -149,13 +160,22 @@ export const ExpressionRow: React.FC<ExpressionRowProps> = (props) => {
             <StyledExpression>
               <ThresholdExpression
                 thresholdComparator={comparator || Comparator.GT}
-                threshold={threshold}
+                threshold={displayedThreshold}
                 customComparators={customComparators}
                 onChangeSelectedThresholdComparator={updateComparator}
                 onChangeSelectedThreshold={updateThreshold}
                 errors={errors}
               />
             </StyledExpression>
+            {isMetricPct && (
+              <div
+                style={{
+                  alignSelf: 'center',
+                }}
+              >
+                <EuiText size={'s'}>%</EuiText>
+              </div>
+            )}
           </StyledExpressionRow>
         </EuiFlexItem>
         {canDelete && (
diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.test.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.test.ts
index fa705798baf7a..3a52bb6b6ce71 100644
--- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.test.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.test.ts
@@ -387,6 +387,36 @@ describe('The metric threshold alert type', () => {
   //     expect(getState(instanceID).alertState).toBe(AlertStates.OK);
   //   });
   // });
+
+  describe('querying a metric with a percentage metric', () => {
+    const instanceID = '*';
+    const execute = () =>
+      executor({
+        services,
+        params: {
+          sourceId: 'default',
+          criteria: [
+            {
+              ...baseCriterion,
+              metric: 'test.metric.pct',
+              comparator: Comparator.GT,
+              threshold: [0.75],
+            },
+          ],
+        },
+      });
+    test('reports values converted from decimals to percentages to the action context', async () => {
+      const now = 1577858400000;
+      await execute();
+      const { action } = mostRecentAction(instanceID);
+      expect(action.group).toBe('*');
+      expect(action.reason).toContain('current value is 100%');
+      expect(action.reason).toContain('threshold of 75%');
+      expect(action.threshold.condition0[0]).toBe('75%');
+      expect(action.value.condition0).toBe('100%');
+      expect(action.timestamp).toBe(new Date(now).toISOString());
+    });
+  });
 });
 
 const createMockStaticConfiguration = (sources: any) => ({
diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts
index b2a8f0281b9e2..9265e8089e915 100644
--- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts
@@ -14,6 +14,7 @@ import {
   buildNoDataAlertReason,
   stateToAlertMessage,
 } from '../common/messages';
+import { createFormatter } from '../../../../common/formatters';
 import { AlertStates } from './types';
 import { evaluateAlert } from './lib/evaluate_alert';
 
@@ -59,7 +60,7 @@ export const createMetricThresholdExecutor = (libs: InfraBackendLibs) =>
       let reason;
       if (nextState === AlertStates.ALERT) {
         reason = alertResults
-          .map((result) => buildFiredAlertReason(result[group] as any))
+          .map((result) => buildFiredAlertReason(formatAlertResult(result[group]) as any))
           .join('\n');
       }
       if (alertOnNoData) {
@@ -83,8 +84,14 @@ export const createMetricThresholdExecutor = (libs: InfraBackendLibs) =>
           alertState: stateToAlertMessage[nextState],
           reason,
           timestamp,
-          value: mapToConditionsLookup(alertResults, (result) => result[group].currentValue),
-          threshold: mapToConditionsLookup(criteria, (c) => c.threshold),
+          value: mapToConditionsLookup(
+            alertResults,
+            (result) => formatAlertResult(result[group]).currentValue
+          ),
+          threshold: mapToConditionsLookup(
+            alertResults,
+            (result) => formatAlertResult(result[group]).threshold
+          ),
           metric: mapToConditionsLookup(criteria, (c) => c.metric),
         });
       }
@@ -113,3 +120,18 @@ const mapToConditionsLookup = (
       (result: Record<string, any>, value, i) => ({ ...result, [`condition${i}`]: value }),
       {}
     );
+
+const formatAlertResult = (alertResult: {
+  metric: string;
+  currentValue: number;
+  threshold: number[];
+}) => {
+  const { metric, currentValue, threshold } = alertResult;
+  if (!metric.endsWith('.pct')) return alertResult;
+  const formatter = createFormatter('percent');
+  return {
+    ...alertResult,
+    currentValue: formatter(currentValue),
+    threshold: Array.isArray(threshold) ? threshold.map((v: number) => formatter(v)) : threshold,
+  };
+};

From bcca9331b568659a908a73d3f6b6c64bd75e0623 Mon Sep 17 00:00:00 2001
From: Zacqary Adam Xeper <Zacqary@users.noreply.github.com>
Date: Thu, 20 Aug 2020 13:28:10 -0500
Subject: [PATCH 74/85] [Metrics UI] Get custom metrics working in inventory
 alerts with limited UI (#75073)

---
 .../formatters}/get_custom_metric_label.ts    |   2 +-
 .../inventory/components/alert_flyout.tsx     |  17 +-
 .../inventory/components/expression.test.tsx  | 186 ++++++++++++++++++
 .../inventory/components/expression.tsx       |  86 ++++++--
 .../alerting/inventory/components/metric.tsx  |   7 +-
 .../hooks/use_inventory_alert_prefill.ts      |   8 +-
 .../waffle/metric_control/index.tsx           |   2 +-
 .../metric_control/metrics_context_menu.tsx   |   2 +-
 .../metric_control/metrics_edit_mode.tsx      |   2 +-
 .../hooks/use_waffle_options.test.ts          |  19 ++
 .../hooks/use_waffle_options.ts               |   3 +-
 .../evaluate_condition.ts                     |  15 +-
 .../inventory_metric_threshold_executor.ts    |  33 ++--
 ...r_inventory_metric_threshold_alert_type.ts |   9 +
 .../inventory_metric_threshold/types.ts       |   2 +
 15 files changed, 348 insertions(+), 45 deletions(-)
 rename x-pack/plugins/infra/{public/pages/metrics/inventory_view/components/waffle/metric_control => common/formatters}/get_custom_metric_label.ts (91%)
 create mode 100644 x-pack/plugins/infra/public/alerting/inventory/components/expression.test.tsx

diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/get_custom_metric_label.ts b/x-pack/plugins/infra/common/formatters/get_custom_metric_label.ts
similarity index 91%
rename from x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/get_custom_metric_label.ts
rename to x-pack/plugins/infra/common/formatters/get_custom_metric_label.ts
index 495cc8197d2e7..3be5986d489d3 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/get_custom_metric_label.ts
+++ b/x-pack/plugins/infra/common/formatters/get_custom_metric_label.ts
@@ -5,7 +5,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { SnapshotCustomMetricInput } from '../../../../../../../common/http_api/snapshot_api';
+import { SnapshotCustomMetricInput } from '../http_api/snapshot_api';
 
 export const getCustomMetricLabel = (metric: SnapshotCustomMetricInput) => {
   const METRIC_LABELS = {
diff --git a/x-pack/plugins/infra/public/alerting/inventory/components/alert_flyout.tsx b/x-pack/plugins/infra/public/alerting/inventory/components/alert_flyout.tsx
index 804ff9602c81c..834afefd74712 100644
--- a/x-pack/plugins/infra/public/alerting/inventory/components/alert_flyout.tsx
+++ b/x-pack/plugins/infra/public/alerting/inventory/components/alert_flyout.tsx
@@ -12,6 +12,7 @@ import { useKibana } from '../../../../../../../src/plugins/kibana_react/public'
 import { METRIC_INVENTORY_THRESHOLD_ALERT_TYPE_ID } from '../../../../server/lib/alerting/inventory_metric_threshold/types';
 import { InfraWaffleMapOptions } from '../../../lib/lib';
 import { InventoryItemType } from '../../../../common/inventory_models/types';
+import { useAlertPrefillContext } from '../../../alerting/use_alert_prefill';
 
 interface Props {
   visible?: boolean;
@@ -21,16 +22,24 @@ interface Props {
   setVisible: React.Dispatch<React.SetStateAction<boolean>>;
 }
 
-export const AlertFlyout = (props: Props) => {
+export const AlertFlyout = ({ options, nodeType, filter, visible, setVisible }: Props) => {
   const { triggersActionsUI } = useContext(TriggerActionsContext);
   const { services } = useKibana();
 
+  const { inventoryPrefill } = useAlertPrefillContext();
+  const { customMetrics } = inventoryPrefill;
+
   return (
     <>
       {triggersActionsUI && (
         <AlertsContextProvider
           value={{
-            metadata: { options: props.options, nodeType: props.nodeType, filter: props.filter },
+            metadata: {
+              options,
+              nodeType,
+              filter,
+              customMetrics,
+            },
             toastNotifications: services.notifications?.toasts,
             http: services.http,
             docLinks: services.docLinks,
@@ -40,8 +49,8 @@ export const AlertFlyout = (props: Props) => {
           }}
         >
           <AlertAdd
-            addFlyoutVisible={props.visible!}
-            setAddFlyoutVisibility={props.setVisible}
+            addFlyoutVisible={visible!}
+            setAddFlyoutVisibility={setVisible}
             alertTypeId={METRIC_INVENTORY_THRESHOLD_ALERT_TYPE_ID}
             canChangeTrigger={false}
             consumer={'infrastructure'}
diff --git a/x-pack/plugins/infra/public/alerting/inventory/components/expression.test.tsx b/x-pack/plugins/infra/public/alerting/inventory/components/expression.test.tsx
new file mode 100644
index 0000000000000..ada7a30a859e0
--- /dev/null
+++ b/x-pack/plugins/infra/public/alerting/inventory/components/expression.test.tsx
@@ -0,0 +1,186 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { mountWithIntl, nextTick } from 'test_utils/enzyme_helpers';
+import { actionTypeRegistryMock } from '../../../../../triggers_actions_ui/public/application/action_type_registry.mock';
+import { alertTypeRegistryMock } from '../../../../../triggers_actions_ui/public/application/alert_type_registry.mock';
+import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { AlertsContextValue } from '../../../../../triggers_actions_ui/public/application/context/alerts_context';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { InventoryMetricConditions } from '../../../../server/lib/alerting/inventory_metric_threshold/types';
+import React from 'react';
+import { Expressions, AlertContextMeta, ExpressionRow } from './expression';
+import { act } from 'react-dom/test-utils';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { Comparator } from '../../../../server/lib/alerting/metric_threshold/types';
+import { SnapshotCustomMetricInput } from '../../../../common/http_api/snapshot_api';
+
+jest.mock('../../../containers/source/use_source_via_http', () => ({
+  useSourceViaHttp: () => ({
+    source: { id: 'default' },
+    createDerivedIndexPattern: () => ({ fields: [], title: 'metricbeat-*' }),
+  }),
+}));
+
+const exampleCustomMetric = {
+  id: 'this-is-an-id',
+  field: 'some.system.field',
+  aggregation: 'rate',
+  type: 'custom',
+} as SnapshotCustomMetricInput;
+
+describe('Expression', () => {
+  async function setup(currentOptions: AlertContextMeta) {
+    const alertParams = {
+      criteria: [],
+      nodeType: undefined,
+      filterQueryText: '',
+    };
+
+    const mocks = coreMock.createSetup();
+    const startMocks = coreMock.createStart();
+    const [
+      {
+        application: { capabilities },
+      },
+    ] = await mocks.getStartServices();
+
+    const context: AlertsContextValue<AlertContextMeta> = {
+      http: mocks.http,
+      toastNotifications: mocks.notifications.toasts,
+      actionTypeRegistry: actionTypeRegistryMock.create() as any,
+      alertTypeRegistry: alertTypeRegistryMock.create() as any,
+      docLinks: startMocks.docLinks,
+      capabilities: {
+        ...capabilities,
+        actions: {
+          delete: true,
+          save: true,
+          show: true,
+        },
+      },
+      metadata: currentOptions,
+    };
+
+    const wrapper = mountWithIntl(
+      <Expressions
+        alertsContext={context}
+        alertInterval="1m"
+        alertParams={alertParams as any}
+        errors={[]}
+        setAlertParams={(key, value) => Reflect.set(alertParams, key, value)}
+        setAlertProperty={() => {}}
+      />
+    );
+
+    const update = async () =>
+      await act(async () => {
+        await nextTick();
+        wrapper.update();
+      });
+
+    await update();
+
+    return { wrapper, update, alertParams };
+  }
+
+  it('should prefill the alert using the context metadata', async () => {
+    const currentOptions = {
+      filter: 'foo',
+      nodeType: 'pod',
+      customMetrics: [],
+      options: { metric: { type: 'memory' } },
+    };
+    const { alertParams } = await setup(currentOptions as AlertContextMeta);
+    expect(alertParams.nodeType).toBe('pod');
+    expect(alertParams.filterQueryText).toBe('foo');
+    expect(alertParams.criteria).toEqual([
+      {
+        metric: 'memory',
+        comparator: Comparator.GT,
+        threshold: [],
+        timeSize: 1,
+        timeUnit: 'm',
+      },
+    ]);
+  });
+  describe('using custom metrics', () => {
+    it('should prefill the alert using the context metadata', async () => {
+      const currentOptions = {
+        filter: '',
+        nodeType: 'tx',
+        customMetrics: [exampleCustomMetric],
+        options: { metric: exampleCustomMetric },
+      };
+      const { alertParams, update } = await setup(currentOptions as AlertContextMeta);
+      await update();
+      expect(alertParams.nodeType).toBe('tx');
+      expect(alertParams.filterQueryText).toBe('');
+      expect(alertParams.criteria).toEqual([
+        {
+          metric: 'custom',
+          comparator: Comparator.GT,
+          threshold: [],
+          timeSize: 1,
+          timeUnit: 'm',
+          customMetric: exampleCustomMetric,
+        },
+      ]);
+    });
+  });
+});
+
+describe('ExpressionRow', () => {
+  async function setup(expression: InventoryMetricConditions) {
+    const wrapper = mountWithIntl(
+      <ExpressionRow
+        nodeType="host"
+        canDelete={false}
+        remove={() => {}}
+        addExpression={() => {}}
+        key={1}
+        expressionId={1}
+        setAlertParams={() => {}}
+        errors={{
+          aggField: [],
+          timeSizeUnit: [],
+          timeWindowSize: [],
+          metric: [],
+        }}
+        expression={expression}
+        alertsContextMetadata={{
+          customMetrics: [],
+        }}
+      />
+    );
+
+    const update = async () =>
+      await act(async () => {
+        await nextTick();
+        wrapper.update();
+      });
+
+    await update();
+
+    return { wrapper, update };
+  }
+  const expression = {
+    metric: 'custom',
+    comparator: Comparator.GT,
+    threshold: [],
+    timeSize: 1,
+    timeUnit: 'm',
+    customMetric: exampleCustomMetric,
+  };
+
+  it('loads custom metrics passed in through the expression, even with an empty context', async () => {
+    const { wrapper } = await setup(expression as InventoryMetricConditions);
+    const [valueMatch] =
+      wrapper.html().match('<span class="euiExpression__value">Rate of some.system.field</span>') ??
+      [];
+    expect(valueMatch).toBeTruthy();
+  });
+});
diff --git a/x-pack/plugins/infra/public/alerting/inventory/components/expression.tsx b/x-pack/plugins/infra/public/alerting/inventory/components/expression.tsx
index 7ca17617871ff..78cabcf354437 100644
--- a/x-pack/plugins/infra/public/alerting/inventory/components/expression.tsx
+++ b/x-pack/plugins/infra/public/alerting/inventory/components/expression.tsx
@@ -4,7 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { debounce, pick } from 'lodash';
+import { set } from '@elastic/safer-lodash-set';
+import { debounce, pick, uniqBy, isEqual } from 'lodash';
 import { Unit } from '@elastic/datemath';
 import React, { useCallback, useMemo, useEffect, useState, ChangeEvent } from 'react';
 import {
@@ -22,6 +23,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
+import { getCustomMetricLabel } from '../../../../common/formatters/get_custom_metric_label';
 import { toMetricOpt } from '../../../../common/snapshot_metric_i18n';
 import { AlertPreview } from '../../common';
 import { METRIC_INVENTORY_THRESHOLD_ALERT_TYPE_ID } from '../../../../common/alerting/metrics';
@@ -49,22 +51,31 @@ import { hostMetricTypes } from '../../../../common/inventory_models/host/toolba
 import { containerMetricTypes } from '../../../../common/inventory_models/container/toolbar_items';
 import { podMetricTypes } from '../../../../common/inventory_models/pod/toolbar_items';
 import { findInventoryModel } from '../../../../common/inventory_models';
-import { InventoryItemType, SnapshotMetricType } from '../../../../common/inventory_models/types';
+import {
+  InventoryItemType,
+  SnapshotMetricType,
+  SnapshotMetricTypeRT,
+} from '../../../../common/inventory_models/types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { InventoryMetricConditions } from '../../../../server/lib/alerting/inventory_metric_threshold/types';
 import { MetricExpression } from './metric';
 import { NodeTypeExpression } from './node_type';
 import { InfraWaffleMapOptions } from '../../../lib/lib';
 import { convertKueryToElasticSearchQuery } from '../../../utils/kuery';
+import {
+  SnapshotCustomMetricInput,
+  SnapshotCustomMetricInputRT,
+} from '../../../../common/http_api/snapshot_api';
 
 import { validateMetricThreshold } from './validation';
 
 const FILTER_TYPING_DEBOUNCE_MS = 500;
 
-interface AlertContextMeta {
+export interface AlertContextMeta {
   options?: Partial<InfraWaffleMapOptions>;
   nodeType?: InventoryItemType;
   filter?: string;
+  customMetrics?: SnapshotCustomMetricInput[];
 }
 
 interface Props {
@@ -89,6 +100,7 @@ const defaultExpression = {
   threshold: [],
   timeSize: 1,
   timeUnit: 'm',
+  customMetric: undefined,
 } as InventoryMetricConditions;
 
 export const Expressions: React.FC<Props> = (props) => {
@@ -204,6 +216,9 @@ export const Expressions: React.FC<Props> = (props) => {
         {
           ...defaultExpression,
           metric: md.options.metric!.type,
+          customMetric: SnapshotCustomMetricInputRT.is(md.options.metric)
+            ? md.options.metric
+            : undefined,
         } as InventoryMetricConditions,
       ]);
     } else {
@@ -282,6 +297,7 @@ export const Expressions: React.FC<Props> = (props) => {
               setAlertParams={updateParams}
               errors={errors[idx] || emptyError}
               expression={e || {}}
+              alertsContextMetadata={alertsContext.metadata}
             />
           );
         })}
@@ -389,6 +405,7 @@ interface ExpressionRowProps {
   addExpression(): void;
   remove(id: number): void;
   setAlertParams(id: number, params: Partial<InventoryMetricConditions>): void;
+  alertsContextMetadata: AlertsContextValue<AlertContextMeta>['metadata'];
 }
 
 const StyledExpressionRow = euiStyled(EuiFlexGroup)`
@@ -402,14 +419,48 @@ const StyledExpression = euiStyled.div`
 `;
 
 export const ExpressionRow: React.FC<ExpressionRowProps> = (props) => {
-  const { setAlertParams, expression, errors, expressionId, remove, canDelete } = props;
-  const { metric, comparator = Comparator.GT, threshold = [] } = expression;
+  const {
+    setAlertParams,
+    expression,
+    errors,
+    expressionId,
+    remove,
+    canDelete,
+    alertsContextMetadata,
+  } = props;
+  const { metric, comparator = Comparator.GT, threshold = [], customMetric } = expression;
+  const [customMetrics, updateCustomMetrics] = useState<SnapshotCustomMetricInput[]>([]);
+
+  // Create and uniquify a list of custom metrics including:
+  // - The alert metadata context (which only gives us custom metrics on the inventory page)
+  // - The custom metric stored in the expression (necessary when editing this alert without having
+  //    access to the metadata context)
+  // - Whatever custom metrics were previously stored in this list (to preserve the custom metric in the dropdown
+  //    if the user edits the alert and switches away from the custom metric)
+  useEffect(() => {
+    const ctxCustomMetrics = alertsContextMetadata?.customMetrics ?? [];
+    const expressionCustomMetrics = customMetric ? [customMetric] : [];
+    const newCustomMetrics = uniqBy(
+      [...customMetrics, ...ctxCustomMetrics, ...expressionCustomMetrics],
+      (cm: SnapshotCustomMetricInput) => cm.id
+    );
+    if (!isEqual(customMetrics, newCustomMetrics)) updateCustomMetrics(newCustomMetrics);
+  }, [alertsContextMetadata, customMetric, customMetrics, updateCustomMetrics]);
 
   const updateMetric = useCallback(
-    (m?: SnapshotMetricType) => {
-      setAlertParams(expressionId, { ...expression, metric: m });
+    (m?: SnapshotMetricType | string) => {
+      const newMetric = SnapshotMetricTypeRT.is(m) ? m : 'custom';
+      const newAlertParams = { ...expression, metric: newMetric };
+      if (newMetric === 'custom' && customMetrics) {
+        set(
+          newAlertParams,
+          'customMetric',
+          customMetrics.find((cm) => cm.id === m)
+        );
+      }
+      setAlertParams(expressionId, newAlertParams);
     },
-    [expressionId, expression, setAlertParams]
+    [expressionId, expression, setAlertParams, customMetrics]
   );
 
   const updateComparator = useCallback(
@@ -446,6 +497,7 @@ export const ExpressionRow: React.FC<ExpressionRowProps> = (props) => {
         break;
       case 'host':
         myMetrics = hostMetricTypes;
+
         break;
       case 'pod':
         myMetrics = podMetricTypes;
@@ -454,8 +506,17 @@ export const ExpressionRow: React.FC<ExpressionRowProps> = (props) => {
         myMetrics = containerMetricTypes;
         break;
     }
-    return myMetrics.map(toMetricOpt);
-  }, [props.nodeType]);
+    const baseMetricOpts = myMetrics.map(toMetricOpt);
+    const customMetricOpts = customMetrics
+      ? customMetrics.map((m, i) => ({
+          text: getCustomMetricLabel(m),
+          value: m.id,
+        }))
+      : [];
+    return [...baseMetricOpts, ...customMetricOpts];
+  }, [props.nodeType, customMetrics]);
+
+  const selectedMetricValue = metric === 'custom' && customMetric ? customMetric.id : metric!;
 
   return (
     <>
@@ -465,8 +526,8 @@ export const ExpressionRow: React.FC<ExpressionRowProps> = (props) => {
             <StyledExpression>
               <MetricExpression
                 metric={{
-                  value: metric!,
-                  text: ofFields.find((v) => v?.value === metric)?.text || '',
+                  value: selectedMetricValue,
+                  text: ofFields.find((v) => v?.value === selectedMetricValue)?.text || '',
                 }}
                 metrics={
                   ofFields.filter((m) => m !== undefined && m.value !== undefined) as Array<{
@@ -568,4 +629,5 @@ const metricUnit: Record<string, { label: string }> = {
   s3DownloadBytes: { label: 'bytes' },
   sqsOldestMessage: { label: 'seconds' },
   rdsLatency: { label: 'ms' },
+  custom: { label: '' },
 };
diff --git a/x-pack/plugins/infra/public/alerting/inventory/components/metric.tsx b/x-pack/plugins/infra/public/alerting/inventory/components/metric.tsx
index ff859a95a3d9d..2e5ccbe1a4276 100644
--- a/x-pack/plugins/infra/public/alerting/inventory/components/metric.tsx
+++ b/x-pack/plugins/infra/public/alerting/inventory/components/metric.tsx
@@ -18,13 +18,12 @@ import {
 import { EuiPopoverTitle, EuiButtonIcon } from '@elastic/eui';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { IErrorObject } from '../../../../../triggers_actions_ui/public/types';
-import { SnapshotMetricType } from '../../../../common/inventory_models/types';
 
 interface Props {
-  metric?: { value: SnapshotMetricType; text: string };
+  metric?: { value: string; text: string };
   metrics: Array<{ value: string; text: string }>;
   errors: IErrorObject;
-  onChange: (metric?: SnapshotMetricType) => void;
+  onChange: (metric?: string) => void;
   popupPosition?:
     | 'upCenter'
     | 'upLeft'
@@ -104,7 +103,7 @@ export const MetricExpression = ({ metric, metrics, errors, onChange, popupPosit
                 renderOption={(o: any) => o.label}
                 onChange={(selectedOptions) => {
                   if (selectedOptions.length > 0) {
-                    onChange(selectedOptions[0].value as SnapshotMetricType);
+                    onChange(selectedOptions[0].value);
                     setAggFieldPopoverOpen(false);
                   } else {
                     onChange();
diff --git a/x-pack/plugins/infra/public/alerting/inventory/hooks/use_inventory_alert_prefill.ts b/x-pack/plugins/infra/public/alerting/inventory/hooks/use_inventory_alert_prefill.ts
index d659057b95ed9..a57f9cafa5e19 100644
--- a/x-pack/plugins/infra/public/alerting/inventory/hooks/use_inventory_alert_prefill.ts
+++ b/x-pack/plugins/infra/public/alerting/inventory/hooks/use_inventory_alert_prefill.ts
@@ -5,20 +5,26 @@
  */
 
 import { useState } from 'react';
-import { SnapshotMetricInput } from '../../../../common/http_api/snapshot_api';
+import {
+  SnapshotMetricInput,
+  SnapshotCustomMetricInput,
+} from '../../../../common/http_api/snapshot_api';
 import { InventoryItemType } from '../../../../common/inventory_models/types';
 
 export const useInventoryAlertPrefill = () => {
   const [nodeType, setNodeType] = useState<InventoryItemType>('host');
   const [filterQuery, setFilterQuery] = useState<string | undefined>();
   const [metric, setMetric] = useState<SnapshotMetricInput>({ type: 'cpu' });
+  const [customMetrics, setCustomMetrics] = useState<SnapshotCustomMetricInput[]>([]);
 
   return {
     nodeType,
     filterQuery,
     metric,
+    customMetrics,
     setNodeType,
     setFilterQuery,
     setMetric,
+    setCustomMetrics,
   };
 };
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/index.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/index.tsx
index aae787c8c0395..96169810e02a8 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/index.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/index.tsx
@@ -8,13 +8,13 @@ import { EuiPopover } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useState, useCallback } from 'react';
 import { IFieldType } from 'src/plugins/data/public';
+import { getCustomMetricLabel } from '../../../../../../../common/formatters/get_custom_metric_label';
 import {
   SnapshotMetricInput,
   SnapshotCustomMetricInput,
   SnapshotCustomMetricInputRT,
 } from '../../../../../../../common/http_api/snapshot_api';
 import { CustomMetricForm } from './custom_metric_form';
-import { getCustomMetricLabel } from './get_custom_metric_label';
 import { MetricsContextMenu } from './metrics_context_menu';
 import { ModeSwitcher } from './mode_switcher';
 import { MetricsEditMode } from './metrics_edit_mode';
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/metrics_context_menu.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/metrics_context_menu.tsx
index 7ab90297ebbb3..71a000d3165b6 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/metrics_context_menu.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/metrics_context_menu.tsx
@@ -5,6 +5,7 @@
  */
 import React, { useCallback } from 'react';
 import { EuiContextMenuPanelDescriptor, EuiContextMenu } from '@elastic/eui';
+import { getCustomMetricLabel } from '../../../../../../../common/formatters/get_custom_metric_label';
 import {
   SnapshotMetricInput,
   SnapshotCustomMetricInput,
@@ -14,7 +15,6 @@ import {
   SnapshotMetricTypeRT,
   SnapshotMetricType,
 } from '../../../../../../../common/inventory_models/types';
-import { getCustomMetricLabel } from './get_custom_metric_label';
 
 interface Props {
   options: Array<{ text: string; value: string }>;
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/metrics_edit_mode.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/metrics_edit_mode.tsx
index 649dcc4282d67..e75885ccbc917 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/metrics_edit_mode.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/metrics_edit_mode.tsx
@@ -6,8 +6,8 @@
 import React from 'react';
 import { EuiFlexItem, EuiFlexGroup, EuiButtonIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { getCustomMetricLabel } from '../../../../../../../common/formatters/get_custom_metric_label';
 import { SnapshotCustomMetricInput } from '../../../../../../../common/http_api/snapshot_api';
-import { getCustomMetricLabel } from './get_custom_metric_label';
 import {
   EuiTheme,
   withTheme,
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_options.test.ts b/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_options.test.ts
index 579073e9500d0..d44d8fca4faba 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_options.test.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_options.test.ts
@@ -20,6 +20,7 @@ jest.mock('react-router-dom', () => ({
 // reassign them, so we can't make these both part of the same object
 let PREFILL_NODETYPE: WaffleOptionsState['nodeType'] | undefined;
 let PREFILL_METRIC: WaffleOptionsState['metric'] | undefined;
+let PREFILL_CUSTOM_METRICS: WaffleOptionsState['customMetrics'] | undefined;
 jest.mock('../../../../alerting/use_alert_prefill', () => ({
   useAlertPrefillContext: () => ({
     inventoryPrefill: {
@@ -29,6 +30,9 @@ jest.mock('../../../../alerting/use_alert_prefill', () => ({
       setMetric(metric: WaffleOptionsState['metric']) {
         PREFILL_METRIC = metric;
       },
+      setCustomMetrics(customMetrics: WaffleOptionsState['customMetrics']) {
+        PREFILL_CUSTOM_METRICS = customMetrics;
+      },
     },
   }),
 }));
@@ -39,6 +43,7 @@ describe('useWaffleOptions', () => {
   beforeEach(() => {
     PREFILL_NODETYPE = undefined;
     PREFILL_METRIC = undefined;
+    PREFILL_CUSTOM_METRICS = undefined;
   });
 
   it('should sync the options to the inventory alert preview context', () => {
@@ -47,6 +52,15 @@ describe('useWaffleOptions', () => {
     const newOptions = {
       nodeType: 'pod',
       metric: { type: 'memory' },
+      customMetrics: [
+        {
+          type: 'custom',
+          id:
+            "i don't want to bother to copy and paste an actual uuid so instead i'm going to smash my keyboard skjdghsjodkyjheurvjnsgn",
+          aggregation: 'avg',
+          field: 'hey.system.are.you.good',
+        },
+      ],
     } as WaffleOptionsState;
     act(() => {
       result.current.changeNodeType(newOptions.nodeType);
@@ -58,5 +72,10 @@ describe('useWaffleOptions', () => {
     });
     rerender();
     expect(PREFILL_METRIC).toEqual(newOptions.metric);
+    act(() => {
+      result.current.changeCustomMetrics(newOptions.customMetrics);
+    });
+    rerender();
+    expect(PREFILL_CUSTOM_METRICS).toEqual(newOptions.customMetrics);
   });
 });
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_options.ts b/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_options.ts
index 8059d1ad12a3a..35d069adc939e 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_options.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_options.ts
@@ -125,9 +125,10 @@ export const useWaffleOptions = () => {
 
   const { inventoryPrefill } = useAlertPrefillContext();
   useEffect(() => {
-    const { setNodeType, setMetric } = inventoryPrefill;
+    const { setNodeType, setMetric, setCustomMetrics } = inventoryPrefill;
     setNodeType(state.nodeType);
     setMetric(state.metric);
+    setCustomMetrics(state.customMetrics);
   }, [state, inventoryPrefill]);
 
   return {
diff --git a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/evaluate_condition.ts b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/evaluate_condition.ts
index 3b795810b39f0..9be6a4b52157c 100644
--- a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/evaluate_condition.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/evaluate_condition.ts
@@ -5,6 +5,7 @@
  */
 import { mapValues, last, first } from 'lodash';
 import moment from 'moment';
+import { SnapshotCustomMetricInput } from '../../../../common/http_api/snapshot_api';
 import {
   isTooManyBucketsPreviewException,
   TOO_MANY_BUCKETS_PREVIEW_EXCEPTION,
@@ -37,7 +38,7 @@ export const evaluateCondition = async (
   filterQuery?: string,
   lookbackSize?: number
 ): Promise<Record<string, ConditionResult>> => {
-  const { comparator, metric } = condition;
+  const { comparator, metric, customMetric } = condition;
   let { threshold } = condition;
 
   const timerange = {
@@ -55,7 +56,8 @@ export const evaluateCondition = async (
     metric,
     timerange,
     sourceConfiguration,
-    filterQuery
+    filterQuery,
+    customMetric
   );
 
   threshold = threshold.map((n) => convertMetricValue(metric, n));
@@ -93,19 +95,24 @@ const getData = async (
   metric: SnapshotMetricType,
   timerange: InfraTimerangeInput,
   sourceConfiguration: InfraSourceConfiguration,
-  filterQuery?: string
+  filterQuery?: string,
+  customMetric?: SnapshotCustomMetricInput
 ) => {
   const snapshot = new InfraSnapshot();
   const esClient = <Hit = {}, Aggregation = undefined>(
     options: CallWithRequestParams
   ): Promise<InfraDatabaseSearchResponse<Hit, Aggregation>> => callCluster('search', options);
 
+  const metrics = [
+    metric === 'custom' ? (customMetric as SnapshotCustomMetricInput) : { type: metric },
+  ];
+
   const options = {
     filterQuery: parseFilterQuery(filterQuery),
     nodeType,
     groupBy: [],
     sourceConfiguration,
-    metrics: [{ type: metric }],
+    metrics,
     timerange,
     includeTimeseries: Boolean(timerange.lookbackSize),
   };
diff --git a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.ts b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.ts
index 7b816f2f225b5..db1ff26ee1810 100644
--- a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.ts
@@ -6,6 +6,7 @@
 import { first, get, last } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import moment from 'moment';
+import { getCustomMetricLabel } from '../../../../common/formatters/get_custom_metric_label';
 import { toMetricOpt } from '../../../../common/snapshot_metric_i18n';
 import { AlertStates, InventoryMetricConditions } from './types';
 import { AlertExecutorOptions } from '../../../../../alerts/server';
@@ -77,27 +78,19 @@ export const createInventoryMetricThresholdExecutor = (libs: InfraBackendLibs) =
     let reason;
     if (nextState === AlertStates.ALERT) {
       reason = results
-        .map((result) => {
-          if (!result[item]) return '';
-          const resultWithVerboseMetricName = {
-            ...result[item],
-            metric: toMetricOpt(result[item].metric)?.text || result[item].metric,
-            currentValue: formatMetric(result[item].metric, result[item].currentValue),
-          };
-          return buildFiredAlertReason(resultWithVerboseMetricName);
-        })
+        .map((result) => buildReasonWithVerboseMetricName(result[item], buildFiredAlertReason))
         .join('\n');
     }
     if (alertOnNoData) {
       if (nextState === AlertStates.NO_DATA) {
         reason = results
           .filter((result) => result[item].isNoData)
-          .map((result) => buildNoDataAlertReason(result[item]))
+          .map((result) => buildReasonWithVerboseMetricName(result[item], buildNoDataAlertReason))
           .join('\n');
       } else if (nextState === AlertStates.ERROR) {
         reason = results
           .filter((result) => result[item].isError)
-          .map((result) => buildErrorAlertReason(result[item].metric))
+          .map((result) => buildReasonWithVerboseMetricName(result[item], buildErrorAlertReason))
           .join('\n');
       }
     }
@@ -121,6 +114,20 @@ export const createInventoryMetricThresholdExecutor = (libs: InfraBackendLibs) =
   }
 };
 
+const buildReasonWithVerboseMetricName = (resultItem: any, buildReason: (r: any) => string) => {
+  if (!resultItem) return '';
+  const resultWithVerboseMetricName = {
+    ...resultItem,
+    metric:
+      toMetricOpt(resultItem.metric)?.text ||
+      (resultItem.metric === 'custom'
+        ? getCustomMetricLabel(resultItem.customMetric)
+        : resultItem.metric),
+    currentValue: formatMetric(resultItem.metric, resultItem.currentValue),
+  };
+  return buildReason(resultWithVerboseMetricName);
+};
+
 const mapToConditionsLookup = (
   list: any[],
   mapFn: (value: any, index: number, array: any[]) => unknown
@@ -140,10 +147,6 @@ export const FIRED_ACTIONS = {
 };
 
 const formatMetric = (metric: SnapshotMetricType, value: number) => {
-  // if (SnapshotCustomMetricInputRT.is(metric)) {
-  //   const formatter = createFormatterForMetric(metric);
-  //   return formatter(val);
-  // }
   const metricFormatter = get(METRIC_FORMATTERS, metric, METRIC_FORMATTERS.count);
   if (value == null) {
     return '';
diff --git a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/register_inventory_metric_threshold_alert_type.ts b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/register_inventory_metric_threshold_alert_type.ts
index f664a59acd165..14d1acf0e4a9f 100644
--- a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/register_inventory_metric_threshold_alert_type.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/register_inventory_metric_threshold_alert_type.ts
@@ -27,6 +27,15 @@ const condition = schema.object({
   timeUnit: schema.string(),
   timeSize: schema.number(),
   metric: schema.string(),
+  customMetric: schema.maybe(
+    schema.object({
+      type: schema.literal('custom'),
+      id: schema.string(),
+      field: schema.string(),
+      aggregation: schema.string(),
+      label: schema.maybe(schema.string()),
+    })
+  ),
 });
 
 export const registerMetricInventoryThresholdAlertType = (libs: InfraBackendLibs) => ({
diff --git a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/types.ts b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/types.ts
index 86c77e6d7459a..06f5efaf9eb36 100644
--- a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/types.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/types.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { Unit } from '@elastic/datemath';
+import { SnapshotCustomMetricInput } from '../../../../common/http_api/snapshot_api';
 import { SnapshotMetricType } from '../../../../common/inventory_models/types';
 import { Comparator, AlertStates } from '../common/types';
 
@@ -18,4 +19,5 @@ export interface InventoryMetricConditions {
   sourceId?: string;
   threshold: number[];
   comparator: Comparator;
+  customMetric?: SnapshotCustomMetricInput;
 }

From 5308cc7100bdff415e8b576655930f0d2a45b561 Mon Sep 17 00:00:00 2001
From: Gidi Meir Morris <github@gidi.io>
Date: Thu, 20 Aug 2020 21:26:56 +0100
Subject: [PATCH 75/85] [Task Manager] Monitors the Task Manager Poller and
 automatically recovers from failure (#75420)

Introduces a monitor around the Task Manager poller which pips through all values emitted by the poller and recovers from poller failures or stalls.
This monitor does the following:
1. Catches the poller thrown errors and recovers by proxying the error to a handler and continues listening to the poller.
2. Reacts to the poller `error` (caused by uncaught errors) and `completion` events, by starting a new poller and piping its event through to any previous subscribers (in our case, Task Manager itself).
3. Tracks the rate at which the poller emits events (this can be both work events, and `No Task` events, so polling and finding no work, still counts as an emitted event) and times out when this rate gets too long (suggesting the poller  has hung) and replaces the Poller with a new one.

We're not aware of any clear cases where Task Manager should actually get restarted by the monitor - this is definitely an error case and we have addressed all known cases.
The goal of introducing this monitor is as an insurance policy in case an unexpected error case breaks the poller in a long running production environment.
---
 .../task_manager/server/polling/index.ts      |   9 +
 .../server/polling/observable_monitor.test.ts | 170 ++++++++++++++++++
 .../server/polling/observable_monitor.ts      |  80 +++++++++
 .../server/{ => polling}/task_poller.test.ts  |   4 +-
 .../server/{ => polling}/task_poller.ts       |   6 +-
 .../timeout_promise_after.test.ts             |   0
 .../{lib => polling}/timeout_promise_after.ts |   0
 .../task_manager/server/task_manager.ts       |  51 ++++--
 8 files changed, 302 insertions(+), 18 deletions(-)
 create mode 100644 x-pack/plugins/task_manager/server/polling/index.ts
 create mode 100644 x-pack/plugins/task_manager/server/polling/observable_monitor.test.ts
 create mode 100644 x-pack/plugins/task_manager/server/polling/observable_monitor.ts
 rename x-pack/plugins/task_manager/server/{ => polling}/task_poller.test.ts (99%)
 rename x-pack/plugins/task_manager/server/{ => polling}/task_poller.ts (97%)
 rename x-pack/plugins/task_manager/server/{lib => polling}/timeout_promise_after.test.ts (100%)
 rename x-pack/plugins/task_manager/server/{lib => polling}/timeout_promise_after.ts (100%)

diff --git a/x-pack/plugins/task_manager/server/polling/index.ts b/x-pack/plugins/task_manager/server/polling/index.ts
new file mode 100644
index 0000000000000..5c1f06eaeb256
--- /dev/null
+++ b/x-pack/plugins/task_manager/server/polling/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;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { createObservableMonitor } from './observable_monitor';
+export { createTaskPoller, PollingError, PollingErrorType } from './task_poller';
+export { timeoutPromiseAfter } from './timeout_promise_after';
diff --git a/x-pack/plugins/task_manager/server/polling/observable_monitor.test.ts b/x-pack/plugins/task_manager/server/polling/observable_monitor.test.ts
new file mode 100644
index 0000000000000..0b7bbdfb623e5
--- /dev/null
+++ b/x-pack/plugins/task_manager/server/polling/observable_monitor.test.ts
@@ -0,0 +1,170 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { interval, from, Subject } from 'rxjs';
+import { map, concatMap, takeWhile, take } from 'rxjs/operators';
+
+import { createObservableMonitor } from './observable_monitor';
+import { times } from 'lodash';
+
+describe('Poll Monitor', () => {
+  test('returns a cold observable so that the monitored Observable is only created on demand', async () => {
+    const instantiator = jest.fn(() => new Subject());
+
+    createObservableMonitor(instantiator);
+
+    expect(instantiator).not.toHaveBeenCalled();
+  });
+
+  test('subscribing to the observable instantiates a new observable and pipes its results through', async () => {
+    const instantiator = jest.fn(() => from([0, 1, 2]));
+    const monitoredObservable = createObservableMonitor(instantiator);
+
+    expect(instantiator).not.toHaveBeenCalled();
+
+    return new Promise((resolve) => {
+      const next = jest.fn();
+      monitoredObservable.pipe(take(3)).subscribe({
+        next,
+        complete: () => {
+          expect(instantiator).toHaveBeenCalled();
+          expect(next).toHaveBeenCalledWith(0);
+          expect(next).toHaveBeenCalledWith(1);
+          expect(next).toHaveBeenCalledWith(2);
+          resolve();
+        },
+      });
+    });
+  });
+
+  test('unsubscribing from the monitor prevents the monitor from resubscribing to the observable', async () => {
+    const heartbeatInterval = 1000;
+    const instantiator = jest.fn(() => interval(100));
+    const monitoredObservable = createObservableMonitor(instantiator, { heartbeatInterval });
+
+    return new Promise((resolve) => {
+      const next = jest.fn();
+      monitoredObservable.pipe(take(3)).subscribe({
+        next,
+        complete: () => {
+          expect(instantiator).toHaveBeenCalledTimes(1);
+          setTimeout(() => {
+            expect(instantiator).toHaveBeenCalledTimes(1);
+            resolve();
+          }, heartbeatInterval * 2);
+        },
+      });
+    });
+  });
+
+  test(`ensures the observable subscription hasn't closed at a fixed interval and reinstantiates if it has`, async () => {
+    let iteration = 0;
+    const instantiator = jest.fn(() => {
+      iteration++;
+      return interval(100).pipe(
+        map((index) => `${iteration}:${index}`),
+        // throw on 3rd value of the first iteration
+        map((value, index) => {
+          if (iteration === 1 && index === 3) {
+            throw new Error('Source threw an error!');
+          }
+          return value;
+        })
+      );
+    });
+
+    const onError = jest.fn();
+    const monitoredObservable = createObservableMonitor(instantiator, { onError });
+
+    return new Promise((resolve) => {
+      const next = jest.fn();
+      const error = jest.fn();
+      monitoredObservable
+        .pipe(
+          // unsubscribe once we confirm we have successfully recovered from an error in the source
+          takeWhile(function validateExpectation() {
+            try {
+              [...times(3, (index) => `1:${index}`), ...times(5, (index) => `2:${index}`)].forEach(
+                (expecteArg) => {
+                  expect(next).toHaveBeenCalledWith(expecteArg);
+                }
+              );
+              return false;
+            } catch {
+              return true;
+            }
+          })
+        )
+        .subscribe({
+          next,
+          error,
+          complete: () => {
+            expect(error).not.toHaveBeenCalled();
+            expect(onError).toHaveBeenCalledWith(new Error('Source threw an error!'));
+            resolve();
+          },
+        });
+    });
+  });
+
+  test(`ensures the observable subscription hasn't hung at a fixed interval and reinstantiates if it has`, async () => {
+    let iteration = 0;
+    const instantiator = jest.fn(() => {
+      iteration++;
+      return interval(100).pipe(
+        map((index) => `${iteration}:${index}`),
+        // hang on 3rd value of the first iteration
+        concatMap((value, index) => {
+          if (iteration === 1 && index === 3) {
+            return new Promise(() => {
+              // never resolve or reject, just hang for EVER
+            });
+          }
+          return Promise.resolve(value);
+        })
+      );
+    });
+
+    const onError = jest.fn();
+    const monitoredObservable = createObservableMonitor(instantiator, {
+      onError,
+      heartbeatInterval: 100,
+      inactivityTimeout: 500,
+    });
+
+    return new Promise((resolve) => {
+      const next = jest.fn();
+      const error = jest.fn();
+      monitoredObservable
+        .pipe(
+          // unsubscribe once we confirm we have successfully recovered from an error in the source
+          takeWhile(function validateExpectation() {
+            try {
+              [...times(3, (index) => `1:${index}`), ...times(5, (index) => `2:${index}`)].forEach(
+                (expecteArg) => {
+                  expect(next).toHaveBeenCalledWith(expecteArg);
+                }
+              );
+              return false;
+            } catch {
+              return true;
+            }
+          })
+        )
+        .subscribe({
+          next,
+          error,
+          complete: () => {
+            expect(error).not.toHaveBeenCalled();
+            expect(onError).toHaveBeenCalledWith(
+              new Error(`Observable Monitor: Hung Observable restarted after 500ms of inactivity`)
+            );
+            resolve();
+          },
+        });
+    });
+  });
+});
diff --git a/x-pack/plugins/task_manager/server/polling/observable_monitor.ts b/x-pack/plugins/task_manager/server/polling/observable_monitor.ts
new file mode 100644
index 0000000000000..7b06117ef59d1
--- /dev/null
+++ b/x-pack/plugins/task_manager/server/polling/observable_monitor.ts
@@ -0,0 +1,80 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Subject, Observable, throwError, interval, timer, Subscription } from 'rxjs';
+import { exhaustMap, tap, takeUntil, switchMap, switchMapTo, catchError } from 'rxjs/operators';
+import { noop } from 'lodash';
+
+const DEFAULT_HEARTBEAT_INTERVAL = 1000;
+
+// by default don't monitor inactivity as not all observables are expected
+// to emit at any kind of fixed interval
+const DEFAULT_INACTIVITY_TIMEOUT = 0;
+
+export interface ObservableMonitorOptions<E> {
+  heartbeatInterval?: number;
+  inactivityTimeout?: number;
+  onError?: (err: E) => void;
+}
+
+export function createObservableMonitor<T, E>(
+  observableFactory: () => Observable<T>,
+  {
+    heartbeatInterval = DEFAULT_HEARTBEAT_INTERVAL,
+    inactivityTimeout = DEFAULT_INACTIVITY_TIMEOUT,
+    onError = noop,
+  }: ObservableMonitorOptions<E> = {}
+): Observable<T> {
+  return new Observable((subscriber) => {
+    const subscription: Subscription = interval(heartbeatInterval)
+      .pipe(
+        // switch from the heartbeat interval to the instantiated observable until it completes / errors
+        exhaustMap(() => takeUntilDurationOfInactivity(observableFactory(), inactivityTimeout)),
+        // if an error is thrown, catch it, notify and try to recover
+        catchError((err: E, source$: Observable<T>) => {
+          onError(err);
+          // return source, which will allow our observable to recover from this error and
+          // keep pulling values out of it
+          return source$;
+        })
+      )
+      .subscribe(subscriber);
+    return () => {
+      subscription.unsubscribe();
+    };
+  });
+}
+
+function takeUntilDurationOfInactivity<T>(source$: Observable<T>, inactivityTimeout: number) {
+  // if there's a specified maximum duration of inactivity, only take values until that
+  // duration elapses without any new events
+  if (inactivityTimeout) {
+    // an observable which starts a timer every time a new value is passed in, replacing the previous timer
+    // if the timer goes off without having been reset by a fresh value, it will emit a single event - which will
+    // notify our monitor that the source has been inactive for too long
+    const inactivityMonitor$ = new Subject<void>();
+    return source$.pipe(
+      takeUntil(
+        inactivityMonitor$.pipe(
+          // on each new emited value, start a new timer, discarding the old one
+          switchMap(() => timer(inactivityTimeout)),
+          // every time a timer expires (meaning no new value came in on time to discard it)
+          // throw an error, forcing the monitor instantiate a new observable
+          switchMapTo(
+            throwError(
+              new Error(
+                `Observable Monitor: Hung Observable restarted after ${inactivityTimeout}ms of inactivity`
+              )
+            )
+          )
+        )
+      ),
+      // poke `inactivityMonitor$` so it restarts the timer
+      tap(() => inactivityMonitor$.next())
+    );
+  }
+  return source$;
+}
diff --git a/x-pack/plugins/task_manager/server/task_poller.test.ts b/x-pack/plugins/task_manager/server/polling/task_poller.test.ts
similarity index 99%
rename from x-pack/plugins/task_manager/server/task_poller.test.ts
rename to x-pack/plugins/task_manager/server/polling/task_poller.test.ts
index 98e6d0f9388a4..607e2ac2b80fa 100644
--- a/x-pack/plugins/task_manager/server/task_poller.test.ts
+++ b/x-pack/plugins/task_manager/server/polling/task_poller.test.ts
@@ -9,8 +9,8 @@ import { Subject } from 'rxjs';
 import { Option, none, some } from 'fp-ts/lib/Option';
 import { createTaskPoller, PollingError, PollingErrorType } from './task_poller';
 import { fakeSchedulers } from 'rxjs-marbles/jest';
-import { sleep, resolvable, Resolvable } from './test_utils';
-import { asOk, asErr } from './lib/result_type';
+import { sleep, resolvable, Resolvable } from '../test_utils';
+import { asOk, asErr } from '../lib/result_type';
 
 describe('TaskPoller', () => {
   beforeEach(() => jest.useFakeTimers());
diff --git a/x-pack/plugins/task_manager/server/task_poller.ts b/x-pack/plugins/task_manager/server/polling/task_poller.ts
similarity index 97%
rename from x-pack/plugins/task_manager/server/task_poller.ts
rename to x-pack/plugins/task_manager/server/polling/task_poller.ts
index 88511f42f96fb..a1435ffafe8f8 100644
--- a/x-pack/plugins/task_manager/server/task_poller.ts
+++ b/x-pack/plugins/task_manager/server/polling/task_poller.ts
@@ -15,7 +15,7 @@ import { mapTo, filter, scan, concatMap, tap, catchError } from 'rxjs/operators'
 
 import { pipe } from 'fp-ts/lib/pipeable';
 import { Option, none, map as mapOptional, getOrElse } from 'fp-ts/lib/Option';
-import { pullFromSet } from './lib/pull_from_set';
+import { pullFromSet } from '../lib/pull_from_set';
 import {
   Result,
   Err,
@@ -24,8 +24,8 @@ import {
   asOk,
   asErr,
   promiseResult,
-} from './lib/result_type';
-import { timeoutPromiseAfter } from './lib/timeout_promise_after';
+} from '../lib/result_type';
+import { timeoutPromiseAfter } from './timeout_promise_after';
 
 type WorkFn<T, H> = (...params: T[]) => Promise<H>;
 
diff --git a/x-pack/plugins/task_manager/server/lib/timeout_promise_after.test.ts b/x-pack/plugins/task_manager/server/polling/timeout_promise_after.test.ts
similarity index 100%
rename from x-pack/plugins/task_manager/server/lib/timeout_promise_after.test.ts
rename to x-pack/plugins/task_manager/server/polling/timeout_promise_after.test.ts
diff --git a/x-pack/plugins/task_manager/server/lib/timeout_promise_after.ts b/x-pack/plugins/task_manager/server/polling/timeout_promise_after.ts
similarity index 100%
rename from x-pack/plugins/task_manager/server/lib/timeout_promise_after.ts
rename to x-pack/plugins/task_manager/server/polling/timeout_promise_after.ts
diff --git a/x-pack/plugins/task_manager/server/task_manager.ts b/x-pack/plugins/task_manager/server/task_manager.ts
index 2c812f0da516d..fb2d5e07030a4 100644
--- a/x-pack/plugins/task_manager/server/task_manager.ts
+++ b/x-pack/plugins/task_manager/server/task_manager.ts
@@ -46,7 +46,12 @@ import {
   TaskStatus,
   ElasticJs,
 } from './task';
-import { createTaskPoller, PollingError, PollingErrorType } from './task_poller';
+import {
+  createTaskPoller,
+  PollingError,
+  PollingErrorType,
+  createObservableMonitor,
+} from './polling';
 import { TaskPool } from './task_pool';
 import { TaskManagerRunner, TaskRunner } from './task_runner';
 import {
@@ -154,18 +159,38 @@ export class TaskManager {
       maxWorkers: opts.config.max_workers,
     });
 
-    this.poller$ = createTaskPoller<string, FillPoolResult>({
-      pollInterval: opts.config.poll_interval,
-      bufferCapacity: opts.config.request_capacity,
-      getCapacity: () => this.pool.availableWorkers,
-      pollRequests$: this.claimRequests$,
-      work: this.pollForWork,
-      // Time out the `work` phase if it takes longer than a certain number of polling cycles
-      // The `work` phase includes the prework needed *before* executing a task
-      // (such as polling for new work, marking tasks as running etc.) but does not
-      // include the time of actually running the task
-      workTimeout: opts.config.poll_interval * opts.config.max_poll_inactivity_cycles,
-    });
+    const {
+      max_poll_inactivity_cycles: maxPollInactivityCycles,
+      poll_interval: pollInterval,
+    } = opts.config;
+    this.poller$ = createObservableMonitor<Result<FillPoolResult, PollingError<string>>, Error>(
+      () =>
+        createTaskPoller<string, FillPoolResult>({
+          pollInterval,
+          bufferCapacity: opts.config.request_capacity,
+          getCapacity: () => this.pool.availableWorkers,
+          pollRequests$: this.claimRequests$,
+          work: this.pollForWork,
+          // Time out the `work` phase if it takes longer than a certain number of polling cycles
+          // The `work` phase includes the prework needed *before* executing a task
+          // (such as polling for new work, marking tasks as running etc.) but does not
+          // include the time of actually running the task
+          workTimeout: pollInterval * maxPollInactivityCycles,
+        }),
+      {
+        heartbeatInterval: pollInterval,
+        // Time out the poller itself if it has failed to complete the entire stream for a certain amount of time.
+        // This is different that the `work` timeout above, as the poller could enter an invalid state where
+        // it fails to complete a cycle even thought `work` is completing quickly.
+        // We grant it a single cycle longer than the time alotted to `work` so that timing out the `work`
+        // doesn't get short circuited by the monitor reinstantiating the poller all together (a far more expensive
+        // operation than just timing out the `work` internally)
+        inactivityTimeout: pollInterval * (maxPollInactivityCycles + 1),
+        onError: (error) => {
+          this.logger.error(`[Task Poller Monitor]: ${error.message}`);
+        },
+      }
+    );
   }
 
   private emitEvent = (event: TaskLifecycleEvent) => {

From 3201efe79739bf8245a9648df9dac8d2a566d55a Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Thu, 20 Aug 2020 15:29:56 -0700
Subject: [PATCH 76/85] [Ingest Manager] Add namespace validation (#75381)

* Add namespace validation on APIs and UI

* Add test coverage

* Fix imports

* Fix schema

* Rename to policy

* Fix typo
---
 .../ingest_manager/common/services/index.ts   |  1 +
 .../services/is_valid_namespace.test.ts       | 28 +++++++++++++++++++
 .../common/services/is_valid_namespace.ts     | 17 +++++++++++
 .../components/agent_policy_form.tsx          |  8 ++++++
 .../services/validate_package_policy.ts       |  8 +++++-
 .../ingest_manager/services/index.ts          |  1 +
 .../server/types/models/agent_policy.ts       |  4 +--
 .../server/types/models/package_policy.ts     | 12 +++++++-
 .../apis/agent_policy/agent_policy.ts         | 13 ++++++++-
 .../apis/package_policy/create.ts             | 27 +++++++++++++++++-
 10 files changed, 113 insertions(+), 6 deletions(-)
 create mode 100644 x-pack/plugins/ingest_manager/common/services/is_valid_namespace.test.ts
 create mode 100644 x-pack/plugins/ingest_manager/common/services/is_valid_namespace.ts

diff --git a/x-pack/plugins/ingest_manager/common/services/index.ts b/x-pack/plugins/ingest_manager/common/services/index.ts
index 28fd15b5ea700..ad739bf9ff844 100644
--- a/x-pack/plugins/ingest_manager/common/services/index.ts
+++ b/x-pack/plugins/ingest_manager/common/services/index.ts
@@ -10,3 +10,4 @@ export { storedPackagePoliciesToAgentInputs } from './package_policies_to_agent_
 export { fullAgentPolicyToYaml } from './full_agent_policy_to_yaml';
 export { isPackageLimited, doesAgentPolicyAlreadyIncludePackage } from './limited_package';
 export { decodeCloudId } from './decode_cloud_id';
+export { isValidNamespace } from './is_valid_namespace';
diff --git a/x-pack/plugins/ingest_manager/common/services/is_valid_namespace.test.ts b/x-pack/plugins/ingest_manager/common/services/is_valid_namespace.test.ts
new file mode 100644
index 0000000000000..40f37cc456f94
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/common/services/is_valid_namespace.test.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { isValidNamespace } from './is_valid_namespace';
+
+describe('Ingest Manager - isValidNamespace', () => {
+  it('returns true for valid namespaces', () => {
+    expect(isValidNamespace('default')).toBe(true);
+    expect(isValidNamespace('namespace-with-dash')).toBe(true);
+    expect(isValidNamespace('123')).toBe(true);
+  });
+
+  it('returns false for invalid namespaces', () => {
+    expect(isValidNamespace('Default')).toBe(false);
+    expect(isValidNamespace('namespace with spaces')).toBe(false);
+    expect(isValidNamespace('foo/bar')).toBe(false);
+    expect(isValidNamespace('foo\\bar')).toBe(false);
+    expect(isValidNamespace('foo*bar')).toBe(false);
+    expect(isValidNamespace('foo?bar')).toBe(false);
+    expect(isValidNamespace('foo"bar')).toBe(false);
+    expect(isValidNamespace('foo<bar')).toBe(false);
+    expect(isValidNamespace('foo|bar')).toBe(false);
+    expect(isValidNamespace('foo,bar')).toBe(false);
+    expect(isValidNamespace('foo#bar')).toBe(false);
+  });
+});
diff --git a/x-pack/plugins/ingest_manager/common/services/is_valid_namespace.ts b/x-pack/plugins/ingest_manager/common/services/is_valid_namespace.ts
new file mode 100644
index 0000000000000..c0adb0356d996
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/common/services/is_valid_namespace.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+// Namespace string eventually becomes part of an index name. This method partially implements index name rules from
+// https://github.com/elastic/elasticsearch/blob/master/docs/reference/indices/create-index.asciidoc
+export function isValidNamespace(namespace: string) {
+  return (
+    typeof namespace === 'string' &&
+    // Lowercase only
+    namespace === namespace.toLowerCase() &&
+    // Cannot include \, /, *, ?, ", <, >, |, space character, comma, #, :
+    /^[^\*\\/\?"<>|\s,#:]+$/.test(namespace)
+  );
+}
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_form.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_form.tsx
index a858a53c485b7..b216270aa08f0 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_form.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_form.tsx
@@ -24,6 +24,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 import styled from 'styled-components';
 import { NewAgentPolicy, AgentPolicy } from '../../../types';
+import { isValidNamespace } from '../../../services';
 import { AgentPolicyDeleteProvider } from './agent_policy_delete_provider';
 
 interface ValidationResults {
@@ -57,6 +58,13 @@ export const agentPolicyFormValidation = (
         defaultMessage="A namespace is required"
       />,
     ];
+  } else if (!isValidNamespace(agentPolicy.namespace)) {
+    errors.namespace = [
+      <FormattedMessage
+        id="xpack.ingestManager.agentPolicyForm.namespaceInvalidErrorMessage"
+        defaultMessage="Namespace contains invalid characters"
+      />,
+    ];
   }
 
   return errors;
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/validate_package_policy.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/validate_package_policy.ts
index f375352c5a055..2714f1fe2e6e5 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/validate_package_policy.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/validate_package_policy.ts
@@ -5,7 +5,7 @@
  */
 import { i18n } from '@kbn/i18n';
 import { safeLoad } from 'js-yaml';
-import { getFlattenedObject } from '../../../../services';
+import { getFlattenedObject, isValidNamespace } from '../../../../services';
 import {
   NewPackagePolicy,
   PackagePolicyInput,
@@ -65,6 +65,12 @@ export const validatePackagePolicy = (
         defaultMessage: 'Namespace is required',
       }),
     ];
+  } else if (!isValidNamespace(packagePolicy.namespace)) {
+    validationResults.namespace = [
+      i18n.translate('xpack.ingestManager.packagePolicyValidation.namespaceInvalidErrorMessage', {
+        defaultMessage: 'Namespace contains invalid characters',
+      }),
+    ];
   }
 
   if (
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/services/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/services/index.ts
index 7d426c11c0aab..56179b02c5ba2 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/services/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/services/index.ts
@@ -24,4 +24,5 @@ export {
   fullAgentPolicyToYaml,
   isPackageLimited,
   doesAgentPolicyAlreadyIncludePackage,
+  isValidNamespace,
 } from '../../../../common';
diff --git a/x-pack/plugins/ingest_manager/server/types/models/agent_policy.ts b/x-pack/plugins/ingest_manager/server/types/models/agent_policy.ts
index 877d8e9e91714..5fff9247d78d9 100644
--- a/x-pack/plugins/ingest_manager/server/types/models/agent_policy.ts
+++ b/x-pack/plugins/ingest_manager/server/types/models/agent_policy.ts
@@ -4,12 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { schema } from '@kbn/config-schema';
-import { PackagePolicySchema } from './package_policy';
+import { PackagePolicySchema, NamespaceSchema } from './package_policy';
 import { AgentPolicyStatus } from '../../../common';
 
 const AgentPolicyBaseSchema = {
   name: schema.string({ minLength: 1 }),
-  namespace: schema.string({ minLength: 1 }),
+  namespace: NamespaceSchema,
   description: schema.maybe(schema.string()),
   monitoring_enabled: schema.maybe(
     schema.arrayOf(schema.oneOf([schema.literal('logs'), schema.literal('metrics')]))
diff --git a/x-pack/plugins/ingest_manager/server/types/models/package_policy.ts b/x-pack/plugins/ingest_manager/server/types/models/package_policy.ts
index 81bfb599b4c9a..c23918210114e 100644
--- a/x-pack/plugins/ingest_manager/server/types/models/package_policy.ts
+++ b/x-pack/plugins/ingest_manager/server/types/models/package_policy.ts
@@ -4,6 +4,16 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { schema } from '@kbn/config-schema';
+import { isValidNamespace } from '../../../common';
+
+export const NamespaceSchema = schema.string({
+  minLength: 1,
+  validate: (value) => {
+    if (!isValidNamespace(value)) {
+      return 'Namespace contains invalid characters';
+    }
+  },
+});
 
 const ConfigRecordSchema = schema.recordOf(
   schema.string(),
@@ -16,7 +26,7 @@ const ConfigRecordSchema = schema.recordOf(
 const PackagePolicyBaseSchema = {
   name: schema.string(),
   description: schema.maybe(schema.string()),
-  namespace: schema.string({ minLength: 1 }),
+  namespace: NamespaceSchema,
   policy_id: schema.string(),
   enabled: schema.boolean(),
   package: schema.maybe(
diff --git a/x-pack/test/ingest_manager_api_integration/apis/agent_policy/agent_policy.ts b/x-pack/test/ingest_manager_api_integration/apis/agent_policy/agent_policy.ts
index 5253b19b24d65..b55da0798c5f0 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/agent_policy/agent_policy.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/agent_policy/agent_policy.ts
@@ -26,7 +26,7 @@ export default function ({ getService }: FtrProviderContext) {
         expect(apiResponse.success).to.be(true);
       });
 
-      it('should return a 400 with an invalid namespace', async () => {
+      it('should return a 400 with an empty namespace', async () => {
         await supertest
           .post(`/api/ingest_manager/agent_policies`)
           .set('kbn-xsrf', 'xxxx')
@@ -36,6 +36,17 @@ export default function ({ getService }: FtrProviderContext) {
           })
           .expect(400);
       });
+
+      it('should return a 400 with an invalid namespace', async () => {
+        await supertest
+          .post(`/api/ingest_manager/agent_policies`)
+          .set('kbn-xsrf', 'xxxx')
+          .send({
+            name: 'TEST',
+            namespace: 'InvalidNamespace',
+          })
+          .expect(400);
+      });
     });
 
     describe('POST /api/ingest_manager/agent_policies/{agentPolicyId}/copy', () => {
diff --git a/x-pack/test/ingest_manager_api_integration/apis/package_policy/create.ts b/x-pack/test/ingest_manager_api_integration/apis/package_policy/create.ts
index 2043faa07b1e1..c88f03de59615 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/package_policy/create.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/package_policy/create.ts
@@ -59,7 +59,7 @@ export default function ({ getService }: FtrProviderContext) {
       }
     });
 
-    it('should return a 400 with an invalid namespace', async function () {
+    it('should return a 400 with an empty namespace', async function () {
       if (server.enabled) {
         await supertest
           .post(`/api/ingest_manager/package_policies`)
@@ -84,6 +84,31 @@ export default function ({ getService }: FtrProviderContext) {
       }
     });
 
+    it('should return a 400 with an invalid namespace', async function () {
+      if (server.enabled) {
+        await supertest
+          .post(`/api/ingest_manager/package_policies`)
+          .set('kbn-xsrf', 'xxxx')
+          .send({
+            name: 'filetest-1',
+            description: '',
+            namespace: 'InvalidNamespace',
+            policy_id: agentPolicyId,
+            enabled: true,
+            output_id: '',
+            inputs: [],
+            package: {
+              name: 'filetest',
+              title: 'For File Tests',
+              version: '0.1.0',
+            },
+          })
+          .expect(400);
+      } else {
+        warnAndSkipTest(this, log);
+      }
+    });
+
     it('should not allow multiple limited packages on the same agent policy', async function () {
       if (server.enabled) {
         await supertest

From 958296c5c2fec4ca41bc0b71af33dab4ff3ef29e Mon Sep 17 00:00:00 2001
From: Quynh Nguyen <43350163+qn895@users.noreply.github.com>
Date: Thu, 20 Aug 2020 18:14:58 -0500
Subject: [PATCH 77/85] [ML] Update broken job config callout error (#75481)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../job_config_error_callout.tsx                | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/job_config_error_callout/job_config_error_callout.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/job_config_error_callout/job_config_error_callout.tsx
index 9b9e1258db503..959f2d18d99fe 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/job_config_error_callout/job_config_error_callout.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/job_config_error_callout/job_config_error_callout.tsx
@@ -4,13 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { FC } from 'react';
+import React, { FC, useMemo } from 'react';
 
 import { EuiCallOut, EuiLink, EuiPanel, EuiSpacer } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
 
 import { ExplorationTitle } from '../exploration_title';
+import { useMlKibana } from '../../../../../contexts/kibana';
 
 const jobConfigErrorTitle = i18n.translate('xpack.ml.dataframe.analytics.jobConfig.errorTitle', {
   defaultMessage: 'Unable to fetch results. An error occurred loading the job configuration data.',
@@ -31,6 +32,11 @@ export const JobConfigErrorCallout: FC<Props> = ({
   jobConfigErrorMessage,
   title,
 }) => {
+  const {
+    services: {
+      application: { getUrlForApp },
+    },
+  } = useMlKibana();
   const containsIndexPatternLink =
     typeof jobCapsServiceErrorMessage === 'string' &&
     jobCapsServiceErrorMessage.includes('locate that index-pattern') &&
@@ -39,9 +45,16 @@ export const JobConfigErrorCallout: FC<Props> = ({
   const message = (
     <p>{jobConfigErrorMessage ? jobConfigErrorMessage : jobCapsServiceErrorMessage}</p>
   );
+  const newIndexPatternUrl = useMemo(
+    () =>
+      getUrlForApp('management', {
+        path: 'kibana/indexPatterns',
+      }),
+    []
+  );
 
   const calloutBody = containsIndexPatternLink ? (
-    <EuiLink href="management/kibana/indexPatterns" target="_blank">
+    <EuiLink href={newIndexPatternUrl} target="_blank">
       {message}
     </EuiLink>
   ) : (

From 7b23e7cd8b20aa889a0d31181df91bf96c0f676d Mon Sep 17 00:00:00 2001
From: Spencer <email@spalger.com>
Date: Thu, 20 Aug 2020 18:50:36 -0700
Subject: [PATCH 78/85] [kbn/plugin-generator] remove sao, modernize (#75465)

Co-authored-by: spalger <spalger@users.noreply.github.com>
---
 .eslintignore                                 |     2 +-
 .eslintrc.js                                  |     1 -
 packages/kbn-plugin-generator/README.md       |    10 +-
 packages/kbn-plugin-generator/index.js        |    69 -
 .../integration_tests/generate_plugin.test.js |    62 -
 packages/kbn-plugin-generator/package.json    |    26 +-
 .../kbn-plugin-generator/sao_template/sao.js  |   189 -
 .../sao_template/sao.test.js                  |   159 -
 .../sao_template/template/eslintrc.js         |     9 -
 .../sao_template/template/i18nrc.json         |    10 -
 .../template/public/application.tsx           |    25 -
 .../sao_template/template/public/index.ts     |    16 -
 .../sao_template/template/public/types.ts     |    11 -
 .../sao_template/template/server/index.ts     |    15 -
 .../sao_template/template/server/plugin.ts    |    30 -
 .../template/translations/ja-JP.json          |    82 -
 .../kbn-plugin-generator/scripts/build.js     |    43 +
 .../kbn-plugin-generator/src/ask_questions.ts |   103 +
 .../kbn-plugin-generator/src/casing.test.ts   |    68 +
 packages/kbn-plugin-generator/src/casing.ts   |    32 +
 packages/kbn-plugin-generator/src/cli.ts      |    98 +
 .../{index.js.d.ts => src/index.ts}           |     8 +-
 .../integration_tests/generate_plugin.test.ts |   143 +
 .../src/render_template.ts                    |   127 +
 packages/kbn-plugin-generator/src/streams.ts  |    73 +
 .../template/.eslintrc.js.ejs                 |    10 +
 .../kbn-plugin-generator/template/.gitignore  |     2 +
 .../template/.i18nrc.json.ejs                 |     9 +
 .../README.md => template/README.md.ejs}      |     4 +-
 .../index.ts => template/common/index.ts.ejs} |     0
 .../kibana.json => template/kibana.json.ejs}  |     3 +-
 .../template/package.json.ejs                 |     8 +
 .../template/public/application.tsx.ejs       |    24 +
 .../public/components/app.tsx.ejs}            |    58 +-
 .../template/public/index.scss                |     0
 .../template/public/index.ts.ejs              |    14 +
 .../public/plugin.ts.ejs}                     |    14 +-
 .../template/public/types.ts.ejs              |    11 +
 .../template/server/index.ts.ejs              |    15 +
 .../template/server/plugin.ts.ejs             |    40 +
 .../server/routes/index.ts.ejs}               |     3 +-
 .../types.ts => template/server/types.ts.ejs} |     4 +-
 .../template/translations/ja-JP.json.ejs      |    81 +
 .../tsconfig.json.ejs}                        |     0
 packages/kbn-plugin-generator/tsconfig.json   |    11 +-
 packages/kbn-pm/dist/index.js                 | 46141 ++++++++--------
 scripts/generate_plugin.js                    |     4 +-
 src/dev/file.ts                               |     8 +-
 .../tasks/extract_untracked_translations.ts   |     2 +-
 src/dev/precommit_hook/casing_check_config.js |     8 +
 src/dev/precommit_hook/check_file_casing.js   |     5 +
 yarn.lock                                     |   653 +-
 52 files changed, 24071 insertions(+), 24472 deletions(-)
 delete mode 100644 packages/kbn-plugin-generator/index.js
 delete mode 100644 packages/kbn-plugin-generator/integration_tests/generate_plugin.test.js
 delete mode 100755 packages/kbn-plugin-generator/sao_template/sao.js
 delete mode 100755 packages/kbn-plugin-generator/sao_template/sao.test.js
 delete mode 100644 packages/kbn-plugin-generator/sao_template/template/eslintrc.js
 delete mode 100644 packages/kbn-plugin-generator/sao_template/template/i18nrc.json
 delete mode 100644 packages/kbn-plugin-generator/sao_template/template/public/application.tsx
 delete mode 100644 packages/kbn-plugin-generator/sao_template/template/public/index.ts
 delete mode 100644 packages/kbn-plugin-generator/sao_template/template/public/types.ts
 delete mode 100644 packages/kbn-plugin-generator/sao_template/template/server/index.ts
 delete mode 100644 packages/kbn-plugin-generator/sao_template/template/server/plugin.ts
 delete mode 100644 packages/kbn-plugin-generator/sao_template/template/translations/ja-JP.json
 create mode 100644 packages/kbn-plugin-generator/scripts/build.js
 create mode 100644 packages/kbn-plugin-generator/src/ask_questions.ts
 create mode 100644 packages/kbn-plugin-generator/src/casing.test.ts
 create mode 100644 packages/kbn-plugin-generator/src/casing.ts
 create mode 100644 packages/kbn-plugin-generator/src/cli.ts
 rename packages/kbn-plugin-generator/{index.js.d.ts => src/index.ts} (88%)
 create mode 100644 packages/kbn-plugin-generator/src/integration_tests/generate_plugin.test.ts
 create mode 100644 packages/kbn-plugin-generator/src/render_template.ts
 create mode 100644 packages/kbn-plugin-generator/src/streams.ts
 create mode 100644 packages/kbn-plugin-generator/template/.eslintrc.js.ejs
 create mode 100644 packages/kbn-plugin-generator/template/.gitignore
 create mode 100644 packages/kbn-plugin-generator/template/.i18nrc.json.ejs
 rename packages/kbn-plugin-generator/{sao_template/template/README.md => template/README.md.ejs} (66%)
 rename packages/kbn-plugin-generator/{sao_template/template/common/index.ts => template/common/index.ts.ejs} (100%)
 rename packages/kbn-plugin-generator/{sao_template/template/kibana.json => template/kibana.json.ejs} (74%)
 create mode 100644 packages/kbn-plugin-generator/template/package.json.ejs
 create mode 100644 packages/kbn-plugin-generator/template/public/application.tsx.ejs
 rename packages/kbn-plugin-generator/{sao_template/template/public/components/app.tsx => template/public/components/app.tsx.ejs} (62%)
 rename packages/kbn-plugin-generator/{sao_template => }/template/public/index.scss (100%)
 create mode 100644 packages/kbn-plugin-generator/template/public/index.ts.ejs
 rename packages/kbn-plugin-generator/{sao_template/template/public/plugin.ts => template/public/plugin.ts.ejs} (68%)
 create mode 100644 packages/kbn-plugin-generator/template/public/types.ts.ejs
 create mode 100644 packages/kbn-plugin-generator/template/server/index.ts.ejs
 create mode 100644 packages/kbn-plugin-generator/template/server/plugin.ts.ejs
 rename packages/kbn-plugin-generator/{sao_template/template/server/routes/index.ts => template/server/routes/index.ts.ejs} (81%)
 rename packages/kbn-plugin-generator/{sao_template/template/server/types.ts => template/server/types.ts.ejs} (52%)
 create mode 100644 packages/kbn-plugin-generator/template/translations/ja-JP.json.ejs
 rename packages/kbn-plugin-generator/{sao_template/template/tsconfig.json => template/tsconfig.json.ejs} (100%)

diff --git a/.eslintignore b/.eslintignore
index 2b291e1c19714..972c818d791bf 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -41,7 +41,7 @@ target
 # package overrides
 /packages/eslint-config-kibana
 /packages/kbn-interpreter/src/common/lib/grammar.js
-/packages/kbn-plugin-generator/sao_template/template
+/packages/kbn-plugin-generator/template
 /packages/kbn-pm/dist
 /packages/kbn-test/src/functional_test_runner/__tests__/fixtures/
 /packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/
diff --git a/.eslintrc.js b/.eslintrc.js
index 5cd9809242bba..8c2a46f80a3a8 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -604,7 +604,6 @@ module.exports = {
     {
       files: [
         '.eslintrc.js',
-        'packages/kbn-plugin-generator/**/*.js',
         'packages/kbn-eslint-import-resolver-kibana/**/*.js',
         'packages/kbn-eslint-plugin-eslint/**/*',
         'x-pack/gulpfile.js',
diff --git a/packages/kbn-plugin-generator/README.md b/packages/kbn-plugin-generator/README.md
index 6ad665f9b87f8..9ff9a8aa95ca2 100644
--- a/packages/kbn-plugin-generator/README.md
+++ b/packages/kbn-plugin-generator/README.md
@@ -17,17 +17,17 @@ If you are targeting **Kibana 6.3 or greater** then checkout the corresponding K
 To target the current development version of Kibana just use the default  `master` branch.
 
 ```sh
-node scripts/generate_plugin my_plugin_name
+node scripts/generate_plugin --name my_plugin_name -y
 # generates a plugin in `plugins/my_plugin_name`
 ```
 
-To target 6.3, use the `6.x` branch (until the `6.3` branch is created).
+To target 6.8, use the `6.8` branch.
 
 ```sh
 git checkout 6.x
 yarn kbn bootstrap # always bootstrap when switching branches
-node scripts/generate_plugin my_plugin_name
-# generates a plugin for Kibana 6.3 in `../kibana-extra/my_plugin_name`
+node scripts/generate_plugin --name my_plugin_name -y
+# generates a plugin for Kibana 6.8 in `../kibana-extra/my_plugin_name`
 ```
 
 The generate script supports a few flags; run it with the `--help` flag to learn more.
@@ -49,7 +49,7 @@ yarn kbn bootstrap
 
 ## Plugin Development Scripts
 
-Generated plugins receive a handful of scripts that can be used during development. Those scripts are detailed in the [README.md](sao_template/template/README.md) file in each newly generated plugin, and expose the scripts provided by the [Kibana plugin helpers](../kbn-plugin-helpers), but here is a quick reference in case you need it:
+Generated plugins receive a handful of scripts that can be used during development. Those scripts are detailed in the [README.md](template/README.md) file in each newly generated plugin, and expose the scripts provided by the [Kibana plugin helpers](../kbn-plugin-helpers), but here is a quick reference in case you need it:
 
 > ***NOTE:*** All of these scripts should be run from the generated plugin.
 
diff --git a/packages/kbn-plugin-generator/index.js b/packages/kbn-plugin-generator/index.js
deleted file mode 100644
index 398b49fa1ecd5..0000000000000
--- a/packages/kbn-plugin-generator/index.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-const { resolve } = require('path');
-
-const dedent = require('dedent');
-const sao = require('sao');
-const chalk = require('chalk');
-const getopts = require('getopts');
-const { snakeCase } = require('lodash');
-
-exports.run = function run(argv) {
-  const options = getopts(argv, {
-    alias: {
-      h: 'help',
-      i: 'internal',
-    },
-  });
-
-  if (!options.help && options._.length !== 1) {
-    console.log(chalk`{red {bold [name]} is a required argument}\n`);
-    options.help = true;
-  }
-
-  if (options.help) {
-    console.log(
-      dedent(chalk`
-        # {dim Usage:}
-        node scripts/generate-plugin {bold [name]}
-        Generate a fresh Kibana plugin in the plugins/ directory
-      `) + '\n'
-    );
-    process.exit(1);
-  }
-
-  const name = options._[0];
-  const template = resolve(__dirname, './sao_template');
-  const kibanaPlugins = resolve(process.cwd(), 'plugins');
-  const targetPath = resolve(kibanaPlugins, snakeCase(name));
-
-  sao({
-    template: template,
-    targetPath: targetPath,
-    configOptions: {
-      name,
-      targetPath,
-    },
-  }).catch((error) => {
-    console.error(chalk`{red fatal error}!`);
-    console.error(error.stack);
-    process.exit(1);
-  });
-};
diff --git a/packages/kbn-plugin-generator/integration_tests/generate_plugin.test.js b/packages/kbn-plugin-generator/integration_tests/generate_plugin.test.js
deleted file mode 100644
index f434d09c6bf81..0000000000000
--- a/packages/kbn-plugin-generator/integration_tests/generate_plugin.test.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { spawn } from 'child_process';
-import Fs from 'fs';
-import { resolve } from 'path';
-import { promisify } from 'util';
-
-import del from 'del';
-import { snakeCase } from 'lodash';
-
-const statAsync = promisify(Fs.stat);
-const ROOT_DIR = resolve(__dirname, '../../../');
-
-const pluginName = 'ispec-plugin';
-const snakeCased = snakeCase(pluginName);
-const generatedPath = resolve(ROOT_DIR, `plugins/${snakeCased}`);
-
-beforeAll(async () => {
-  await del(generatedPath, { force: true });
-});
-
-afterAll(async () => {
-  await del(generatedPath, { force: true });
-});
-
-it('generates a plugin', async () => {
-  await new Promise((resolve, reject) => {
-    const proc = spawn(process.execPath, ['scripts/generate_plugin.js', pluginName], {
-      cwd: ROOT_DIR,
-      stdio: 'pipe',
-    });
-
-    proc.stdout.on('data', function selectDefaults() {
-      proc.stdin.write('\n'); // Generate a plugin with default options.
-    });
-
-    proc.on('close', resolve);
-    proc.on('error', reject);
-  });
-
-  const stats = await statAsync(generatedPath);
-  if (!stats.isDirectory()) {
-    throw new Error(`Expected [${generatedPath}] to be a directory`);
-  }
-});
diff --git a/packages/kbn-plugin-generator/package.json b/packages/kbn-plugin-generator/package.json
index 0803e498279f3..89e4251bd7802 100644
--- a/packages/kbn-plugin-generator/package.json
+++ b/packages/kbn-plugin-generator/package.json
@@ -1,14 +1,26 @@
 {
   "name": "@kbn/plugin-generator",
-  "license": "Apache-2.0",
-  "private": true,
   "version": "1.0.0",
+  "private": true,
+  "license": "Apache-2.0",
+  "main": "target/index.js",
+  "scripts": {
+    "kbn:bootstrap": "node scripts/build",
+    "kbn:watch": "node scripts/build --watch"
+  },
   "dependencies": {
-    "chalk": "^4.1.0",
-    "dedent": "^0.7.0",
+    "@kbn/dev-utils": "1.0.0",
+    "ejs": "^3.1.5",
     "execa": "^4.0.2",
-    "getopts": "^2.2.4",
-    "lodash": "^4.17.15",
-    "sao": "^0.22.12"
+    "inquirer": "^7.3.3",
+    "normalize-path": "^3.0.0",
+    "prettier": "^2.0.5",
+    "vinyl": "^2.2.0",
+    "vinyl-fs": "^3.0.3"
+  },
+  "devDependencies": {
+    "@types/ejs": "^3.0.4",
+    "@types/prettier": "^2.0.2",
+    "@types/inquirer": "^7.3.1"
   }
 }
diff --git a/packages/kbn-plugin-generator/sao_template/sao.js b/packages/kbn-plugin-generator/sao_template/sao.js
deleted file mode 100755
index e5f81a984ee93..0000000000000
--- a/packages/kbn-plugin-generator/sao_template/sao.js
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-const { relative, resolve } = require('path');
-const fs = require('fs');
-
-const { camelCase, startCase, snakeCase } = require('lodash');
-const chalk = require('chalk');
-const execa = require('execa');
-
-const pkg = require('../package.json');
-const kibanaPkgPath = require.resolve('../../../package.json');
-const kibanaPkg = require(kibanaPkgPath); // eslint-disable-line import/no-dynamic-require
-
-async function gitInit(dir) {
-  // Only plugins in /plugins get git init
-  try {
-    await execa('git', ['init', dir]);
-    console.log(`Git repo initialized in ${dir}`);
-  } catch (error) {
-    console.error(error);
-    throw new Error(`Failure to git init ${dir}: ${error.all || error}`);
-  }
-}
-
-async function moveToCustomFolder(from, to) {
-  try {
-    await execa('mv', [from, to]);
-  } catch (error) {
-    console.error(error);
-    throw new Error(`Failure to move plugin to ${to}: ${error.all || error}`);
-  }
-}
-
-async function eslintPlugin(dir) {
-  try {
-    await execa('yarn', ['lint:es', `./${dir}/**/*.ts*`, '--no-ignore', '--fix']);
-  } catch (error) {
-    console.error(error);
-    throw new Error(`Failure when running prettier on the generated output: ${error.all || error}`);
-  }
-}
-
-module.exports = function ({ name, targetPath }) {
-  return {
-    prompts: {
-      customPath: {
-        message: 'Would you like to create the plugin in a different folder?',
-        default: '/plugins',
-        filter(value) {
-          // Keep default value empty
-          if (value === '/plugins') return '';
-          // Remove leading slash
-          return value.startsWith('/') ? value.slice(1) : value;
-        },
-        validate(customPath) {
-          const p = resolve(process.cwd(), customPath);
-          const exists = fs.existsSync(p);
-          if (!exists)
-            return `Folder should exist relative to the kibana root folder. Consider /src/plugins or /x-pack/plugins.`;
-          return true;
-        },
-      },
-      description: {
-        message: 'Provide a short description',
-        default: 'An awesome Kibana plugin',
-      },
-      kbnVersion: {
-        message: 'What Kibana version are you targeting?',
-        default: kibanaPkg.version,
-      },
-      generateApp: {
-        type: 'confirm',
-        message: 'Should an app component be generated?',
-        default: true,
-      },
-      generateApi: {
-        type: 'confirm',
-        message: 'Should a server API be generated?',
-        default: true,
-      },
-      generateTranslations: {
-        type: 'confirm',
-        when: (answers) => {
-          // only for 3rd party plugins
-          return !answers.customPath && answers.generateApp;
-        },
-        message: 'Should translation files be generated?',
-        default({ customPath }) {
-          // only for 3rd party plugins
-          return !customPath;
-        },
-      },
-      generateScss: {
-        type: 'confirm',
-        message: 'Should SCSS be used?',
-        when: (answers) => answers.generateApp,
-        default: true,
-      },
-      generateEslint: {
-        type: 'confirm',
-        message: 'Would you like to use a custom eslint file?',
-        default({ customPath }) {
-          return !customPath;
-        },
-      },
-      generateTsconfig: {
-        type: 'confirm',
-        message: 'Would you like to use a custom tsconfig file?',
-        default: true,
-      },
-    },
-    filters: {
-      'public/**/index.scss': 'generateScss',
-      'public/**/*': 'generateApp',
-      'server/**/*': 'generateApi',
-      'translations/**/*': 'generateTranslations',
-      'i18nrc.json': 'generateTranslations',
-      'eslintrc.js': 'generateEslint',
-      'tsconfig.json': 'generateTsconfig',
-    },
-    move: {
-      'eslintrc.js': '.eslintrc.js',
-      'i18nrc.json': '.i18nrc.json',
-    },
-    data: (answers) => {
-      const pathToPlugin = answers.customPath
-        ? resolve(answers.customPath, camelCase(name), 'public')
-        : resolve(targetPath, 'public');
-      return Object.assign(
-        {
-          templateVersion: pkg.version,
-          startCase,
-          camelCase,
-          snakeCase,
-          name,
-          // kibana plugins are placed in a the non default path
-          isKibanaPlugin: !answers.customPath,
-          kbnVersion: answers.kbnVersion,
-          upperCamelCaseName: name.charAt(0).toUpperCase() + camelCase(name).slice(1),
-          hasUi: !!answers.generateApp,
-          hasServer: !!answers.generateApi,
-          hasScss: !!answers.generateScss,
-          relRoot: relative(pathToPlugin, process.cwd()),
-        },
-        answers
-      );
-    },
-    enforceNewFolder: true,
-    installDependencies: false,
-    async post({ log, answers }) {
-      let dir = relative(process.cwd(), targetPath);
-      if (answers.customPath) {
-        // Move to custom path
-        moveToCustomFolder(targetPath, answers.customPath);
-        dir = relative(process.cwd(), resolve(answers.customPath, snakeCase(name)));
-      } else {
-        // Init git only in the default path
-        await gitInit(dir);
-      }
-
-      // Apply eslint to the generated plugin
-      eslintPlugin(dir);
-
-      log.success(chalk`🎉
-
-Your plugin has been created in {bold ${dir}}.
-
-  {bold yarn start}
-`);
-    },
-  };
-};
diff --git a/packages/kbn-plugin-generator/sao_template/sao.test.js b/packages/kbn-plugin-generator/sao_template/sao.test.js
deleted file mode 100755
index af243326cff33..0000000000000
--- a/packages/kbn-plugin-generator/sao_template/sao.test.js
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-const sao = require('sao');
-
-const template = {
-  fromPath: __dirname,
-  configOptions: {
-    name: 'Some fancy plugin',
-    targetPath: '',
-  },
-};
-
-function getFileContents(file) {
-  return file.contents.toString();
-}
-
-describe('plugin generator sao integration', () => {
-  test('skips files when answering no', async () => {
-    const res = await sao.mockPrompt(template, {
-      generateApp: false,
-      generateApi: false,
-    });
-
-    expect(res.fileList).toContain('common/index.ts');
-    expect(res.fileList).not.toContain('public/index.ts');
-    expect(res.fileList).not.toContain('server/index.ts');
-  });
-
-  it('includes app when answering yes', async () => {
-    const res = await sao.mockPrompt(template, {
-      generateApp: true,
-      generateApi: false,
-      generateScss: true,
-    });
-
-    // check output files
-    expect(res.fileList).toContain('common/index.ts');
-    expect(res.fileList).toContain('public/index.ts');
-    expect(res.fileList).toContain('public/plugin.ts');
-    expect(res.fileList).toContain('public/types.ts');
-    expect(res.fileList).toContain('public/components/app.tsx');
-    expect(res.fileList).toContain('public/index.scss');
-    expect(res.fileList).not.toContain('server/index.ts');
-  });
-
-  it('includes server api when answering yes', async () => {
-    const res = await sao.mockPrompt(template, {
-      generateApp: true,
-      generateApi: true,
-    });
-
-    // check output files
-    expect(res.fileList).toContain('public/plugin.ts');
-    expect(res.fileList).toContain('server/plugin.ts');
-    expect(res.fileList).toContain('server/index.ts');
-    expect(res.fileList).toContain('server/types.ts');
-    expect(res.fileList).toContain('server/routes/index.ts');
-  });
-
-  it('skips eslintrc and scss', async () => {
-    const res = await sao.mockPrompt(template, {
-      generateApp: true,
-      generateApi: true,
-      generateScss: false,
-      generateEslint: false,
-      generateTsconfig: false,
-    });
-
-    // check output files
-    expect(res.fileList).toContain('public/plugin.ts');
-    expect(res.fileList).not.toContain('public/index.scss');
-    expect(res.fileList).not.toContain('.eslintrc.js');
-    expect(res.fileList).not.toContain('tsconfig.json');
-  });
-
-  it('plugin package has correct title', async () => {
-    const res = await sao.mockPrompt(template, {
-      generateApp: true,
-      generateApi: true,
-    });
-
-    const contents = getFileContents(res.files['common/index.ts']);
-    const controllerLine = contents.match("PLUGIN_NAME = '(.*)'")[1];
-
-    expect(controllerLine).toContain('Some fancy plugin');
-  });
-
-  it('package has version "kibana" with master', async () => {
-    const res = await sao.mockPrompt(template, {
-      kbnVersion: 'master',
-    });
-
-    const packageContents = getFileContents(res.files['kibana.json']);
-    const pkg = JSON.parse(packageContents);
-
-    expect(pkg.version).toBe('master');
-  });
-
-  it('package has correct version', async () => {
-    const res = await sao.mockPrompt(template, {
-      kbnVersion: 'v6.0.0',
-    });
-
-    const packageContents = getFileContents(res.files['kibana.json']);
-    const pkg = JSON.parse(packageContents);
-
-    expect(pkg.version).toBe('v6.0.0');
-  });
-
-  it('sample app has correct values', async () => {
-    const res = await sao.mockPrompt(template, {
-      generateApp: true,
-      generateApi: true,
-    });
-
-    const contents = getFileContents(res.files['common/index.ts']);
-    const controllerLine = contents.match("PLUGIN_ID = '(.*)'")[1];
-
-    expect(controllerLine).toContain('someFancyPlugin');
-  });
-
-  it('includes dotfiles', async () => {
-    const res = await sao.mockPrompt(template);
-    expect(res.files['tsconfig.json']).toBeTruthy();
-    expect(res.files['.eslintrc.js']).toBeTruthy();
-    expect(res.files['.i18nrc.json']).toBeTruthy();
-  });
-
-  it('validaes path override', async () => {
-    try {
-      await sao.mockPrompt(template, {
-        generateApp: true,
-        generateApi: true,
-        generateScss: false,
-        generateEslint: false,
-        customPath: 'banana',
-      });
-    } catch (e) {
-      expect(e.message).toContain('Validation failed at prompt "customPath"');
-    }
-  });
-});
diff --git a/packages/kbn-plugin-generator/sao_template/template/eslintrc.js b/packages/kbn-plugin-generator/sao_template/template/eslintrc.js
deleted file mode 100644
index b68d42e32e047..0000000000000
--- a/packages/kbn-plugin-generator/sao_template/template/eslintrc.js
+++ /dev/null
@@ -1,9 +0,0 @@
-module.exports = {	
-  root: true,	
-  extends: ['@elastic/eslint-config-kibana', 'plugin:@elastic/eui/recommended'],
-  <%_ if (!isKibanaPlugin) { -%>
-  rules: {
-    "@kbn/eslint/require-license-header": "off"
-  }
-  <%_ } -%>
-};
\ No newline at end of file
diff --git a/packages/kbn-plugin-generator/sao_template/template/i18nrc.json b/packages/kbn-plugin-generator/sao_template/template/i18nrc.json
deleted file mode 100644
index a4b78b88e64e2..0000000000000
--- a/packages/kbn-plugin-generator/sao_template/template/i18nrc.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "prefix": "<%= camelCase(name) %>",
-    "paths": {
-      "<%= camelCase(name) %>": "."
-    },
-    "translations": [
-      "translations/ja-JP.json"
-    ]
-  }
-  
\ No newline at end of file
diff --git a/packages/kbn-plugin-generator/sao_template/template/public/application.tsx b/packages/kbn-plugin-generator/sao_template/template/public/application.tsx
deleted file mode 100644
index 8106a18a784e7..0000000000000
--- a/packages/kbn-plugin-generator/sao_template/template/public/application.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import { AppMountParameters, CoreStart } from '<%= relRoot %>/src/core/public';
-import { AppPluginStartDependencies } from './types';
-import { <%= upperCamelCaseName %>App } from './components/app';
-
-
-export const renderApp = (
-    { notifications, http }: CoreStart,
-    { navigation }: AppPluginStartDependencies,
-    { appBasePath, element }: AppMountParameters
-  ) => {
-    ReactDOM.render(
-      <<%= upperCamelCaseName %>App
-        basename={appBasePath}
-        notifications={notifications}
-        http={http}
-        navigation={navigation}
-      />,
-      element
-    );
-  
-    return () => ReactDOM.unmountComponentAtNode(element);
-  };
-  
\ No newline at end of file
diff --git a/packages/kbn-plugin-generator/sao_template/template/public/index.ts b/packages/kbn-plugin-generator/sao_template/template/public/index.ts
deleted file mode 100644
index 2999dc7264ddb..0000000000000
--- a/packages/kbn-plugin-generator/sao_template/template/public/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-<%_ if (hasScss) { -%>
-import './index.scss';
-<%_ } -%>
-
-import { <%= upperCamelCaseName %>Plugin } from './plugin';
-
-// This exports static code and TypeScript types, 
-// as well as, Kibana Platform `plugin()` initializer. 
-export function plugin() {
-  return new <%= upperCamelCaseName %>Plugin();
-}
-export {
-  <%= upperCamelCaseName %>PluginSetup,
-  <%= upperCamelCaseName %>PluginStart,
-} from './types';
-
diff --git a/packages/kbn-plugin-generator/sao_template/template/public/types.ts b/packages/kbn-plugin-generator/sao_template/template/public/types.ts
deleted file mode 100644
index 2ebb0c0d1257f..0000000000000
--- a/packages/kbn-plugin-generator/sao_template/template/public/types.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { NavigationPublicPluginStart } from '<%= relRoot %>/src/plugins/navigation/public';
-
-export interface <%= upperCamelCaseName %>PluginSetup {
-  getGreeting: () => string;
-}
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface <%= upperCamelCaseName %>PluginStart {}
-
-export interface AppPluginStartDependencies { 
-  navigation: NavigationPublicPluginStart 
-};
diff --git a/packages/kbn-plugin-generator/sao_template/template/server/index.ts b/packages/kbn-plugin-generator/sao_template/template/server/index.ts
deleted file mode 100644
index 816b8faec2a45..0000000000000
--- a/packages/kbn-plugin-generator/sao_template/template/server/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { PluginInitializerContext } from '<%= relRoot %>/src/core/server';
-import { <%= upperCamelCaseName %>Plugin } from './plugin';
-
-
-//  This exports static code and TypeScript types, 
-//  as well as, Kibana Platform `plugin()` initializer.
- 
- export function plugin(initializerContext: PluginInitializerContext) {
-  return new <%= upperCamelCaseName %>Plugin(initializerContext);
-}
-
-export {
-  <%= upperCamelCaseName %>PluginSetup,
-  <%= upperCamelCaseName %>PluginStart,
-} from './types';
diff --git a/packages/kbn-plugin-generator/sao_template/template/server/plugin.ts b/packages/kbn-plugin-generator/sao_template/template/server/plugin.ts
deleted file mode 100644
index d6a343209e39e..0000000000000
--- a/packages/kbn-plugin-generator/sao_template/template/server/plugin.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from '<%= relRoot %>/src/core/server';
-
-import { <%= upperCamelCaseName %>PluginSetup, <%= upperCamelCaseName %>PluginStart } from './types';
-import { defineRoutes } from './routes';
-
-export class <%= upperCamelCaseName %>Plugin
-  implements Plugin<<%= upperCamelCaseName %>PluginSetup, <%= upperCamelCaseName %>PluginStart> {
-  private readonly logger: Logger;
-
-  constructor(initializerContext: PluginInitializerContext) {  
-    this.logger = initializerContext.logger.get(); 
-  }
-  
-  public setup(core: CoreSetup) {
-    this.logger.debug('<%= name %>: Setup');
-    const router = core.http.createRouter();
-
-    // Register server side APIs
-    defineRoutes(router);
-
-    return {};
-  }
-
-  public start(core: CoreStart) {
-    this.logger.debug('<%= name %>: Started');
-    return {};
-  }
-
-  public stop() {}
-}
diff --git a/packages/kbn-plugin-generator/sao_template/template/translations/ja-JP.json b/packages/kbn-plugin-generator/sao_template/template/translations/ja-JP.json
deleted file mode 100644
index ab4503f2c129c..0000000000000
--- a/packages/kbn-plugin-generator/sao_template/template/translations/ja-JP.json
+++ /dev/null
@@ -1,82 +0,0 @@
-
-{
-    "formats": {
-      "number": {
-        "currency": {
-          "style": "currency"
-        },
-        "percent": {
-          "style": "percent"
-        }
-      },
-      "date": {
-        "short": {
-          "month": "numeric",
-          "day": "numeric",
-          "year": "2-digit"
-        },
-        "medium": {
-          "month": "short",
-          "day": "numeric",
-          "year": "numeric"
-        },
-        "long": {
-          "month": "long",
-          "day": "numeric",
-          "year": "numeric"
-        },
-        "full": {
-          "weekday": "long",
-          "month": "long",
-          "day": "numeric",
-          "year": "numeric"
-        }
-      },
-      "time": {
-        "short": {
-          "hour": "numeric",
-          "minute": "numeric"
-        },
-        "medium": {
-          "hour": "numeric",
-          "minute": "numeric",
-          "second": "numeric"
-        },
-        "long": {
-          "hour": "numeric",
-          "minute": "numeric",
-          "second": "numeric",
-          "timeZoneName": "short"
-        },
-        "full": {
-          "hour": "numeric",
-          "minute": "numeric",
-          "second": "numeric",
-          "timeZoneName": "short"
-        }
-      },
-      "relative": {
-        "years": {
-          "units": "year"
-        },
-        "months": {
-          "units": "month"
-        },
-        "days": {
-          "units": "day"
-        },
-        "hours": {
-          "units": "hour"
-        },
-        "minutes": {
-          "units": "minute"
-        },
-        "seconds": {
-          "units": "second"
-        }
-      }
-    },
-    "messages": {
-      "<%= camelCase(name) %>.buttonText": "Translate me to Japanese",
-    }
-}
\ No newline at end of file
diff --git a/packages/kbn-plugin-generator/scripts/build.js b/packages/kbn-plugin-generator/scripts/build.js
new file mode 100644
index 0000000000000..2c252a064866c
--- /dev/null
+++ b/packages/kbn-plugin-generator/scripts/build.js
@@ -0,0 +1,43 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+const Path = require('path');
+
+const { run } = require('@kbn/dev-utils');
+const del = require('del');
+const execa = require('execa');
+
+run(
+  async ({ flags }) => {
+    await del(Path.resolve(__dirname, '../target'));
+
+    await execa(require.resolve('typescript/bin/tsc'), flags.watch ? ['--watch'] : [], {
+      cwd: Path.resolve(__dirname, '..'),
+      stdio: 'inherit',
+    });
+  },
+  {
+    flags: {
+      boolean: ['watch'],
+      help: `
+        --watch           Watch files and rebuild on changes
+      `,
+    },
+  }
+);
diff --git a/packages/kbn-plugin-generator/src/ask_questions.ts b/packages/kbn-plugin-generator/src/ask_questions.ts
new file mode 100644
index 0000000000000..b598396187245
--- /dev/null
+++ b/packages/kbn-plugin-generator/src/ask_questions.ts
@@ -0,0 +1,103 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import Path from 'path';
+
+import { REPO_ROOT } from '@kbn/dev-utils';
+import inquirer from 'inquirer';
+
+export interface Answers {
+  name: string;
+  internal: boolean;
+  internalLocation: string;
+  ui: boolean;
+  server: boolean;
+}
+
+export const INTERNAL_PLUGIN_LOCATIONS: Array<{ name: string; value: string }> = [
+  {
+    name: 'Kibana Example',
+    value: Path.resolve(REPO_ROOT, 'examples'),
+  },
+  {
+    name: 'Kibana OSS',
+    value: Path.resolve(REPO_ROOT, 'src/plugins'),
+  },
+  {
+    name: 'Kibana OSS Functional Testing',
+    value: Path.resolve(REPO_ROOT, 'test/plugin_functional/plugins'),
+  },
+  {
+    name: 'X-Pack',
+    value: Path.resolve(REPO_ROOT, 'x-pack/plugins'),
+  },
+  {
+    name: 'X-Pack Functional Testing',
+    value: Path.resolve(REPO_ROOT, 'x-pack/test/plugin_functional/plugins'),
+  },
+];
+
+export const QUESTIONS = [
+  {
+    name: 'name',
+    message: 'Plugin name (use camelCase)',
+    default: undefined,
+    validate: (name: string) => (!name ? 'name is required' : true),
+  },
+  {
+    name: 'internal',
+    type: 'confirm',
+    message: 'Will this plugin be part of the Kibana repository?',
+    default: false,
+  },
+  {
+    name: 'internalLocation',
+    type: 'list',
+    message: 'What type of internal plugin would you like to create',
+    choices: INTERNAL_PLUGIN_LOCATIONS,
+    default: INTERNAL_PLUGIN_LOCATIONS[0].value,
+    when: ({ internal }: Answers) => internal,
+  },
+  {
+    name: 'ui',
+    type: 'confirm',
+    message: 'Should an UI plugin be generated?',
+    default: true,
+  },
+  {
+    name: 'server',
+    type: 'confirm',
+    message: 'Should a server plugin be generated?',
+    default: true,
+  },
+] as const;
+
+export async function askQuestions(overrides: Partial<Answers>) {
+  return await inquirer.prompt<Answers>(QUESTIONS, overrides);
+}
+
+export function getDefaultAnswers(overrides: Partial<Answers>) {
+  return QUESTIONS.reduce(
+    (acc, q) => ({
+      ...acc,
+      [q.name]: overrides[q.name] != null ? overrides[q.name] : q.default,
+    }),
+    {}
+  ) as Answers;
+}
diff --git a/packages/kbn-plugin-generator/src/casing.test.ts b/packages/kbn-plugin-generator/src/casing.test.ts
new file mode 100644
index 0000000000000..05411678afdbf
--- /dev/null
+++ b/packages/kbn-plugin-generator/src/casing.test.ts
@@ -0,0 +1,68 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { camelCase, snakeCase, upperCamelCase } from './casing';
+
+describe('camelCase', () => {
+  it.each([
+    ['foo', 'foo'],
+    ['foo_bar', 'fooBar'],
+    ['foo bar', 'fooBar'],
+    ['fooBar', 'fooBar'],
+    ['___foo *$( bar 14', 'fooBar14'],
+    ['foo-bar', 'fooBar'],
+    ['FOO BAR', 'fooBar'],
+    ['FOO_BAR', 'fooBar'],
+    ['FOOBAR', 'foobar'],
+  ])('converts %j to %j', (input, output) => {
+    expect(camelCase(input)).toBe(output);
+  });
+});
+
+describe('upperCamelCase', () => {
+  it.each([
+    ['foo', 'Foo'],
+    ['foo_bar', 'FooBar'],
+    ['foo bar', 'FooBar'],
+    ['fooBar', 'FooBar'],
+    ['___foo *$( bar 14', 'FooBar14'],
+    ['foo-bar', 'FooBar'],
+    ['FOO BAR', 'FooBar'],
+    ['FOO_BAR', 'FooBar'],
+    ['FOOBAR', 'Foobar'],
+  ])('converts %j to %j', (input, output) => {
+    expect(upperCamelCase(input)).toBe(output);
+  });
+});
+
+describe('snakeCase', () => {
+  it.each([
+    ['foo', 'foo'],
+    ['foo_bar', 'foo_bar'],
+    ['foo bar', 'foo_bar'],
+    ['fooBar', 'foo_bar'],
+    ['___foo *$( bar 14', 'foo_bar_14'],
+    ['foo-bar', 'foo_bar'],
+    ['FOO BAR', 'foo_bar'],
+    ['FOO_BAR', 'foo_bar'],
+    ['FOOBAR', 'foobar'],
+  ])('converts %j to %j', (input, output) => {
+    expect(snakeCase(input)).toBe(output);
+  });
+});
diff --git a/packages/kbn-plugin-generator/src/casing.ts b/packages/kbn-plugin-generator/src/casing.ts
new file mode 100644
index 0000000000000..30296de65aecb
--- /dev/null
+++ b/packages/kbn-plugin-generator/src/casing.ts
@@ -0,0 +1,32 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+const words = (input: string) =>
+  input
+    .replace(/([a-z0-9])([A-Z])/g, '$1 $2')
+    .toLowerCase()
+    .split(/[^a-z0-9]+/g)
+    .filter(Boolean);
+
+const upperFirst = (input: string) => `${input.slice(0, 1).toUpperCase()}${input.slice(1)}`;
+const lowerFirst = (input: string) => `${input.slice(0, 1).toLowerCase()}${input.slice(1)}`;
+
+export const snakeCase = (input: string) => words(input).join('_');
+export const upperCamelCase = (input: string) => words(input).map(upperFirst).join('');
+export const camelCase = (input: string) => lowerFirst(upperCamelCase(input));
diff --git a/packages/kbn-plugin-generator/src/cli.ts b/packages/kbn-plugin-generator/src/cli.ts
new file mode 100644
index 0000000000000..f6966a245e46f
--- /dev/null
+++ b/packages/kbn-plugin-generator/src/cli.ts
@@ -0,0 +1,98 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import Path from 'path';
+import Fs from 'fs';
+
+import execa from 'execa';
+import { REPO_ROOT, run, createFailError, createFlagError } from '@kbn/dev-utils';
+
+import { snakeCase } from './casing';
+import { askQuestions, getDefaultAnswers } from './ask_questions';
+import { renderTemplates } from './render_template';
+
+export function runCli() {
+  run(
+    async ({ log, flags }) => {
+      const name = flags.name || undefined;
+      if (name && typeof name !== 'string') {
+        throw createFlagError(`expected one --name flag`);
+      }
+
+      if (flags.yes && !name) {
+        throw createFlagError(`passing --yes requires that you specify a name`);
+      }
+
+      const overrides = {
+        name,
+        ui: typeof flags.ui === 'boolean' ? flags.ui : undefined,
+        server: typeof flags.server === 'boolean' ? flags.server : undefined,
+      };
+      const answers = flags.yes ? getDefaultAnswers(overrides) : await askQuestions(overrides);
+
+      const outputDir = answers.internal
+        ? Path.resolve(answers.internalLocation, snakeCase(answers.name))
+        : Path.resolve(REPO_ROOT, 'plugins', snakeCase(answers.name));
+
+      if (Fs.existsSync(outputDir)) {
+        throw createFailError(`Target output directory [${outputDir}] already exists`);
+      }
+
+      // process the template directory, creating the actual plugin files
+      await renderTemplates({
+        outputDir,
+        answers,
+      });
+
+      // init git repo in third party plugins
+      if (!answers.internal) {
+        await execa('git', ['init', outputDir]);
+      }
+
+      log.success(
+        `🎉\n\nYour plugin has been created in ${Path.relative(process.cwd(), outputDir)}\n`
+      );
+    },
+    {
+      usage: 'node scripts/generate_plugin',
+      description: `
+        Generate a fresh Kibana plugin in the plugins/ directory
+      `,
+      flags: {
+        string: ['name'],
+        boolean: ['yes', 'ui', 'server'],
+        default: {
+          ui: null,
+          server: null,
+        },
+        alias: {
+          y: 'yes',
+          u: 'ui',
+          s: 'server',
+        },
+        help: `
+          --yes, -y          Answer yes to all prompts, requires passing --name
+          --name             Set the plugin name
+          --ui               Generate a UI plugin
+          --server           Generate a Server plugin
+        `,
+      },
+    }
+  );
+}
diff --git a/packages/kbn-plugin-generator/index.js.d.ts b/packages/kbn-plugin-generator/src/index.ts
similarity index 88%
rename from packages/kbn-plugin-generator/index.js.d.ts
rename to packages/kbn-plugin-generator/src/index.ts
index 46f7c43fd5790..a05bc698bde17 100644
--- a/packages/kbn-plugin-generator/index.js.d.ts
+++ b/packages/kbn-plugin-generator/src/index.ts
@@ -16,9 +16,5 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-interface PluginGenerator {
-  /**
-   * Run plugin generator.
-   */
-  run: (...args: any[]) => any;
-}
+
+export * from './cli';
diff --git a/packages/kbn-plugin-generator/src/integration_tests/generate_plugin.test.ts b/packages/kbn-plugin-generator/src/integration_tests/generate_plugin.test.ts
new file mode 100644
index 0000000000000..b48113afc0ca7
--- /dev/null
+++ b/packages/kbn-plugin-generator/src/integration_tests/generate_plugin.test.ts
@@ -0,0 +1,143 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import Path from 'path';
+
+import del from 'del';
+import execa from 'execa';
+import { REPO_ROOT, createAbsolutePathSerializer } from '@kbn/dev-utils';
+import globby from 'globby';
+
+const GENERATED_DIR = Path.resolve(REPO_ROOT, `plugins`);
+
+expect.addSnapshotSerializer(createAbsolutePathSerializer());
+
+beforeEach(async () => {
+  await del(GENERATED_DIR, { force: true });
+});
+
+afterEach(async () => {
+  await del(GENERATED_DIR, { force: true });
+});
+
+it('generates a plugin', async () => {
+  await execa(process.execPath, ['scripts/generate_plugin.js', '-y', '--name=foo'], {
+    cwd: REPO_ROOT,
+    buffer: true,
+  });
+
+  const paths = await globby('**/*', {
+    cwd: GENERATED_DIR,
+    absolute: true,
+    dot: true,
+    onlyFiles: true,
+    ignore: ['**/.git'],
+  });
+
+  expect(paths.sort((a, b) => a.localeCompare(b))).toMatchInlineSnapshot(`
+    Array [
+      <absolute path>/plugins/foo/.eslintrc.js,
+      <absolute path>/plugins/foo/.gitignore,
+      <absolute path>/plugins/foo/.i18nrc.json,
+      <absolute path>/plugins/foo/common/index.ts,
+      <absolute path>/plugins/foo/kibana.json,
+      <absolute path>/plugins/foo/package.json,
+      <absolute path>/plugins/foo/public/application.tsx,
+      <absolute path>/plugins/foo/public/components/app.tsx,
+      <absolute path>/plugins/foo/public/index.scss,
+      <absolute path>/plugins/foo/public/index.ts,
+      <absolute path>/plugins/foo/public/plugin.ts,
+      <absolute path>/plugins/foo/public/types.ts,
+      <absolute path>/plugins/foo/README.md,
+      <absolute path>/plugins/foo/server/index.ts,
+      <absolute path>/plugins/foo/server/plugin.ts,
+      <absolute path>/plugins/foo/server/routes/index.ts,
+      <absolute path>/plugins/foo/server/types.ts,
+      <absolute path>/plugins/foo/translations/ja-JP.json,
+      <absolute path>/plugins/foo/tsconfig.json,
+    ]
+  `);
+});
+
+it('generates a plugin without UI', async () => {
+  await execa(process.execPath, ['scripts/generate_plugin.js', '--name=bar', '-y', '--no-ui'], {
+    cwd: REPO_ROOT,
+    buffer: true,
+  });
+
+  const paths = await globby('**/*', {
+    cwd: GENERATED_DIR,
+    absolute: true,
+    dot: true,
+    onlyFiles: true,
+    ignore: ['**/.git'],
+  });
+
+  expect(paths.sort((a, b) => a.localeCompare(b))).toMatchInlineSnapshot(`
+    Array [
+      <absolute path>/plugins/bar/.eslintrc.js,
+      <absolute path>/plugins/bar/.gitignore,
+      <absolute path>/plugins/bar/.i18nrc.json,
+      <absolute path>/plugins/bar/common/index.ts,
+      <absolute path>/plugins/bar/kibana.json,
+      <absolute path>/plugins/bar/package.json,
+      <absolute path>/plugins/bar/README.md,
+      <absolute path>/plugins/bar/server/index.ts,
+      <absolute path>/plugins/bar/server/plugin.ts,
+      <absolute path>/plugins/bar/server/routes/index.ts,
+      <absolute path>/plugins/bar/server/types.ts,
+      <absolute path>/plugins/bar/tsconfig.json,
+    ]
+  `);
+});
+
+it('generates a plugin without server plugin', async () => {
+  await execa(process.execPath, ['scripts/generate_plugin.js', '--name=baz', '-y', '--no-server'], {
+    cwd: REPO_ROOT,
+    buffer: true,
+  });
+
+  const paths = await globby('**/*', {
+    cwd: GENERATED_DIR,
+    absolute: true,
+    dot: true,
+    onlyFiles: true,
+    ignore: ['**/.git'],
+  });
+
+  expect(paths.sort((a, b) => a.localeCompare(b))).toMatchInlineSnapshot(`
+    Array [
+      <absolute path>/plugins/baz/.eslintrc.js,
+      <absolute path>/plugins/baz/.gitignore,
+      <absolute path>/plugins/baz/.i18nrc.json,
+      <absolute path>/plugins/baz/common/index.ts,
+      <absolute path>/plugins/baz/kibana.json,
+      <absolute path>/plugins/baz/package.json,
+      <absolute path>/plugins/baz/public/application.tsx,
+      <absolute path>/plugins/baz/public/components/app.tsx,
+      <absolute path>/plugins/baz/public/index.scss,
+      <absolute path>/plugins/baz/public/index.ts,
+      <absolute path>/plugins/baz/public/plugin.ts,
+      <absolute path>/plugins/baz/public/types.ts,
+      <absolute path>/plugins/baz/README.md,
+      <absolute path>/plugins/baz/translations/ja-JP.json,
+      <absolute path>/plugins/baz/tsconfig.json,
+    ]
+  `);
+});
diff --git a/packages/kbn-plugin-generator/src/render_template.ts b/packages/kbn-plugin-generator/src/render_template.ts
new file mode 100644
index 0000000000000..18bdcf1be1a6b
--- /dev/null
+++ b/packages/kbn-plugin-generator/src/render_template.ts
@@ -0,0 +1,127 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import Path from 'path';
+import { pipeline } from 'stream';
+import { promisify } from 'util';
+
+import vfs from 'vinyl-fs';
+import prettier from 'prettier';
+import { REPO_ROOT } from '@kbn/dev-utils';
+import ejs from 'ejs';
+
+import { snakeCase, camelCase, upperCamelCase } from './casing';
+import { excludeFiles, tapFileStream } from './streams';
+import { Answers } from './ask_questions';
+
+const asyncPipeline = promisify(pipeline);
+
+/**
+ * Stream all the files from the template directory, ignoring
+ * certain files based on the answers, process the .ejs templates
+ * to the output files they represent, renaming the .ejs files to
+ * remove that extension, then run every file through prettier
+ * before writing the files to the output directory.
+ */
+export async function renderTemplates({
+  outputDir,
+  answers,
+}: {
+  outputDir: string;
+  answers: Answers;
+}) {
+  const prettierConfig = await prettier.resolveConfig(process.cwd());
+
+  const defaultTemplateData = {
+    name: answers.name,
+
+    internalPlugin: !!answers.internal,
+    thirdPartyPlugin: !answers.internal,
+
+    hasServer: !!answers.server,
+    hasUi: !!answers.ui,
+
+    camelCase,
+    snakeCase,
+    upperCamelCase,
+  };
+
+  await asyncPipeline(
+    vfs.src(['**/*'], {
+      dot: true,
+      buffer: true,
+      nodir: true,
+      cwd: Path.resolve(__dirname, '../template'),
+    }),
+
+    // exclude files from the template based on selected options, patterns
+    // are matched without the .ejs extension
+    excludeFiles(
+      ([] as string[]).concat(
+        answers.ui ? [] : 'public/**/*',
+        answers.ui && !answers.internal ? [] : ['translations/**/*', 'i18nrc.json'],
+        answers.server ? [] : 'server/**/*',
+        !answers.internal ? [] : ['eslintrc.js', 'tsconfig.json', 'package.json', '.gitignore']
+      )
+    ),
+
+    // render .ejs templates and rename to not use .ejs extension
+    tapFileStream((file) => {
+      if (file.extname !== '.ejs') {
+        return;
+      }
+
+      const templateData = {
+        ...defaultTemplateData,
+        importFromRoot(rootRelative: string) {
+          const filesOutputDirname = Path.dirname(Path.resolve(outputDir, file.relative));
+          const target = Path.resolve(REPO_ROOT, rootRelative);
+          return Path.relative(filesOutputDirname, target);
+        },
+      };
+
+      // render source and write back to file object
+      file.contents = Buffer.from(
+        ejs.render(file.contents.toString('utf8'), templateData, {
+          beautify: false,
+        })
+      );
+
+      // file.stem is the basename but without the extension
+      file.basename = file.stem;
+    }),
+
+    // format each file with prettier
+    tapFileStream((file) => {
+      if (!file.extname) {
+        return;
+      }
+
+      file.contents = Buffer.from(
+        prettier.format(file.contents.toString('utf8'), {
+          ...prettierConfig,
+          filepath: file.path,
+        })
+      );
+    }),
+
+    // write files to disk
+    vfs.dest(outputDir)
+  );
+}
diff --git a/packages/kbn-plugin-generator/src/streams.ts b/packages/kbn-plugin-generator/src/streams.ts
new file mode 100644
index 0000000000000..976008e879dd3
--- /dev/null
+++ b/packages/kbn-plugin-generator/src/streams.ts
@@ -0,0 +1,73 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Transform } from 'stream';
+
+import File from 'vinyl';
+import { Minimatch } from 'minimatch';
+
+interface BufferedFile extends File {
+  contents: Buffer;
+  isDirectory(): false;
+}
+
+/**
+ * Create a transform stream that processes Vinyl fs streams and
+ * calls a function for each file, allowing the function to either
+ * mutate the file, replace it with another file (return a new File
+ * object), or drop it from the stream (return null)
+ */
+export const tapFileStream = (
+  fn: (file: BufferedFile) => File | void | null | Promise<File | void | null>
+) =>
+  new Transform({
+    objectMode: true,
+    transform(file: BufferedFile, _, cb) {
+      Promise.resolve(file)
+        .then(fn)
+        .then(
+          (result) => {
+            // drop the file when null is returned
+            if (result === null) {
+              cb();
+            } else {
+              cb(undefined, result || file);
+            }
+          },
+          (error) => cb(error)
+        );
+    },
+  });
+
+export const excludeFiles = (globs: string[]) => {
+  const patterns = globs.map(
+    (g) =>
+      new Minimatch(g, {
+        matchBase: true,
+      })
+  );
+
+  return tapFileStream((file) => {
+    const path = file.relative.replace(/\.ejs$/, '');
+    const exclude = patterns.some((p) => p.match(path));
+    if (exclude) {
+      return null;
+    }
+  });
+};
diff --git a/packages/kbn-plugin-generator/template/.eslintrc.js.ejs b/packages/kbn-plugin-generator/template/.eslintrc.js.ejs
new file mode 100644
index 0000000000000..d063fc481b718
--- /dev/null
+++ b/packages/kbn-plugin-generator/template/.eslintrc.js.ejs
@@ -0,0 +1,10 @@
+module.exports = {
+  root: true,
+  extends: [
+    '@elastic/eslint-config-kibana',
+    'plugin:@elastic/eui/recommended'
+  ],
+  rules: {
+    '@kbn/eslint/require-license-header': 'off',
+  },
+};
diff --git a/packages/kbn-plugin-generator/template/.gitignore b/packages/kbn-plugin-generator/template/.gitignore
new file mode 100644
index 0000000000000..c3dca1b96fcc2
--- /dev/null
+++ b/packages/kbn-plugin-generator/template/.gitignore
@@ -0,0 +1,2 @@
+/build
+/target
diff --git a/packages/kbn-plugin-generator/template/.i18nrc.json.ejs b/packages/kbn-plugin-generator/template/.i18nrc.json.ejs
new file mode 100644
index 0000000000000..280fb5cca62b9
--- /dev/null
+++ b/packages/kbn-plugin-generator/template/.i18nrc.json.ejs
@@ -0,0 +1,9 @@
+{
+  "prefix": "<%= camelCase(name) %>",
+  "paths": {
+    "<%= camelCase(name) %>": "."
+  },
+  "translations": [
+    "translations/ja-JP.json"
+  ]
+}
diff --git a/packages/kbn-plugin-generator/sao_template/template/README.md b/packages/kbn-plugin-generator/template/README.md.ejs
similarity index 66%
rename from packages/kbn-plugin-generator/sao_template/template/README.md
rename to packages/kbn-plugin-generator/template/README.md.ejs
index 008d500abbbf5..5f30bf0463305 100755
--- a/packages/kbn-plugin-generator/sao_template/template/README.md
+++ b/packages/kbn-plugin-generator/template/README.md.ejs
@@ -1,8 +1,6 @@
 # <%= name %>
 
-<%- (description || '').split('\n').map(function (line) {
-  return '> ' + line
-}).join('\n') %>
+A Kibana plugin
 
 ---
 
diff --git a/packages/kbn-plugin-generator/sao_template/template/common/index.ts b/packages/kbn-plugin-generator/template/common/index.ts.ejs
similarity index 100%
rename from packages/kbn-plugin-generator/sao_template/template/common/index.ts
rename to packages/kbn-plugin-generator/template/common/index.ts.ejs
diff --git a/packages/kbn-plugin-generator/sao_template/template/kibana.json b/packages/kbn-plugin-generator/template/kibana.json.ejs
similarity index 74%
rename from packages/kbn-plugin-generator/sao_template/template/kibana.json
rename to packages/kbn-plugin-generator/template/kibana.json.ejs
index f8bb07040abeb..698a394e0d0b5 100644
--- a/packages/kbn-plugin-generator/sao_template/template/kibana.json
+++ b/packages/kbn-plugin-generator/template/kibana.json.ejs
@@ -1,6 +1,7 @@
 {
   "id": "<%= camelCase(name) %>",
-  "version": "<%= kbnVersion %>",
+  "version": "1.0.0",
+  "kibanaVersion": "kibana",
   "server": <%= hasServer %>,
   "ui": <%= hasUi %>,
   "requiredPlugins": ["navigation"],
diff --git a/packages/kbn-plugin-generator/template/package.json.ejs b/packages/kbn-plugin-generator/template/package.json.ejs
new file mode 100644
index 0000000000000..cbd59894ca47c
--- /dev/null
+++ b/packages/kbn-plugin-generator/template/package.json.ejs
@@ -0,0 +1,8 @@
+{
+  "name": "<%= camelCase(name) %>",
+  "version": "0.0.0",
+  "private": true,
+  "scripts": {
+    "kbn": "node ../../scripts/kbn"
+  }
+}
diff --git a/packages/kbn-plugin-generator/template/public/application.tsx.ejs b/packages/kbn-plugin-generator/template/public/application.tsx.ejs
new file mode 100644
index 0000000000000..678d7ccc04681
--- /dev/null
+++ b/packages/kbn-plugin-generator/template/public/application.tsx.ejs
@@ -0,0 +1,24 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { AppMountParameters, CoreStart } from '<%= importFromRoot('src/core/public') %>';
+import { AppPluginStartDependencies } from './types';
+import { <%= upperCamelCase(name) %>App } from './components/app';
+
+
+export const renderApp = (
+  { notifications, http }: CoreStart,
+  { navigation }: AppPluginStartDependencies,
+  { appBasePath, element }: AppMountParameters
+) => {
+  ReactDOM.render(
+    <<%= upperCamelCase(name) %>App
+      basename={appBasePath}
+      notifications={notifications}
+      http={http}
+      navigation={navigation}
+    />,
+    element
+  );
+
+  return () => ReactDOM.unmountComponentAtNode(element);
+};
diff --git a/packages/kbn-plugin-generator/sao_template/template/public/components/app.tsx b/packages/kbn-plugin-generator/template/public/components/app.tsx.ejs
similarity index 62%
rename from packages/kbn-plugin-generator/sao_template/template/public/components/app.tsx
rename to packages/kbn-plugin-generator/template/public/components/app.tsx.ejs
index d75bd2f01ef23..c3e33788464fb 100644
--- a/packages/kbn-plugin-generator/sao_template/template/public/components/app.tsx
+++ b/packages/kbn-plugin-generator/template/public/components/app.tsx.ejs
@@ -1,22 +1,3 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
 import React, { useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage, I18nProvider } from '@kbn/i18n/react';
@@ -35,36 +16,36 @@ import {
   EuiText,
 } from '@elastic/eui';
 
-import { CoreStart } from '<%= relRoot %>/../src/core/public';
-import { NavigationPublicPluginStart } from '<%= relRoot %>/../src/plugins/navigation/public';
+import { CoreStart } from '<%= importFromRoot('src/core/public') %>';
+import { NavigationPublicPluginStart } from '<%= importFromRoot('src/plugins/navigation/public') %>';
 
 import { PLUGIN_ID, PLUGIN_NAME } from '../../common';
 
-interface <%= upperCamelCaseName %>AppDeps {
+interface <%= upperCamelCase(name) %>AppDeps {
   basename: string;
   notifications: CoreStart['notifications'];
   http: CoreStart['http'];
   navigation: NavigationPublicPluginStart;
 }
 
-export const <%= upperCamelCaseName %>App = ({ basename, notifications, http, navigation }: <%= upperCamelCaseName %>AppDeps) => {
+export const <%= upperCamelCase(name) %>App = ({ basename, notifications, http, navigation }: <%= upperCamelCase(name) %>AppDeps) => {
   // Use React hooks to manage state.
   const [timestamp, setTimestamp] = useState<string | undefined>();
 
   const onClickHandler = () => {
-<%_ if (generateApi) { -%>
-    // Use the core http service to make a response to the server API.
-    http.get('/api/<%= snakeCase(name) %>/example').then(res => {
-      setTimestamp(res.time);
-      // Use the core notifications service to display a success message.
-      notifications.toasts.addSuccess(i18n.translate('<%= camelCase(name) %>.dataUpdated', {
-        defaultMessage: 'Data updated',
-      }));
-    });
-<%_ } else { -%>
-    setTimestamp(new Date().toISOString());
-    notifications.toasts.addSuccess(PLUGIN_NAME);
-<%_ } -%>
+    <% if (hasServer) { %>
+      // Use the core http service to make a response to the server API.
+      http.get('/api/<%= snakeCase(name) %>/example').then(res => {
+        setTimestamp(res.time);
+        // Use the core notifications service to display a success message.
+        notifications.toasts.addSuccess(i18n.translate('<%= camelCase(name) %>.dataUpdated', {
+          defaultMessage: 'Data updated',
+        }));
+      });
+    <% } else { %>
+      setTimestamp(new Date().toISOString());
+      notifications.toasts.addSuccess(PLUGIN_NAME);
+    <% } %>
   };
 
   // Render the application DOM.
@@ -115,7 +96,10 @@ export const <%= upperCamelCaseName %>App = ({ basename, notifications, http, na
                       />
                     </p>
                     <EuiButton type="primary" size="s" onClick={onClickHandler}>
-                      <FormattedMessage id="<%= camelCase(name) %>.buttonText" defaultMessage="<%_ if (generateApi) { -%>Get data<%_ } else { -%>Click me<%_ } -%>" />
+                      <FormattedMessage
+                        id="<%= camelCase(name) %>.buttonText"
+                        defaultMessage="<%= hasServer ? 'Get data' : 'Click me' %>"
+                      />
                     </EuiButton>
                   </EuiText>
                 </EuiPageContentBody>
diff --git a/packages/kbn-plugin-generator/sao_template/template/public/index.scss b/packages/kbn-plugin-generator/template/public/index.scss
similarity index 100%
rename from packages/kbn-plugin-generator/sao_template/template/public/index.scss
rename to packages/kbn-plugin-generator/template/public/index.scss
diff --git a/packages/kbn-plugin-generator/template/public/index.ts.ejs b/packages/kbn-plugin-generator/template/public/index.ts.ejs
new file mode 100644
index 0000000000000..f859f34bee2ee
--- /dev/null
+++ b/packages/kbn-plugin-generator/template/public/index.ts.ejs
@@ -0,0 +1,14 @@
+import './index.scss';
+
+import { <%= upperCamelCase(name) %>Plugin } from './plugin';
+
+// This exports static code and TypeScript types,
+// as well as, Kibana Platform `plugin()` initializer.
+export function plugin() {
+  return new <%= upperCamelCase(name) %>Plugin();
+}
+export {
+  <%= upperCamelCase(name) %>PluginSetup,
+  <%= upperCamelCase(name) %>PluginStart,
+} from './types';
+
diff --git a/packages/kbn-plugin-generator/sao_template/template/public/plugin.ts b/packages/kbn-plugin-generator/template/public/plugin.ts.ejs
similarity index 68%
rename from packages/kbn-plugin-generator/sao_template/template/public/plugin.ts
rename to packages/kbn-plugin-generator/template/public/plugin.ts.ejs
index 76f7f1a6f9908..1090430ab7f87 100644
--- a/packages/kbn-plugin-generator/sao_template/template/public/plugin.ts
+++ b/packages/kbn-plugin-generator/template/public/plugin.ts.ejs
@@ -1,12 +1,12 @@
 import { i18n } from '@kbn/i18n';
-import { AppMountParameters, CoreSetup, CoreStart, Plugin } from '<%= relRoot %>/src/core/public';
-import { <%= upperCamelCaseName %>PluginSetup, <%= upperCamelCaseName %>PluginStart, AppPluginStartDependencies } from './types';
+import { AppMountParameters, CoreSetup, CoreStart, Plugin } from '<%= importFromRoot('src/core/public') %>';
+import { <%= upperCamelCase(name) %>PluginSetup, <%= upperCamelCase(name) %>PluginStart, AppPluginStartDependencies } from './types';
 import { PLUGIN_NAME } from '../common';
 
-export class <%= upperCamelCaseName %>Plugin
-  implements Plugin<<%= upperCamelCaseName %>PluginSetup, <%= upperCamelCaseName %>PluginStart> {
-  
-  public setup(core: CoreSetup): <%= upperCamelCaseName %>PluginSetup {
+export class <%= upperCamelCase(name) %>Plugin
+  implements Plugin<<%= upperCamelCase(name) %>PluginSetup, <%= upperCamelCase(name) %>PluginStart> {
+
+  public setup(core: CoreSetup): <%= upperCamelCase(name) %>PluginSetup {
     // Register an application into the side navigation menu
     core.application.register({
       id: '<%= camelCase(name) %>',
@@ -34,7 +34,7 @@ export class <%= upperCamelCaseName %>Plugin
     };
   }
 
-  public start(core: CoreStart): <%= upperCamelCaseName %>PluginStart {
+  public start(core: CoreStart): <%= upperCamelCase(name) %>PluginStart {
     return {};
   }
 
diff --git a/packages/kbn-plugin-generator/template/public/types.ts.ejs b/packages/kbn-plugin-generator/template/public/types.ts.ejs
new file mode 100644
index 0000000000000..e33db549ccd04
--- /dev/null
+++ b/packages/kbn-plugin-generator/template/public/types.ts.ejs
@@ -0,0 +1,11 @@
+import { NavigationPublicPluginStart } from '<%= importFromRoot('src/plugins/navigation/public') %>';
+
+export interface <%= upperCamelCase(name) %>PluginSetup {
+  getGreeting: () => string;
+}
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface <%= upperCamelCase(name) %>PluginStart {}
+
+export interface AppPluginStartDependencies {
+  navigation: NavigationPublicPluginStart
+};
diff --git a/packages/kbn-plugin-generator/template/server/index.ts.ejs b/packages/kbn-plugin-generator/template/server/index.ts.ejs
new file mode 100644
index 0000000000000..f6b40f2ee0642
--- /dev/null
+++ b/packages/kbn-plugin-generator/template/server/index.ts.ejs
@@ -0,0 +1,15 @@
+import { PluginInitializerContext } from '<%= importFromRoot('src/core/server') %>';
+import { <%= upperCamelCase(name) %>Plugin } from './plugin';
+
+
+//  This exports static code and TypeScript types,
+//  as well as, Kibana Platform `plugin()` initializer.
+
+ export function plugin(initializerContext: PluginInitializerContext) {
+  return new <%= upperCamelCase(name) %>Plugin(initializerContext);
+}
+
+export {
+  <%= upperCamelCase(name) %>PluginSetup,
+  <%= upperCamelCase(name) %>PluginStart,
+} from './types';
diff --git a/packages/kbn-plugin-generator/template/server/plugin.ts.ejs b/packages/kbn-plugin-generator/template/server/plugin.ts.ejs
new file mode 100644
index 0000000000000..b91e793653003
--- /dev/null
+++ b/packages/kbn-plugin-generator/template/server/plugin.ts.ejs
@@ -0,0 +1,40 @@
+import {
+  PluginInitializerContext,
+  CoreSetup,
+  CoreStart,
+  Plugin,
+  Logger
+} from '<%= importFromRoot('src/core/server') %>';
+
+import {
+  <%= upperCamelCase(name) %>PluginSetup,
+  <%= upperCamelCase(name) %>PluginStart
+} from './types';
+import { defineRoutes } from './routes';
+
+export class <%= upperCamelCase(name) %>Plugin
+  implements Plugin<<%= upperCamelCase(name) %>PluginSetup, <%= upperCamelCase(name) %>PluginStart> {
+
+  private readonly logger: Logger;
+
+  constructor(initializerContext: PluginInitializerContext) {
+    this.logger = initializerContext.logger.get();
+  }
+
+  public setup(core: CoreSetup) {
+    this.logger.debug('<%= name %>: Setup');
+    const router = core.http.createRouter();
+
+    // Register server side APIs
+    defineRoutes(router);
+
+    return {};
+  }
+
+  public start(core: CoreStart) {
+    this.logger.debug('<%= name %>: Started');
+    return {};
+  }
+
+  public stop() {}
+}
diff --git a/packages/kbn-plugin-generator/sao_template/template/server/routes/index.ts b/packages/kbn-plugin-generator/template/server/routes/index.ts.ejs
similarity index 81%
rename from packages/kbn-plugin-generator/sao_template/template/server/routes/index.ts
rename to packages/kbn-plugin-generator/template/server/routes/index.ts.ejs
index d8bb00f0dea6c..475200ca21632 100644
--- a/packages/kbn-plugin-generator/sao_template/template/server/routes/index.ts
+++ b/packages/kbn-plugin-generator/template/server/routes/index.ts.ejs
@@ -1,4 +1,5 @@
-import { IRouter } from '<%= relRoot %>/../src/core/server';
+import { IRouter } from '<%= importFromRoot('src/core/server') %>';
+
 
 export function defineRoutes(router: IRouter) {
   router.get(
diff --git a/packages/kbn-plugin-generator/sao_template/template/server/types.ts b/packages/kbn-plugin-generator/template/server/types.ts.ejs
similarity index 52%
rename from packages/kbn-plugin-generator/sao_template/template/server/types.ts
rename to packages/kbn-plugin-generator/template/server/types.ts.ejs
index adbc5e93f03c5..2ed6a8436bec4 100644
--- a/packages/kbn-plugin-generator/sao_template/template/server/types.ts
+++ b/packages/kbn-plugin-generator/template/server/types.ts.ejs
@@ -1,4 +1,4 @@
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface <%= upperCamelCaseName %>PluginSetup {}
+export interface <%= upperCamelCase(name) %>PluginSetup {}
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface <%= upperCamelCaseName %>PluginStart {}
+export interface <%= upperCamelCase(name) %>PluginStart {}
diff --git a/packages/kbn-plugin-generator/template/translations/ja-JP.json.ejs b/packages/kbn-plugin-generator/template/translations/ja-JP.json.ejs
new file mode 100644
index 0000000000000..134f96481bcad
--- /dev/null
+++ b/packages/kbn-plugin-generator/template/translations/ja-JP.json.ejs
@@ -0,0 +1,81 @@
+{
+  "formats": {
+    "number": {
+      "currency": {
+        "style": "currency"
+      },
+      "percent": {
+        "style": "percent"
+      }
+    },
+    "date": {
+      "short": {
+        "month": "numeric",
+        "day": "numeric",
+        "year": "2-digit"
+      },
+      "medium": {
+        "month": "short",
+        "day": "numeric",
+        "year": "numeric"
+      },
+      "long": {
+        "month": "long",
+        "day": "numeric",
+        "year": "numeric"
+      },
+      "full": {
+        "weekday": "long",
+        "month": "long",
+        "day": "numeric",
+        "year": "numeric"
+      }
+    },
+    "time": {
+      "short": {
+        "hour": "numeric",
+        "minute": "numeric"
+      },
+      "medium": {
+        "hour": "numeric",
+        "minute": "numeric",
+        "second": "numeric"
+      },
+      "long": {
+        "hour": "numeric",
+        "minute": "numeric",
+        "second": "numeric",
+        "timeZoneName": "short"
+      },
+      "full": {
+        "hour": "numeric",
+        "minute": "numeric",
+        "second": "numeric",
+        "timeZoneName": "short"
+      }
+    },
+    "relative": {
+      "years": {
+        "units": "year"
+      },
+      "months": {
+        "units": "month"
+      },
+      "days": {
+        "units": "day"
+      },
+      "hours": {
+        "units": "hour"
+      },
+      "minutes": {
+        "units": "minute"
+      },
+      "seconds": {
+        "units": "second"
+      }
+    }
+  },
+  "messages": {
+    "<%= camelCase(name) %>.buttonText": "Translate me to Japanese",
+  }
+}
diff --git a/packages/kbn-plugin-generator/sao_template/template/tsconfig.json b/packages/kbn-plugin-generator/template/tsconfig.json.ejs
similarity index 100%
rename from packages/kbn-plugin-generator/sao_template/template/tsconfig.json
rename to packages/kbn-plugin-generator/template/tsconfig.json.ejs
diff --git a/packages/kbn-plugin-generator/tsconfig.json b/packages/kbn-plugin-generator/tsconfig.json
index fe0f7112f1fa9..fc88223dae4b2 100644
--- a/packages/kbn-plugin-generator/tsconfig.json
+++ b/packages/kbn-plugin-generator/tsconfig.json
@@ -1,5 +1,12 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["**/*", "index.js.d.ts"],
-  "exclude": ["sao_template/template/*"]
+  "compilerOptions": {
+    "outDir": "target",
+    "target": "ES2019",
+    "declaration": true,
+    "declarationMap": true,
+    "sourceMap": true
+  },
+  "include": ["src/**/*"],
+  "exclude": ["src/template/*"]
 }
diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js
index 339f16eaf8593..1d4c13e605f27 100644
--- a/packages/kbn-pm/dist/index.js
+++ b/packages/kbn-pm/dist/index.js
@@ -94,7 +94,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _cli__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "run", function() { return _cli__WEBPACK_IMPORTED_MODULE_0__["run"]; });
 
-/* harmony import */ var _production__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(505);
+/* harmony import */ var _production__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(503);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buildProductionProjects", function() { return _production__WEBPACK_IMPORTED_MODULE_1__["buildProductionProjects"]; });
 
 /* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(145);
@@ -103,10 +103,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _utils_project__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(163);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Project", function() { return _utils_project__WEBPACK_IMPORTED_MODULE_3__["Project"]; });
 
-/* harmony import */ var _utils_workspaces__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(287);
+/* harmony import */ var _utils_workspaces__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(279);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "copyWorkspacePackages", function() { return _utils_workspaces__WEBPACK_IMPORTED_MODULE_4__["copyWorkspacePackages"]; });
 
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(288);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(280);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getProjectPaths", function() { return _config__WEBPACK_IMPORTED_MODULE_5__["getProjectPaths"]; });
 
 /*
@@ -150,7 +150,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(5);
 /* harmony import */ var _kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_3__);
 /* harmony import */ var _commands__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(127);
-/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(498);
+/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(496);
 /* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(143);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
@@ -8762,9 +8762,9 @@ exports.ToolingLogCollectingWriter = ToolingLogCollectingWriter;
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "commands", function() { return commands; });
 /* harmony import */ var _bootstrap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(128);
-/* harmony import */ var _clean__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(295);
-/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(397);
-/* harmony import */ var _watch__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(398);
+/* harmony import */ var _clean__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(287);
+/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(395);
+/* harmony import */ var _watch__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(396);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -8805,8 +8805,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(143);
 /* harmony import */ var _utils_parallelize__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(144);
 /* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(145);
-/* harmony import */ var _utils_project_checksums__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(289);
-/* harmony import */ var _utils_bootstrap_cache_file__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(294);
+/* harmony import */ var _utils_project_checksums__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(281);
+/* harmony import */ var _utils_bootstrap_cache_file__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(286);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -9393,6 +9393,14 @@ if (typeof Symbol === 'function' && typeof Symbol.for === 'function') {
 
 function noop () {}
 
+function publishQueue(context, queue) {
+  Object.defineProperty(context, gracefulQueue, {
+    get: function() {
+      return queue
+    }
+  })
+}
+
 var debug = noop
 if (util.debuglog)
   debug = util.debuglog('gfs4')
@@ -9404,14 +9412,10 @@ else if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || ''))
   }
 
 // Once time initialization
-if (!global[gracefulQueue]) {
+if (!fs[gracefulQueue]) {
   // This queue can be shared by multiple loaded instances
-  var queue = []
-  Object.defineProperty(global, gracefulQueue, {
-    get: function() {
-      return queue
-    }
-  })
+  var queue = global[gracefulQueue] || []
+  publishQueue(fs, queue)
 
   // Patch fs.close/closeSync to shared queue version, because we need
   // to retry() whenever a close happens *anywhere* in the program.
@@ -9451,12 +9455,16 @@ if (!global[gracefulQueue]) {
 
   if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || '')) {
     process.on('exit', function() {
-      debug(global[gracefulQueue])
-      __webpack_require__(139).equal(global[gracefulQueue].length, 0)
+      debug(fs[gracefulQueue])
+      __webpack_require__(139).equal(fs[gracefulQueue].length, 0)
     })
   }
 }
 
+if (!global[gracefulQueue]) {
+  publishQueue(global, fs[gracefulQueue]);
+}
+
 module.exports = patch(clone(fs))
 if (process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH && !fs.__patched) {
     module.exports = patch(fs)
@@ -9706,11 +9714,11 @@ function patch (fs) {
 
 function enqueue (elem) {
   debug('ENQUEUE', elem[0].name, elem[1])
-  global[gracefulQueue].push(elem)
+  fs[gracefulQueue].push(elem)
 }
 
 function retry () {
-  var elem = global[gracefulQueue].shift()
+  var elem = fs[gracefulQueue].shift()
   if (elem) {
     debug('RETRY', elem[0].name, elem[1])
     elem[0].apply(null, elem[1])
@@ -10814,7 +10822,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(162);
 /* harmony import */ var _project__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(163);
-/* harmony import */ var _workspaces__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(287);
+/* harmony import */ var _workspaces__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(279);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -14425,7 +14433,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(162);
 /* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(143);
 /* harmony import */ var _package_json__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(164);
-/* harmony import */ var _scripts__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(233);
+/* harmony import */ var _scripts__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(225);
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -22347,7 +22355,7 @@ module.exports = JSON.parse("{\"repositories\":\"'repositories' (plural) Not sup
 
 const path = __webpack_require__(4);
 const writeJsonFile = __webpack_require__(214);
-const sortKeys = __webpack_require__(228);
+const sortKeys = __webpack_require__(220);
 
 const dependencyKeys = new Set([
 	'dependencies',
@@ -22418,12 +22426,12 @@ module.exports.sync = (filePath, data, options) => {
 "use strict";
 
 const path = __webpack_require__(4);
-const fs = __webpack_require__(215);
-const writeFileAtomic = __webpack_require__(219);
-const sortKeys = __webpack_require__(228);
-const makeDir = __webpack_require__(230);
-const pify = __webpack_require__(231);
-const detectIndent = __webpack_require__(232);
+const fs = __webpack_require__(132);
+const writeFileAtomic = __webpack_require__(215);
+const sortKeys = __webpack_require__(220);
+const makeDir = __webpack_require__(222);
+const pify = __webpack_require__(223);
+const detectIndent = __webpack_require__(224);
 
 const init = (fn, filePath, data, options) => {
 	if (!filePath) {
@@ -22498,8363 +22506,8020 @@ module.exports.sync = (filePath, data, options) => {
 /* 215 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var fs = __webpack_require__(133)
-var polyfills = __webpack_require__(216)
-var legacy = __webpack_require__(217)
-var clone = __webpack_require__(218)
+"use strict";
 
-var queue = []
+module.exports = writeFile
+module.exports.sync = writeFileSync
+module.exports._getTmpname = getTmpname // for testing
+module.exports._cleanupOnExit = cleanupOnExit
 
-var util = __webpack_require__(111)
+var fs = __webpack_require__(132)
+var MurmurHash3 = __webpack_require__(216)
+var onExit = __webpack_require__(217)
+var path = __webpack_require__(4)
+var activeFiles = {}
 
-function noop () {}
+// if we run inside of a worker_thread, `process.pid` is not unique
+/* istanbul ignore next */
+var threadId = (function getId () {
+  try {
+    var workerThreads = __webpack_require__(219)
 
-var debug = noop
-if (util.debuglog)
-  debug = util.debuglog('gfs4')
-else if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || ''))
-  debug = function() {
-    var m = util.format.apply(util, arguments)
-    m = 'GFS4: ' + m.split(/\n/).join('\nGFS4: ')
-    console.error(m)
+    /// if we are in main thread, this is set to `0`
+    return workerThreads.threadId
+  } catch (e) {
+    // worker_threads are not available, fallback to 0
+    return 0
   }
+})()
 
-if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || '')) {
-  process.on('exit', function() {
-    debug(queue)
-    __webpack_require__(139).equal(queue.length, 0)
-  })
-}
-
-module.exports = patch(clone(fs))
-if (process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH && !fs.__patched) {
-    module.exports = patch(fs)
-    fs.__patched = true;
+var invocations = 0
+function getTmpname (filename) {
+  return filename + '.' +
+    MurmurHash3(__filename)
+      .hash(String(process.pid))
+      .hash(String(threadId))
+      .hash(String(++invocations))
+      .result()
 }
 
-// Always patch fs.close/closeSync, because we want to
-// retry() whenever a close happens *anywhere* in the program.
-// This is essential when multiple graceful-fs instances are
-// in play at the same time.
-module.exports.close = (function (fs$close) { return function (fd, cb) {
-  return fs$close.call(fs, fd, function (err) {
-    if (!err)
-      retry()
-
-    if (typeof cb === 'function')
-      cb.apply(this, arguments)
-  })
-}})(fs.close)
-
-module.exports.closeSync = (function (fs$closeSync) { return function (fd) {
-  // Note that graceful-fs also retries when fs.closeSync() fails.
-  // Looks like a bug to me, although it's probably a harmless one.
-  var rval = fs$closeSync.apply(fs, arguments)
-  retry()
-  return rval
-}})(fs.closeSync)
-
-// Only patch fs once, otherwise we'll run into a memory leak if
-// graceful-fs is loaded multiple times, such as in test environments that
-// reset the loaded modules between tests.
-// We look for the string `graceful-fs` from the comment above. This
-// way we are not adding any extra properties and it will detect if older
-// versions of graceful-fs are installed.
-if (!/\bgraceful-fs\b/.test(fs.closeSync.toString())) {
-  fs.closeSync = module.exports.closeSync;
-  fs.close = module.exports.close;
+function cleanupOnExit (tmpfile) {
+  return function () {
+    try {
+      fs.unlinkSync(typeof tmpfile === 'function' ? tmpfile() : tmpfile)
+    } catch (_) {}
+  }
 }
 
-function patch (fs) {
-  // Everything that references the open() function needs to be in here
-  polyfills(fs)
-  fs.gracefulify = patch
-  fs.FileReadStream = ReadStream;  // Legacy name.
-  fs.FileWriteStream = WriteStream;  // Legacy name.
-  fs.createReadStream = createReadStream
-  fs.createWriteStream = createWriteStream
-  var fs$readFile = fs.readFile
-  fs.readFile = readFile
-  function readFile (path, options, cb) {
-    if (typeof options === 'function')
-      cb = options, options = null
-
-    return go$readFile(path, options, cb)
-
-    function go$readFile (path, options, cb) {
-      return fs$readFile(path, options, function (err) {
-        if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
-          enqueue([go$readFile, [path, options, cb]])
-        else {
-          if (typeof cb === 'function')
-            cb.apply(this, arguments)
-          retry()
-        }
-      })
+function writeFile (filename, data, options, callback) {
+  if (options) {
+    if (options instanceof Function) {
+      callback = options
+      options = {}
+    } else if (typeof options === 'string') {
+      options = { encoding: options }
     }
+  } else {
+    options = {}
   }
 
-  var fs$writeFile = fs.writeFile
-  fs.writeFile = writeFile
-  function writeFile (path, data, options, cb) {
-    if (typeof options === 'function')
-      cb = options, options = null
+  var Promise = options.Promise || global.Promise
+  var truename
+  var fd
+  var tmpfile
+  /* istanbul ignore next -- The closure only gets called when onExit triggers */
+  var removeOnExitHandler = onExit(cleanupOnExit(() => tmpfile))
+  var absoluteName = path.resolve(filename)
 
-    return go$writeFile(path, data, options, cb)
+  new Promise(function serializeSameFile (resolve) {
+    // make a queue if it doesn't already exist
+    if (!activeFiles[absoluteName]) activeFiles[absoluteName] = []
 
-    function go$writeFile (path, data, options, cb) {
-      return fs$writeFile(path, data, options, function (err) {
-        if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
-          enqueue([go$writeFile, [path, data, options, cb]])
-        else {
-          if (typeof cb === 'function')
-            cb.apply(this, arguments)
-          retry()
-        }
+    activeFiles[absoluteName].push(resolve) // add this job to the queue
+    if (activeFiles[absoluteName].length === 1) resolve() // kick off the first one
+  }).then(function getRealPath () {
+    return new Promise(function (resolve) {
+      fs.realpath(filename, function (_, realname) {
+        truename = realname || filename
+        tmpfile = getTmpname(truename)
+        resolve()
       })
-    }
-  }
-
-  var fs$appendFile = fs.appendFile
-  if (fs$appendFile)
-    fs.appendFile = appendFile
-  function appendFile (path, data, options, cb) {
-    if (typeof options === 'function')
-      cb = options, options = null
-
-    return go$appendFile(path, data, options, cb)
+    })
+  }).then(function stat () {
+    return new Promise(function stat (resolve) {
+      if (options.mode && options.chown) resolve()
+      else {
+        // Either mode or chown is not explicitly set
+        // Default behavior is to copy it from original file
+        fs.stat(truename, function (err, stats) {
+          if (err || !stats) resolve()
+          else {
+            options = Object.assign({}, options)
 
-    function go$appendFile (path, data, options, cb) {
-      return fs$appendFile(path, data, options, function (err) {
-        if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
-          enqueue([go$appendFile, [path, data, options, cb]])
-        else {
-          if (typeof cb === 'function')
-            cb.apply(this, arguments)
-          retry()
-        }
+            if (options.mode == null) {
+              options.mode = stats.mode
+            }
+            if (options.chown == null && process.getuid) {
+              options.chown = { uid: stats.uid, gid: stats.gid }
+            }
+            resolve()
+          }
+        })
+      }
+    })
+  }).then(function thenWriteFile () {
+    return new Promise(function (resolve, reject) {
+      fs.open(tmpfile, 'w', options.mode, function (err, _fd) {
+        fd = _fd
+        if (err) reject(err)
+        else resolve()
+      })
+    })
+  }).then(function write () {
+    return new Promise(function (resolve, reject) {
+      if (Buffer.isBuffer(data)) {
+        fs.write(fd, data, 0, data.length, 0, function (err) {
+          if (err) reject(err)
+          else resolve()
+        })
+      } else if (data != null) {
+        fs.write(fd, String(data), 0, String(options.encoding || 'utf8'), function (err) {
+          if (err) reject(err)
+          else resolve()
+        })
+      } else resolve()
+    })
+  }).then(function syncAndClose () {
+    return new Promise(function (resolve, reject) {
+      if (options.fsync !== false) {
+        fs.fsync(fd, function (err) {
+          if (err) fs.close(fd, () => reject(err))
+          else fs.close(fd, resolve)
+        })
+      } else {
+        fs.close(fd, resolve)
+      }
+    })
+  }).then(function chown () {
+    fd = null
+    if (options.chown) {
+      return new Promise(function (resolve, reject) {
+        fs.chown(tmpfile, options.chown.uid, options.chown.gid, function (err) {
+          if (err) reject(err)
+          else resolve()
+        })
       })
     }
-  }
-
-  var fs$readdir = fs.readdir
-  fs.readdir = readdir
-  function readdir (path, options, cb) {
-    var args = [path]
-    if (typeof options !== 'function') {
-      args.push(options)
-    } else {
-      cb = options
+  }).then(function chmod () {
+    if (options.mode) {
+      return new Promise(function (resolve, reject) {
+        fs.chmod(tmpfile, options.mode, function (err) {
+          if (err) reject(err)
+          else resolve()
+        })
+      })
     }
-    args.push(go$readdir$cb)
-
-    return go$readdir(args)
-
-    function go$readdir$cb (err, files) {
-      if (files && files.sort)
-        files.sort()
+  }).then(function rename () {
+    return new Promise(function (resolve, reject) {
+      fs.rename(tmpfile, truename, function (err) {
+        if (err) reject(err)
+        else resolve()
+      })
+    })
+  }).then(function success () {
+    removeOnExitHandler()
+    callback()
+  }, function fail (err) {
+    return new Promise(resolve => {
+      return fd ? fs.close(fd, resolve) : resolve()
+    }).then(() => {
+      removeOnExitHandler()
+      fs.unlink(tmpfile, function () {
+        callback(err)
+      })
+    })
+  }).then(function checkQueue () {
+    activeFiles[absoluteName].shift() // remove the element added by serializeSameFile
+    if (activeFiles[absoluteName].length > 0) {
+      activeFiles[absoluteName][0]() // start next job if one is pending
+    } else delete activeFiles[absoluteName]
+  })
+}
 
-      if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
-        enqueue([go$readdir, [args]])
+function writeFileSync (filename, data, options) {
+  if (typeof options === 'string') options = { encoding: options }
+  else if (!options) options = {}
+  try {
+    filename = fs.realpathSync(filename)
+  } catch (ex) {
+    // it's ok, it'll happen on a not yet existing file
+  }
+  var tmpfile = getTmpname(filename)
 
-      else {
-        if (typeof cb === 'function')
-          cb.apply(this, arguments)
-        retry()
+  if (!options.mode || !options.chown) {
+    // Either mode or chown is not explicitly set
+    // Default behavior is to copy it from original file
+    try {
+      var stats = fs.statSync(filename)
+      options = Object.assign({}, options)
+      if (!options.mode) {
+        options.mode = stats.mode
+      }
+      if (!options.chown && process.getuid) {
+        options.chown = { uid: stats.uid, gid: stats.gid }
       }
+    } catch (ex) {
+      // ignore stat errors
     }
   }
 
-  function go$readdir (args) {
-    return fs$readdir.apply(fs, args)
-  }
+  var fd
+  var cleanup = cleanupOnExit(tmpfile)
+  var removeOnExitHandler = onExit(cleanup)
 
-  if (process.version.substr(0, 4) === 'v0.8') {
-    var legStreams = legacy(fs)
-    ReadStream = legStreams.ReadStream
-    WriteStream = legStreams.WriteStream
+  try {
+    fd = fs.openSync(tmpfile, 'w', options.mode)
+    if (Buffer.isBuffer(data)) {
+      fs.writeSync(fd, data, 0, data.length, 0)
+    } else if (data != null) {
+      fs.writeSync(fd, String(data), 0, String(options.encoding || 'utf8'))
+    }
+    if (options.fsync !== false) {
+      fs.fsyncSync(fd)
+    }
+    fs.closeSync(fd)
+    if (options.chown) fs.chownSync(tmpfile, options.chown.uid, options.chown.gid)
+    if (options.mode) fs.chmodSync(tmpfile, options.mode)
+    fs.renameSync(tmpfile, filename)
+    removeOnExitHandler()
+  } catch (err) {
+    if (fd) {
+      try {
+        fs.closeSync(fd)
+      } catch (ex) {
+        // ignore close errors at this stage, error may have closed fd already.
+      }
+    }
+    removeOnExitHandler()
+    cleanup()
+    throw err
   }
+}
 
-  var fs$ReadStream = fs.ReadStream
-  if (fs$ReadStream) {
-    ReadStream.prototype = Object.create(fs$ReadStream.prototype)
-    ReadStream.prototype.open = ReadStream$open
-  }
 
-  var fs$WriteStream = fs.WriteStream
-  if (fs$WriteStream) {
-    WriteStream.prototype = Object.create(fs$WriteStream.prototype)
-    WriteStream.prototype.open = WriteStream$open
-  }
+/***/ }),
+/* 216 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  fs.ReadStream = ReadStream
-  fs.WriteStream = WriteStream
+/**
+ * @preserve
+ * JS Implementation of incremental MurmurHash3 (r150) (as of May 10, 2013)
+ *
+ * @author <a href="mailto:jensyt@gmail.com">Jens Taylor</a>
+ * @see http://github.com/homebrewing/brauhaus-diff
+ * @author <a href="mailto:gary.court@gmail.com">Gary Court</a>
+ * @see http://github.com/garycourt/murmurhash-js
+ * @author <a href="mailto:aappleby@gmail.com">Austin Appleby</a>
+ * @see http://sites.google.com/site/murmurhash/
+ */
+(function(){
+    var cache;
 
-  function ReadStream (path, options) {
-    if (this instanceof ReadStream)
-      return fs$ReadStream.apply(this, arguments), this
-    else
-      return ReadStream.apply(Object.create(ReadStream.prototype), arguments)
-  }
+    // Call this function without `new` to use the cached object (good for
+    // single-threaded environments), or with `new` to create a new object.
+    //
+    // @param {string} key A UTF-16 or ASCII string
+    // @param {number} seed An optional positive integer
+    // @return {object} A MurmurHash3 object for incremental hashing
+    function MurmurHash3(key, seed) {
+        var m = this instanceof MurmurHash3 ? this : cache;
+        m.reset(seed)
+        if (typeof key === 'string' && key.length > 0) {
+            m.hash(key);
+        }
 
-  function ReadStream$open () {
-    var that = this
-    open(that.path, that.flags, that.mode, function (err, fd) {
-      if (err) {
-        if (that.autoClose)
-          that.destroy()
+        if (m !== this) {
+            return m;
+        }
+    };
 
-        that.emit('error', err)
-      } else {
-        that.fd = fd
-        that.emit('open', fd)
-        that.read()
-      }
-    })
-  }
+    // Incrementally add a string to this hash
+    //
+    // @param {string} key A UTF-16 or ASCII string
+    // @return {object} this
+    MurmurHash3.prototype.hash = function(key) {
+        var h1, k1, i, top, len;
 
-  function WriteStream (path, options) {
-    if (this instanceof WriteStream)
-      return fs$WriteStream.apply(this, arguments), this
-    else
-      return WriteStream.apply(Object.create(WriteStream.prototype), arguments)
-  }
+        len = key.length;
+        this.len += len;
 
-  function WriteStream$open () {
-    var that = this
-    open(that.path, that.flags, that.mode, function (err, fd) {
-      if (err) {
-        that.destroy()
-        that.emit('error', err)
-      } else {
-        that.fd = fd
-        that.emit('open', fd)
-      }
-    })
-  }
+        k1 = this.k1;
+        i = 0;
+        switch (this.rem) {
+            case 0: k1 ^= len > i ? (key.charCodeAt(i++) & 0xffff) : 0;
+            case 1: k1 ^= len > i ? (key.charCodeAt(i++) & 0xffff) << 8 : 0;
+            case 2: k1 ^= len > i ? (key.charCodeAt(i++) & 0xffff) << 16 : 0;
+            case 3:
+                k1 ^= len > i ? (key.charCodeAt(i) & 0xff) << 24 : 0;
+                k1 ^= len > i ? (key.charCodeAt(i++) & 0xff00) >> 8 : 0;
+        }
 
-  function createReadStream (path, options) {
-    return new ReadStream(path, options)
-  }
+        this.rem = (len + this.rem) & 3; // & 3 is same as % 4
+        len -= this.rem;
+        if (len > 0) {
+            h1 = this.h1;
+            while (1) {
+                k1 = (k1 * 0x2d51 + (k1 & 0xffff) * 0xcc9e0000) & 0xffffffff;
+                k1 = (k1 << 15) | (k1 >>> 17);
+                k1 = (k1 * 0x3593 + (k1 & 0xffff) * 0x1b870000) & 0xffffffff;
 
-  function createWriteStream (path, options) {
-    return new WriteStream(path, options)
-  }
+                h1 ^= k1;
+                h1 = (h1 << 13) | (h1 >>> 19);
+                h1 = (h1 * 5 + 0xe6546b64) & 0xffffffff;
 
-  var fs$open = fs.open
-  fs.open = open
-  function open (path, flags, mode, cb) {
-    if (typeof mode === 'function')
-      cb = mode, mode = null
+                if (i >= len) {
+                    break;
+                }
 
-    return go$open(path, flags, mode, cb)
+                k1 = ((key.charCodeAt(i++) & 0xffff)) ^
+                     ((key.charCodeAt(i++) & 0xffff) << 8) ^
+                     ((key.charCodeAt(i++) & 0xffff) << 16);
+                top = key.charCodeAt(i++);
+                k1 ^= ((top & 0xff) << 24) ^
+                      ((top & 0xff00) >> 8);
+            }
 
-    function go$open (path, flags, mode, cb) {
-      return fs$open(path, flags, mode, function (err, fd) {
-        if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
-          enqueue([go$open, [path, flags, mode, cb]])
-        else {
-          if (typeof cb === 'function')
-            cb.apply(this, arguments)
-          retry()
+            k1 = 0;
+            switch (this.rem) {
+                case 3: k1 ^= (key.charCodeAt(i + 2) & 0xffff) << 16;
+                case 2: k1 ^= (key.charCodeAt(i + 1) & 0xffff) << 8;
+                case 1: k1 ^= (key.charCodeAt(i) & 0xffff);
+            }
+
+            this.h1 = h1;
         }
-      })
-    }
-  }
 
-  return fs
-}
+        this.k1 = k1;
+        return this;
+    };
 
-function enqueue (elem) {
-  debug('ENQUEUE', elem[0].name, elem[1])
-  queue.push(elem)
-}
+    // Get the result of this hash
+    //
+    // @return {number} The 32-bit hash
+    MurmurHash3.prototype.result = function() {
+        var k1, h1;
+        
+        k1 = this.k1;
+        h1 = this.h1;
 
-function retry () {
-  var elem = queue.shift()
-  if (elem) {
-    debug('RETRY', elem[0].name, elem[1])
-    elem[0].apply(null, elem[1])
-  }
-}
+        if (k1 > 0) {
+            k1 = (k1 * 0x2d51 + (k1 & 0xffff) * 0xcc9e0000) & 0xffffffff;
+            k1 = (k1 << 15) | (k1 >>> 17);
+            k1 = (k1 * 0x3593 + (k1 & 0xffff) * 0x1b870000) & 0xffffffff;
+            h1 ^= k1;
+        }
 
+        h1 ^= this.len;
 
-/***/ }),
-/* 216 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var constants = __webpack_require__(135)
-
-var origCwd = process.cwd
-var cwd = null
-
-var platform = process.env.GRACEFUL_FS_PLATFORM || process.platform
-
-process.cwd = function() {
-  if (!cwd)
-    cwd = origCwd.call(process)
-  return cwd
-}
-try {
-  process.cwd()
-} catch (er) {}
+        h1 ^= h1 >>> 16;
+        h1 = (h1 * 0xca6b + (h1 & 0xffff) * 0x85eb0000) & 0xffffffff;
+        h1 ^= h1 >>> 13;
+        h1 = (h1 * 0xae35 + (h1 & 0xffff) * 0xc2b20000) & 0xffffffff;
+        h1 ^= h1 >>> 16;
 
-var chdir = process.chdir
-process.chdir = function(d) {
-  cwd = null
-  chdir.call(process, d)
-}
+        return h1 >>> 0;
+    };
 
-module.exports = patch
+    // Reset the hash object for reuse
+    //
+    // @param {number} seed An optional positive integer
+    MurmurHash3.prototype.reset = function(seed) {
+        this.h1 = typeof seed === 'number' ? seed : 0;
+        this.rem = this.k1 = this.len = 0;
+        return this;
+    };
 
-function patch (fs) {
-  // (re-)implement some things that are known busted or missing.
+    // A cached object to use. This can be safely used if you're in a single-
+    // threaded environment, otherwise you need to create new hashes to use.
+    cache = new MurmurHash3();
 
-  // lchmod, broken prior to 0.6.2
-  // back-port the fix here.
-  if (constants.hasOwnProperty('O_SYMLINK') &&
-      process.version.match(/^v0\.6\.[0-2]|^v0\.5\./)) {
-    patchLchmod(fs)
-  }
+    if (true) {
+        module.exports = MurmurHash3;
+    } else {}
+}());
 
-  // lutimes implementation, or no-op
-  if (!fs.lutimes) {
-    patchLutimes(fs)
-  }
 
-  // https://github.com/isaacs/node-graceful-fs/issues/4
-  // Chown should not fail on einval or eperm if non-root.
-  // It should not fail on enosys ever, as this just indicates
-  // that a fs doesn't support the intended operation.
+/***/ }),
+/* 217 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  fs.chown = chownFix(fs.chown)
-  fs.fchown = chownFix(fs.fchown)
-  fs.lchown = chownFix(fs.lchown)
+// Note: since nyc uses this module to output coverage, any lines
+// that are in the direct sync flow of nyc's outputCoverage are
+// ignored, since we can never get coverage for them.
+var assert = __webpack_require__(139)
+var signals = __webpack_require__(218)
 
-  fs.chmod = chmodFix(fs.chmod)
-  fs.fchmod = chmodFix(fs.fchmod)
-  fs.lchmod = chmodFix(fs.lchmod)
+var EE = __webpack_require__(155)
+/* istanbul ignore if */
+if (typeof EE !== 'function') {
+  EE = EE.EventEmitter
+}
 
-  fs.chownSync = chownFixSync(fs.chownSync)
-  fs.fchownSync = chownFixSync(fs.fchownSync)
-  fs.lchownSync = chownFixSync(fs.lchownSync)
+var emitter
+if (process.__signal_exit_emitter__) {
+  emitter = process.__signal_exit_emitter__
+} else {
+  emitter = process.__signal_exit_emitter__ = new EE()
+  emitter.count = 0
+  emitter.emitted = {}
+}
 
-  fs.chmodSync = chmodFixSync(fs.chmodSync)
-  fs.fchmodSync = chmodFixSync(fs.fchmodSync)
-  fs.lchmodSync = chmodFixSync(fs.lchmodSync)
+// Because this emitter is a global, we have to check to see if a
+// previous version of this library failed to enable infinite listeners.
+// I know what you're about to say.  But literally everything about
+// signal-exit is a compromise with evil.  Get used to it.
+if (!emitter.infinite) {
+  emitter.setMaxListeners(Infinity)
+  emitter.infinite = true
+}
 
-  fs.stat = statFix(fs.stat)
-  fs.fstat = statFix(fs.fstat)
-  fs.lstat = statFix(fs.lstat)
+module.exports = function (cb, opts) {
+  assert.equal(typeof cb, 'function', 'a callback must be provided for exit handler')
 
-  fs.statSync = statFixSync(fs.statSync)
-  fs.fstatSync = statFixSync(fs.fstatSync)
-  fs.lstatSync = statFixSync(fs.lstatSync)
+  if (loaded === false) {
+    load()
+  }
 
-  // if lchmod/lchown do not exist, then make them no-ops
-  if (!fs.lchmod) {
-    fs.lchmod = function (path, mode, cb) {
-      if (cb) process.nextTick(cb)
-    }
-    fs.lchmodSync = function () {}
+  var ev = 'exit'
+  if (opts && opts.alwaysLast) {
+    ev = 'afterexit'
   }
-  if (!fs.lchown) {
-    fs.lchown = function (path, uid, gid, cb) {
-      if (cb) process.nextTick(cb)
+
+  var remove = function () {
+    emitter.removeListener(ev, cb)
+    if (emitter.listeners('exit').length === 0 &&
+        emitter.listeners('afterexit').length === 0) {
+      unload()
     }
-    fs.lchownSync = function () {}
   }
+  emitter.on(ev, cb)
 
-  // on Windows, A/V software can lock the directory, causing this
-  // to fail with an EACCES or EPERM if the directory contains newly
-  // created files.  Try again on failure, for up to 60 seconds.
+  return remove
+}
 
-  // Set the timeout this long because some Windows Anti-Virus, such as Parity
-  // bit9, may lock files for up to a minute, causing npm package install
-  // failures. Also, take care to yield the scheduler. Windows scheduling gives
-  // CPU to a busy looping process, which can cause the program causing the lock
-  // contention to be starved of CPU by node, so the contention doesn't resolve.
-  if (platform === "win32") {
-    fs.rename = (function (fs$rename) { return function (from, to, cb) {
-      var start = Date.now()
-      var backoff = 0;
-      fs$rename(from, to, function CB (er) {
-        if (er
-            && (er.code === "EACCES" || er.code === "EPERM")
-            && Date.now() - start < 60000) {
-          setTimeout(function() {
-            fs.stat(to, function (stater, st) {
-              if (stater && stater.code === "ENOENT")
-                fs$rename(from, to, CB);
-              else
-                cb(er)
-            })
-          }, backoff)
-          if (backoff < 100)
-            backoff += 10;
-          return;
-        }
-        if (cb) cb(er)
-      })
-    }})(fs.rename)
+module.exports.unload = unload
+function unload () {
+  if (!loaded) {
+    return
   }
+  loaded = false
 
-  // if read() returns EAGAIN, then just try it again.
-  fs.read = (function (fs$read) { return function (fd, buffer, offset, length, position, callback_) {
-    var callback
-    if (callback_ && typeof callback_ === 'function') {
-      var eagCounter = 0
-      callback = function (er, _, __) {
-        if (er && er.code === 'EAGAIN' && eagCounter < 10) {
-          eagCounter ++
-          return fs$read.call(fs, fd, buffer, offset, length, position, callback)
-        }
-        callback_.apply(this, arguments)
-      }
-    }
-    return fs$read.call(fs, fd, buffer, offset, length, position, callback)
-  }})(fs.read)
-
-  fs.readSync = (function (fs$readSync) { return function (fd, buffer, offset, length, position) {
-    var eagCounter = 0
-    while (true) {
-      try {
-        return fs$readSync.call(fs, fd, buffer, offset, length, position)
-      } catch (er) {
-        if (er.code === 'EAGAIN' && eagCounter < 10) {
-          eagCounter ++
-          continue
-        }
-        throw er
-      }
-    }
-  }})(fs.readSync)
-
-  function patchLchmod (fs) {
-    fs.lchmod = function (path, mode, callback) {
-      fs.open( path
-             , constants.O_WRONLY | constants.O_SYMLINK
-             , mode
-             , function (err, fd) {
-        if (err) {
-          if (callback) callback(err)
-          return
-        }
-        // prefer to return the chmod error, if one occurs,
-        // but still try to close, and report closing errors if they occur.
-        fs.fchmod(fd, mode, function (err) {
-          fs.close(fd, function(err2) {
-            if (callback) callback(err || err2)
-          })
-        })
-      })
-    }
+  signals.forEach(function (sig) {
+    try {
+      process.removeListener(sig, sigListeners[sig])
+    } catch (er) {}
+  })
+  process.emit = originalProcessEmit
+  process.reallyExit = originalProcessReallyExit
+  emitter.count -= 1
+}
 
-    fs.lchmodSync = function (path, mode) {
-      var fd = fs.openSync(path, constants.O_WRONLY | constants.O_SYMLINK, mode)
+function emit (event, code, signal) {
+  if (emitter.emitted[event]) {
+    return
+  }
+  emitter.emitted[event] = true
+  emitter.emit(event, code, signal)
+}
 
-      // prefer to return the chmod error, if one occurs,
-      // but still try to close, and report closing errors if they occur.
-      var threw = true
-      var ret
-      try {
-        ret = fs.fchmodSync(fd, mode)
-        threw = false
-      } finally {
-        if (threw) {
-          try {
-            fs.closeSync(fd)
-          } catch (er) {}
-        } else {
-          fs.closeSync(fd)
-        }
-      }
-      return ret
+// { <signal>: <listener fn>, ... }
+var sigListeners = {}
+signals.forEach(function (sig) {
+  sigListeners[sig] = function listener () {
+    // If there are no other listeners, an exit is coming!
+    // Simplest way: remove us and then re-send the signal.
+    // We know that this will kill the process, so we can
+    // safely emit now.
+    var listeners = process.listeners(sig)
+    if (listeners.length === emitter.count) {
+      unload()
+      emit('exit', null, sig)
+      /* istanbul ignore next */
+      emit('afterexit', null, sig)
+      /* istanbul ignore next */
+      process.kill(process.pid, sig)
     }
   }
+})
 
-  function patchLutimes (fs) {
-    if (constants.hasOwnProperty("O_SYMLINK")) {
-      fs.lutimes = function (path, at, mt, cb) {
-        fs.open(path, constants.O_SYMLINK, function (er, fd) {
-          if (er) {
-            if (cb) cb(er)
-            return
-          }
-          fs.futimes(fd, at, mt, function (er) {
-            fs.close(fd, function (er2) {
-              if (cb) cb(er || er2)
-            })
-          })
-        })
-      }
-
-      fs.lutimesSync = function (path, at, mt) {
-        var fd = fs.openSync(path, constants.O_SYMLINK)
-        var ret
-        var threw = true
-        try {
-          ret = fs.futimesSync(fd, at, mt)
-          threw = false
-        } finally {
-          if (threw) {
-            try {
-              fs.closeSync(fd)
-            } catch (er) {}
-          } else {
-            fs.closeSync(fd)
-          }
-        }
-        return ret
-      }
+module.exports.signals = function () {
+  return signals
+}
 
-    } else {
-      fs.lutimes = function (_a, _b, _c, cb) { if (cb) process.nextTick(cb) }
-      fs.lutimesSync = function () {}
-    }
-  }
+module.exports.load = load
 
-  function chmodFix (orig) {
-    if (!orig) return orig
-    return function (target, mode, cb) {
-      return orig.call(fs, target, mode, function (er) {
-        if (chownErOk(er)) er = null
-        if (cb) cb.apply(this, arguments)
-      })
-    }
-  }
+var loaded = false
 
-  function chmodFixSync (orig) {
-    if (!orig) return orig
-    return function (target, mode) {
-      try {
-        return orig.call(fs, target, mode)
-      } catch (er) {
-        if (!chownErOk(er)) throw er
-      }
-    }
+function load () {
+  if (loaded) {
+    return
   }
+  loaded = true
 
+  // This is the number of onSignalExit's that are in play.
+  // It's important so that we can count the correct number of
+  // listeners on signals, and don't wait for the other one to
+  // handle it instead of us.
+  emitter.count += 1
 
-  function chownFix (orig) {
-    if (!orig) return orig
-    return function (target, uid, gid, cb) {
-      return orig.call(fs, target, uid, gid, function (er) {
-        if (chownErOk(er)) er = null
-        if (cb) cb.apply(this, arguments)
-      })
+  signals = signals.filter(function (sig) {
+    try {
+      process.on(sig, sigListeners[sig])
+      return true
+    } catch (er) {
+      return false
     }
-  }
+  })
 
-  function chownFixSync (orig) {
-    if (!orig) return orig
-    return function (target, uid, gid) {
-      try {
-        return orig.call(fs, target, uid, gid)
-      } catch (er) {
-        if (!chownErOk(er)) throw er
-      }
-    }
-  }
+  process.emit = processEmit
+  process.reallyExit = processReallyExit
+}
 
+var originalProcessReallyExit = process.reallyExit
+function processReallyExit (code) {
+  process.exitCode = code || 0
+  emit('exit', process.exitCode, null)
+  /* istanbul ignore next */
+  emit('afterexit', process.exitCode, null)
+  /* istanbul ignore next */
+  originalProcessReallyExit.call(process, process.exitCode)
+}
 
-  function statFix (orig) {
-    if (!orig) return orig
-    // Older versions of Node erroneously returned signed integers for
-    // uid + gid.
-    return function (target, cb) {
-      return orig.call(fs, target, function (er, stats) {
-        if (!stats) return cb.apply(this, arguments)
-        if (stats.uid < 0) stats.uid += 0x100000000
-        if (stats.gid < 0) stats.gid += 0x100000000
-        if (cb) cb.apply(this, arguments)
-      })
+var originalProcessEmit = process.emit
+function processEmit (ev, arg) {
+  if (ev === 'exit') {
+    if (arg !== undefined) {
+      process.exitCode = arg
     }
+    var ret = originalProcessEmit.apply(this, arguments)
+    emit('exit', process.exitCode, null)
+    /* istanbul ignore next */
+    emit('afterexit', process.exitCode, null)
+    return ret
+  } else {
+    return originalProcessEmit.apply(this, arguments)
   }
+}
 
-  function statFixSync (orig) {
-    if (!orig) return orig
-    // Older versions of Node erroneously returned signed integers for
-    // uid + gid.
-    return function (target) {
-      var stats = orig.call(fs, target)
-      if (stats.uid < 0) stats.uid += 0x100000000
-      if (stats.gid < 0) stats.gid += 0x100000000
-      return stats;
-    }
-  }
 
-  // ENOSYS means that the fs doesn't support the op. Just ignore
-  // that, because it doesn't matter.
-  //
-  // if there's no getuid, or if getuid() is something other
-  // than 0, and the error is EINVAL or EPERM, then just ignore
-  // it.
-  //
-  // This specific case is a silent failure in cp, install, tar,
-  // and most other unix tools that manage permissions.
-  //
-  // When running as root, or if other types of errors are
-  // encountered, then it's strict.
-  function chownErOk (er) {
-    if (!er)
-      return true
+/***/ }),
+/* 218 */
+/***/ (function(module, exports) {
 
-    if (er.code === "ENOSYS")
-      return true
+// This is not the set of all possible signals.
+//
+// It IS, however, the set of all signals that trigger
+// an exit on either Linux or BSD systems.  Linux is a
+// superset of the signal names supported on BSD, and
+// the unknown signals just fail to register, so we can
+// catch that easily enough.
+//
+// Don't bother with SIGKILL.  It's uncatchable, which
+// means that we can't fire any callbacks anyway.
+//
+// If a user does happen to register a handler on a non-
+// fatal signal like SIGWINCH or something, and then
+// exit, it'll end up firing `process.emit('exit')`, so
+// the handler will be fired anyway.
+//
+// SIGBUS, SIGFPE, SIGSEGV and SIGILL, when not raised
+// artificially, inherently leave the process in a
+// state from which it is not safe to try and enter JS
+// listeners.
+module.exports = [
+  'SIGABRT',
+  'SIGALRM',
+  'SIGHUP',
+  'SIGINT',
+  'SIGTERM'
+]
 
-    var nonroot = !process.getuid || process.getuid() !== 0
-    if (nonroot) {
-      if (er.code === "EINVAL" || er.code === "EPERM")
-        return true
-    }
+if (process.platform !== 'win32') {
+  module.exports.push(
+    'SIGVTALRM',
+    'SIGXCPU',
+    'SIGXFSZ',
+    'SIGUSR2',
+    'SIGTRAP',
+    'SIGSYS',
+    'SIGQUIT',
+    'SIGIOT'
+    // should detect profiler and enable/disable accordingly.
+    // see #21
+    // 'SIGPROF'
+  )
+}
 
-    return false
-  }
+if (process.platform === 'linux') {
+  module.exports.push(
+    'SIGIO',
+    'SIGPOLL',
+    'SIGPWR',
+    'SIGSTKFLT',
+    'SIGUNUSED'
+  )
 }
 
 
 /***/ }),
-/* 217 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var Stream = __webpack_require__(137).Stream
+/* 219 */
+/***/ (function(module, exports) {
 
-module.exports = legacy
+module.exports = require(undefined);
 
-function legacy (fs) {
-  return {
-    ReadStream: ReadStream,
-    WriteStream: WriteStream
-  }
+/***/ }),
+/* 220 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  function ReadStream (path, options) {
-    if (!(this instanceof ReadStream)) return new ReadStream(path, options);
+"use strict";
 
-    Stream.call(this);
+const isPlainObj = __webpack_require__(221);
 
-    var self = this;
+module.exports = (obj, opts) => {
+	if (!isPlainObj(obj)) {
+		throw new TypeError('Expected a plain object');
+	}
 
-    this.path = path;
-    this.fd = null;
-    this.readable = true;
-    this.paused = false;
+	opts = opts || {};
 
-    this.flags = 'r';
-    this.mode = 438; /*=0666*/
-    this.bufferSize = 64 * 1024;
+	// DEPRECATED
+	if (typeof opts === 'function') {
+		throw new TypeError('Specify the compare function as an option instead');
+	}
 
-    options = options || {};
-
-    // Mixin options into this
-    var keys = Object.keys(options);
-    for (var index = 0, length = keys.length; index < length; index++) {
-      var key = keys[index];
-      this[key] = options[key];
-    }
-
-    if (this.encoding) this.setEncoding(this.encoding);
+	const deep = opts.deep;
+	const seenInput = [];
+	const seenOutput = [];
 
-    if (this.start !== undefined) {
-      if ('number' !== typeof this.start) {
-        throw TypeError('start must be a Number');
-      }
-      if (this.end === undefined) {
-        this.end = Infinity;
-      } else if ('number' !== typeof this.end) {
-        throw TypeError('end must be a Number');
-      }
+	const sortKeys = x => {
+		const seenIndex = seenInput.indexOf(x);
 
-      if (this.start > this.end) {
-        throw new Error('start must be <= end');
-      }
+		if (seenIndex !== -1) {
+			return seenOutput[seenIndex];
+		}
 
-      this.pos = this.start;
-    }
+		const ret = {};
+		const keys = Object.keys(x).sort(opts.compare);
 
-    if (this.fd !== null) {
-      process.nextTick(function() {
-        self._read();
-      });
-      return;
-    }
+		seenInput.push(x);
+		seenOutput.push(ret);
 
-    fs.open(this.path, this.flags, this.mode, function (err, fd) {
-      if (err) {
-        self.emit('error', err);
-        self.readable = false;
-        return;
-      }
+		for (let i = 0; i < keys.length; i++) {
+			const key = keys[i];
+			const val = x[key];
 
-      self.fd = fd;
-      self.emit('open', fd);
-      self._read();
-    })
-  }
+			if (deep && Array.isArray(val)) {
+				const retArr = [];
 
-  function WriteStream (path, options) {
-    if (!(this instanceof WriteStream)) return new WriteStream(path, options);
+				for (let j = 0; j < val.length; j++) {
+					retArr[j] = isPlainObj(val[j]) ? sortKeys(val[j]) : val[j];
+				}
 
-    Stream.call(this);
+				ret[key] = retArr;
+				continue;
+			}
 
-    this.path = path;
-    this.fd = null;
-    this.writable = true;
+			ret[key] = deep && isPlainObj(val) ? sortKeys(val) : val;
+		}
 
-    this.flags = 'w';
-    this.encoding = 'binary';
-    this.mode = 438; /*=0666*/
-    this.bytesWritten = 0;
+		return ret;
+	};
 
-    options = options || {};
+	return sortKeys(obj);
+};
 
-    // Mixin options into this
-    var keys = Object.keys(options);
-    for (var index = 0, length = keys.length; index < length; index++) {
-      var key = keys[index];
-      this[key] = options[key];
-    }
 
-    if (this.start !== undefined) {
-      if ('number' !== typeof this.start) {
-        throw TypeError('start must be a Number');
-      }
-      if (this.start < 0) {
-        throw new Error('start must be >= zero');
-      }
+/***/ }),
+/* 221 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      this.pos = this.start;
-    }
+"use strict";
 
-    this.busy = false;
-    this._queue = [];
+var toString = Object.prototype.toString;
 
-    if (this.fd === null) {
-      this._open = fs.open;
-      this._queue.push([this._open, this.path, this.flags, this.mode, undefined]);
-      this.flush();
-    }
-  }
-}
+module.exports = function (x) {
+	var prototype;
+	return toString.call(x) === '[object Object]' && (prototype = Object.getPrototypeOf(x), prototype === null || prototype === Object.getPrototypeOf({}));
+};
 
 
 /***/ }),
-/* 218 */
+/* 222 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+const fs = __webpack_require__(133);
+const path = __webpack_require__(4);
+const pify = __webpack_require__(223);
+const semver = __webpack_require__(189);
 
-module.exports = clone
-
-function clone (obj) {
-  if (obj === null || typeof obj !== 'object')
-    return obj
-
-  if (obj instanceof Object)
-    var copy = { __proto__: obj.__proto__ }
-  else
-    var copy = Object.create(null)
-
-  Object.getOwnPropertyNames(obj).forEach(function (key) {
-    Object.defineProperty(copy, key, Object.getOwnPropertyDescriptor(obj, key))
-  })
-
-  return copy
-}
+const defaults = {
+	mode: 0o777 & (~process.umask()),
+	fs
+};
 
+const useNativeRecursiveOption = semver.satisfies(process.version, '>=10.12.0');
 
-/***/ }),
-/* 219 */
-/***/ (function(module, exports, __webpack_require__) {
+// https://github.com/nodejs/node/issues/8987
+// https://github.com/libuv/libuv/pull/1088
+const checkPath = pth => {
+	if (process.platform === 'win32') {
+		const pathHasInvalidWinCharacters = /[<>:"|?*]/.test(pth.replace(path.parse(pth).root, ''));
 
-"use strict";
+		if (pathHasInvalidWinCharacters) {
+			const error = new Error(`Path contains invalid characters: ${pth}`);
+			error.code = 'EINVAL';
+			throw error;
+		}
+	}
+};
 
-module.exports = writeFile
-module.exports.sync = writeFileSync
-module.exports._getTmpname = getTmpname // for testing
-module.exports._cleanupOnExit = cleanupOnExit
+const permissionError = pth => {
+	// This replicates the exception of `fs.mkdir` with native the
+	// `recusive` option when run on an invalid drive under Windows.
+	const error = new Error(`operation not permitted, mkdir '${pth}'`);
+	error.code = 'EPERM';
+	error.errno = -4048;
+	error.path = pth;
+	error.syscall = 'mkdir';
+	return error;
+};
 
-var fs = __webpack_require__(220)
-var MurmurHash3 = __webpack_require__(224)
-var onExit = __webpack_require__(225)
-var path = __webpack_require__(4)
-var activeFiles = {}
+const makeDir = (input, options) => Promise.resolve().then(() => {
+	checkPath(input);
+	options = Object.assign({}, defaults, options);
 
-// if we run inside of a worker_thread, `process.pid` is not unique
-/* istanbul ignore next */
-var threadId = (function getId () {
-  try {
-    var workerThreads = __webpack_require__(227)
+	// TODO: Use util.promisify when targeting Node.js 8
+	const mkdir = pify(options.fs.mkdir);
+	const stat = pify(options.fs.stat);
 
-    /// if we are in main thread, this is set to `0`
-    return workerThreads.threadId
-  } catch (e) {
-    // worker_threads are not available, fallback to 0
-    return 0
-  }
-})()
+	if (useNativeRecursiveOption && options.fs.mkdir === fs.mkdir) {
+		const pth = path.resolve(input);
 
-var invocations = 0
-function getTmpname (filename) {
-  return filename + '.' +
-    MurmurHash3(__filename)
-      .hash(String(process.pid))
-      .hash(String(threadId))
-      .hash(String(++invocations))
-      .result()
-}
+		return mkdir(pth, {
+			mode: options.mode,
+			recursive: true
+		}).then(() => pth);
+	}
 
-function cleanupOnExit (tmpfile) {
-  return function () {
-    try {
-      fs.unlinkSync(typeof tmpfile === 'function' ? tmpfile() : tmpfile)
-    } catch (_) {}
-  }
-}
+	const make = pth => {
+		return mkdir(pth, options.mode)
+			.then(() => pth)
+			.catch(error => {
+				if (error.code === 'EPERM') {
+					throw error;
+				}
 
-function writeFile (filename, data, options, callback) {
-  if (options) {
-    if (options instanceof Function) {
-      callback = options
-      options = {}
-    } else if (typeof options === 'string') {
-      options = { encoding: options }
-    }
-  } else {
-    options = {}
-  }
+				if (error.code === 'ENOENT') {
+					if (path.dirname(pth) === pth) {
+						throw permissionError(pth);
+					}
 
-  var Promise = options.Promise || global.Promise
-  var truename
-  var fd
-  var tmpfile
-  /* istanbul ignore next -- The closure only gets called when onExit triggers */
-  var removeOnExitHandler = onExit(cleanupOnExit(() => tmpfile))
-  var absoluteName = path.resolve(filename)
+					if (error.message.includes('null bytes')) {
+						throw error;
+					}
 
-  new Promise(function serializeSameFile (resolve) {
-    // make a queue if it doesn't already exist
-    if (!activeFiles[absoluteName]) activeFiles[absoluteName] = []
+					return make(path.dirname(pth)).then(() => make(pth));
+				}
 
-    activeFiles[absoluteName].push(resolve) // add this job to the queue
-    if (activeFiles[absoluteName].length === 1) resolve() // kick off the first one
-  }).then(function getRealPath () {
-    return new Promise(function (resolve) {
-      fs.realpath(filename, function (_, realname) {
-        truename = realname || filename
-        tmpfile = getTmpname(truename)
-        resolve()
-      })
-    })
-  }).then(function stat () {
-    return new Promise(function stat (resolve) {
-      if (options.mode && options.chown) resolve()
-      else {
-        // Either mode or chown is not explicitly set
-        // Default behavior is to copy it from original file
-        fs.stat(truename, function (err, stats) {
-          if (err || !stats) resolve()
-          else {
-            options = Object.assign({}, options)
+				return stat(pth)
+					.then(stats => stats.isDirectory() ? pth : Promise.reject())
+					.catch(() => {
+						throw error;
+					});
+			});
+	};
 
-            if (options.mode == null) {
-              options.mode = stats.mode
-            }
-            if (options.chown == null && process.getuid) {
-              options.chown = { uid: stats.uid, gid: stats.gid }
-            }
-            resolve()
-          }
-        })
-      }
-    })
-  }).then(function thenWriteFile () {
-    return new Promise(function (resolve, reject) {
-      fs.open(tmpfile, 'w', options.mode, function (err, _fd) {
-        fd = _fd
-        if (err) reject(err)
-        else resolve()
-      })
-    })
-  }).then(function write () {
-    return new Promise(function (resolve, reject) {
-      if (Buffer.isBuffer(data)) {
-        fs.write(fd, data, 0, data.length, 0, function (err) {
-          if (err) reject(err)
-          else resolve()
-        })
-      } else if (data != null) {
-        fs.write(fd, String(data), 0, String(options.encoding || 'utf8'), function (err) {
-          if (err) reject(err)
-          else resolve()
-        })
-      } else resolve()
-    })
-  }).then(function syncAndClose () {
-    return new Promise(function (resolve, reject) {
-      if (options.fsync !== false) {
-        fs.fsync(fd, function (err) {
-          if (err) fs.close(fd, () => reject(err))
-          else fs.close(fd, resolve)
-        })
-      } else {
-        fs.close(fd, resolve)
-      }
-    })
-  }).then(function chown () {
-    fd = null
-    if (options.chown) {
-      return new Promise(function (resolve, reject) {
-        fs.chown(tmpfile, options.chown.uid, options.chown.gid, function (err) {
-          if (err) reject(err)
-          else resolve()
-        })
-      })
-    }
-  }).then(function chmod () {
-    if (options.mode) {
-      return new Promise(function (resolve, reject) {
-        fs.chmod(tmpfile, options.mode, function (err) {
-          if (err) reject(err)
-          else resolve()
-        })
-      })
-    }
-  }).then(function rename () {
-    return new Promise(function (resolve, reject) {
-      fs.rename(tmpfile, truename, function (err) {
-        if (err) reject(err)
-        else resolve()
-      })
-    })
-  }).then(function success () {
-    removeOnExitHandler()
-    callback()
-  }, function fail (err) {
-    return new Promise(resolve => {
-      return fd ? fs.close(fd, resolve) : resolve()
-    }).then(() => {
-      removeOnExitHandler()
-      fs.unlink(tmpfile, function () {
-        callback(err)
-      })
-    })
-  }).then(function checkQueue () {
-    activeFiles[absoluteName].shift() // remove the element added by serializeSameFile
-    if (activeFiles[absoluteName].length > 0) {
-      activeFiles[absoluteName][0]() // start next job if one is pending
-    } else delete activeFiles[absoluteName]
-  })
-}
+	return make(path.resolve(input));
+});
 
-function writeFileSync (filename, data, options) {
-  if (typeof options === 'string') options = { encoding: options }
-  else if (!options) options = {}
-  try {
-    filename = fs.realpathSync(filename)
-  } catch (ex) {
-    // it's ok, it'll happen on a not yet existing file
-  }
-  var tmpfile = getTmpname(filename)
+module.exports = makeDir;
+module.exports.default = makeDir;
 
-  if (!options.mode || !options.chown) {
-    // Either mode or chown is not explicitly set
-    // Default behavior is to copy it from original file
-    try {
-      var stats = fs.statSync(filename)
-      options = Object.assign({}, options)
-      if (!options.mode) {
-        options.mode = stats.mode
-      }
-      if (!options.chown && process.getuid) {
-        options.chown = { uid: stats.uid, gid: stats.gid }
-      }
-    } catch (ex) {
-      // ignore stat errors
-    }
-  }
+module.exports.sync = (input, options) => {
+	checkPath(input);
+	options = Object.assign({}, defaults, options);
 
-  var fd
-  var cleanup = cleanupOnExit(tmpfile)
-  var removeOnExitHandler = onExit(cleanup)
+	if (useNativeRecursiveOption && options.fs.mkdirSync === fs.mkdirSync) {
+		const pth = path.resolve(input);
 
-  try {
-    fd = fs.openSync(tmpfile, 'w', options.mode)
-    if (Buffer.isBuffer(data)) {
-      fs.writeSync(fd, data, 0, data.length, 0)
-    } else if (data != null) {
-      fs.writeSync(fd, String(data), 0, String(options.encoding || 'utf8'))
-    }
-    if (options.fsync !== false) {
-      fs.fsyncSync(fd)
-    }
-    fs.closeSync(fd)
-    if (options.chown) fs.chownSync(tmpfile, options.chown.uid, options.chown.gid)
-    if (options.mode) fs.chmodSync(tmpfile, options.mode)
-    fs.renameSync(tmpfile, filename)
-    removeOnExitHandler()
-  } catch (err) {
-    if (fd) {
-      try {
-        fs.closeSync(fd)
-      } catch (ex) {
-        // ignore close errors at this stage, error may have closed fd already.
-      }
-    }
-    removeOnExitHandler()
-    cleanup()
-    throw err
-  }
-}
+		fs.mkdirSync(pth, {
+			mode: options.mode,
+			recursive: true
+		});
 
+		return pth;
+	}
 
-/***/ }),
-/* 220 */
-/***/ (function(module, exports, __webpack_require__) {
+	const make = pth => {
+		try {
+			options.fs.mkdirSync(pth, options.mode);
+		} catch (error) {
+			if (error.code === 'EPERM') {
+				throw error;
+			}
 
-var fs = __webpack_require__(133)
-var polyfills = __webpack_require__(221)
-var legacy = __webpack_require__(223)
-var queue = []
+			if (error.code === 'ENOENT') {
+				if (path.dirname(pth) === pth) {
+					throw permissionError(pth);
+				}
 
-var util = __webpack_require__(111)
+				if (error.message.includes('null bytes')) {
+					throw error;
+				}
 
-function noop () {}
+				make(path.dirname(pth));
+				return make(pth);
+			}
 
-var debug = noop
-if (util.debuglog)
-  debug = util.debuglog('gfs4')
-else if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || ''))
-  debug = function() {
-    var m = util.format.apply(util, arguments)
-    m = 'GFS4: ' + m.split(/\n/).join('\nGFS4: ')
-    console.error(m)
-  }
+			try {
+				if (!options.fs.statSync(pth).isDirectory()) {
+					throw new Error('The path is not a directory');
+				}
+			} catch (_) {
+				throw error;
+			}
+		}
 
-if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || '')) {
-  process.on('exit', function() {
-    debug(queue)
-    __webpack_require__(139).equal(queue.length, 0)
-  })
-}
+		return pth;
+	};
 
-module.exports = patch(__webpack_require__(222))
-if (process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH) {
-  module.exports = patch(fs)
-}
+	return make(path.resolve(input));
+};
 
-// Always patch fs.close/closeSync, because we want to
-// retry() whenever a close happens *anywhere* in the program.
-// This is essential when multiple graceful-fs instances are
-// in play at the same time.
-module.exports.close =
-fs.close = (function (fs$close) { return function (fd, cb) {
-  return fs$close.call(fs, fd, function (err) {
-    if (!err)
-      retry()
 
-    if (typeof cb === 'function')
-      cb.apply(this, arguments)
-  })
-}})(fs.close)
+/***/ }),
+/* 223 */
+/***/ (function(module, exports, __webpack_require__) {
 
-module.exports.closeSync =
-fs.closeSync = (function (fs$closeSync) { return function (fd) {
-  // Note that graceful-fs also retries when fs.closeSync() fails.
-  // Looks like a bug to me, although it's probably a harmless one.
-  var rval = fs$closeSync.apply(fs, arguments)
-  retry()
-  return rval
-}})(fs.closeSync)
+"use strict";
 
-function patch (fs) {
-  // Everything that references the open() function needs to be in here
-  polyfills(fs)
-  fs.gracefulify = patch
-  fs.FileReadStream = ReadStream;  // Legacy name.
-  fs.FileWriteStream = WriteStream;  // Legacy name.
-  fs.createReadStream = createReadStream
-  fs.createWriteStream = createWriteStream
-  var fs$readFile = fs.readFile
-  fs.readFile = readFile
-  function readFile (path, options, cb) {
-    if (typeof options === 'function')
-      cb = options, options = null
 
-    return go$readFile(path, options, cb)
+const processFn = (fn, options) => function (...args) {
+	const P = options.promiseModule;
 
-    function go$readFile (path, options, cb) {
-      return fs$readFile(path, options, function (err) {
-        if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
-          enqueue([go$readFile, [path, options, cb]])
-        else {
-          if (typeof cb === 'function')
-            cb.apply(this, arguments)
-          retry()
-        }
-      })
-    }
-  }
+	return new P((resolve, reject) => {
+		if (options.multiArgs) {
+			args.push((...result) => {
+				if (options.errorFirst) {
+					if (result[0]) {
+						reject(result);
+					} else {
+						result.shift();
+						resolve(result);
+					}
+				} else {
+					resolve(result);
+				}
+			});
+		} else if (options.errorFirst) {
+			args.push((error, result) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(result);
+				}
+			});
+		} else {
+			args.push(resolve);
+		}
 
-  var fs$writeFile = fs.writeFile
-  fs.writeFile = writeFile
-  function writeFile (path, data, options, cb) {
-    if (typeof options === 'function')
-      cb = options, options = null
+		fn.apply(this, args);
+	});
+};
 
-    return go$writeFile(path, data, options, cb)
+module.exports = (input, options) => {
+	options = Object.assign({
+		exclude: [/.+(Sync|Stream)$/],
+		errorFirst: true,
+		promiseModule: Promise
+	}, options);
 
-    function go$writeFile (path, data, options, cb) {
-      return fs$writeFile(path, data, options, function (err) {
-        if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
-          enqueue([go$writeFile, [path, data, options, cb]])
-        else {
-          if (typeof cb === 'function')
-            cb.apply(this, arguments)
-          retry()
-        }
-      })
-    }
-  }
+	const objType = typeof input;
+	if (!(input !== null && (objType === 'object' || objType === 'function'))) {
+		throw new TypeError(`Expected \`input\` to be a \`Function\` or \`Object\`, got \`${input === null ? 'null' : objType}\``);
+	}
 
-  var fs$appendFile = fs.appendFile
-  if (fs$appendFile)
-    fs.appendFile = appendFile
-  function appendFile (path, data, options, cb) {
-    if (typeof options === 'function')
-      cb = options, options = null
+	const filter = key => {
+		const match = pattern => typeof pattern === 'string' ? key === pattern : pattern.test(key);
+		return options.include ? options.include.some(match) : !options.exclude.some(match);
+	};
 
-    return go$appendFile(path, data, options, cb)
+	let ret;
+	if (objType === 'function') {
+		ret = function (...args) {
+			return options.excludeMain ? input(...args) : processFn(input, options).apply(this, args);
+		};
+	} else {
+		ret = Object.create(Object.getPrototypeOf(input));
+	}
 
-    function go$appendFile (path, data, options, cb) {
-      return fs$appendFile(path, data, options, function (err) {
-        if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
-          enqueue([go$appendFile, [path, data, options, cb]])
-        else {
-          if (typeof cb === 'function')
-            cb.apply(this, arguments)
-          retry()
-        }
-      })
-    }
-  }
+	for (const key in input) { // eslint-disable-line guard-for-in
+		const property = input[key];
+		ret[key] = typeof property === 'function' && filter(key) ? processFn(property, options) : property;
+	}
 
-  var fs$readdir = fs.readdir
-  fs.readdir = readdir
-  function readdir (path, options, cb) {
-    var args = [path]
-    if (typeof options !== 'function') {
-      args.push(options)
-    } else {
-      cb = options
-    }
-    args.push(go$readdir$cb)
+	return ret;
+};
 
-    return go$readdir(args)
 
-    function go$readdir$cb (err, files) {
-      if (files && files.sort)
-        files.sort()
+/***/ }),
+/* 224 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
-        enqueue([go$readdir, [args]])
-      else {
-        if (typeof cb === 'function')
-          cb.apply(this, arguments)
-        retry()
-      }
-    }
-  }
+"use strict";
 
-  function go$readdir (args) {
-    return fs$readdir.apply(fs, args)
-  }
 
-  if (process.version.substr(0, 4) === 'v0.8') {
-    var legStreams = legacy(fs)
-    ReadStream = legStreams.ReadStream
-    WriteStream = legStreams.WriteStream
-  }
+// detect either spaces or tabs but not both to properly handle tabs
+// for indentation and spaces for alignment
+const INDENT_RE = /^(?:( )+|\t+)/;
 
-  var fs$ReadStream = fs.ReadStream
-  ReadStream.prototype = Object.create(fs$ReadStream.prototype)
-  ReadStream.prototype.open = ReadStream$open
+function getMostUsed(indents) {
+	let result = 0;
+	let maxUsed = 0;
+	let maxWeight = 0;
 
-  var fs$WriteStream = fs.WriteStream
-  WriteStream.prototype = Object.create(fs$WriteStream.prototype)
-  WriteStream.prototype.open = WriteStream$open
+	for (const entry of indents) {
+		// TODO: use destructuring when targeting Node.js 6
+		const key = entry[0];
+		const val = entry[1];
 
-  fs.ReadStream = ReadStream
-  fs.WriteStream = WriteStream
+		const u = val[0];
+		const w = val[1];
 
-  function ReadStream (path, options) {
-    if (this instanceof ReadStream)
-      return fs$ReadStream.apply(this, arguments), this
-    else
-      return ReadStream.apply(Object.create(ReadStream.prototype), arguments)
-  }
+		if (u > maxUsed || (u === maxUsed && w > maxWeight)) {
+			maxUsed = u;
+			maxWeight = w;
+			result = Number(key);
+		}
+	}
 
-  function ReadStream$open () {
-    var that = this
-    open(that.path, that.flags, that.mode, function (err, fd) {
-      if (err) {
-        if (that.autoClose)
-          that.destroy()
+	return result;
+}
 
-        that.emit('error', err)
-      } else {
-        that.fd = fd
-        that.emit('open', fd)
-        that.read()
-      }
-    })
-  }
+module.exports = str => {
+	if (typeof str !== 'string') {
+		throw new TypeError('Expected a string');
+	}
 
-  function WriteStream (path, options) {
-    if (this instanceof WriteStream)
-      return fs$WriteStream.apply(this, arguments), this
-    else
-      return WriteStream.apply(Object.create(WriteStream.prototype), arguments)
-  }
+	// used to see if tabs or spaces are the most used
+	let tabs = 0;
+	let spaces = 0;
 
-  function WriteStream$open () {
-    var that = this
-    open(that.path, that.flags, that.mode, function (err, fd) {
-      if (err) {
-        that.destroy()
-        that.emit('error', err)
-      } else {
-        that.fd = fd
-        that.emit('open', fd)
-      }
-    })
-  }
+	// remember the size of previous line's indentation
+	let prev = 0;
 
-  function createReadStream (path, options) {
-    return new ReadStream(path, options)
-  }
+	// remember how many indents/unindents as occurred for a given size
+	// and how much lines follow a given indentation
+	//
+	// indents = {
+	//    3: [1, 0],
+	//    4: [1, 5],
+	//    5: [1, 0],
+	//   12: [1, 0],
+	// }
+	const indents = new Map();
 
-  function createWriteStream (path, options) {
-    return new WriteStream(path, options)
-  }
+	// pointer to the array of last used indent
+	let current;
 
-  var fs$open = fs.open
-  fs.open = open
-  function open (path, flags, mode, cb) {
-    if (typeof mode === 'function')
-      cb = mode, mode = null
+	// whether the last action was an indent (opposed to an unindent)
+	let isIndent;
 
-    return go$open(path, flags, mode, cb)
+	for (const line of str.split(/\n/g)) {
+		if (!line) {
+			// ignore empty lines
+			continue;
+		}
 
-    function go$open (path, flags, mode, cb) {
-      return fs$open(path, flags, mode, function (err, fd) {
-        if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
-          enqueue([go$open, [path, flags, mode, cb]])
-        else {
-          if (typeof cb === 'function')
-            cb.apply(this, arguments)
-          retry()
-        }
-      })
-    }
-  }
+		let indent;
+		const matches = line.match(INDENT_RE);
 
-  return fs
-}
+		if (matches) {
+			indent = matches[0].length;
 
-function enqueue (elem) {
-  debug('ENQUEUE', elem[0].name, elem[1])
-  queue.push(elem)
-}
+			if (matches[1]) {
+				spaces++;
+			} else {
+				tabs++;
+			}
+		} else {
+			indent = 0;
+		}
 
-function retry () {
-  var elem = queue.shift()
-  if (elem) {
-    debug('RETRY', elem[0].name, elem[1])
-    elem[0].apply(null, elem[1])
-  }
-}
+		const diff = indent - prev;
+		prev = indent;
+
+		if (diff) {
+			// an indent or unindent has been detected
+
+			isIndent = diff > 0;
+
+			current = indents.get(isIndent ? diff : -diff);
+
+			if (current) {
+				current[0]++;
+			} else {
+				current = [1, 0];
+				indents.set(diff, current);
+			}
+		} else if (current) {
+			// if the last action was an indent, increment the weight
+			current[1] += Number(isIndent);
+		}
+	}
+
+	const amount = getMostUsed(indents);
+
+	let type;
+	let indent;
+	if (!amount) {
+		type = null;
+		indent = '';
+	} else if (spaces >= tabs) {
+		type = 'space';
+		indent = ' '.repeat(amount);
+	} else {
+		type = 'tab';
+		indent = '\t'.repeat(amount);
+	}
+
+	return {
+		amount,
+		type,
+		indent
+	};
+};
 
 
 /***/ }),
-/* 221 */
-/***/ (function(module, exports, __webpack_require__) {
+/* 225 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-var fs = __webpack_require__(222)
-var constants = __webpack_require__(135)
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "installInDir", function() { return installInDir; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "runScriptInPackage", function() { return runScriptInPackage; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "runScriptInPackageStreaming", function() { return runScriptInPackageStreaming; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "yarnWorkspacesInfo", function() { return yarnWorkspacesInfo; });
+/* harmony import */ var _child_process__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(226);
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
-var origCwd = process.cwd
-var cwd = null
+const YARN_EXEC = process.env.npm_execpath || 'yarn';
 
-var platform = process.env.GRACEFUL_FS_PLATFORM || process.platform
+/**
+ * Install all dependencies in the given directory
+ */
+async function installInDir(directory, extraArgs = []) {
+  const options = ['install', '--non-interactive', ...extraArgs]; // We pass the mutex flag to ensure only one instance of yarn runs at any
+  // given time (e.g. to avoid conflicts).
 
-process.cwd = function() {
-  if (!cwd)
-    cwd = origCwd.call(process)
-  return cwd
+  await Object(_child_process__WEBPACK_IMPORTED_MODULE_0__["spawn"])(YARN_EXEC, options, {
+    cwd: directory
+  });
 }
-try {
-  process.cwd()
-} catch (er) {}
+/**
+ * Run script in the given directory
+ */
 
-var chdir = process.chdir
-process.chdir = function(d) {
-  cwd = null
-  chdir.call(process, d)
+async function runScriptInPackage(script, args, pkg) {
+  const execOpts = {
+    cwd: pkg.path
+  };
+  await Object(_child_process__WEBPACK_IMPORTED_MODULE_0__["spawn"])(YARN_EXEC, ['run', script, ...args], execOpts);
 }
+/**
+ * Run script in the given directory
+ */
 
-module.exports = patch
-
-function patch (fs) {
-  // (re-)implement some things that are known busted or missing.
+function runScriptInPackageStreaming({
+  script,
+  args,
+  pkg,
+  debug
+}) {
+  const execOpts = {
+    cwd: pkg.path
+  };
+  return Object(_child_process__WEBPACK_IMPORTED_MODULE_0__["spawnStreaming"])(YARN_EXEC, ['run', script, ...args], execOpts, {
+    prefix: pkg.name,
+    debug
+  });
+}
+async function yarnWorkspacesInfo(directory) {
+  const {
+    stdout
+  } = await Object(_child_process__WEBPACK_IMPORTED_MODULE_0__["spawn"])(YARN_EXEC, ['--json', 'workspaces', 'info'], {
+    cwd: directory,
+    stdio: 'pipe'
+  });
 
-  // lchmod, broken prior to 0.6.2
-  // back-port the fix here.
-  if (constants.hasOwnProperty('O_SYMLINK') &&
-      process.version.match(/^v0\.6\.[0-2]|^v0\.5\./)) {
-    patchLchmod(fs)
+  try {
+    return JSON.parse(JSON.parse(stdout).data);
+  } catch (error) {
+    throw new Error(`'yarn workspaces info --json' produced unexpected output: \n${stdout}`);
   }
+}
 
-  // lutimes implementation, or no-op
-  if (!fs.lutimes) {
-    patchLutimes(fs)
-  }
+/***/ }),
+/* 226 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  // https://github.com/isaacs/node-graceful-fs/issues/4
-  // Chown should not fail on einval or eperm if non-root.
-  // It should not fail on enosys ever, as this just indicates
-  // that a fs doesn't support the intended operation.
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "spawn", function() { return spawn; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "spawnStreaming", function() { return spawnStreaming; });
+/* harmony import */ var stream__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(137);
+/* harmony import */ var stream__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(stream__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(227);
+/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(236);
+/* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(execa__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var strong_log_transformer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(271);
+/* harmony import */ var strong_log_transformer__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(strong_log_transformer__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(143);
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-  fs.chown = chownFix(fs.chown)
-  fs.fchown = chownFix(fs.fchown)
-  fs.lchown = chownFix(fs.lchown)
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-  fs.chmod = chmodFix(fs.chmod)
-  fs.fchmod = chmodFix(fs.fchmod)
-  fs.lchmod = chmodFix(fs.lchmod)
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-  fs.chownSync = chownFixSync(fs.chownSync)
-  fs.fchownSync = chownFixSync(fs.fchownSync)
-  fs.lchownSync = chownFixSync(fs.lchownSync)
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
-  fs.chmodSync = chmodFixSync(fs.chmodSync)
-  fs.fchmodSync = chmodFixSync(fs.fchmodSync)
-  fs.lchmodSync = chmodFixSync(fs.lchmodSync)
 
-  fs.stat = statFix(fs.stat)
-  fs.fstat = statFix(fs.fstat)
-  fs.lstat = statFix(fs.lstat)
 
-  fs.statSync = statFixSync(fs.statSync)
-  fs.fstatSync = statFixSync(fs.fstatSync)
-  fs.lstatSync = statFixSync(fs.lstatSync)
 
-  // if lchmod/lchown do not exist, then make them no-ops
-  if (!fs.lchmod) {
-    fs.lchmod = function (path, mode, cb) {
-      if (cb) process.nextTick(cb)
-    }
-    fs.lchmodSync = function () {}
-  }
-  if (!fs.lchown) {
-    fs.lchown = function (path, uid, gid, cb) {
-      if (cb) process.nextTick(cb)
-    }
-    fs.lchownSync = function () {}
-  }
 
-  // on Windows, A/V software can lock the directory, causing this
-  // to fail with an EACCES or EPERM if the directory contains newly
-  // created files.  Try again on failure, for up to 60 seconds.
+const colorWheel = [chalk__WEBPACK_IMPORTED_MODULE_1___default.a.cyan, chalk__WEBPACK_IMPORTED_MODULE_1___default.a.magenta, chalk__WEBPACK_IMPORTED_MODULE_1___default.a.blue, chalk__WEBPACK_IMPORTED_MODULE_1___default.a.yellow, chalk__WEBPACK_IMPORTED_MODULE_1___default.a.green];
 
-  // Set the timeout this long because some Windows Anti-Virus, such as Parity
-  // bit9, may lock files for up to a minute, causing npm package install
-  // failures. Also, take care to yield the scheduler. Windows scheduling gives
-  // CPU to a busy looping process, which can cause the program causing the lock
-  // contention to be starved of CPU by node, so the contention doesn't resolve.
-  if (platform === "win32") {
-    fs.rename = (function (fs$rename) { return function (from, to, cb) {
-      var start = Date.now()
-      var backoff = 0;
-      fs$rename(from, to, function CB (er) {
-        if (er
-            && (er.code === "EACCES" || er.code === "EPERM")
-            && Date.now() - start < 60000) {
-          setTimeout(function() {
-            fs.stat(to, function (stater, st) {
-              if (stater && stater.code === "ENOENT")
-                fs$rename(from, to, CB);
-              else
-                cb(er)
-            })
-          }, backoff)
-          if (backoff < 100)
-            backoff += 10;
-          return;
-        }
-        if (cb) cb(er)
-      })
-    }})(fs.rename)
-  }
-
-  // if read() returns EAGAIN, then just try it again.
-  fs.read = (function (fs$read) { return function (fd, buffer, offset, length, position, callback_) {
-    var callback
-    if (callback_ && typeof callback_ === 'function') {
-      var eagCounter = 0
-      callback = function (er, _, __) {
-        if (er && er.code === 'EAGAIN' && eagCounter < 10) {
-          eagCounter ++
-          return fs$read.call(fs, fd, buffer, offset, length, position, callback)
-        }
-        callback_.apply(this, arguments)
-      }
-    }
-    return fs$read.call(fs, fd, buffer, offset, length, position, callback)
-  }})(fs.read)
+const getColor = () => {
+  const color = colorWheel.shift();
+  colorWheel.push(color);
+  return color;
+};
 
-  fs.readSync = (function (fs$readSync) { return function (fd, buffer, offset, length, position) {
-    var eagCounter = 0
-    while (true) {
-      try {
-        return fs$readSync.call(fs, fd, buffer, offset, length, position)
-      } catch (er) {
-        if (er.code === 'EAGAIN' && eagCounter < 10) {
-          eagCounter ++
-          continue
-        }
-        throw er
-      }
-    }
-  }})(fs.readSync)
+function spawn(command, args, opts) {
+  return execa__WEBPACK_IMPORTED_MODULE_2___default()(command, args, _objectSpread({
+    stdio: 'inherit',
+    preferLocal: true
+  }, opts));
 }
 
-function patchLchmod (fs) {
-  fs.lchmod = function (path, mode, callback) {
-    fs.open( path
-           , constants.O_WRONLY | constants.O_SYMLINK
-           , mode
-           , function (err, fd) {
-      if (err) {
-        if (callback) callback(err)
-        return
-      }
-      // prefer to return the chmod error, if one occurs,
-      // but still try to close, and report closing errors if they occur.
-      fs.fchmod(fd, mode, function (err) {
-        fs.close(fd, function(err2) {
-          if (callback) callback(err || err2)
-        })
-      })
-    })
-  }
-
-  fs.lchmodSync = function (path, mode) {
-    var fd = fs.openSync(path, constants.O_WRONLY | constants.O_SYMLINK, mode)
+function streamToLog(debug = true) {
+  return new stream__WEBPACK_IMPORTED_MODULE_0__["Writable"]({
+    objectMode: true,
 
-    // prefer to return the chmod error, if one occurs,
-    // but still try to close, and report closing errors if they occur.
-    var threw = true
-    var ret
-    try {
-      ret = fs.fchmodSync(fd, mode)
-      threw = false
-    } finally {
-      if (threw) {
-        try {
-          fs.closeSync(fd)
-        } catch (er) {}
+    write(line, _, cb) {
+      if (line.endsWith('\n')) {
+        _log__WEBPACK_IMPORTED_MODULE_4__["log"][debug ? 'debug' : 'write'](line.slice(0, -1));
       } else {
-        fs.closeSync(fd)
+        _log__WEBPACK_IMPORTED_MODULE_4__["log"][debug ? 'debug' : 'write'](line);
       }
-    }
-    return ret
-  }
-}
-
-function patchLutimes (fs) {
-  if (constants.hasOwnProperty("O_SYMLINK")) {
-    fs.lutimes = function (path, at, mt, cb) {
-      fs.open(path, constants.O_SYMLINK, function (er, fd) {
-        if (er) {
-          if (cb) cb(er)
-          return
-        }
-        fs.futimes(fd, at, mt, function (er) {
-          fs.close(fd, function (er2) {
-            if (cb) cb(er || er2)
-          })
-        })
-      })
-    }
 
-    fs.lutimesSync = function (path, at, mt) {
-      var fd = fs.openSync(path, constants.O_SYMLINK)
-      var ret
-      var threw = true
-      try {
-        ret = fs.futimesSync(fd, at, mt)
-        threw = false
-      } finally {
-        if (threw) {
-          try {
-            fs.closeSync(fd)
-          } catch (er) {}
-        } else {
-          fs.closeSync(fd)
-        }
-      }
-      return ret
+      cb();
     }
 
-  } else {
-    fs.lutimes = function (_a, _b, _c, cb) { if (cb) process.nextTick(cb) }
-    fs.lutimesSync = function () {}
-  }
-}
-
-function chmodFix (orig) {
-  if (!orig) return orig
-  return function (target, mode, cb) {
-    return orig.call(fs, target, mode, function (er) {
-      if (chownErOk(er)) er = null
-      if (cb) cb.apply(this, arguments)
-    })
-  }
+  });
 }
 
-function chmodFixSync (orig) {
-  if (!orig) return orig
-  return function (target, mode) {
-    try {
-      return orig.call(fs, target, mode)
-    } catch (er) {
-      if (!chownErOk(er)) throw er
-    }
-  }
+function spawnStreaming(command, args, opts, {
+  prefix,
+  debug
+}) {
+  const spawned = execa__WEBPACK_IMPORTED_MODULE_2___default()(command, args, _objectSpread({
+    stdio: ['ignore', 'pipe', 'pipe'],
+    preferLocal: true
+  }, opts));
+  const color = getColor();
+  const prefixedStdout = strong_log_transformer__WEBPACK_IMPORTED_MODULE_3___default()({
+    tag: color.bold(prefix)
+  });
+  const prefixedStderr = strong_log_transformer__WEBPACK_IMPORTED_MODULE_3___default()({
+    mergeMultiline: true,
+    tag: color.bold(prefix)
+  });
+  spawned.stdout.pipe(prefixedStdout).pipe(streamToLog(debug));
+  spawned.stderr.pipe(prefixedStderr).pipe(streamToLog(debug));
+  return spawned;
 }
 
+/***/ }),
+/* 227 */
+/***/ (function(module, exports, __webpack_require__) {
 
-function chownFix (orig) {
-  if (!orig) return orig
-  return function (target, uid, gid, cb) {
-    return orig.call(fs, target, uid, gid, function (er) {
-      if (chownErOk(er)) er = null
-      if (cb) cb.apply(this, arguments)
-    })
-  }
-}
-
-function chownFixSync (orig) {
-  if (!orig) return orig
-  return function (target, uid, gid) {
-    try {
-      return orig.call(fs, target, uid, gid)
-    } catch (er) {
-      if (!chownErOk(er)) throw er
-    }
-  }
-}
+"use strict";
 
+const ansiStyles = __webpack_require__(228);
+const {stdout: stdoutColor, stderr: stderrColor} = __webpack_require__(232);
+const {
+	stringReplaceAll,
+	stringEncaseCRLFWithFirstIndex
+} = __webpack_require__(234);
 
-function statFix (orig) {
-  if (!orig) return orig
-  // Older versions of Node erroneously returned signed integers for
-  // uid + gid.
-  return function (target, cb) {
-    return orig.call(fs, target, function (er, stats) {
-      if (!stats) return cb.apply(this, arguments)
-      if (stats.uid < 0) stats.uid += 0x100000000
-      if (stats.gid < 0) stats.gid += 0x100000000
-      if (cb) cb.apply(this, arguments)
-    })
-  }
-}
+const {isArray} = Array;
 
-function statFixSync (orig) {
-  if (!orig) return orig
-  // Older versions of Node erroneously returned signed integers for
-  // uid + gid.
-  return function (target) {
-    var stats = orig.call(fs, target)
-    if (stats.uid < 0) stats.uid += 0x100000000
-    if (stats.gid < 0) stats.gid += 0x100000000
-    return stats;
-  }
-}
+// `supportsColor.level` → `ansiStyles.color[name]` mapping
+const levelMapping = [
+	'ansi',
+	'ansi',
+	'ansi256',
+	'ansi16m'
+];
 
-// ENOSYS means that the fs doesn't support the op. Just ignore
-// that, because it doesn't matter.
-//
-// if there's no getuid, or if getuid() is something other
-// than 0, and the error is EINVAL or EPERM, then just ignore
-// it.
-//
-// This specific case is a silent failure in cp, install, tar,
-// and most other unix tools that manage permissions.
-//
-// When running as root, or if other types of errors are
-// encountered, then it's strict.
-function chownErOk (er) {
-  if (!er)
-    return true
+const styles = Object.create(null);
 
-  if (er.code === "ENOSYS")
-    return true
+const applyOptions = (object, options = {}) => {
+	if (options.level && !(Number.isInteger(options.level) && options.level >= 0 && options.level <= 3)) {
+		throw new Error('The `level` option should be an integer from 0 to 3');
+	}
 
-  var nonroot = !process.getuid || process.getuid() !== 0
-  if (nonroot) {
-    if (er.code === "EINVAL" || er.code === "EPERM")
-      return true
-  }
+	// Detect level if not set manually
+	const colorLevel = stdoutColor ? stdoutColor.level : 0;
+	object.level = options.level === undefined ? colorLevel : options.level;
+};
 
-  return false
+class ChalkClass {
+	constructor(options) {
+		// eslint-disable-next-line no-constructor-return
+		return chalkFactory(options);
+	}
 }
 
+const chalkFactory = options => {
+	const chalk = {};
+	applyOptions(chalk, options);
 
-/***/ }),
-/* 222 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var fs = __webpack_require__(133)
+	chalk.template = (...arguments_) => chalkTag(chalk.template, ...arguments_);
 
-module.exports = clone(fs)
+	Object.setPrototypeOf(chalk, Chalk.prototype);
+	Object.setPrototypeOf(chalk.template, chalk);
 
-function clone (obj) {
-  if (obj === null || typeof obj !== 'object')
-    return obj
+	chalk.template.constructor = () => {
+		throw new Error('`chalk.constructor()` is deprecated. Use `new chalk.Instance()` instead.');
+	};
 
-  if (obj instanceof Object)
-    var copy = { __proto__: obj.__proto__ }
-  else
-    var copy = Object.create(null)
+	chalk.template.Instance = ChalkClass;
 
-  Object.getOwnPropertyNames(obj).forEach(function (key) {
-    Object.defineProperty(copy, key, Object.getOwnPropertyDescriptor(obj, key))
-  })
+	return chalk.template;
+};
 
-  return copy
+function Chalk(options) {
+	return chalkFactory(options);
 }
 
+for (const [styleName, style] of Object.entries(ansiStyles)) {
+	styles[styleName] = {
+		get() {
+			const builder = createBuilder(this, createStyler(style.open, style.close, this._styler), this._isEmpty);
+			Object.defineProperty(this, styleName, {value: builder});
+			return builder;
+		}
+	};
+}
 
-/***/ }),
-/* 223 */
-/***/ (function(module, exports, __webpack_require__) {
+styles.visible = {
+	get() {
+		const builder = createBuilder(this, this._styler, true);
+		Object.defineProperty(this, 'visible', {value: builder});
+		return builder;
+	}
+};
 
-var Stream = __webpack_require__(137).Stream
+const usedModels = ['rgb', 'hex', 'keyword', 'hsl', 'hsv', 'hwb', 'ansi', 'ansi256'];
 
-module.exports = legacy
+for (const model of usedModels) {
+	styles[model] = {
+		get() {
+			const {level} = this;
+			return function (...arguments_) {
+				const styler = createStyler(ansiStyles.color[levelMapping[level]][model](...arguments_), ansiStyles.color.close, this._styler);
+				return createBuilder(this, styler, this._isEmpty);
+			};
+		}
+	};
+}
 
-function legacy (fs) {
-  return {
-    ReadStream: ReadStream,
-    WriteStream: WriteStream
-  }
+for (const model of usedModels) {
+	const bgModel = 'bg' + model[0].toUpperCase() + model.slice(1);
+	styles[bgModel] = {
+		get() {
+			const {level} = this;
+			return function (...arguments_) {
+				const styler = createStyler(ansiStyles.bgColor[levelMapping[level]][model](...arguments_), ansiStyles.bgColor.close, this._styler);
+				return createBuilder(this, styler, this._isEmpty);
+			};
+		}
+	};
+}
 
-  function ReadStream (path, options) {
-    if (!(this instanceof ReadStream)) return new ReadStream(path, options);
+const proto = Object.defineProperties(() => {}, {
+	...styles,
+	level: {
+		enumerable: true,
+		get() {
+			return this._generator.level;
+		},
+		set(level) {
+			this._generator.level = level;
+		}
+	}
+});
 
-    Stream.call(this);
+const createStyler = (open, close, parent) => {
+	let openAll;
+	let closeAll;
+	if (parent === undefined) {
+		openAll = open;
+		closeAll = close;
+	} else {
+		openAll = parent.openAll + open;
+		closeAll = close + parent.closeAll;
+	}
 
-    var self = this;
+	return {
+		open,
+		close,
+		openAll,
+		closeAll,
+		parent
+	};
+};
 
-    this.path = path;
-    this.fd = null;
-    this.readable = true;
-    this.paused = false;
+const createBuilder = (self, _styler, _isEmpty) => {
+	const builder = (...arguments_) => {
+		if (isArray(arguments_[0]) && isArray(arguments_[0].raw)) {
+			// Called as a template literal, for example: chalk.red`2 + 3 = {bold ${2+3}}`
+			return applyStyle(builder, chalkTag(builder, ...arguments_));
+		}
 
-    this.flags = 'r';
-    this.mode = 438; /*=0666*/
-    this.bufferSize = 64 * 1024;
+		// Single argument is hot path, implicit coercion is faster than anything
+		// eslint-disable-next-line no-implicit-coercion
+		return applyStyle(builder, (arguments_.length === 1) ? ('' + arguments_[0]) : arguments_.join(' '));
+	};
 
-    options = options || {};
+	// We alter the prototype because we must return a function, but there is
+	// no way to create a function with a different prototype
+	Object.setPrototypeOf(builder, proto);
 
-    // Mixin options into this
-    var keys = Object.keys(options);
-    for (var index = 0, length = keys.length; index < length; index++) {
-      var key = keys[index];
-      this[key] = options[key];
-    }
+	builder._generator = self;
+	builder._styler = _styler;
+	builder._isEmpty = _isEmpty;
 
-    if (this.encoding) this.setEncoding(this.encoding);
+	return builder;
+};
 
-    if (this.start !== undefined) {
-      if ('number' !== typeof this.start) {
-        throw TypeError('start must be a Number');
-      }
-      if (this.end === undefined) {
-        this.end = Infinity;
-      } else if ('number' !== typeof this.end) {
-        throw TypeError('end must be a Number');
-      }
+const applyStyle = (self, string) => {
+	if (self.level <= 0 || !string) {
+		return self._isEmpty ? '' : string;
+	}
 
-      if (this.start > this.end) {
-        throw new Error('start must be <= end');
-      }
+	let styler = self._styler;
 
-      this.pos = this.start;
-    }
+	if (styler === undefined) {
+		return string;
+	}
 
-    if (this.fd !== null) {
-      process.nextTick(function() {
-        self._read();
-      });
-      return;
-    }
+	const {openAll, closeAll} = styler;
+	if (string.indexOf('\u001B') !== -1) {
+		while (styler !== undefined) {
+			// Replace any instances already present with a re-opening code
+			// otherwise only the part of the string until said closing code
+			// will be colored, and the rest will simply be 'plain'.
+			string = stringReplaceAll(string, styler.close, styler.open);
 
-    fs.open(this.path, this.flags, this.mode, function (err, fd) {
-      if (err) {
-        self.emit('error', err);
-        self.readable = false;
-        return;
-      }
+			styler = styler.parent;
+		}
+	}
 
-      self.fd = fd;
-      self.emit('open', fd);
-      self._read();
-    })
-  }
+	// We can move both next actions out of loop, because remaining actions in loop won't have
+	// any/visible effect on parts we add here. Close the styling before a linebreak and reopen
+	// after next line to fix a bleed issue on macOS: https://github.com/chalk/chalk/pull/92
+	const lfIndex = string.indexOf('\n');
+	if (lfIndex !== -1) {
+		string = stringEncaseCRLFWithFirstIndex(string, closeAll, openAll, lfIndex);
+	}
 
-  function WriteStream (path, options) {
-    if (!(this instanceof WriteStream)) return new WriteStream(path, options);
+	return openAll + string + closeAll;
+};
 
-    Stream.call(this);
+let template;
+const chalkTag = (chalk, ...strings) => {
+	const [firstString] = strings;
 
-    this.path = path;
-    this.fd = null;
-    this.writable = true;
+	if (!isArray(firstString) || !isArray(firstString.raw)) {
+		// If chalk() was called by itself or with a string,
+		// return the string itself as a string.
+		return strings.join(' ');
+	}
 
-    this.flags = 'w';
-    this.encoding = 'binary';
-    this.mode = 438; /*=0666*/
-    this.bytesWritten = 0;
+	const arguments_ = strings.slice(1);
+	const parts = [firstString.raw[0]];
 
-    options = options || {};
+	for (let i = 1; i < firstString.length; i++) {
+		parts.push(
+			String(arguments_[i - 1]).replace(/[{}\\]/g, '\\$&'),
+			String(firstString.raw[i])
+		);
+	}
 
-    // Mixin options into this
-    var keys = Object.keys(options);
-    for (var index = 0, length = keys.length; index < length; index++) {
-      var key = keys[index];
-      this[key] = options[key];
-    }
+	if (template === undefined) {
+		template = __webpack_require__(235);
+	}
 
-    if (this.start !== undefined) {
-      if ('number' !== typeof this.start) {
-        throw TypeError('start must be a Number');
-      }
-      if (this.start < 0) {
-        throw new Error('start must be >= zero');
-      }
+	return template(chalk, parts.join(''));
+};
 
-      this.pos = this.start;
-    }
+Object.defineProperties(Chalk.prototype, styles);
 
-    this.busy = false;
-    this._queue = [];
+const chalk = Chalk(); // eslint-disable-line new-cap
+chalk.supportsColor = stdoutColor;
+chalk.stderr = Chalk({level: stderrColor ? stderrColor.level : 0}); // eslint-disable-line new-cap
+chalk.stderr.supportsColor = stderrColor;
 
-    if (this.fd === null) {
-      this._open = fs.open;
-      this._queue.push([this._open, this.path, this.flags, this.mode, undefined]);
-      this.flush();
-    }
-  }
-}
+module.exports = chalk;
 
 
 /***/ }),
-/* 224 */
+/* 228 */
 /***/ (function(module, exports, __webpack_require__) {
 
-/**
- * @preserve
- * JS Implementation of incremental MurmurHash3 (r150) (as of May 10, 2013)
- *
- * @author <a href="mailto:jensyt@gmail.com">Jens Taylor</a>
- * @see http://github.com/homebrewing/brauhaus-diff
- * @author <a href="mailto:gary.court@gmail.com">Gary Court</a>
- * @see http://github.com/garycourt/murmurhash-js
- * @author <a href="mailto:aappleby@gmail.com">Austin Appleby</a>
- * @see http://sites.google.com/site/murmurhash/
- */
-(function(){
-    var cache;
+"use strict";
+/* WEBPACK VAR INJECTION */(function(module) {
 
-    // Call this function without `new` to use the cached object (good for
-    // single-threaded environments), or with `new` to create a new object.
-    //
-    // @param {string} key A UTF-16 or ASCII string
-    // @param {number} seed An optional positive integer
-    // @return {object} A MurmurHash3 object for incremental hashing
-    function MurmurHash3(key, seed) {
-        var m = this instanceof MurmurHash3 ? this : cache;
-        m.reset(seed)
-        if (typeof key === 'string' && key.length > 0) {
-            m.hash(key);
-        }
+const wrapAnsi16 = (fn, offset) => (...args) => {
+	const code = fn(...args);
+	return `\u001B[${code + offset}m`;
+};
 
-        if (m !== this) {
-            return m;
-        }
-    };
+const wrapAnsi256 = (fn, offset) => (...args) => {
+	const code = fn(...args);
+	return `\u001B[${38 + offset};5;${code}m`;
+};
 
-    // Incrementally add a string to this hash
-    //
-    // @param {string} key A UTF-16 or ASCII string
-    // @return {object} this
-    MurmurHash3.prototype.hash = function(key) {
-        var h1, k1, i, top, len;
+const wrapAnsi16m = (fn, offset) => (...args) => {
+	const rgb = fn(...args);
+	return `\u001B[${38 + offset};2;${rgb[0]};${rgb[1]};${rgb[2]}m`;
+};
 
-        len = key.length;
-        this.len += len;
+const ansi2ansi = n => n;
+const rgb2rgb = (r, g, b) => [r, g, b];
 
-        k1 = this.k1;
-        i = 0;
-        switch (this.rem) {
-            case 0: k1 ^= len > i ? (key.charCodeAt(i++) & 0xffff) : 0;
-            case 1: k1 ^= len > i ? (key.charCodeAt(i++) & 0xffff) << 8 : 0;
-            case 2: k1 ^= len > i ? (key.charCodeAt(i++) & 0xffff) << 16 : 0;
-            case 3:
-                k1 ^= len > i ? (key.charCodeAt(i) & 0xff) << 24 : 0;
-                k1 ^= len > i ? (key.charCodeAt(i++) & 0xff00) >> 8 : 0;
-        }
+const setLazyProperty = (object, property, get) => {
+	Object.defineProperty(object, property, {
+		get: () => {
+			const value = get();
 
-        this.rem = (len + this.rem) & 3; // & 3 is same as % 4
-        len -= this.rem;
-        if (len > 0) {
-            h1 = this.h1;
-            while (1) {
-                k1 = (k1 * 0x2d51 + (k1 & 0xffff) * 0xcc9e0000) & 0xffffffff;
-                k1 = (k1 << 15) | (k1 >>> 17);
-                k1 = (k1 * 0x3593 + (k1 & 0xffff) * 0x1b870000) & 0xffffffff;
-
-                h1 ^= k1;
-                h1 = (h1 << 13) | (h1 >>> 19);
-                h1 = (h1 * 5 + 0xe6546b64) & 0xffffffff;
-
-                if (i >= len) {
-                    break;
-                }
+			Object.defineProperty(object, property, {
+				value,
+				enumerable: true,
+				configurable: true
+			});
 
-                k1 = ((key.charCodeAt(i++) & 0xffff)) ^
-                     ((key.charCodeAt(i++) & 0xffff) << 8) ^
-                     ((key.charCodeAt(i++) & 0xffff) << 16);
-                top = key.charCodeAt(i++);
-                k1 ^= ((top & 0xff) << 24) ^
-                      ((top & 0xff00) >> 8);
-            }
+			return value;
+		},
+		enumerable: true,
+		configurable: true
+	});
+};
 
-            k1 = 0;
-            switch (this.rem) {
-                case 3: k1 ^= (key.charCodeAt(i + 2) & 0xffff) << 16;
-                case 2: k1 ^= (key.charCodeAt(i + 1) & 0xffff) << 8;
-                case 1: k1 ^= (key.charCodeAt(i) & 0xffff);
-            }
+/** @type {typeof import('color-convert')} */
+let colorConvert;
+const makeDynamicStyles = (wrap, targetSpace, identity, isBackground) => {
+	if (colorConvert === undefined) {
+		colorConvert = __webpack_require__(229);
+	}
 
-            this.h1 = h1;
-        }
+	const offset = isBackground ? 10 : 0;
+	const styles = {};
 
-        this.k1 = k1;
-        return this;
-    };
+	for (const [sourceSpace, suite] of Object.entries(colorConvert)) {
+		const name = sourceSpace === 'ansi16' ? 'ansi' : sourceSpace;
+		if (sourceSpace === targetSpace) {
+			styles[name] = wrap(identity, offset);
+		} else if (typeof suite === 'object') {
+			styles[name] = wrap(suite[targetSpace], offset);
+		}
+	}
 
-    // Get the result of this hash
-    //
-    // @return {number} The 32-bit hash
-    MurmurHash3.prototype.result = function() {
-        var k1, h1;
-        
-        k1 = this.k1;
-        h1 = this.h1;
+	return styles;
+};
 
-        if (k1 > 0) {
-            k1 = (k1 * 0x2d51 + (k1 & 0xffff) * 0xcc9e0000) & 0xffffffff;
-            k1 = (k1 << 15) | (k1 >>> 17);
-            k1 = (k1 * 0x3593 + (k1 & 0xffff) * 0x1b870000) & 0xffffffff;
-            h1 ^= k1;
-        }
+function assembleStyles() {
+	const codes = new Map();
+	const styles = {
+		modifier: {
+			reset: [0, 0],
+			// 21 isn't widely supported and 22 does the same thing
+			bold: [1, 22],
+			dim: [2, 22],
+			italic: [3, 23],
+			underline: [4, 24],
+			inverse: [7, 27],
+			hidden: [8, 28],
+			strikethrough: [9, 29]
+		},
+		color: {
+			black: [30, 39],
+			red: [31, 39],
+			green: [32, 39],
+			yellow: [33, 39],
+			blue: [34, 39],
+			magenta: [35, 39],
+			cyan: [36, 39],
+			white: [37, 39],
 
-        h1 ^= this.len;
+			// Bright color
+			blackBright: [90, 39],
+			redBright: [91, 39],
+			greenBright: [92, 39],
+			yellowBright: [93, 39],
+			blueBright: [94, 39],
+			magentaBright: [95, 39],
+			cyanBright: [96, 39],
+			whiteBright: [97, 39]
+		},
+		bgColor: {
+			bgBlack: [40, 49],
+			bgRed: [41, 49],
+			bgGreen: [42, 49],
+			bgYellow: [43, 49],
+			bgBlue: [44, 49],
+			bgMagenta: [45, 49],
+			bgCyan: [46, 49],
+			bgWhite: [47, 49],
 
-        h1 ^= h1 >>> 16;
-        h1 = (h1 * 0xca6b + (h1 & 0xffff) * 0x85eb0000) & 0xffffffff;
-        h1 ^= h1 >>> 13;
-        h1 = (h1 * 0xae35 + (h1 & 0xffff) * 0xc2b20000) & 0xffffffff;
-        h1 ^= h1 >>> 16;
+			// Bright color
+			bgBlackBright: [100, 49],
+			bgRedBright: [101, 49],
+			bgGreenBright: [102, 49],
+			bgYellowBright: [103, 49],
+			bgBlueBright: [104, 49],
+			bgMagentaBright: [105, 49],
+			bgCyanBright: [106, 49],
+			bgWhiteBright: [107, 49]
+		}
+	};
 
-        return h1 >>> 0;
-    };
+	// Alias bright black as gray (and grey)
+	styles.color.gray = styles.color.blackBright;
+	styles.bgColor.bgGray = styles.bgColor.bgBlackBright;
+	styles.color.grey = styles.color.blackBright;
+	styles.bgColor.bgGrey = styles.bgColor.bgBlackBright;
 
-    // Reset the hash object for reuse
-    //
-    // @param {number} seed An optional positive integer
-    MurmurHash3.prototype.reset = function(seed) {
-        this.h1 = typeof seed === 'number' ? seed : 0;
-        this.rem = this.k1 = this.len = 0;
-        return this;
-    };
+	for (const [groupName, group] of Object.entries(styles)) {
+		for (const [styleName, style] of Object.entries(group)) {
+			styles[styleName] = {
+				open: `\u001B[${style[0]}m`,
+				close: `\u001B[${style[1]}m`
+			};
 
-    // A cached object to use. This can be safely used if you're in a single-
-    // threaded environment, otherwise you need to create new hashes to use.
-    cache = new MurmurHash3();
+			group[styleName] = styles[styleName];
 
-    if (true) {
-        module.exports = MurmurHash3;
-    } else {}
-}());
+			codes.set(style[0], style[1]);
+		}
 
+		Object.defineProperty(styles, groupName, {
+			value: group,
+			enumerable: false
+		});
+	}
 
-/***/ }),
-/* 225 */
-/***/ (function(module, exports, __webpack_require__) {
+	Object.defineProperty(styles, 'codes', {
+		value: codes,
+		enumerable: false
+	});
 
-// Note: since nyc uses this module to output coverage, any lines
-// that are in the direct sync flow of nyc's outputCoverage are
-// ignored, since we can never get coverage for them.
-var assert = __webpack_require__(139)
-var signals = __webpack_require__(226)
+	styles.color.close = '\u001B[39m';
+	styles.bgColor.close = '\u001B[49m';
 
-var EE = __webpack_require__(155)
-/* istanbul ignore if */
-if (typeof EE !== 'function') {
-  EE = EE.EventEmitter
-}
+	setLazyProperty(styles.color, 'ansi', () => makeDynamicStyles(wrapAnsi16, 'ansi16', ansi2ansi, false));
+	setLazyProperty(styles.color, 'ansi256', () => makeDynamicStyles(wrapAnsi256, 'ansi256', ansi2ansi, false));
+	setLazyProperty(styles.color, 'ansi16m', () => makeDynamicStyles(wrapAnsi16m, 'rgb', rgb2rgb, false));
+	setLazyProperty(styles.bgColor, 'ansi', () => makeDynamicStyles(wrapAnsi16, 'ansi16', ansi2ansi, true));
+	setLazyProperty(styles.bgColor, 'ansi256', () => makeDynamicStyles(wrapAnsi256, 'ansi256', ansi2ansi, true));
+	setLazyProperty(styles.bgColor, 'ansi16m', () => makeDynamicStyles(wrapAnsi16m, 'rgb', rgb2rgb, true));
 
-var emitter
-if (process.__signal_exit_emitter__) {
-  emitter = process.__signal_exit_emitter__
-} else {
-  emitter = process.__signal_exit_emitter__ = new EE()
-  emitter.count = 0
-  emitter.emitted = {}
+	return styles;
 }
 
-// Because this emitter is a global, we have to check to see if a
-// previous version of this library failed to enable infinite listeners.
-// I know what you're about to say.  But literally everything about
-// signal-exit is a compromise with evil.  Get used to it.
-if (!emitter.infinite) {
-  emitter.setMaxListeners(Infinity)
-  emitter.infinite = true
-}
+// Make the export immutable
+Object.defineProperty(module, 'exports', {
+	enumerable: true,
+	get: assembleStyles
+});
 
-module.exports = function (cb, opts) {
-  assert.equal(typeof cb, 'function', 'a callback must be provided for exit handler')
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(114)(module)))
 
-  if (loaded === false) {
-    load()
-  }
+/***/ }),
+/* 229 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  var ev = 'exit'
-  if (opts && opts.alwaysLast) {
-    ev = 'afterexit'
-  }
+const conversions = __webpack_require__(230);
+const route = __webpack_require__(231);
 
-  var remove = function () {
-    emitter.removeListener(ev, cb)
-    if (emitter.listeners('exit').length === 0 &&
-        emitter.listeners('afterexit').length === 0) {
-      unload()
-    }
-  }
-  emitter.on(ev, cb)
+const convert = {};
 
-  return remove
-}
+const models = Object.keys(conversions);
 
-module.exports.unload = unload
-function unload () {
-  if (!loaded) {
-    return
-  }
-  loaded = false
+function wrapRaw(fn) {
+	const wrappedFn = function (...args) {
+		const arg0 = args[0];
+		if (arg0 === undefined || arg0 === null) {
+			return arg0;
+		}
 
-  signals.forEach(function (sig) {
-    try {
-      process.removeListener(sig, sigListeners[sig])
-    } catch (er) {}
-  })
-  process.emit = originalProcessEmit
-  process.reallyExit = originalProcessReallyExit
-  emitter.count -= 1
-}
+		if (arg0.length > 1) {
+			args = arg0;
+		}
 
-function emit (event, code, signal) {
-  if (emitter.emitted[event]) {
-    return
-  }
-  emitter.emitted[event] = true
-  emitter.emit(event, code, signal)
-}
+		return fn(args);
+	};
 
-// { <signal>: <listener fn>, ... }
-var sigListeners = {}
-signals.forEach(function (sig) {
-  sigListeners[sig] = function listener () {
-    // If there are no other listeners, an exit is coming!
-    // Simplest way: remove us and then re-send the signal.
-    // We know that this will kill the process, so we can
-    // safely emit now.
-    var listeners = process.listeners(sig)
-    if (listeners.length === emitter.count) {
-      unload()
-      emit('exit', null, sig)
-      /* istanbul ignore next */
-      emit('afterexit', null, sig)
-      /* istanbul ignore next */
-      process.kill(process.pid, sig)
-    }
-  }
-})
+	// Preserve .conversion property if there is one
+	if ('conversion' in fn) {
+		wrappedFn.conversion = fn.conversion;
+	}
 
-module.exports.signals = function () {
-  return signals
+	return wrappedFn;
 }
 
-module.exports.load = load
+function wrapRounded(fn) {
+	const wrappedFn = function (...args) {
+		const arg0 = args[0];
 
-var loaded = false
+		if (arg0 === undefined || arg0 === null) {
+			return arg0;
+		}
 
-function load () {
-  if (loaded) {
-    return
-  }
-  loaded = true
+		if (arg0.length > 1) {
+			args = arg0;
+		}
 
-  // This is the number of onSignalExit's that are in play.
-  // It's important so that we can count the correct number of
-  // listeners on signals, and don't wait for the other one to
-  // handle it instead of us.
-  emitter.count += 1
+		const result = fn(args);
 
-  signals = signals.filter(function (sig) {
-    try {
-      process.on(sig, sigListeners[sig])
-      return true
-    } catch (er) {
-      return false
-    }
-  })
+		// We're assuming the result is an array here.
+		// see notice in conversions.js; don't use box types
+		// in conversion functions.
+		if (typeof result === 'object') {
+			for (let len = result.length, i = 0; i < len; i++) {
+				result[i] = Math.round(result[i]);
+			}
+		}
 
-  process.emit = processEmit
-  process.reallyExit = processReallyExit
-}
+		return result;
+	};
 
-var originalProcessReallyExit = process.reallyExit
-function processReallyExit (code) {
-  process.exitCode = code || 0
-  emit('exit', process.exitCode, null)
-  /* istanbul ignore next */
-  emit('afterexit', process.exitCode, null)
-  /* istanbul ignore next */
-  originalProcessReallyExit.call(process, process.exitCode)
-}
+	// Preserve .conversion property if there is one
+	if ('conversion' in fn) {
+		wrappedFn.conversion = fn.conversion;
+	}
 
-var originalProcessEmit = process.emit
-function processEmit (ev, arg) {
-  if (ev === 'exit') {
-    if (arg !== undefined) {
-      process.exitCode = arg
-    }
-    var ret = originalProcessEmit.apply(this, arguments)
-    emit('exit', process.exitCode, null)
-    /* istanbul ignore next */
-    emit('afterexit', process.exitCode, null)
-    return ret
-  } else {
-    return originalProcessEmit.apply(this, arguments)
-  }
+	return wrappedFn;
 }
 
+models.forEach(fromModel => {
+	convert[fromModel] = {};
 
-/***/ }),
-/* 226 */
-/***/ (function(module, exports) {
-
-// This is not the set of all possible signals.
-//
-// It IS, however, the set of all signals that trigger
-// an exit on either Linux or BSD systems.  Linux is a
-// superset of the signal names supported on BSD, and
-// the unknown signals just fail to register, so we can
-// catch that easily enough.
-//
-// Don't bother with SIGKILL.  It's uncatchable, which
-// means that we can't fire any callbacks anyway.
-//
-// If a user does happen to register a handler on a non-
-// fatal signal like SIGWINCH or something, and then
-// exit, it'll end up firing `process.emit('exit')`, so
-// the handler will be fired anyway.
-//
-// SIGBUS, SIGFPE, SIGSEGV and SIGILL, when not raised
-// artificially, inherently leave the process in a
-// state from which it is not safe to try and enter JS
-// listeners.
-module.exports = [
-  'SIGABRT',
-  'SIGALRM',
-  'SIGHUP',
-  'SIGINT',
-  'SIGTERM'
-]
+	Object.defineProperty(convert[fromModel], 'channels', {value: conversions[fromModel].channels});
+	Object.defineProperty(convert[fromModel], 'labels', {value: conversions[fromModel].labels});
 
-if (process.platform !== 'win32') {
-  module.exports.push(
-    'SIGVTALRM',
-    'SIGXCPU',
-    'SIGXFSZ',
-    'SIGUSR2',
-    'SIGTRAP',
-    'SIGSYS',
-    'SIGQUIT',
-    'SIGIOT'
-    // should detect profiler and enable/disable accordingly.
-    // see #21
-    // 'SIGPROF'
-  )
-}
+	const routes = route(fromModel);
+	const routeModels = Object.keys(routes);
 
-if (process.platform === 'linux') {
-  module.exports.push(
-    'SIGIO',
-    'SIGPOLL',
-    'SIGPWR',
-    'SIGSTKFLT',
-    'SIGUNUSED'
-  )
-}
+	routeModels.forEach(toModel => {
+		const fn = routes[toModel];
 
+		convert[fromModel][toModel] = wrapRounded(fn);
+		convert[fromModel][toModel].raw = wrapRaw(fn);
+	});
+});
 
-/***/ }),
-/* 227 */
-/***/ (function(module, exports) {
+module.exports = convert;
 
-module.exports = require(undefined);
 
 /***/ }),
-/* 228 */
+/* 230 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/* MIT license */
+/* eslint-disable no-mixed-operators */
+const cssKeywords = __webpack_require__(117);
 
-const isPlainObj = __webpack_require__(229);
+// NOTE: conversions should only return primitive values (i.e. arrays, or
+//       values that give correct `typeof` results).
+//       do not use box values types (i.e. Number(), String(), etc.)
 
-module.exports = (obj, opts) => {
-	if (!isPlainObj(obj)) {
-		throw new TypeError('Expected a plain object');
-	}
+const reverseKeywords = {};
+for (const key of Object.keys(cssKeywords)) {
+	reverseKeywords[cssKeywords[key]] = key;
+}
 
-	opts = opts || {};
+const convert = {
+	rgb: {channels: 3, labels: 'rgb'},
+	hsl: {channels: 3, labels: 'hsl'},
+	hsv: {channels: 3, labels: 'hsv'},
+	hwb: {channels: 3, labels: 'hwb'},
+	cmyk: {channels: 4, labels: 'cmyk'},
+	xyz: {channels: 3, labels: 'xyz'},
+	lab: {channels: 3, labels: 'lab'},
+	lch: {channels: 3, labels: 'lch'},
+	hex: {channels: 1, labels: ['hex']},
+	keyword: {channels: 1, labels: ['keyword']},
+	ansi16: {channels: 1, labels: ['ansi16']},
+	ansi256: {channels: 1, labels: ['ansi256']},
+	hcg: {channels: 3, labels: ['h', 'c', 'g']},
+	apple: {channels: 3, labels: ['r16', 'g16', 'b16']},
+	gray: {channels: 1, labels: ['gray']}
+};
 
-	// DEPRECATED
-	if (typeof opts === 'function') {
-		throw new TypeError('Specify the compare function as an option instead');
+module.exports = convert;
+
+// Hide .channels and .labels properties
+for (const model of Object.keys(convert)) {
+	if (!('channels' in convert[model])) {
+		throw new Error('missing channels property: ' + model);
 	}
 
-	const deep = opts.deep;
-	const seenInput = [];
-	const seenOutput = [];
+	if (!('labels' in convert[model])) {
+		throw new Error('missing channel labels property: ' + model);
+	}
 
-	const sortKeys = x => {
-		const seenIndex = seenInput.indexOf(x);
+	if (convert[model].labels.length !== convert[model].channels) {
+		throw new Error('channel and label counts mismatch: ' + model);
+	}
 
-		if (seenIndex !== -1) {
-			return seenOutput[seenIndex];
-		}
+	const {channels, labels} = convert[model];
+	delete convert[model].channels;
+	delete convert[model].labels;
+	Object.defineProperty(convert[model], 'channels', {value: channels});
+	Object.defineProperty(convert[model], 'labels', {value: labels});
+}
 
-		const ret = {};
-		const keys = Object.keys(x).sort(opts.compare);
+convert.rgb.hsl = function (rgb) {
+	const r = rgb[0] / 255;
+	const g = rgb[1] / 255;
+	const b = rgb[2] / 255;
+	const min = Math.min(r, g, b);
+	const max = Math.max(r, g, b);
+	const delta = max - min;
+	let h;
+	let s;
 
-		seenInput.push(x);
-		seenOutput.push(ret);
+	if (max === min) {
+		h = 0;
+	} else if (r === max) {
+		h = (g - b) / delta;
+	} else if (g === max) {
+		h = 2 + (b - r) / delta;
+	} else if (b === max) {
+		h = 4 + (r - g) / delta;
+	}
 
-		for (let i = 0; i < keys.length; i++) {
-			const key = keys[i];
-			const val = x[key];
+	h = Math.min(h * 60, 360);
 
-			if (deep && Array.isArray(val)) {
-				const retArr = [];
+	if (h < 0) {
+		h += 360;
+	}
 
-				for (let j = 0; j < val.length; j++) {
-					retArr[j] = isPlainObj(val[j]) ? sortKeys(val[j]) : val[j];
-				}
+	const l = (min + max) / 2;
 
-				ret[key] = retArr;
-				continue;
-			}
+	if (max === min) {
+		s = 0;
+	} else if (l <= 0.5) {
+		s = delta / (max + min);
+	} else {
+		s = delta / (2 - max - min);
+	}
 
-			ret[key] = deep && isPlainObj(val) ? sortKeys(val) : val;
-		}
+	return [h, s * 100, l * 100];
+};
 
-		return ret;
+convert.rgb.hsv = function (rgb) {
+	let rdif;
+	let gdif;
+	let bdif;
+	let h;
+	let s;
+
+	const r = rgb[0] / 255;
+	const g = rgb[1] / 255;
+	const b = rgb[2] / 255;
+	const v = Math.max(r, g, b);
+	const diff = v - Math.min(r, g, b);
+	const diffc = function (c) {
+		return (v - c) / 6 / diff + 1 / 2;
 	};
 
-	return sortKeys(obj);
-};
+	if (diff === 0) {
+		h = 0;
+		s = 0;
+	} else {
+		s = diff / v;
+		rdif = diffc(r);
+		gdif = diffc(g);
+		bdif = diffc(b);
+
+		if (r === v) {
+			h = bdif - gdif;
+		} else if (g === v) {
+			h = (1 / 3) + rdif - bdif;
+		} else if (b === v) {
+			h = (2 / 3) + gdif - rdif;
+		}
 
+		if (h < 0) {
+			h += 1;
+		} else if (h > 1) {
+			h -= 1;
+		}
+	}
 
-/***/ }),
-/* 229 */
-/***/ (function(module, exports, __webpack_require__) {
+	return [
+		h * 360,
+		s * 100,
+		v * 100
+	];
+};
 
-"use strict";
+convert.rgb.hwb = function (rgb) {
+	const r = rgb[0];
+	const g = rgb[1];
+	let b = rgb[2];
+	const h = convert.rgb.hsl(rgb)[0];
+	const w = 1 / 255 * Math.min(r, Math.min(g, b));
 
-var toString = Object.prototype.toString;
+	b = 1 - 1 / 255 * Math.max(r, Math.max(g, b));
 
-module.exports = function (x) {
-	var prototype;
-	return toString.call(x) === '[object Object]' && (prototype = Object.getPrototypeOf(x), prototype === null || prototype === Object.getPrototypeOf({}));
+	return [h, w * 100, b * 100];
 };
 
+convert.rgb.cmyk = function (rgb) {
+	const r = rgb[0] / 255;
+	const g = rgb[1] / 255;
+	const b = rgb[2] / 255;
 
-/***/ }),
-/* 230 */
-/***/ (function(module, exports, __webpack_require__) {
+	const k = Math.min(1 - r, 1 - g, 1 - b);
+	const c = (1 - r - k) / (1 - k) || 0;
+	const m = (1 - g - k) / (1 - k) || 0;
+	const y = (1 - b - k) / (1 - k) || 0;
 
-"use strict";
+	return [c * 100, m * 100, y * 100, k * 100];
+};
 
-const fs = __webpack_require__(133);
-const path = __webpack_require__(4);
-const pify = __webpack_require__(231);
-const semver = __webpack_require__(189);
+function comparativeDistance(x, y) {
+	/*
+		See https://en.m.wikipedia.org/wiki/Euclidean_distance#Squared_Euclidean_distance
+	*/
+	return (
+		((x[0] - y[0]) ** 2) +
+		((x[1] - y[1]) ** 2) +
+		((x[2] - y[2]) ** 2)
+	);
+}
 
-const defaults = {
-	mode: 0o777 & (~process.umask()),
-	fs
-};
+convert.rgb.keyword = function (rgb) {
+	const reversed = reverseKeywords[rgb];
+	if (reversed) {
+		return reversed;
+	}
 
-const useNativeRecursiveOption = semver.satisfies(process.version, '>=10.12.0');
+	let currentClosestDistance = Infinity;
+	let currentClosestKeyword;
 
-// https://github.com/nodejs/node/issues/8987
-// https://github.com/libuv/libuv/pull/1088
-const checkPath = pth => {
-	if (process.platform === 'win32') {
-		const pathHasInvalidWinCharacters = /[<>:"|?*]/.test(pth.replace(path.parse(pth).root, ''));
+	for (const keyword of Object.keys(cssKeywords)) {
+		const value = cssKeywords[keyword];
 
-		if (pathHasInvalidWinCharacters) {
-			const error = new Error(`Path contains invalid characters: ${pth}`);
-			error.code = 'EINVAL';
-			throw error;
+		// Compute comparative distance
+		const distance = comparativeDistance(rgb, value);
+
+		// Check if its less, if so set as closest
+		if (distance < currentClosestDistance) {
+			currentClosestDistance = distance;
+			currentClosestKeyword = keyword;
 		}
 	}
-};
 
-const permissionError = pth => {
-	// This replicates the exception of `fs.mkdir` with native the
-	// `recusive` option when run on an invalid drive under Windows.
-	const error = new Error(`operation not permitted, mkdir '${pth}'`);
-	error.code = 'EPERM';
-	error.errno = -4048;
-	error.path = pth;
-	error.syscall = 'mkdir';
-	return error;
+	return currentClosestKeyword;
 };
 
-const makeDir = (input, options) => Promise.resolve().then(() => {
-	checkPath(input);
-	options = Object.assign({}, defaults, options);
-
-	// TODO: Use util.promisify when targeting Node.js 8
-	const mkdir = pify(options.fs.mkdir);
-	const stat = pify(options.fs.stat);
-
-	if (useNativeRecursiveOption && options.fs.mkdir === fs.mkdir) {
-		const pth = path.resolve(input);
-
-		return mkdir(pth, {
-			mode: options.mode,
-			recursive: true
-		}).then(() => pth);
-	}
+convert.keyword.rgb = function (keyword) {
+	return cssKeywords[keyword];
+};
 
-	const make = pth => {
-		return mkdir(pth, options.mode)
-			.then(() => pth)
-			.catch(error => {
-				if (error.code === 'EPERM') {
-					throw error;
-				}
+convert.rgb.xyz = function (rgb) {
+	let r = rgb[0] / 255;
+	let g = rgb[1] / 255;
+	let b = rgb[2] / 255;
 
-				if (error.code === 'ENOENT') {
-					if (path.dirname(pth) === pth) {
-						throw permissionError(pth);
-					}
+	// Assume sRGB
+	r = r > 0.04045 ? (((r + 0.055) / 1.055) ** 2.4) : (r / 12.92);
+	g = g > 0.04045 ? (((g + 0.055) / 1.055) ** 2.4) : (g / 12.92);
+	b = b > 0.04045 ? (((b + 0.055) / 1.055) ** 2.4) : (b / 12.92);
 
-					if (error.message.includes('null bytes')) {
-						throw error;
-					}
+	const x = (r * 0.4124) + (g * 0.3576) + (b * 0.1805);
+	const y = (r * 0.2126) + (g * 0.7152) + (b * 0.0722);
+	const z = (r * 0.0193) + (g * 0.1192) + (b * 0.9505);
 
-					return make(path.dirname(pth)).then(() => make(pth));
-				}
+	return [x * 100, y * 100, z * 100];
+};
 
-				return stat(pth)
-					.then(stats => stats.isDirectory() ? pth : Promise.reject())
-					.catch(() => {
-						throw error;
-					});
-			});
-	};
+convert.rgb.lab = function (rgb) {
+	const xyz = convert.rgb.xyz(rgb);
+	let x = xyz[0];
+	let y = xyz[1];
+	let z = xyz[2];
 
-	return make(path.resolve(input));
-});
+	x /= 95.047;
+	y /= 100;
+	z /= 108.883;
 
-module.exports = makeDir;
-module.exports.default = makeDir;
+	x = x > 0.008856 ? (x ** (1 / 3)) : (7.787 * x) + (16 / 116);
+	y = y > 0.008856 ? (y ** (1 / 3)) : (7.787 * y) + (16 / 116);
+	z = z > 0.008856 ? (z ** (1 / 3)) : (7.787 * z) + (16 / 116);
 
-module.exports.sync = (input, options) => {
-	checkPath(input);
-	options = Object.assign({}, defaults, options);
+	const l = (116 * y) - 16;
+	const a = 500 * (x - y);
+	const b = 200 * (y - z);
 
-	if (useNativeRecursiveOption && options.fs.mkdirSync === fs.mkdirSync) {
-		const pth = path.resolve(input);
+	return [l, a, b];
+};
 
-		fs.mkdirSync(pth, {
-			mode: options.mode,
-			recursive: true
-		});
+convert.hsl.rgb = function (hsl) {
+	const h = hsl[0] / 360;
+	const s = hsl[1] / 100;
+	const l = hsl[2] / 100;
+	let t2;
+	let t3;
+	let val;
 
-		return pth;
+	if (s === 0) {
+		val = l * 255;
+		return [val, val, val];
 	}
 
-	const make = pth => {
-		try {
-			options.fs.mkdirSync(pth, options.mode);
-		} catch (error) {
-			if (error.code === 'EPERM') {
-				throw error;
-			}
+	if (l < 0.5) {
+		t2 = l * (1 + s);
+	} else {
+		t2 = l + s - l * s;
+	}
 
-			if (error.code === 'ENOENT') {
-				if (path.dirname(pth) === pth) {
-					throw permissionError(pth);
-				}
+	const t1 = 2 * l - t2;
 
-				if (error.message.includes('null bytes')) {
-					throw error;
-				}
+	const rgb = [0, 0, 0];
+	for (let i = 0; i < 3; i++) {
+		t3 = h + 1 / 3 * -(i - 1);
+		if (t3 < 0) {
+			t3++;
+		}
 
-				make(path.dirname(pth));
-				return make(pth);
-			}
+		if (t3 > 1) {
+			t3--;
+		}
 
-			try {
-				if (!options.fs.statSync(pth).isDirectory()) {
-					throw new Error('The path is not a directory');
-				}
-			} catch (_) {
-				throw error;
-			}
+		if (6 * t3 < 1) {
+			val = t1 + (t2 - t1) * 6 * t3;
+		} else if (2 * t3 < 1) {
+			val = t2;
+		} else if (3 * t3 < 2) {
+			val = t1 + (t2 - t1) * (2 / 3 - t3) * 6;
+		} else {
+			val = t1;
 		}
 
-		return pth;
-	};
+		rgb[i] = val * 255;
+	}
 
-	return make(path.resolve(input));
+	return rgb;
 };
 
+convert.hsl.hsv = function (hsl) {
+	const h = hsl[0];
+	let s = hsl[1] / 100;
+	let l = hsl[2] / 100;
+	let smin = s;
+	const lmin = Math.max(l, 0.01);
 
-/***/ }),
-/* 231 */
-/***/ (function(module, exports, __webpack_require__) {
+	l *= 2;
+	s *= (l <= 1) ? l : 2 - l;
+	smin *= lmin <= 1 ? lmin : 2 - lmin;
+	const v = (l + s) / 2;
+	const sv = l === 0 ? (2 * smin) / (lmin + smin) : (2 * s) / (l + s);
 
-"use strict";
+	return [h, sv * 100, v * 100];
+};
 
+convert.hsv.rgb = function (hsv) {
+	const h = hsv[0] / 60;
+	const s = hsv[1] / 100;
+	let v = hsv[2] / 100;
+	const hi = Math.floor(h) % 6;
 
-const processFn = (fn, options) => function (...args) {
-	const P = options.promiseModule;
+	const f = h - Math.floor(h);
+	const p = 255 * v * (1 - s);
+	const q = 255 * v * (1 - (s * f));
+	const t = 255 * v * (1 - (s * (1 - f)));
+	v *= 255;
 
-	return new P((resolve, reject) => {
-		if (options.multiArgs) {
-			args.push((...result) => {
-				if (options.errorFirst) {
-					if (result[0]) {
-						reject(result);
-					} else {
-						result.shift();
-						resolve(result);
-					}
-				} else {
-					resolve(result);
-				}
-			});
-		} else if (options.errorFirst) {
-			args.push((error, result) => {
-				if (error) {
-					reject(error);
-				} else {
-					resolve(result);
-				}
-			});
-		} else {
-			args.push(resolve);
-		}
+	switch (hi) {
+		case 0:
+			return [v, t, p];
+		case 1:
+			return [q, v, p];
+		case 2:
+			return [p, v, t];
+		case 3:
+			return [p, q, v];
+		case 4:
+			return [t, p, v];
+		case 5:
+			return [v, p, q];
+	}
+};
 
-		fn.apply(this, args);
-	});
+convert.hsv.hsl = function (hsv) {
+	const h = hsv[0];
+	const s = hsv[1] / 100;
+	const v = hsv[2] / 100;
+	const vmin = Math.max(v, 0.01);
+	let sl;
+	let l;
+
+	l = (2 - s) * v;
+	const lmin = (2 - s) * vmin;
+	sl = s * vmin;
+	sl /= (lmin <= 1) ? lmin : 2 - lmin;
+	sl = sl || 0;
+	l /= 2;
+
+	return [h, sl * 100, l * 100];
 };
 
-module.exports = (input, options) => {
-	options = Object.assign({
-		exclude: [/.+(Sync|Stream)$/],
-		errorFirst: true,
-		promiseModule: Promise
-	}, options);
+// http://dev.w3.org/csswg/css-color/#hwb-to-rgb
+convert.hwb.rgb = function (hwb) {
+	const h = hwb[0] / 360;
+	let wh = hwb[1] / 100;
+	let bl = hwb[2] / 100;
+	const ratio = wh + bl;
+	let f;
 
-	const objType = typeof input;
-	if (!(input !== null && (objType === 'object' || objType === 'function'))) {
-		throw new TypeError(`Expected \`input\` to be a \`Function\` or \`Object\`, got \`${input === null ? 'null' : objType}\``);
+	// Wh + bl cant be > 1
+	if (ratio > 1) {
+		wh /= ratio;
+		bl /= ratio;
 	}
 
-	const filter = key => {
-		const match = pattern => typeof pattern === 'string' ? key === pattern : pattern.test(key);
-		return options.include ? options.include.some(match) : !options.exclude.some(match);
-	};
+	const i = Math.floor(6 * h);
+	const v = 1 - bl;
+	f = 6 * h - i;
 
-	let ret;
-	if (objType === 'function') {
-		ret = function (...args) {
-			return options.excludeMain ? input(...args) : processFn(input, options).apply(this, args);
-		};
-	} else {
-		ret = Object.create(Object.getPrototypeOf(input));
+	if ((i & 0x01) !== 0) {
+		f = 1 - f;
 	}
 
-	for (const key in input) { // eslint-disable-line guard-for-in
-		const property = input[key];
-		ret[key] = typeof property === 'function' && filter(key) ? processFn(property, options) : property;
+	const n = wh + f * (v - wh); // Linear interpolation
+
+	let r;
+	let g;
+	let b;
+	/* eslint-disable max-statements-per-line,no-multi-spaces */
+	switch (i) {
+		default:
+		case 6:
+		case 0: r = v;  g = n;  b = wh; break;
+		case 1: r = n;  g = v;  b = wh; break;
+		case 2: r = wh; g = v;  b = n; break;
+		case 3: r = wh; g = n;  b = v; break;
+		case 4: r = n;  g = wh; b = v; break;
+		case 5: r = v;  g = wh; b = n; break;
 	}
+	/* eslint-enable max-statements-per-line,no-multi-spaces */
 
-	return ret;
+	return [r * 255, g * 255, b * 255];
 };
 
+convert.cmyk.rgb = function (cmyk) {
+	const c = cmyk[0] / 100;
+	const m = cmyk[1] / 100;
+	const y = cmyk[2] / 100;
+	const k = cmyk[3] / 100;
 
-/***/ }),
-/* 232 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+	const r = 1 - Math.min(1, c * (1 - k) + k);
+	const g = 1 - Math.min(1, m * (1 - k) + k);
+	const b = 1 - Math.min(1, y * (1 - k) + k);
 
+	return [r * 255, g * 255, b * 255];
+};
 
-// detect either spaces or tabs but not both to properly handle tabs
-// for indentation and spaces for alignment
-const INDENT_RE = /^(?:( )+|\t+)/;
+convert.xyz.rgb = function (xyz) {
+	const x = xyz[0] / 100;
+	const y = xyz[1] / 100;
+	const z = xyz[2] / 100;
+	let r;
+	let g;
+	let b;
 
-function getMostUsed(indents) {
-	let result = 0;
-	let maxUsed = 0;
-	let maxWeight = 0;
+	r = (x * 3.2406) + (y * -1.5372) + (z * -0.4986);
+	g = (x * -0.9689) + (y * 1.8758) + (z * 0.0415);
+	b = (x * 0.0557) + (y * -0.2040) + (z * 1.0570);
 
-	for (const entry of indents) {
-		// TODO: use destructuring when targeting Node.js 6
-		const key = entry[0];
-		const val = entry[1];
+	// Assume sRGB
+	r = r > 0.0031308
+		? ((1.055 * (r ** (1.0 / 2.4))) - 0.055)
+		: r * 12.92;
 
-		const u = val[0];
-		const w = val[1];
+	g = g > 0.0031308
+		? ((1.055 * (g ** (1.0 / 2.4))) - 0.055)
+		: g * 12.92;
 
-		if (u > maxUsed || (u === maxUsed && w > maxWeight)) {
-			maxUsed = u;
-			maxWeight = w;
-			result = Number(key);
-		}
-	}
+	b = b > 0.0031308
+		? ((1.055 * (b ** (1.0 / 2.4))) - 0.055)
+		: b * 12.92;
 
-	return result;
-}
-
-module.exports = str => {
-	if (typeof str !== 'string') {
-		throw new TypeError('Expected a string');
-	}
+	r = Math.min(Math.max(0, r), 1);
+	g = Math.min(Math.max(0, g), 1);
+	b = Math.min(Math.max(0, b), 1);
 
-	// used to see if tabs or spaces are the most used
-	let tabs = 0;
-	let spaces = 0;
+	return [r * 255, g * 255, b * 255];
+};
 
-	// remember the size of previous line's indentation
-	let prev = 0;
+convert.xyz.lab = function (xyz) {
+	let x = xyz[0];
+	let y = xyz[1];
+	let z = xyz[2];
 
-	// remember how many indents/unindents as occurred for a given size
-	// and how much lines follow a given indentation
-	//
-	// indents = {
-	//    3: [1, 0],
-	//    4: [1, 5],
-	//    5: [1, 0],
-	//   12: [1, 0],
-	// }
-	const indents = new Map();
+	x /= 95.047;
+	y /= 100;
+	z /= 108.883;
 
-	// pointer to the array of last used indent
-	let current;
+	x = x > 0.008856 ? (x ** (1 / 3)) : (7.787 * x) + (16 / 116);
+	y = y > 0.008856 ? (y ** (1 / 3)) : (7.787 * y) + (16 / 116);
+	z = z > 0.008856 ? (z ** (1 / 3)) : (7.787 * z) + (16 / 116);
 
-	// whether the last action was an indent (opposed to an unindent)
-	let isIndent;
+	const l = (116 * y) - 16;
+	const a = 500 * (x - y);
+	const b = 200 * (y - z);
 
-	for (const line of str.split(/\n/g)) {
-		if (!line) {
-			// ignore empty lines
-			continue;
-		}
+	return [l, a, b];
+};
 
-		let indent;
-		const matches = line.match(INDENT_RE);
+convert.lab.xyz = function (lab) {
+	const l = lab[0];
+	const a = lab[1];
+	const b = lab[2];
+	let x;
+	let y;
+	let z;
 
-		if (matches) {
-			indent = matches[0].length;
+	y = (l + 16) / 116;
+	x = a / 500 + y;
+	z = y - b / 200;
 
-			if (matches[1]) {
-				spaces++;
-			} else {
-				tabs++;
-			}
-		} else {
-			indent = 0;
-		}
+	const y2 = y ** 3;
+	const x2 = x ** 3;
+	const z2 = z ** 3;
+	y = y2 > 0.008856 ? y2 : (y - 16 / 116) / 7.787;
+	x = x2 > 0.008856 ? x2 : (x - 16 / 116) / 7.787;
+	z = z2 > 0.008856 ? z2 : (z - 16 / 116) / 7.787;
 
-		const diff = indent - prev;
-		prev = indent;
+	x *= 95.047;
+	y *= 100;
+	z *= 108.883;
 
-		if (diff) {
-			// an indent or unindent has been detected
+	return [x, y, z];
+};
 
-			isIndent = diff > 0;
+convert.lab.lch = function (lab) {
+	const l = lab[0];
+	const a = lab[1];
+	const b = lab[2];
+	let h;
 
-			current = indents.get(isIndent ? diff : -diff);
+	const hr = Math.atan2(b, a);
+	h = hr * 360 / 2 / Math.PI;
 
-			if (current) {
-				current[0]++;
-			} else {
-				current = [1, 0];
-				indents.set(diff, current);
-			}
-		} else if (current) {
-			// if the last action was an indent, increment the weight
-			current[1] += Number(isIndent);
-		}
+	if (h < 0) {
+		h += 360;
 	}
 
-	const amount = getMostUsed(indents);
-
-	let type;
-	let indent;
-	if (!amount) {
-		type = null;
-		indent = '';
-	} else if (spaces >= tabs) {
-		type = 'space';
-		indent = ' '.repeat(amount);
-	} else {
-		type = 'tab';
-		indent = '\t'.repeat(amount);
-	}
+	const c = Math.sqrt(a * a + b * b);
 
-	return {
-		amount,
-		type,
-		indent
-	};
+	return [l, c, h];
 };
 
+convert.lch.lab = function (lch) {
+	const l = lch[0];
+	const c = lch[1];
+	const h = lch[2];
 
-/***/ }),
-/* 233 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	const hr = h / 360 * 2 * Math.PI;
+	const a = c * Math.cos(hr);
+	const b = c * Math.sin(hr);
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "installInDir", function() { return installInDir; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "runScriptInPackage", function() { return runScriptInPackage; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "runScriptInPackageStreaming", function() { return runScriptInPackageStreaming; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "yarnWorkspacesInfo", function() { return yarnWorkspacesInfo; });
-/* harmony import */ var _child_process__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(234);
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
+	return [l, a, b];
+};
 
-const YARN_EXEC = process.env.npm_execpath || 'yarn';
+convert.rgb.ansi16 = function (args, saturation = null) {
+	const [r, g, b] = args;
+	let value = saturation === null ? convert.rgb.hsv(args)[2] : saturation; // Hsv -> ansi16 optimization
 
-/**
- * Install all dependencies in the given directory
- */
-async function installInDir(directory, extraArgs = []) {
-  const options = ['install', '--non-interactive', ...extraArgs]; // We pass the mutex flag to ensure only one instance of yarn runs at any
-  // given time (e.g. to avoid conflicts).
+	value = Math.round(value / 50);
 
-  await Object(_child_process__WEBPACK_IMPORTED_MODULE_0__["spawn"])(YARN_EXEC, options, {
-    cwd: directory
-  });
-}
-/**
- * Run script in the given directory
- */
+	if (value === 0) {
+		return 30;
+	}
 
-async function runScriptInPackage(script, args, pkg) {
-  const execOpts = {
-    cwd: pkg.path
-  };
-  await Object(_child_process__WEBPACK_IMPORTED_MODULE_0__["spawn"])(YARN_EXEC, ['run', script, ...args], execOpts);
-}
-/**
- * Run script in the given directory
- */
+	let ansi = 30
+		+ ((Math.round(b / 255) << 2)
+		| (Math.round(g / 255) << 1)
+		| Math.round(r / 255));
 
-function runScriptInPackageStreaming({
-  script,
-  args,
-  pkg,
-  debug
-}) {
-  const execOpts = {
-    cwd: pkg.path
-  };
-  return Object(_child_process__WEBPACK_IMPORTED_MODULE_0__["spawnStreaming"])(YARN_EXEC, ['run', script, ...args], execOpts, {
-    prefix: pkg.name,
-    debug
-  });
-}
-async function yarnWorkspacesInfo(directory) {
-  const {
-    stdout
-  } = await Object(_child_process__WEBPACK_IMPORTED_MODULE_0__["spawn"])(YARN_EXEC, ['--json', 'workspaces', 'info'], {
-    cwd: directory,
-    stdio: 'pipe'
-  });
+	if (value === 2) {
+		ansi += 60;
+	}
 
-  try {
-    return JSON.parse(JSON.parse(stdout).data);
-  } catch (error) {
-    throw new Error(`'yarn workspaces info --json' produced unexpected output: \n${stdout}`);
-  }
-}
+	return ansi;
+};
 
-/***/ }),
-/* 234 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+convert.hsv.ansi16 = function (args) {
+	// Optimization here; we already know the value and don't need to get
+	// it converted for us.
+	return convert.rgb.ansi16(convert.hsv.rgb(args), args[2]);
+};
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "spawn", function() { return spawn; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "spawnStreaming", function() { return spawnStreaming; });
-/* harmony import */ var stream__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(137);
-/* harmony import */ var stream__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(stream__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(235);
-/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(244);
-/* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(execa__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var strong_log_transformer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(279);
-/* harmony import */ var strong_log_transformer__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(strong_log_transformer__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(143);
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+convert.rgb.ansi256 = function (args) {
+	const r = args[0];
+	const g = args[1];
+	const b = args[2];
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+	// We use the extended greyscale palette here, with the exception of
+	// black and white. normal palette only has 4 greyscale shades.
+	if (r === g && g === b) {
+		if (r < 8) {
+			return 16;
+		}
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+		if (r > 248) {
+			return 231;
+		}
 
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
+		return Math.round(((r - 8) / 247) * 24) + 232;
+	}
+
+	const ansi = 16
+		+ (36 * Math.round(r / 255 * 5))
+		+ (6 * Math.round(g / 255 * 5))
+		+ Math.round(b / 255 * 5);
 
+	return ansi;
+};
 
+convert.ansi16.rgb = function (args) {
+	let color = args % 10;
 
+	// Handle greyscale
+	if (color === 0 || color === 7) {
+		if (args > 50) {
+			color += 3.5;
+		}
 
+		color = color / 10.5 * 255;
 
-const colorWheel = [chalk__WEBPACK_IMPORTED_MODULE_1___default.a.cyan, chalk__WEBPACK_IMPORTED_MODULE_1___default.a.magenta, chalk__WEBPACK_IMPORTED_MODULE_1___default.a.blue, chalk__WEBPACK_IMPORTED_MODULE_1___default.a.yellow, chalk__WEBPACK_IMPORTED_MODULE_1___default.a.green];
+		return [color, color, color];
+	}
 
-const getColor = () => {
-  const color = colorWheel.shift();
-  colorWheel.push(color);
-  return color;
+	const mult = (~~(args > 50) + 1) * 0.5;
+	const r = ((color & 1) * mult) * 255;
+	const g = (((color >> 1) & 1) * mult) * 255;
+	const b = (((color >> 2) & 1) * mult) * 255;
+
+	return [r, g, b];
 };
 
-function spawn(command, args, opts) {
-  return execa__WEBPACK_IMPORTED_MODULE_2___default()(command, args, _objectSpread({
-    stdio: 'inherit',
-    preferLocal: true
-  }, opts));
-}
+convert.ansi256.rgb = function (args) {
+	// Handle greyscale
+	if (args >= 232) {
+		const c = (args - 232) * 10 + 8;
+		return [c, c, c];
+	}
 
-function streamToLog(debug = true) {
-  return new stream__WEBPACK_IMPORTED_MODULE_0__["Writable"]({
-    objectMode: true,
+	args -= 16;
 
-    write(line, _, cb) {
-      if (line.endsWith('\n')) {
-        _log__WEBPACK_IMPORTED_MODULE_4__["log"][debug ? 'debug' : 'write'](line.slice(0, -1));
-      } else {
-        _log__WEBPACK_IMPORTED_MODULE_4__["log"][debug ? 'debug' : 'write'](line);
-      }
+	let rem;
+	const r = Math.floor(args / 36) / 5 * 255;
+	const g = Math.floor((rem = args % 36) / 6) / 5 * 255;
+	const b = (rem % 6) / 5 * 255;
 
-      cb();
-    }
+	return [r, g, b];
+};
 
-  });
-}
+convert.rgb.hex = function (args) {
+	const integer = ((Math.round(args[0]) & 0xFF) << 16)
+		+ ((Math.round(args[1]) & 0xFF) << 8)
+		+ (Math.round(args[2]) & 0xFF);
 
-function spawnStreaming(command, args, opts, {
-  prefix,
-  debug
-}) {
-  const spawned = execa__WEBPACK_IMPORTED_MODULE_2___default()(command, args, _objectSpread({
-    stdio: ['ignore', 'pipe', 'pipe'],
-    preferLocal: true
-  }, opts));
-  const color = getColor();
-  const prefixedStdout = strong_log_transformer__WEBPACK_IMPORTED_MODULE_3___default()({
-    tag: color.bold(prefix)
-  });
-  const prefixedStderr = strong_log_transformer__WEBPACK_IMPORTED_MODULE_3___default()({
-    mergeMultiline: true,
-    tag: color.bold(prefix)
-  });
-  spawned.stdout.pipe(prefixedStdout).pipe(streamToLog(debug));
-  spawned.stderr.pipe(prefixedStderr).pipe(streamToLog(debug));
-  return spawned;
-}
+	const string = integer.toString(16).toUpperCase();
+	return '000000'.substring(string.length) + string;
+};
 
-/***/ }),
-/* 235 */
-/***/ (function(module, exports, __webpack_require__) {
+convert.hex.rgb = function (args) {
+	const match = args.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);
+	if (!match) {
+		return [0, 0, 0];
+	}
 
-"use strict";
+	let colorString = match[0];
 
-const ansiStyles = __webpack_require__(236);
-const {stdout: stdoutColor, stderr: stderrColor} = __webpack_require__(240);
-const {
-	stringReplaceAll,
-	stringEncaseCRLFWithFirstIndex
-} = __webpack_require__(242);
+	if (match[0].length === 3) {
+		colorString = colorString.split('').map(char => {
+			return char + char;
+		}).join('');
+	}
 
-const {isArray} = Array;
+	const integer = parseInt(colorString, 16);
+	const r = (integer >> 16) & 0xFF;
+	const g = (integer >> 8) & 0xFF;
+	const b = integer & 0xFF;
 
-// `supportsColor.level` → `ansiStyles.color[name]` mapping
-const levelMapping = [
-	'ansi',
-	'ansi',
-	'ansi256',
-	'ansi16m'
-];
+	return [r, g, b];
+};
 
-const styles = Object.create(null);
+convert.rgb.hcg = function (rgb) {
+	const r = rgb[0] / 255;
+	const g = rgb[1] / 255;
+	const b = rgb[2] / 255;
+	const max = Math.max(Math.max(r, g), b);
+	const min = Math.min(Math.min(r, g), b);
+	const chroma = (max - min);
+	let grayscale;
+	let hue;
 
-const applyOptions = (object, options = {}) => {
-	if (options.level && !(Number.isInteger(options.level) && options.level >= 0 && options.level <= 3)) {
-		throw new Error('The `level` option should be an integer from 0 to 3');
+	if (chroma < 1) {
+		grayscale = min / (1 - chroma);
+	} else {
+		grayscale = 0;
 	}
 
-	// Detect level if not set manually
-	const colorLevel = stdoutColor ? stdoutColor.level : 0;
-	object.level = options.level === undefined ? colorLevel : options.level;
-};
-
-class ChalkClass {
-	constructor(options) {
-		// eslint-disable-next-line no-constructor-return
-		return chalkFactory(options);
+	if (chroma <= 0) {
+		hue = 0;
+	} else
+	if (max === r) {
+		hue = ((g - b) / chroma) % 6;
+	} else
+	if (max === g) {
+		hue = 2 + (b - r) / chroma;
+	} else {
+		hue = 4 + (r - g) / chroma;
 	}
-}
 
-const chalkFactory = options => {
-	const chalk = {};
-	applyOptions(chalk, options);
+	hue /= 6;
+	hue %= 1;
 
-	chalk.template = (...arguments_) => chalkTag(chalk.template, ...arguments_);
+	return [hue * 360, chroma * 100, grayscale * 100];
+};
 
-	Object.setPrototypeOf(chalk, Chalk.prototype);
-	Object.setPrototypeOf(chalk.template, chalk);
+convert.hsl.hcg = function (hsl) {
+	const s = hsl[1] / 100;
+	const l = hsl[2] / 100;
 
-	chalk.template.constructor = () => {
-		throw new Error('`chalk.constructor()` is deprecated. Use `new chalk.Instance()` instead.');
-	};
+	const c = l < 0.5 ? (2.0 * s * l) : (2.0 * s * (1.0 - l));
 
-	chalk.template.Instance = ChalkClass;
+	let f = 0;
+	if (c < 1.0) {
+		f = (l - 0.5 * c) / (1.0 - c);
+	}
 
-	return chalk.template;
+	return [hsl[0], c * 100, f * 100];
 };
 
-function Chalk(options) {
-	return chalkFactory(options);
-}
+convert.hsv.hcg = function (hsv) {
+	const s = hsv[1] / 100;
+	const v = hsv[2] / 100;
 
-for (const [styleName, style] of Object.entries(ansiStyles)) {
-	styles[styleName] = {
-		get() {
-			const builder = createBuilder(this, createStyler(style.open, style.close, this._styler), this._isEmpty);
-			Object.defineProperty(this, styleName, {value: builder});
-			return builder;
-		}
-	};
-}
+	const c = s * v;
+	let f = 0;
 
-styles.visible = {
-	get() {
-		const builder = createBuilder(this, this._styler, true);
-		Object.defineProperty(this, 'visible', {value: builder});
-		return builder;
+	if (c < 1.0) {
+		f = (v - c) / (1 - c);
 	}
+
+	return [hsv[0], c * 100, f * 100];
 };
 
-const usedModels = ['rgb', 'hex', 'keyword', 'hsl', 'hsv', 'hwb', 'ansi', 'ansi256'];
+convert.hcg.rgb = function (hcg) {
+	const h = hcg[0] / 360;
+	const c = hcg[1] / 100;
+	const g = hcg[2] / 100;
 
-for (const model of usedModels) {
-	styles[model] = {
-		get() {
-			const {level} = this;
-			return function (...arguments_) {
-				const styler = createStyler(ansiStyles.color[levelMapping[level]][model](...arguments_), ansiStyles.color.close, this._styler);
-				return createBuilder(this, styler, this._isEmpty);
-			};
-		}
-	};
-}
+	if (c === 0.0) {
+		return [g * 255, g * 255, g * 255];
+	}
 
-for (const model of usedModels) {
-	const bgModel = 'bg' + model[0].toUpperCase() + model.slice(1);
-	styles[bgModel] = {
-		get() {
-			const {level} = this;
-			return function (...arguments_) {
-				const styler = createStyler(ansiStyles.bgColor[levelMapping[level]][model](...arguments_), ansiStyles.bgColor.close, this._styler);
-				return createBuilder(this, styler, this._isEmpty);
-			};
-		}
-	};
-}
+	const pure = [0, 0, 0];
+	const hi = (h % 1) * 6;
+	const v = hi % 1;
+	const w = 1 - v;
+	let mg = 0;
 
-const proto = Object.defineProperties(() => {}, {
-	...styles,
-	level: {
-		enumerable: true,
-		get() {
-			return this._generator.level;
-		},
-		set(level) {
-			this._generator.level = level;
-		}
+	/* eslint-disable max-statements-per-line */
+	switch (Math.floor(hi)) {
+		case 0:
+			pure[0] = 1; pure[1] = v; pure[2] = 0; break;
+		case 1:
+			pure[0] = w; pure[1] = 1; pure[2] = 0; break;
+		case 2:
+			pure[0] = 0; pure[1] = 1; pure[2] = v; break;
+		case 3:
+			pure[0] = 0; pure[1] = w; pure[2] = 1; break;
+		case 4:
+			pure[0] = v; pure[1] = 0; pure[2] = 1; break;
+		default:
+			pure[0] = 1; pure[1] = 0; pure[2] = w;
 	}
-});
+	/* eslint-enable max-statements-per-line */
 
-const createStyler = (open, close, parent) => {
-	let openAll;
-	let closeAll;
-	if (parent === undefined) {
-		openAll = open;
-		closeAll = close;
-	} else {
-		openAll = parent.openAll + open;
-		closeAll = close + parent.closeAll;
-	}
+	mg = (1.0 - c) * g;
 
-	return {
-		open,
-		close,
-		openAll,
-		closeAll,
-		parent
-	};
+	return [
+		(c * pure[0] + mg) * 255,
+		(c * pure[1] + mg) * 255,
+		(c * pure[2] + mg) * 255
+	];
 };
 
-const createBuilder = (self, _styler, _isEmpty) => {
-	const builder = (...arguments_) => {
-		if (isArray(arguments_[0]) && isArray(arguments_[0].raw)) {
-			// Called as a template literal, for example: chalk.red`2 + 3 = {bold ${2+3}}`
-			return applyStyle(builder, chalkTag(builder, ...arguments_));
-		}
-
-		// Single argument is hot path, implicit coercion is faster than anything
-		// eslint-disable-next-line no-implicit-coercion
-		return applyStyle(builder, (arguments_.length === 1) ? ('' + arguments_[0]) : arguments_.join(' '));
-	};
+convert.hcg.hsv = function (hcg) {
+	const c = hcg[1] / 100;
+	const g = hcg[2] / 100;
 
-	// We alter the prototype because we must return a function, but there is
-	// no way to create a function with a different prototype
-	Object.setPrototypeOf(builder, proto);
+	const v = c + g * (1.0 - c);
+	let f = 0;
 
-	builder._generator = self;
-	builder._styler = _styler;
-	builder._isEmpty = _isEmpty;
+	if (v > 0.0) {
+		f = c / v;
+	}
 
-	return builder;
+	return [hcg[0], f * 100, v * 100];
 };
 
-const applyStyle = (self, string) => {
-	if (self.level <= 0 || !string) {
-		return self._isEmpty ? '' : string;
-	}
+convert.hcg.hsl = function (hcg) {
+	const c = hcg[1] / 100;
+	const g = hcg[2] / 100;
 
-	let styler = self._styler;
+	const l = g * (1.0 - c) + 0.5 * c;
+	let s = 0;
 
-	if (styler === undefined) {
-		return string;
+	if (l > 0.0 && l < 0.5) {
+		s = c / (2 * l);
+	} else
+	if (l >= 0.5 && l < 1.0) {
+		s = c / (2 * (1 - l));
 	}
 
-	const {openAll, closeAll} = styler;
-	if (string.indexOf('\u001B') !== -1) {
-		while (styler !== undefined) {
-			// Replace any instances already present with a re-opening code
-			// otherwise only the part of the string until said closing code
-			// will be colored, and the rest will simply be 'plain'.
-			string = stringReplaceAll(string, styler.close, styler.open);
+	return [hcg[0], s * 100, l * 100];
+};
 
-			styler = styler.parent;
-		}
-	}
+convert.hcg.hwb = function (hcg) {
+	const c = hcg[1] / 100;
+	const g = hcg[2] / 100;
+	const v = c + g * (1.0 - c);
+	return [hcg[0], (v - c) * 100, (1 - v) * 100];
+};
 
-	// We can move both next actions out of loop, because remaining actions in loop won't have
-	// any/visible effect on parts we add here. Close the styling before a linebreak and reopen
-	// after next line to fix a bleed issue on macOS: https://github.com/chalk/chalk/pull/92
-	const lfIndex = string.indexOf('\n');
-	if (lfIndex !== -1) {
-		string = stringEncaseCRLFWithFirstIndex(string, closeAll, openAll, lfIndex);
+convert.hwb.hcg = function (hwb) {
+	const w = hwb[1] / 100;
+	const b = hwb[2] / 100;
+	const v = 1 - b;
+	const c = v - w;
+	let g = 0;
+
+	if (c < 1) {
+		g = (v - c) / (1 - c);
 	}
 
-	return openAll + string + closeAll;
+	return [hwb[0], c * 100, g * 100];
 };
 
-let template;
-const chalkTag = (chalk, ...strings) => {
-	const [firstString] = strings;
+convert.apple.rgb = function (apple) {
+	return [(apple[0] / 65535) * 255, (apple[1] / 65535) * 255, (apple[2] / 65535) * 255];
+};
 
-	if (!isArray(firstString) || !isArray(firstString.raw)) {
-		// If chalk() was called by itself or with a string,
-		// return the string itself as a string.
-		return strings.join(' ');
-	}
+convert.rgb.apple = function (rgb) {
+	return [(rgb[0] / 255) * 65535, (rgb[1] / 255) * 65535, (rgb[2] / 255) * 65535];
+};
 
-	const arguments_ = strings.slice(1);
-	const parts = [firstString.raw[0]];
+convert.gray.rgb = function (args) {
+	return [args[0] / 100 * 255, args[0] / 100 * 255, args[0] / 100 * 255];
+};
 
-	for (let i = 1; i < firstString.length; i++) {
-		parts.push(
-			String(arguments_[i - 1]).replace(/[{}\\]/g, '\\$&'),
-			String(firstString.raw[i])
-		);
-	}
+convert.gray.hsl = function (args) {
+	return [0, 0, args[0]];
+};
 
-	if (template === undefined) {
-		template = __webpack_require__(243);
-	}
+convert.gray.hsv = convert.gray.hsl;
 
-	return template(chalk, parts.join(''));
+convert.gray.hwb = function (gray) {
+	return [0, 100, gray[0]];
 };
 
-Object.defineProperties(Chalk.prototype, styles);
+convert.gray.cmyk = function (gray) {
+	return [0, 0, 0, gray[0]];
+};
 
-const chalk = Chalk(); // eslint-disable-line new-cap
-chalk.supportsColor = stdoutColor;
-chalk.stderr = Chalk({level: stderrColor ? stderrColor.level : 0}); // eslint-disable-line new-cap
-chalk.stderr.supportsColor = stderrColor;
+convert.gray.lab = function (gray) {
+	return [gray[0], 0, 0];
+};
 
-module.exports = chalk;
+convert.gray.hex = function (gray) {
+	const val = Math.round(gray[0] / 100 * 255) & 0xFF;
+	const integer = (val << 16) + (val << 8) + val;
+
+	const string = integer.toString(16).toUpperCase();
+	return '000000'.substring(string.length) + string;
+};
+
+convert.rgb.gray = function (rgb) {
+	const val = (rgb[0] + rgb[1] + rgb[2]) / 3;
+	return [val / 255 * 100];
+};
 
 
 /***/ }),
-/* 236 */
+/* 231 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-/* WEBPACK VAR INJECTION */(function(module) {
+const conversions = __webpack_require__(230);
 
-const wrapAnsi16 = (fn, offset) => (...args) => {
-	const code = fn(...args);
-	return `\u001B[${code + offset}m`;
-};
+/*
+	This function routes a model to all other models.
 
-const wrapAnsi256 = (fn, offset) => (...args) => {
-	const code = fn(...args);
-	return `\u001B[${38 + offset};5;${code}m`;
-};
+	all functions that are routed have a property `.conversion` attached
+	to the returned synthetic function. This property is an array
+	of strings, each with the steps in between the 'from' and 'to'
+	color models (inclusive).
 
-const wrapAnsi16m = (fn, offset) => (...args) => {
-	const rgb = fn(...args);
-	return `\u001B[${38 + offset};2;${rgb[0]};${rgb[1]};${rgb[2]}m`;
-};
+	conversions that are not possible simply are not included.
+*/
 
-const ansi2ansi = n => n;
-const rgb2rgb = (r, g, b) => [r, g, b];
+function buildGraph() {
+	const graph = {};
+	// https://jsperf.com/object-keys-vs-for-in-with-closure/3
+	const models = Object.keys(conversions);
 
-const setLazyProperty = (object, property, get) => {
-	Object.defineProperty(object, property, {
-		get: () => {
-			const value = get();
+	for (let len = models.length, i = 0; i < len; i++) {
+		graph[models[i]] = {
+			// http://jsperf.com/1-vs-infinity
+			// micro-opt, but this is simple.
+			distance: -1,
+			parent: null
+		};
+	}
 
-			Object.defineProperty(object, property, {
-				value,
-				enumerable: true,
-				configurable: true
-			});
+	return graph;
+}
 
-			return value;
-		},
-		enumerable: true,
-		configurable: true
-	});
-};
+// https://en.wikipedia.org/wiki/Breadth-first_search
+function deriveBFS(fromModel) {
+	const graph = buildGraph();
+	const queue = [fromModel]; // Unshift -> queue -> pop
 
-/** @type {typeof import('color-convert')} */
-let colorConvert;
-const makeDynamicStyles = (wrap, targetSpace, identity, isBackground) => {
-	if (colorConvert === undefined) {
-		colorConvert = __webpack_require__(237);
-	}
+	graph[fromModel].distance = 0;
 
-	const offset = isBackground ? 10 : 0;
-	const styles = {};
+	while (queue.length) {
+		const current = queue.pop();
+		const adjacents = Object.keys(conversions[current]);
 
-	for (const [sourceSpace, suite] of Object.entries(colorConvert)) {
-		const name = sourceSpace === 'ansi16' ? 'ansi' : sourceSpace;
-		if (sourceSpace === targetSpace) {
-			styles[name] = wrap(identity, offset);
-		} else if (typeof suite === 'object') {
-			styles[name] = wrap(suite[targetSpace], offset);
+		for (let len = adjacents.length, i = 0; i < len; i++) {
+			const adjacent = adjacents[i];
+			const node = graph[adjacent];
+
+			if (node.distance === -1) {
+				node.distance = graph[current].distance + 1;
+				node.parent = current;
+				queue.unshift(adjacent);
+			}
 		}
 	}
 
-	return styles;
-};
+	return graph;
+}
 
-function assembleStyles() {
-	const codes = new Map();
-	const styles = {
-		modifier: {
-			reset: [0, 0],
-			// 21 isn't widely supported and 22 does the same thing
-			bold: [1, 22],
-			dim: [2, 22],
-			italic: [3, 23],
-			underline: [4, 24],
-			inverse: [7, 27],
-			hidden: [8, 28],
-			strikethrough: [9, 29]
-		},
-		color: {
-			black: [30, 39],
-			red: [31, 39],
-			green: [32, 39],
-			yellow: [33, 39],
-			blue: [34, 39],
-			magenta: [35, 39],
-			cyan: [36, 39],
-			white: [37, 39],
+function link(from, to) {
+	return function (args) {
+		return to(from(args));
+	};
+}
 
-			// Bright color
-			blackBright: [90, 39],
-			redBright: [91, 39],
-			greenBright: [92, 39],
-			yellowBright: [93, 39],
-			blueBright: [94, 39],
-			magentaBright: [95, 39],
-			cyanBright: [96, 39],
-			whiteBright: [97, 39]
-		},
-		bgColor: {
-			bgBlack: [40, 49],
-			bgRed: [41, 49],
-			bgGreen: [42, 49],
-			bgYellow: [43, 49],
-			bgBlue: [44, 49],
-			bgMagenta: [45, 49],
-			bgCyan: [46, 49],
-			bgWhite: [47, 49],
+function wrapConversion(toModel, graph) {
+	const path = [graph[toModel].parent, toModel];
+	let fn = conversions[graph[toModel].parent][toModel];
 
-			// Bright color
-			bgBlackBright: [100, 49],
-			bgRedBright: [101, 49],
-			bgGreenBright: [102, 49],
-			bgYellowBright: [103, 49],
-			bgBlueBright: [104, 49],
-			bgMagentaBright: [105, 49],
-			bgCyanBright: [106, 49],
-			bgWhiteBright: [107, 49]
-		}
-	};
+	let cur = graph[toModel].parent;
+	while (graph[cur].parent) {
+		path.unshift(graph[cur].parent);
+		fn = link(conversions[graph[cur].parent][cur], fn);
+		cur = graph[cur].parent;
+	}
 
-	// Alias bright black as gray (and grey)
-	styles.color.gray = styles.color.blackBright;
-	styles.bgColor.bgGray = styles.bgColor.bgBlackBright;
-	styles.color.grey = styles.color.blackBright;
-	styles.bgColor.bgGrey = styles.bgColor.bgBlackBright;
+	fn.conversion = path;
+	return fn;
+}
 
-	for (const [groupName, group] of Object.entries(styles)) {
-		for (const [styleName, style] of Object.entries(group)) {
-			styles[styleName] = {
-				open: `\u001B[${style[0]}m`,
-				close: `\u001B[${style[1]}m`
-			};
+module.exports = function (fromModel) {
+	const graph = deriveBFS(fromModel);
+	const conversion = {};
 
-			group[styleName] = styles[styleName];
+	const models = Object.keys(graph);
+	for (let len = models.length, i = 0; i < len; i++) {
+		const toModel = models[i];
+		const node = graph[toModel];
 
-			codes.set(style[0], style[1]);
+		if (node.parent === null) {
+			// No possible conversion, or this node is the source model.
+			continue;
 		}
 
-		Object.defineProperty(styles, groupName, {
-			value: group,
-			enumerable: false
-		});
+		conversion[toModel] = wrapConversion(toModel, graph);
 	}
 
-	Object.defineProperty(styles, 'codes', {
-		value: codes,
-		enumerable: false
-	});
-
-	styles.color.close = '\u001B[39m';
-	styles.bgColor.close = '\u001B[49m';
-
-	setLazyProperty(styles.color, 'ansi', () => makeDynamicStyles(wrapAnsi16, 'ansi16', ansi2ansi, false));
-	setLazyProperty(styles.color, 'ansi256', () => makeDynamicStyles(wrapAnsi256, 'ansi256', ansi2ansi, false));
-	setLazyProperty(styles.color, 'ansi16m', () => makeDynamicStyles(wrapAnsi16m, 'rgb', rgb2rgb, false));
-	setLazyProperty(styles.bgColor, 'ansi', () => makeDynamicStyles(wrapAnsi16, 'ansi16', ansi2ansi, true));
-	setLazyProperty(styles.bgColor, 'ansi256', () => makeDynamicStyles(wrapAnsi256, 'ansi256', ansi2ansi, true));
-	setLazyProperty(styles.bgColor, 'ansi16m', () => makeDynamicStyles(wrapAnsi16m, 'rgb', rgb2rgb, true));
-
-	return styles;
-}
+	return conversion;
+};
 
-// Make the export immutable
-Object.defineProperty(module, 'exports', {
-	enumerable: true,
-	get: assembleStyles
-});
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(114)(module)))
 
 /***/ }),
-/* 237 */
+/* 232 */
 /***/ (function(module, exports, __webpack_require__) {
 
-const conversions = __webpack_require__(238);
-const route = __webpack_require__(239);
-
-const convert = {};
+"use strict";
 
-const models = Object.keys(conversions);
+const os = __webpack_require__(120);
+const tty = __webpack_require__(121);
+const hasFlag = __webpack_require__(233);
 
-function wrapRaw(fn) {
-	const wrappedFn = function (...args) {
-		const arg0 = args[0];
-		if (arg0 === undefined || arg0 === null) {
-			return arg0;
-		}
+const {env} = process;
 
-		if (arg0.length > 1) {
-			args = arg0;
-		}
+let forceColor;
+if (hasFlag('no-color') ||
+	hasFlag('no-colors') ||
+	hasFlag('color=false') ||
+	hasFlag('color=never')) {
+	forceColor = 0;
+} else if (hasFlag('color') ||
+	hasFlag('colors') ||
+	hasFlag('color=true') ||
+	hasFlag('color=always')) {
+	forceColor = 1;
+}
 
-		return fn(args);
-	};
+if ('FORCE_COLOR' in env) {
+	if (env.FORCE_COLOR === 'true') {
+		forceColor = 1;
+	} else if (env.FORCE_COLOR === 'false') {
+		forceColor = 0;
+	} else {
+		forceColor = env.FORCE_COLOR.length === 0 ? 1 : Math.min(parseInt(env.FORCE_COLOR, 10), 3);
+	}
+}
 
-	// Preserve .conversion property if there is one
-	if ('conversion' in fn) {
-		wrappedFn.conversion = fn.conversion;
+function translateLevel(level) {
+	if (level === 0) {
+		return false;
 	}
 
-	return wrappedFn;
+	return {
+		level,
+		hasBasic: true,
+		has256: level >= 2,
+		has16m: level >= 3
+	};
 }
 
-function wrapRounded(fn) {
-	const wrappedFn = function (...args) {
-		const arg0 = args[0];
-
-		if (arg0 === undefined || arg0 === null) {
-			return arg0;
-		}
+function supportsColor(haveStream, streamIsTTY) {
+	if (forceColor === 0) {
+		return 0;
+	}
 
-		if (arg0.length > 1) {
-			args = arg0;
-		}
+	if (hasFlag('color=16m') ||
+		hasFlag('color=full') ||
+		hasFlag('color=truecolor')) {
+		return 3;
+	}
 
-		const result = fn(args);
+	if (hasFlag('color=256')) {
+		return 2;
+	}
 
-		// We're assuming the result is an array here.
-		// see notice in conversions.js; don't use box types
-		// in conversion functions.
-		if (typeof result === 'object') {
-			for (let len = result.length, i = 0; i < len; i++) {
-				result[i] = Math.round(result[i]);
-			}
-		}
+	if (haveStream && !streamIsTTY && forceColor === undefined) {
+		return 0;
+	}
 
-		return result;
-	};
+	const min = forceColor || 0;
 
-	// Preserve .conversion property if there is one
-	if ('conversion' in fn) {
-		wrappedFn.conversion = fn.conversion;
+	if (env.TERM === 'dumb') {
+		return min;
 	}
 
-	return wrappedFn;
-}
-
-models.forEach(fromModel => {
-	convert[fromModel] = {};
-
-	Object.defineProperty(convert[fromModel], 'channels', {value: conversions[fromModel].channels});
-	Object.defineProperty(convert[fromModel], 'labels', {value: conversions[fromModel].labels});
-
-	const routes = route(fromModel);
-	const routeModels = Object.keys(routes);
-
-	routeModels.forEach(toModel => {
-		const fn = routes[toModel];
-
-		convert[fromModel][toModel] = wrapRounded(fn);
-		convert[fromModel][toModel].raw = wrapRaw(fn);
-	});
-});
+	if (process.platform === 'win32') {
+		// Windows 10 build 10586 is the first Windows release that supports 256 colors.
+		// Windows 10 build 14931 is the first release that supports 16m/TrueColor.
+		const osRelease = os.release().split('.');
+		if (
+			Number(osRelease[0]) >= 10 &&
+			Number(osRelease[2]) >= 10586
+		) {
+			return Number(osRelease[2]) >= 14931 ? 3 : 2;
+		}
 
-module.exports = convert;
+		return 1;
+	}
 
+	if ('CI' in env) {
+		if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
+			return 1;
+		}
 
-/***/ }),
-/* 238 */
-/***/ (function(module, exports, __webpack_require__) {
+		return min;
+	}
 
-/* MIT license */
-/* eslint-disable no-mixed-operators */
-const cssKeywords = __webpack_require__(117);
+	if ('TEAMCITY_VERSION' in env) {
+		return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
+	}
 
-// NOTE: conversions should only return primitive values (i.e. arrays, or
-//       values that give correct `typeof` results).
-//       do not use box values types (i.e. Number(), String(), etc.)
+	if ('GITHUB_ACTIONS' in env) {
+		return 1;
+	}
 
-const reverseKeywords = {};
-for (const key of Object.keys(cssKeywords)) {
-	reverseKeywords[cssKeywords[key]] = key;
-}
+	if (env.COLORTERM === 'truecolor') {
+		return 3;
+	}
 
-const convert = {
-	rgb: {channels: 3, labels: 'rgb'},
-	hsl: {channels: 3, labels: 'hsl'},
-	hsv: {channels: 3, labels: 'hsv'},
-	hwb: {channels: 3, labels: 'hwb'},
-	cmyk: {channels: 4, labels: 'cmyk'},
-	xyz: {channels: 3, labels: 'xyz'},
-	lab: {channels: 3, labels: 'lab'},
-	lch: {channels: 3, labels: 'lch'},
-	hex: {channels: 1, labels: ['hex']},
-	keyword: {channels: 1, labels: ['keyword']},
-	ansi16: {channels: 1, labels: ['ansi16']},
-	ansi256: {channels: 1, labels: ['ansi256']},
-	hcg: {channels: 3, labels: ['h', 'c', 'g']},
-	apple: {channels: 3, labels: ['r16', 'g16', 'b16']},
-	gray: {channels: 1, labels: ['gray']}
-};
+	if ('TERM_PROGRAM' in env) {
+		const version = parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
 
-module.exports = convert;
+		switch (env.TERM_PROGRAM) {
+			case 'iTerm.app':
+				return version >= 3 ? 3 : 2;
+			case 'Apple_Terminal':
+				return 2;
+			// No default
+		}
+	}
 
-// Hide .channels and .labels properties
-for (const model of Object.keys(convert)) {
-	if (!('channels' in convert[model])) {
-		throw new Error('missing channels property: ' + model);
+	if (/-256(color)?$/i.test(env.TERM)) {
+		return 2;
 	}
 
-	if (!('labels' in convert[model])) {
-		throw new Error('missing channel labels property: ' + model);
+	if (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
+		return 1;
 	}
 
-	if (convert[model].labels.length !== convert[model].channels) {
-		throw new Error('channel and label counts mismatch: ' + model);
+	if ('COLORTERM' in env) {
+		return 1;
 	}
 
-	const {channels, labels} = convert[model];
-	delete convert[model].channels;
-	delete convert[model].labels;
-	Object.defineProperty(convert[model], 'channels', {value: channels});
-	Object.defineProperty(convert[model], 'labels', {value: labels});
+	return min;
 }
 
-convert.rgb.hsl = function (rgb) {
-	const r = rgb[0] / 255;
-	const g = rgb[1] / 255;
-	const b = rgb[2] / 255;
-	const min = Math.min(r, g, b);
-	const max = Math.max(r, g, b);
-	const delta = max - min;
-	let h;
-	let s;
+function getSupportLevel(stream) {
+	const level = supportsColor(stream, stream && stream.isTTY);
+	return translateLevel(level);
+}
 
-	if (max === min) {
-		h = 0;
-	} else if (r === max) {
-		h = (g - b) / delta;
-	} else if (g === max) {
-		h = 2 + (b - r) / delta;
-	} else if (b === max) {
-		h = 4 + (r - g) / delta;
-	}
+module.exports = {
+	supportsColor: getSupportLevel,
+	stdout: translateLevel(supportsColor(true, tty.isatty(1))),
+	stderr: translateLevel(supportsColor(true, tty.isatty(2)))
+};
 
-	h = Math.min(h * 60, 360);
 
-	if (h < 0) {
-		h += 360;
-	}
+/***/ }),
+/* 233 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	const l = (min + max) / 2;
+"use strict";
 
-	if (max === min) {
-		s = 0;
-	} else if (l <= 0.5) {
-		s = delta / (max + min);
-	} else {
-		s = delta / (2 - max - min);
-	}
 
-	return [h, s * 100, l * 100];
+module.exports = (flag, argv = process.argv) => {
+	const prefix = flag.startsWith('-') ? '' : (flag.length === 1 ? '-' : '--');
+	const position = argv.indexOf(prefix + flag);
+	const terminatorPosition = argv.indexOf('--');
+	return position !== -1 && (terminatorPosition === -1 || position < terminatorPosition);
 };
 
-convert.rgb.hsv = function (rgb) {
-	let rdif;
-	let gdif;
-	let bdif;
-	let h;
-	let s;
 
-	const r = rgb[0] / 255;
-	const g = rgb[1] / 255;
-	const b = rgb[2] / 255;
-	const v = Math.max(r, g, b);
-	const diff = v - Math.min(r, g, b);
-	const diffc = function (c) {
-		return (v - c) / 6 / diff + 1 / 2;
-	};
+/***/ }),
+/* 234 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	if (diff === 0) {
-		h = 0;
-		s = 0;
-	} else {
-		s = diff / v;
-		rdif = diffc(r);
-		gdif = diffc(g);
-		bdif = diffc(b);
+"use strict";
 
-		if (r === v) {
-			h = bdif - gdif;
-		} else if (g === v) {
-			h = (1 / 3) + rdif - bdif;
-		} else if (b === v) {
-			h = (2 / 3) + gdif - rdif;
-		}
 
-		if (h < 0) {
-			h += 1;
-		} else if (h > 1) {
-			h -= 1;
-		}
+const stringReplaceAll = (string, substring, replacer) => {
+	let index = string.indexOf(substring);
+	if (index === -1) {
+		return string;
 	}
 
-	return [
-		h * 360,
-		s * 100,
-		v * 100
-	];
-};
+	const substringLength = substring.length;
+	let endIndex = 0;
+	let returnValue = '';
+	do {
+		returnValue += string.substr(endIndex, index - endIndex) + substring + replacer;
+		endIndex = index + substringLength;
+		index = string.indexOf(substring, endIndex);
+	} while (index !== -1);
 
-convert.rgb.hwb = function (rgb) {
-	const r = rgb[0];
-	const g = rgb[1];
-	let b = rgb[2];
-	const h = convert.rgb.hsl(rgb)[0];
-	const w = 1 / 255 * Math.min(r, Math.min(g, b));
+	returnValue += string.substr(endIndex);
+	return returnValue;
+};
 
-	b = 1 - 1 / 255 * Math.max(r, Math.max(g, b));
+const stringEncaseCRLFWithFirstIndex = (string, prefix, postfix, index) => {
+	let endIndex = 0;
+	let returnValue = '';
+	do {
+		const gotCR = string[index - 1] === '\r';
+		returnValue += string.substr(endIndex, (gotCR ? index - 1 : index) - endIndex) + prefix + (gotCR ? '\r\n' : '\n') + postfix;
+		endIndex = index + 1;
+		index = string.indexOf('\n', endIndex);
+	} while (index !== -1);
 
-	return [h, w * 100, b * 100];
+	returnValue += string.substr(endIndex);
+	return returnValue;
 };
 
-convert.rgb.cmyk = function (rgb) {
-	const r = rgb[0] / 255;
-	const g = rgb[1] / 255;
-	const b = rgb[2] / 255;
+module.exports = {
+	stringReplaceAll,
+	stringEncaseCRLFWithFirstIndex
+};
 
-	const k = Math.min(1 - r, 1 - g, 1 - b);
-	const c = (1 - r - k) / (1 - k) || 0;
-	const m = (1 - g - k) / (1 - k) || 0;
-	const y = (1 - b - k) / (1 - k) || 0;
 
-	return [c * 100, m * 100, y * 100, k * 100];
-};
+/***/ }),
+/* 235 */
+/***/ (function(module, exports, __webpack_require__) {
 
-function comparativeDistance(x, y) {
-	/*
-		See https://en.m.wikipedia.org/wiki/Euclidean_distance#Squared_Euclidean_distance
-	*/
-	return (
-		((x[0] - y[0]) ** 2) +
-		((x[1] - y[1]) ** 2) +
-		((x[2] - y[2]) ** 2)
-	);
-}
+"use strict";
 
-convert.rgb.keyword = function (rgb) {
-	const reversed = reverseKeywords[rgb];
-	if (reversed) {
-		return reversed;
-	}
+const TEMPLATE_REGEX = /(?:\\(u(?:[a-f\d]{4}|\{[a-f\d]{1,6}\})|x[a-f\d]{2}|.))|(?:\{(~)?(\w+(?:\([^)]*\))?(?:\.\w+(?:\([^)]*\))?)*)(?:[ \t]|(?=\r?\n)))|(\})|((?:.|[\r\n\f])+?)/gi;
+const STYLE_REGEX = /(?:^|\.)(\w+)(?:\(([^)]*)\))?/g;
+const STRING_REGEX = /^(['"])((?:\\.|(?!\1)[^\\])*)\1$/;
+const ESCAPE_REGEX = /\\(u(?:[a-f\d]{4}|{[a-f\d]{1,6}})|x[a-f\d]{2}|.)|([^\\])/gi;
 
-	let currentClosestDistance = Infinity;
-	let currentClosestKeyword;
+const ESCAPES = new Map([
+	['n', '\n'],
+	['r', '\r'],
+	['t', '\t'],
+	['b', '\b'],
+	['f', '\f'],
+	['v', '\v'],
+	['0', '\0'],
+	['\\', '\\'],
+	['e', '\u001B'],
+	['a', '\u0007']
+]);
 
-	for (const keyword of Object.keys(cssKeywords)) {
-		const value = cssKeywords[keyword];
+function unescape(c) {
+	const u = c[0] === 'u';
+	const bracket = c[1] === '{';
 
-		// Compute comparative distance
-		const distance = comparativeDistance(rgb, value);
+	if ((u && !bracket && c.length === 5) || (c[0] === 'x' && c.length === 3)) {
+		return String.fromCharCode(parseInt(c.slice(1), 16));
+	}
 
-		// Check if its less, if so set as closest
-		if (distance < currentClosestDistance) {
-			currentClosestDistance = distance;
-			currentClosestKeyword = keyword;
-		}
+	if (u && bracket) {
+		return String.fromCodePoint(parseInt(c.slice(2, -1), 16));
 	}
 
-	return currentClosestKeyword;
-};
+	return ESCAPES.get(c) || c;
+}
 
-convert.keyword.rgb = function (keyword) {
-	return cssKeywords[keyword];
-};
+function parseArguments(name, arguments_) {
+	const results = [];
+	const chunks = arguments_.trim().split(/\s*,\s*/g);
+	let matches;
 
-convert.rgb.xyz = function (rgb) {
-	let r = rgb[0] / 255;
-	let g = rgb[1] / 255;
-	let b = rgb[2] / 255;
+	for (const chunk of chunks) {
+		const number = Number(chunk);
+		if (!Number.isNaN(number)) {
+			results.push(number);
+		} else if ((matches = chunk.match(STRING_REGEX))) {
+			results.push(matches[2].replace(ESCAPE_REGEX, (m, escape, character) => escape ? unescape(escape) : character));
+		} else {
+			throw new Error(`Invalid Chalk template style argument: ${chunk} (in style '${name}')`);
+		}
+	}
 
-	// Assume sRGB
-	r = r > 0.04045 ? (((r + 0.055) / 1.055) ** 2.4) : (r / 12.92);
-	g = g > 0.04045 ? (((g + 0.055) / 1.055) ** 2.4) : (g / 12.92);
-	b = b > 0.04045 ? (((b + 0.055) / 1.055) ** 2.4) : (b / 12.92);
+	return results;
+}
 
-	const x = (r * 0.4124) + (g * 0.3576) + (b * 0.1805);
-	const y = (r * 0.2126) + (g * 0.7152) + (b * 0.0722);
-	const z = (r * 0.0193) + (g * 0.1192) + (b * 0.9505);
+function parseStyle(style) {
+	STYLE_REGEX.lastIndex = 0;
 
-	return [x * 100, y * 100, z * 100];
-};
+	const results = [];
+	let matches;
 
-convert.rgb.lab = function (rgb) {
-	const xyz = convert.rgb.xyz(rgb);
-	let x = xyz[0];
-	let y = xyz[1];
-	let z = xyz[2];
+	while ((matches = STYLE_REGEX.exec(style)) !== null) {
+		const name = matches[1];
 
-	x /= 95.047;
-	y /= 100;
-	z /= 108.883;
+		if (matches[2]) {
+			const args = parseArguments(name, matches[2]);
+			results.push([name].concat(args));
+		} else {
+			results.push([name]);
+		}
+	}
 
-	x = x > 0.008856 ? (x ** (1 / 3)) : (7.787 * x) + (16 / 116);
-	y = y > 0.008856 ? (y ** (1 / 3)) : (7.787 * y) + (16 / 116);
-	z = z > 0.008856 ? (z ** (1 / 3)) : (7.787 * z) + (16 / 116);
+	return results;
+}
 
-	const l = (116 * y) - 16;
-	const a = 500 * (x - y);
-	const b = 200 * (y - z);
+function buildStyle(chalk, styles) {
+	const enabled = {};
 
-	return [l, a, b];
-};
+	for (const layer of styles) {
+		for (const style of layer.styles) {
+			enabled[style[0]] = layer.inverse ? null : style.slice(1);
+		}
+	}
 
-convert.hsl.rgb = function (hsl) {
-	const h = hsl[0] / 360;
-	const s = hsl[1] / 100;
-	const l = hsl[2] / 100;
-	let t2;
-	let t3;
-	let val;
+	let current = chalk;
+	for (const [styleName, styles] of Object.entries(enabled)) {
+		if (!Array.isArray(styles)) {
+			continue;
+		}
 
-	if (s === 0) {
-		val = l * 255;
-		return [val, val, val];
-	}
+		if (!(styleName in current)) {
+			throw new Error(`Unknown Chalk style: ${styleName}`);
+		}
 
-	if (l < 0.5) {
-		t2 = l * (1 + s);
-	} else {
-		t2 = l + s - l * s;
+		current = styles.length > 0 ? current[styleName](...styles) : current[styleName];
 	}
 
-	const t1 = 2 * l - t2;
+	return current;
+}
 
-	const rgb = [0, 0, 0];
-	for (let i = 0; i < 3; i++) {
-		t3 = h + 1 / 3 * -(i - 1);
-		if (t3 < 0) {
-			t3++;
-		}
+module.exports = (chalk, temporary) => {
+	const styles = [];
+	const chunks = [];
+	let chunk = [];
 
-		if (t3 > 1) {
-			t3--;
-		}
+	// eslint-disable-next-line max-params
+	temporary.replace(TEMPLATE_REGEX, (m, escapeCharacter, inverse, style, close, character) => {
+		if (escapeCharacter) {
+			chunk.push(unescape(escapeCharacter));
+		} else if (style) {
+			const string = chunk.join('');
+			chunk = [];
+			chunks.push(styles.length === 0 ? string : buildStyle(chalk, styles)(string));
+			styles.push({inverse, styles: parseStyle(style)});
+		} else if (close) {
+			if (styles.length === 0) {
+				throw new Error('Found extraneous } in Chalk template literal');
+			}
 
-		if (6 * t3 < 1) {
-			val = t1 + (t2 - t1) * 6 * t3;
-		} else if (2 * t3 < 1) {
-			val = t2;
-		} else if (3 * t3 < 2) {
-			val = t1 + (t2 - t1) * (2 / 3 - t3) * 6;
+			chunks.push(buildStyle(chalk, styles)(chunk.join('')));
+			chunk = [];
+			styles.pop();
 		} else {
-			val = t1;
+			chunk.push(character);
 		}
+	});
 
-		rgb[i] = val * 255;
+	chunks.push(chunk.join(''));
+
+	if (styles.length > 0) {
+		const errMessage = `Chalk template literal is missing ${styles.length} closing bracket${styles.length === 1 ? '' : 's'} (\`}\`)`;
+		throw new Error(errMessage);
 	}
 
-	return rgb;
+	return chunks.join('');
 };
 
-convert.hsl.hsv = function (hsl) {
-	const h = hsl[0];
-	let s = hsl[1] / 100;
-	let l = hsl[2] / 100;
-	let smin = s;
-	const lmin = Math.max(l, 0.01);
 
-	l *= 2;
-	s *= (l <= 1) ? l : 2 - l;
-	smin *= lmin <= 1 ? lmin : 2 - lmin;
-	const v = (l + s) / 2;
-	const sv = l === 0 ? (2 * smin) / (lmin + smin) : (2 * s) / (l + s);
+/***/ }),
+/* 236 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	return [h, sv * 100, v * 100];
-};
+"use strict";
 
-convert.hsv.rgb = function (hsv) {
-	const h = hsv[0] / 60;
-	const s = hsv[1] / 100;
-	let v = hsv[2] / 100;
-	const hi = Math.floor(h) % 6;
+const path = __webpack_require__(4);
+const childProcess = __webpack_require__(237);
+const crossSpawn = __webpack_require__(238);
+const stripFinalNewline = __webpack_require__(251);
+const npmRunPath = __webpack_require__(252);
+const onetime = __webpack_require__(253);
+const makeError = __webpack_require__(255);
+const normalizeStdio = __webpack_require__(260);
+const {spawnedKill, spawnedCancel, setupTimeout, setExitHandler} = __webpack_require__(261);
+const {handleInput, getSpawnedResult, makeAllStream, validateInputSync} = __webpack_require__(262);
+const {mergePromise, getSpawnedPromise} = __webpack_require__(269);
+const {joinCommand, parseCommand} = __webpack_require__(270);
 
-	const f = h - Math.floor(h);
-	const p = 255 * v * (1 - s);
-	const q = 255 * v * (1 - (s * f));
-	const t = 255 * v * (1 - (s * (1 - f)));
-	v *= 255;
+const DEFAULT_MAX_BUFFER = 1000 * 1000 * 100;
 
-	switch (hi) {
-		case 0:
-			return [v, t, p];
-		case 1:
-			return [q, v, p];
-		case 2:
-			return [p, v, t];
-		case 3:
-			return [p, q, v];
-		case 4:
-			return [t, p, v];
-		case 5:
-			return [v, p, q];
+const getEnv = ({env: envOption, extendEnv, preferLocal, localDir, execPath}) => {
+	const env = extendEnv ? {...process.env, ...envOption} : envOption;
+
+	if (preferLocal) {
+		return npmRunPath.env({env, cwd: localDir, execPath});
 	}
+
+	return env;
 };
 
-convert.hsv.hsl = function (hsv) {
-	const h = hsv[0];
-	const s = hsv[1] / 100;
-	const v = hsv[2] / 100;
-	const vmin = Math.max(v, 0.01);
-	let sl;
-	let l;
+const handleArgs = (file, args, options = {}) => {
+	const parsed = crossSpawn._parse(file, args, options);
+	file = parsed.command;
+	args = parsed.args;
+	options = parsed.options;
 
-	l = (2 - s) * v;
-	const lmin = (2 - s) * vmin;
-	sl = s * vmin;
-	sl /= (lmin <= 1) ? lmin : 2 - lmin;
-	sl = sl || 0;
-	l /= 2;
+	options = {
+		maxBuffer: DEFAULT_MAX_BUFFER,
+		buffer: true,
+		stripFinalNewline: true,
+		extendEnv: true,
+		preferLocal: false,
+		localDir: options.cwd || process.cwd(),
+		execPath: process.execPath,
+		encoding: 'utf8',
+		reject: true,
+		cleanup: true,
+		all: false,
+		windowsHide: true,
+		...options
+	};
 
-	return [h, sl * 100, l * 100];
-};
+	options.env = getEnv(options);
 
-// http://dev.w3.org/csswg/css-color/#hwb-to-rgb
-convert.hwb.rgb = function (hwb) {
-	const h = hwb[0] / 360;
-	let wh = hwb[1] / 100;
-	let bl = hwb[2] / 100;
-	const ratio = wh + bl;
-	let f;
+	options.stdio = normalizeStdio(options);
 
-	// Wh + bl cant be > 1
-	if (ratio > 1) {
-		wh /= ratio;
-		bl /= ratio;
+	if (process.platform === 'win32' && path.basename(file, '.exe') === 'cmd') {
+		// #116
+		args.unshift('/q');
 	}
 
-	const i = Math.floor(6 * h);
-	const v = 1 - bl;
-	f = 6 * h - i;
+	return {file, args, options, parsed};
+};
 
-	if ((i & 0x01) !== 0) {
-		f = 1 - f;
+const handleOutput = (options, value, error) => {
+	if (typeof value !== 'string' && !Buffer.isBuffer(value)) {
+		// When `execa.sync()` errors, we normalize it to '' to mimic `execa()`
+		return error === undefined ? undefined : '';
 	}
 
-	const n = wh + f * (v - wh); // Linear interpolation
-
-	let r;
-	let g;
-	let b;
-	/* eslint-disable max-statements-per-line,no-multi-spaces */
-	switch (i) {
-		default:
-		case 6:
-		case 0: r = v;  g = n;  b = wh; break;
-		case 1: r = n;  g = v;  b = wh; break;
-		case 2: r = wh; g = v;  b = n; break;
-		case 3: r = wh; g = n;  b = v; break;
-		case 4: r = n;  g = wh; b = v; break;
-		case 5: r = v;  g = wh; b = n; break;
+	if (options.stripFinalNewline) {
+		return stripFinalNewline(value);
 	}
-	/* eslint-enable max-statements-per-line,no-multi-spaces */
 
-	return [r * 255, g * 255, b * 255];
+	return value;
 };
 
-convert.cmyk.rgb = function (cmyk) {
-	const c = cmyk[0] / 100;
-	const m = cmyk[1] / 100;
-	const y = cmyk[2] / 100;
-	const k = cmyk[3] / 100;
+const execa = (file, args, options) => {
+	const parsed = handleArgs(file, args, options);
+	const command = joinCommand(file, args);
 
-	const r = 1 - Math.min(1, c * (1 - k) + k);
-	const g = 1 - Math.min(1, m * (1 - k) + k);
-	const b = 1 - Math.min(1, y * (1 - k) + k);
+	let spawned;
+	try {
+		spawned = childProcess.spawn(parsed.file, parsed.args, parsed.options);
+	} catch (error) {
+		// Ensure the returned error is always both a promise and a child process
+		const dummySpawned = new childProcess.ChildProcess();
+		const errorPromise = Promise.reject(makeError({
+			error,
+			stdout: '',
+			stderr: '',
+			all: '',
+			command,
+			parsed,
+			timedOut: false,
+			isCanceled: false,
+			killed: false
+		}));
+		return mergePromise(dummySpawned, errorPromise);
+	}
 
-	return [r * 255, g * 255, b * 255];
-};
+	const spawnedPromise = getSpawnedPromise(spawned);
+	const timedPromise = setupTimeout(spawned, parsed.options, spawnedPromise);
+	const processDone = setExitHandler(spawned, parsed.options, timedPromise);
 
-convert.xyz.rgb = function (xyz) {
-	const x = xyz[0] / 100;
-	const y = xyz[1] / 100;
-	const z = xyz[2] / 100;
-	let r;
-	let g;
-	let b;
+	const context = {isCanceled: false};
 
-	r = (x * 3.2406) + (y * -1.5372) + (z * -0.4986);
-	g = (x * -0.9689) + (y * 1.8758) + (z * 0.0415);
-	b = (x * 0.0557) + (y * -0.2040) + (z * 1.0570);
+	spawned.kill = spawnedKill.bind(null, spawned.kill.bind(spawned));
+	spawned.cancel = spawnedCancel.bind(null, spawned, context);
 
-	// Assume sRGB
-	r = r > 0.0031308
-		? ((1.055 * (r ** (1.0 / 2.4))) - 0.055)
-		: r * 12.92;
+	const handlePromise = async () => {
+		const [{error, exitCode, signal, timedOut}, stdoutResult, stderrResult, allResult] = await getSpawnedResult(spawned, parsed.options, processDone);
+		const stdout = handleOutput(parsed.options, stdoutResult);
+		const stderr = handleOutput(parsed.options, stderrResult);
+		const all = handleOutput(parsed.options, allResult);
 
-	g = g > 0.0031308
-		? ((1.055 * (g ** (1.0 / 2.4))) - 0.055)
-		: g * 12.92;
+		if (error || exitCode !== 0 || signal !== null) {
+			const returnedError = makeError({
+				error,
+				exitCode,
+				signal,
+				stdout,
+				stderr,
+				all,
+				command,
+				parsed,
+				timedOut,
+				isCanceled: context.isCanceled,
+				killed: spawned.killed
+			});
 
-	b = b > 0.0031308
-		? ((1.055 * (b ** (1.0 / 2.4))) - 0.055)
-		: b * 12.92;
+			if (!parsed.options.reject) {
+				return returnedError;
+			}
 
-	r = Math.min(Math.max(0, r), 1);
-	g = Math.min(Math.max(0, g), 1);
-	b = Math.min(Math.max(0, b), 1);
+			throw returnedError;
+		}
 
-	return [r * 255, g * 255, b * 255];
-};
+		return {
+			command,
+			exitCode: 0,
+			stdout,
+			stderr,
+			all,
+			failed: false,
+			timedOut: false,
+			isCanceled: false,
+			killed: false
+		};
+	};
 
-convert.xyz.lab = function (xyz) {
-	let x = xyz[0];
-	let y = xyz[1];
-	let z = xyz[2];
+	const handlePromiseOnce = onetime(handlePromise);
 
-	x /= 95.047;
-	y /= 100;
-	z /= 108.883;
+	crossSpawn._enoent.hookChildProcess(spawned, parsed.parsed);
 
-	x = x > 0.008856 ? (x ** (1 / 3)) : (7.787 * x) + (16 / 116);
-	y = y > 0.008856 ? (y ** (1 / 3)) : (7.787 * y) + (16 / 116);
-	z = z > 0.008856 ? (z ** (1 / 3)) : (7.787 * z) + (16 / 116);
+	handleInput(spawned, parsed.options.input);
 
-	const l = (116 * y) - 16;
-	const a = 500 * (x - y);
-	const b = 200 * (y - z);
+	spawned.all = makeAllStream(spawned, parsed.options);
 
-	return [l, a, b];
+	return mergePromise(spawned, handlePromiseOnce);
 };
 
-convert.lab.xyz = function (lab) {
-	const l = lab[0];
-	const a = lab[1];
-	const b = lab[2];
-	let x;
-	let y;
-	let z;
+module.exports = execa;
 
-	y = (l + 16) / 116;
-	x = a / 500 + y;
-	z = y - b / 200;
+module.exports.sync = (file, args, options) => {
+	const parsed = handleArgs(file, args, options);
+	const command = joinCommand(file, args);
 
-	const y2 = y ** 3;
-	const x2 = x ** 3;
-	const z2 = z ** 3;
-	y = y2 > 0.008856 ? y2 : (y - 16 / 116) / 7.787;
-	x = x2 > 0.008856 ? x2 : (x - 16 / 116) / 7.787;
-	z = z2 > 0.008856 ? z2 : (z - 16 / 116) / 7.787;
+	validateInputSync(parsed.options);
 
-	x *= 95.047;
-	y *= 100;
-	z *= 108.883;
+	let result;
+	try {
+		result = childProcess.spawnSync(parsed.file, parsed.args, parsed.options);
+	} catch (error) {
+		throw makeError({
+			error,
+			stdout: '',
+			stderr: '',
+			all: '',
+			command,
+			parsed,
+			timedOut: false,
+			isCanceled: false,
+			killed: false
+		});
+	}
 
-	return [x, y, z];
-};
+	const stdout = handleOutput(parsed.options, result.stdout, result.error);
+	const stderr = handleOutput(parsed.options, result.stderr, result.error);
 
-convert.lab.lch = function (lab) {
-	const l = lab[0];
-	const a = lab[1];
-	const b = lab[2];
-	let h;
+	if (result.error || result.status !== 0 || result.signal !== null) {
+		const error = makeError({
+			stdout,
+			stderr,
+			error: result.error,
+			signal: result.signal,
+			exitCode: result.status,
+			command,
+			parsed,
+			timedOut: result.error && result.error.code === 'ETIMEDOUT',
+			isCanceled: false,
+			killed: result.signal !== null
+		});
 
-	const hr = Math.atan2(b, a);
-	h = hr * 360 / 2 / Math.PI;
+		if (!parsed.options.reject) {
+			return error;
+		}
 
-	if (h < 0) {
-		h += 360;
+		throw error;
 	}
 
-	const c = Math.sqrt(a * a + b * b);
-
-	return [l, c, h];
+	return {
+		command,
+		exitCode: 0,
+		stdout,
+		stderr,
+		failed: false,
+		timedOut: false,
+		isCanceled: false,
+		killed: false
+	};
 };
 
-convert.lch.lab = function (lch) {
-	const l = lch[0];
-	const c = lch[1];
-	const h = lch[2];
-
-	const hr = h / 360 * 2 * Math.PI;
-	const a = c * Math.cos(hr);
-	const b = c * Math.sin(hr);
-
-	return [l, a, b];
+module.exports.command = (command, options) => {
+	const [file, ...args] = parseCommand(command);
+	return execa(file, args, options);
 };
 
-convert.rgb.ansi16 = function (args, saturation = null) {
-	const [r, g, b] = args;
-	let value = saturation === null ? convert.rgb.hsv(args)[2] : saturation; // Hsv -> ansi16 optimization
-
-	value = Math.round(value / 50);
+module.exports.commandSync = (command, options) => {
+	const [file, ...args] = parseCommand(command);
+	return execa.sync(file, args, options);
+};
 
-	if (value === 0) {
-		return 30;
+module.exports.node = (scriptPath, args, options = {}) => {
+	if (args && !Array.isArray(args) && typeof args === 'object') {
+		options = args;
+		args = [];
 	}
 
-	let ansi = 30
-		+ ((Math.round(b / 255) << 2)
-		| (Math.round(g / 255) << 1)
-		| Math.round(r / 255));
+	const stdio = normalizeStdio.node(options);
 
-	if (value === 2) {
-		ansi += 60;
-	}
+	const {nodePath = process.execPath, nodeOptions = process.execArgv} = options;
 
-	return ansi;
+	return execa(
+		nodePath,
+		[
+			...nodeOptions,
+			scriptPath,
+			...(Array.isArray(args) ? args : [])
+		],
+		{
+			...options,
+			stdin: undefined,
+			stdout: undefined,
+			stderr: undefined,
+			stdio,
+			shell: false
+		}
+	);
 };
 
-convert.hsv.ansi16 = function (args) {
-	// Optimization here; we already know the value and don't need to get
-	// it converted for us.
-	return convert.rgb.ansi16(convert.hsv.rgb(args), args[2]);
-};
 
-convert.rgb.ansi256 = function (args) {
-	const r = args[0];
-	const g = args[1];
-	const b = args[2];
+/***/ }),
+/* 237 */
+/***/ (function(module, exports) {
 
-	// We use the extended greyscale palette here, with the exception of
-	// black and white. normal palette only has 4 greyscale shades.
-	if (r === g && g === b) {
-		if (r < 8) {
-			return 16;
-		}
+module.exports = require("child_process");
 
-		if (r > 248) {
-			return 231;
-		}
+/***/ }),
+/* 238 */
+/***/ (function(module, exports, __webpack_require__) {
 
-		return Math.round(((r - 8) / 247) * 24) + 232;
-	}
+"use strict";
 
-	const ansi = 16
-		+ (36 * Math.round(r / 255 * 5))
-		+ (6 * Math.round(g / 255 * 5))
-		+ Math.round(b / 255 * 5);
 
-	return ansi;
-};
+const cp = __webpack_require__(237);
+const parse = __webpack_require__(239);
+const enoent = __webpack_require__(250);
 
-convert.ansi16.rgb = function (args) {
-	let color = args % 10;
+function spawn(command, args, options) {
+    // Parse the arguments
+    const parsed = parse(command, args, options);
 
-	// Handle greyscale
-	if (color === 0 || color === 7) {
-		if (args > 50) {
-			color += 3.5;
-		}
+    // Spawn the child process
+    const spawned = cp.spawn(parsed.command, parsed.args, parsed.options);
 
-		color = color / 10.5 * 255;
+    // Hook into child process "exit" event to emit an error if the command
+    // does not exists, see: https://github.com/IndigoUnited/node-cross-spawn/issues/16
+    enoent.hookChildProcess(spawned, parsed);
 
-		return [color, color, color];
-	}
+    return spawned;
+}
 
-	const mult = (~~(args > 50) + 1) * 0.5;
-	const r = ((color & 1) * mult) * 255;
-	const g = (((color >> 1) & 1) * mult) * 255;
-	const b = (((color >> 2) & 1) * mult) * 255;
+function spawnSync(command, args, options) {
+    // Parse the arguments
+    const parsed = parse(command, args, options);
 
-	return [r, g, b];
-};
+    // Spawn the child process
+    const result = cp.spawnSync(parsed.command, parsed.args, parsed.options);
 
-convert.ansi256.rgb = function (args) {
-	// Handle greyscale
-	if (args >= 232) {
-		const c = (args - 232) * 10 + 8;
-		return [c, c, c];
-	}
+    // Analyze if the command does not exist, see: https://github.com/IndigoUnited/node-cross-spawn/issues/16
+    result.error = result.error || enoent.verifyENOENTSync(result.status, parsed);
 
-	args -= 16;
+    return result;
+}
 
-	let rem;
-	const r = Math.floor(args / 36) / 5 * 255;
-	const g = Math.floor((rem = args % 36) / 6) / 5 * 255;
-	const b = (rem % 6) / 5 * 255;
+module.exports = spawn;
+module.exports.spawn = spawn;
+module.exports.sync = spawnSync;
 
-	return [r, g, b];
-};
+module.exports._parse = parse;
+module.exports._enoent = enoent;
 
-convert.rgb.hex = function (args) {
-	const integer = ((Math.round(args[0]) & 0xFF) << 16)
-		+ ((Math.round(args[1]) & 0xFF) << 8)
-		+ (Math.round(args[2]) & 0xFF);
 
-	const string = integer.toString(16).toUpperCase();
-	return '000000'.substring(string.length) + string;
-};
+/***/ }),
+/* 239 */
+/***/ (function(module, exports, __webpack_require__) {
 
-convert.hex.rgb = function (args) {
-	const match = args.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);
-	if (!match) {
-		return [0, 0, 0];
-	}
+"use strict";
 
-	let colorString = match[0];
 
-	if (match[0].length === 3) {
-		colorString = colorString.split('').map(char => {
-			return char + char;
-		}).join('');
-	}
+const path = __webpack_require__(4);
+const resolveCommand = __webpack_require__(240);
+const escape = __webpack_require__(246);
+const readShebang = __webpack_require__(247);
 
-	const integer = parseInt(colorString, 16);
-	const r = (integer >> 16) & 0xFF;
-	const g = (integer >> 8) & 0xFF;
-	const b = integer & 0xFF;
+const isWin = process.platform === 'win32';
+const isExecutableRegExp = /\.(?:com|exe)$/i;
+const isCmdShimRegExp = /node_modules[\\/].bin[\\/][^\\/]+\.cmd$/i;
 
-	return [r, g, b];
-};
+function detectShebang(parsed) {
+    parsed.file = resolveCommand(parsed);
 
-convert.rgb.hcg = function (rgb) {
-	const r = rgb[0] / 255;
-	const g = rgb[1] / 255;
-	const b = rgb[2] / 255;
-	const max = Math.max(Math.max(r, g), b);
-	const min = Math.min(Math.min(r, g), b);
-	const chroma = (max - min);
-	let grayscale;
-	let hue;
+    const shebang = parsed.file && readShebang(parsed.file);
 
-	if (chroma < 1) {
-		grayscale = min / (1 - chroma);
-	} else {
-		grayscale = 0;
-	}
+    if (shebang) {
+        parsed.args.unshift(parsed.file);
+        parsed.command = shebang;
 
-	if (chroma <= 0) {
-		hue = 0;
-	} else
-	if (max === r) {
-		hue = ((g - b) / chroma) % 6;
-	} else
-	if (max === g) {
-		hue = 2 + (b - r) / chroma;
-	} else {
-		hue = 4 + (r - g) / chroma;
-	}
+        return resolveCommand(parsed);
+    }
 
-	hue /= 6;
-	hue %= 1;
+    return parsed.file;
+}
 
-	return [hue * 360, chroma * 100, grayscale * 100];
-};
+function parseNonShell(parsed) {
+    if (!isWin) {
+        return parsed;
+    }
 
-convert.hsl.hcg = function (hsl) {
-	const s = hsl[1] / 100;
-	const l = hsl[2] / 100;
+    // Detect & add support for shebangs
+    const commandFile = detectShebang(parsed);
 
-	const c = l < 0.5 ? (2.0 * s * l) : (2.0 * s * (1.0 - l));
+    // We don't need a shell if the command filename is an executable
+    const needsShell = !isExecutableRegExp.test(commandFile);
 
-	let f = 0;
-	if (c < 1.0) {
-		f = (l - 0.5 * c) / (1.0 - c);
-	}
+    // If a shell is required, use cmd.exe and take care of escaping everything correctly
+    // Note that `forceShell` is an hidden option used only in tests
+    if (parsed.options.forceShell || needsShell) {
+        // Need to double escape meta chars if the command is a cmd-shim located in `node_modules/.bin/`
+        // The cmd-shim simply calls execute the package bin file with NodeJS, proxying any argument
+        // Because the escape of metachars with ^ gets interpreted when the cmd.exe is first called,
+        // we need to double escape them
+        const needsDoubleEscapeMetaChars = isCmdShimRegExp.test(commandFile);
 
-	return [hsl[0], c * 100, f * 100];
-};
+        // Normalize posix paths into OS compatible paths (e.g.: foo/bar -> foo\bar)
+        // This is necessary otherwise it will always fail with ENOENT in those cases
+        parsed.command = path.normalize(parsed.command);
 
-convert.hsv.hcg = function (hsv) {
-	const s = hsv[1] / 100;
-	const v = hsv[2] / 100;
-
-	const c = s * v;
-	let f = 0;
+        // Escape command & arguments
+        parsed.command = escape.command(parsed.command);
+        parsed.args = parsed.args.map((arg) => escape.argument(arg, needsDoubleEscapeMetaChars));
 
-	if (c < 1.0) {
-		f = (v - c) / (1 - c);
-	}
+        const shellCommand = [parsed.command].concat(parsed.args).join(' ');
 
-	return [hsv[0], c * 100, f * 100];
-};
+        parsed.args = ['/d', '/s', '/c', `"${shellCommand}"`];
+        parsed.command = process.env.comspec || 'cmd.exe';
+        parsed.options.windowsVerbatimArguments = true; // Tell node's spawn that the arguments are already escaped
+    }
 
-convert.hcg.rgb = function (hcg) {
-	const h = hcg[0] / 360;
-	const c = hcg[1] / 100;
-	const g = hcg[2] / 100;
+    return parsed;
+}
 
-	if (c === 0.0) {
-		return [g * 255, g * 255, g * 255];
-	}
+function parse(command, args, options) {
+    // Normalize arguments, similar to nodejs
+    if (args && !Array.isArray(args)) {
+        options = args;
+        args = null;
+    }
 
-	const pure = [0, 0, 0];
-	const hi = (h % 1) * 6;
-	const v = hi % 1;
-	const w = 1 - v;
-	let mg = 0;
+    args = args ? args.slice(0) : []; // Clone array to avoid changing the original
+    options = Object.assign({}, options); // Clone object to avoid changing the original
 
-	/* eslint-disable max-statements-per-line */
-	switch (Math.floor(hi)) {
-		case 0:
-			pure[0] = 1; pure[1] = v; pure[2] = 0; break;
-		case 1:
-			pure[0] = w; pure[1] = 1; pure[2] = 0; break;
-		case 2:
-			pure[0] = 0; pure[1] = 1; pure[2] = v; break;
-		case 3:
-			pure[0] = 0; pure[1] = w; pure[2] = 1; break;
-		case 4:
-			pure[0] = v; pure[1] = 0; pure[2] = 1; break;
-		default:
-			pure[0] = 1; pure[1] = 0; pure[2] = w;
-	}
-	/* eslint-enable max-statements-per-line */
+    // Build our parsed object
+    const parsed = {
+        command,
+        args,
+        options,
+        file: undefined,
+        original: {
+            command,
+            args,
+        },
+    };
 
-	mg = (1.0 - c) * g;
+    // Delegate further parsing to shell or non-shell
+    return options.shell ? parsed : parseNonShell(parsed);
+}
 
-	return [
-		(c * pure[0] + mg) * 255,
-		(c * pure[1] + mg) * 255,
-		(c * pure[2] + mg) * 255
-	];
-};
+module.exports = parse;
 
-convert.hcg.hsv = function (hcg) {
-	const c = hcg[1] / 100;
-	const g = hcg[2] / 100;
 
-	const v = c + g * (1.0 - c);
-	let f = 0;
+/***/ }),
+/* 240 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	if (v > 0.0) {
-		f = c / v;
-	}
+"use strict";
 
-	return [hcg[0], f * 100, v * 100];
-};
 
-convert.hcg.hsl = function (hcg) {
-	const c = hcg[1] / 100;
-	const g = hcg[2] / 100;
+const path = __webpack_require__(4);
+const which = __webpack_require__(241);
+const pathKey = __webpack_require__(245)();
 
-	const l = g * (1.0 - c) + 0.5 * c;
-	let s = 0;
+function resolveCommandAttempt(parsed, withoutPathExt) {
+    const cwd = process.cwd();
+    const hasCustomCwd = parsed.options.cwd != null;
+    // Worker threads do not have process.chdir()
+    const shouldSwitchCwd = hasCustomCwd && process.chdir !== undefined;
 
-	if (l > 0.0 && l < 0.5) {
-		s = c / (2 * l);
-	} else
-	if (l >= 0.5 && l < 1.0) {
-		s = c / (2 * (1 - l));
-	}
+    // If a custom `cwd` was specified, we need to change the process cwd
+    // because `which` will do stat calls but does not support a custom cwd
+    if (shouldSwitchCwd) {
+        try {
+            process.chdir(parsed.options.cwd);
+        } catch (err) {
+            /* Empty */
+        }
+    }
 
-	return [hcg[0], s * 100, l * 100];
-};
+    let resolved;
 
-convert.hcg.hwb = function (hcg) {
-	const c = hcg[1] / 100;
-	const g = hcg[2] / 100;
-	const v = c + g * (1.0 - c);
-	return [hcg[0], (v - c) * 100, (1 - v) * 100];
-};
+    try {
+        resolved = which.sync(parsed.command, {
+            path: (parsed.options.env || process.env)[pathKey],
+            pathExt: withoutPathExt ? path.delimiter : undefined,
+        });
+    } catch (e) {
+        /* Empty */
+    } finally {
+        if (shouldSwitchCwd) {
+            process.chdir(cwd);
+        }
+    }
 
-convert.hwb.hcg = function (hwb) {
-	const w = hwb[1] / 100;
-	const b = hwb[2] / 100;
-	const v = 1 - b;
-	const c = v - w;
-	let g = 0;
+    // If we successfully resolved, ensure that an absolute path is returned
+    // Note that when a custom `cwd` was used, we need to resolve to an absolute path based on it
+    if (resolved) {
+        resolved = path.resolve(hasCustomCwd ? parsed.options.cwd : '', resolved);
+    }
 
-	if (c < 1) {
-		g = (v - c) / (1 - c);
-	}
+    return resolved;
+}
 
-	return [hwb[0], c * 100, g * 100];
-};
+function resolveCommand(parsed) {
+    return resolveCommandAttempt(parsed) || resolveCommandAttempt(parsed, true);
+}
 
-convert.apple.rgb = function (apple) {
-	return [(apple[0] / 65535) * 255, (apple[1] / 65535) * 255, (apple[2] / 65535) * 255];
-};
+module.exports = resolveCommand;
 
-convert.rgb.apple = function (rgb) {
-	return [(rgb[0] / 255) * 65535, (rgb[1] / 255) * 65535, (rgb[2] / 255) * 65535];
-};
 
-convert.gray.rgb = function (args) {
-	return [args[0] / 100 * 255, args[0] / 100 * 255, args[0] / 100 * 255];
-};
+/***/ }),
+/* 241 */
+/***/ (function(module, exports, __webpack_require__) {
 
-convert.gray.hsl = function (args) {
-	return [0, 0, args[0]];
-};
+const isWindows = process.platform === 'win32' ||
+    process.env.OSTYPE === 'cygwin' ||
+    process.env.OSTYPE === 'msys'
 
-convert.gray.hsv = convert.gray.hsl;
+const path = __webpack_require__(4)
+const COLON = isWindows ? ';' : ':'
+const isexe = __webpack_require__(242)
 
-convert.gray.hwb = function (gray) {
-	return [0, 100, gray[0]];
-};
+const getNotFoundError = (cmd) =>
+  Object.assign(new Error(`not found: ${cmd}`), { code: 'ENOENT' })
 
-convert.gray.cmyk = function (gray) {
-	return [0, 0, 0, gray[0]];
-};
+const getPathInfo = (cmd, opt) => {
+  const colon = opt.colon || COLON
 
-convert.gray.lab = function (gray) {
-	return [gray[0], 0, 0];
-};
+  // If it has a slash, then we don't bother searching the pathenv.
+  // just check the file itself, and that's it.
+  const pathEnv = cmd.match(/\//) || isWindows && cmd.match(/\\/) ? ['']
+    : (
+      [
+        // windows always checks the cwd first
+        ...(isWindows ? [process.cwd()] : []),
+        ...(opt.path || process.env.PATH ||
+          /* istanbul ignore next: very unusual */ '').split(colon),
+      ]
+    )
+  const pathExtExe = isWindows
+    ? opt.pathExt || process.env.PATHEXT || '.EXE;.CMD;.BAT;.COM'
+    : ''
+  const pathExt = isWindows ? pathExtExe.split(colon) : ['']
 
-convert.gray.hex = function (gray) {
-	const val = Math.round(gray[0] / 100 * 255) & 0xFF;
-	const integer = (val << 16) + (val << 8) + val;
+  if (isWindows) {
+    if (cmd.indexOf('.') !== -1 && pathExt[0] !== '')
+      pathExt.unshift('')
+  }
 
-	const string = integer.toString(16).toUpperCase();
-	return '000000'.substring(string.length) + string;
-};
+  return {
+    pathEnv,
+    pathExt,
+    pathExtExe,
+  }
+}
 
-convert.rgb.gray = function (rgb) {
-	const val = (rgb[0] + rgb[1] + rgb[2]) / 3;
-	return [val / 255 * 100];
-};
+const which = (cmd, opt, cb) => {
+  if (typeof opt === 'function') {
+    cb = opt
+    opt = {}
+  }
+  if (!opt)
+    opt = {}
 
+  const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt)
+  const found = []
 
-/***/ }),
-/* 239 */
-/***/ (function(module, exports, __webpack_require__) {
+  const step = i => new Promise((resolve, reject) => {
+    if (i === pathEnv.length)
+      return opt.all && found.length ? resolve(found)
+        : reject(getNotFoundError(cmd))
 
-const conversions = __webpack_require__(238);
+    const ppRaw = pathEnv[i]
+    const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw
 
-/*
-	This function routes a model to all other models.
+    const pCmd = path.join(pathPart, cmd)
+    const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd
+      : pCmd
 
-	all functions that are routed have a property `.conversion` attached
-	to the returned synthetic function. This property is an array
-	of strings, each with the steps in between the 'from' and 'to'
-	color models (inclusive).
+    resolve(subStep(p, i, 0))
+  })
 
-	conversions that are not possible simply are not included.
-*/
+  const subStep = (p, i, ii) => new Promise((resolve, reject) => {
+    if (ii === pathExt.length)
+      return resolve(step(i + 1))
+    const ext = pathExt[ii]
+    isexe(p + ext, { pathExt: pathExtExe }, (er, is) => {
+      if (!er && is) {
+        if (opt.all)
+          found.push(p + ext)
+        else
+          return resolve(p + ext)
+      }
+      return resolve(subStep(p, i, ii + 1))
+    })
+  })
 
-function buildGraph() {
-	const graph = {};
-	// https://jsperf.com/object-keys-vs-for-in-with-closure/3
-	const models = Object.keys(conversions);
+  return cb ? step(0).then(res => cb(null, res), cb) : step(0)
+}
 
-	for (let len = models.length, i = 0; i < len; i++) {
-		graph[models[i]] = {
-			// http://jsperf.com/1-vs-infinity
-			// micro-opt, but this is simple.
-			distance: -1,
-			parent: null
-		};
-	}
+const whichSync = (cmd, opt) => {
+  opt = opt || {}
 
-	return graph;
-}
+  const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt)
+  const found = []
 
-// https://en.wikipedia.org/wiki/Breadth-first_search
-function deriveBFS(fromModel) {
-	const graph = buildGraph();
-	const queue = [fromModel]; // Unshift -> queue -> pop
+  for (let i = 0; i < pathEnv.length; i ++) {
+    const ppRaw = pathEnv[i]
+    const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw
 
-	graph[fromModel].distance = 0;
+    const pCmd = path.join(pathPart, cmd)
+    const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd
+      : pCmd
 
-	while (queue.length) {
-		const current = queue.pop();
-		const adjacents = Object.keys(conversions[current]);
+    for (let j = 0; j < pathExt.length; j ++) {
+      const cur = p + pathExt[j]
+      try {
+        const is = isexe.sync(cur, { pathExt: pathExtExe })
+        if (is) {
+          if (opt.all)
+            found.push(cur)
+          else
+            return cur
+        }
+      } catch (ex) {}
+    }
+  }
 
-		for (let len = adjacents.length, i = 0; i < len; i++) {
-			const adjacent = adjacents[i];
-			const node = graph[adjacent];
+  if (opt.all && found.length)
+    return found
 
-			if (node.distance === -1) {
-				node.distance = graph[current].distance + 1;
-				node.parent = current;
-				queue.unshift(adjacent);
-			}
-		}
-	}
+  if (opt.nothrow)
+    return null
 
-	return graph;
+  throw getNotFoundError(cmd)
 }
 
-function link(from, to) {
-	return function (args) {
-		return to(from(args));
-	};
-}
+module.exports = which
+which.sync = whichSync
 
-function wrapConversion(toModel, graph) {
-	const path = [graph[toModel].parent, toModel];
-	let fn = conversions[graph[toModel].parent][toModel];
 
-	let cur = graph[toModel].parent;
-	while (graph[cur].parent) {
-		path.unshift(graph[cur].parent);
-		fn = link(conversions[graph[cur].parent][cur], fn);
-		cur = graph[cur].parent;
-	}
+/***/ }),
+/* 242 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	fn.conversion = path;
-	return fn;
+var fs = __webpack_require__(133)
+var core
+if (process.platform === 'win32' || global.TESTING_WINDOWS) {
+  core = __webpack_require__(243)
+} else {
+  core = __webpack_require__(244)
 }
 
-module.exports = function (fromModel) {
-	const graph = deriveBFS(fromModel);
-	const conversion = {};
+module.exports = isexe
+isexe.sync = sync
 
-	const models = Object.keys(graph);
-	for (let len = models.length, i = 0; i < len; i++) {
-		const toModel = models[i];
-		const node = graph[toModel];
+function isexe (path, options, cb) {
+  if (typeof options === 'function') {
+    cb = options
+    options = {}
+  }
 
-		if (node.parent === null) {
-			// No possible conversion, or this node is the source model.
-			continue;
-		}
+  if (!cb) {
+    if (typeof Promise !== 'function') {
+      throw new TypeError('callback not provided')
+    }
 
-		conversion[toModel] = wrapConversion(toModel, graph);
-	}
+    return new Promise(function (resolve, reject) {
+      isexe(path, options || {}, function (er, is) {
+        if (er) {
+          reject(er)
+        } else {
+          resolve(is)
+        }
+      })
+    })
+  }
 
-	return conversion;
-};
+  core(path, options || {}, function (er, is) {
+    // ignore EACCES because that just means we aren't allowed to run it
+    if (er) {
+      if (er.code === 'EACCES' || options && options.ignoreErrors) {
+        er = null
+        is = false
+      }
+    }
+    cb(er, is)
+  })
+}
 
+function sync (path, options) {
+  // my kingdom for a filtered catch
+  try {
+    return core.sync(path, options || {})
+  } catch (er) {
+    if (options && options.ignoreErrors || er.code === 'EACCES') {
+      return false
+    } else {
+      throw er
+    }
+  }
+}
 
 
 /***/ }),
-/* 240 */
+/* 243 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+module.exports = isexe
+isexe.sync = sync
 
-const os = __webpack_require__(120);
-const tty = __webpack_require__(121);
-const hasFlag = __webpack_require__(241);
+var fs = __webpack_require__(133)
 
-const {env} = process;
+function checkPathExt (path, options) {
+  var pathext = options.pathExt !== undefined ?
+    options.pathExt : process.env.PATHEXT
 
-let forceColor;
-if (hasFlag('no-color') ||
-	hasFlag('no-colors') ||
-	hasFlag('color=false') ||
-	hasFlag('color=never')) {
-	forceColor = 0;
-} else if (hasFlag('color') ||
-	hasFlag('colors') ||
-	hasFlag('color=true') ||
-	hasFlag('color=always')) {
-	forceColor = 1;
-}
+  if (!pathext) {
+    return true
+  }
 
-if ('FORCE_COLOR' in env) {
-	if (env.FORCE_COLOR === 'true') {
-		forceColor = 1;
-	} else if (env.FORCE_COLOR === 'false') {
-		forceColor = 0;
-	} else {
-		forceColor = env.FORCE_COLOR.length === 0 ? 1 : Math.min(parseInt(env.FORCE_COLOR, 10), 3);
-	}
+  pathext = pathext.split(';')
+  if (pathext.indexOf('') !== -1) {
+    return true
+  }
+  for (var i = 0; i < pathext.length; i++) {
+    var p = pathext[i].toLowerCase()
+    if (p && path.substr(-p.length).toLowerCase() === p) {
+      return true
+    }
+  }
+  return false
 }
 
-function translateLevel(level) {
-	if (level === 0) {
-		return false;
-	}
+function checkStat (stat, path, options) {
+  if (!stat.isSymbolicLink() && !stat.isFile()) {
+    return false
+  }
+  return checkPathExt(path, options)
+}
 
-	return {
-		level,
-		hasBasic: true,
-		has256: level >= 2,
-		has16m: level >= 3
-	};
+function isexe (path, options, cb) {
+  fs.stat(path, function (er, stat) {
+    cb(er, er ? false : checkStat(stat, path, options))
+  })
 }
 
-function supportsColor(haveStream, streamIsTTY) {
-	if (forceColor === 0) {
-		return 0;
-	}
+function sync (path, options) {
+  return checkStat(fs.statSync(path), path, options)
+}
 
-	if (hasFlag('color=16m') ||
-		hasFlag('color=full') ||
-		hasFlag('color=truecolor')) {
-		return 3;
-	}
 
-	if (hasFlag('color=256')) {
-		return 2;
-	}
+/***/ }),
+/* 244 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	if (haveStream && !streamIsTTY && forceColor === undefined) {
-		return 0;
-	}
+module.exports = isexe
+isexe.sync = sync
 
-	const min = forceColor || 0;
+var fs = __webpack_require__(133)
 
-	if (env.TERM === 'dumb') {
-		return min;
-	}
-
-	if (process.platform === 'win32') {
-		// Windows 10 build 10586 is the first Windows release that supports 256 colors.
-		// Windows 10 build 14931 is the first release that supports 16m/TrueColor.
-		const osRelease = os.release().split('.');
-		if (
-			Number(osRelease[0]) >= 10 &&
-			Number(osRelease[2]) >= 10586
-		) {
-			return Number(osRelease[2]) >= 14931 ? 3 : 2;
-		}
+function isexe (path, options, cb) {
+  fs.stat(path, function (er, stat) {
+    cb(er, er ? false : checkStat(stat, options))
+  })
+}
 
-		return 1;
-	}
+function sync (path, options) {
+  return checkStat(fs.statSync(path), options)
+}
 
-	if ('CI' in env) {
-		if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
-			return 1;
-		}
+function checkStat (stat, options) {
+  return stat.isFile() && checkMode(stat, options)
+}
 
-		return min;
-	}
+function checkMode (stat, options) {
+  var mod = stat.mode
+  var uid = stat.uid
+  var gid = stat.gid
 
-	if ('TEAMCITY_VERSION' in env) {
-		return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
-	}
+  var myUid = options.uid !== undefined ?
+    options.uid : process.getuid && process.getuid()
+  var myGid = options.gid !== undefined ?
+    options.gid : process.getgid && process.getgid()
 
-	if ('GITHUB_ACTIONS' in env) {
-		return 1;
-	}
+  var u = parseInt('100', 8)
+  var g = parseInt('010', 8)
+  var o = parseInt('001', 8)
+  var ug = u | g
 
-	if (env.COLORTERM === 'truecolor') {
-		return 3;
-	}
+  var ret = (mod & o) ||
+    (mod & g) && gid === myGid ||
+    (mod & u) && uid === myUid ||
+    (mod & ug) && myUid === 0
 
-	if ('TERM_PROGRAM' in env) {
-		const version = parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
+  return ret
+}
 
-		switch (env.TERM_PROGRAM) {
-			case 'iTerm.app':
-				return version >= 3 ? 3 : 2;
-			case 'Apple_Terminal':
-				return 2;
-			// No default
-		}
-	}
 
-	if (/-256(color)?$/i.test(env.TERM)) {
-		return 2;
-	}
+/***/ }),
+/* 245 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	if (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
-		return 1;
-	}
+"use strict";
 
-	if ('COLORTERM' in env) {
-		return 1;
-	}
 
-	return min;
-}
+const pathKey = (options = {}) => {
+	const environment = options.env || process.env;
+	const platform = options.platform || process.platform;
 
-function getSupportLevel(stream) {
-	const level = supportsColor(stream, stream && stream.isTTY);
-	return translateLevel(level);
-}
+	if (platform !== 'win32') {
+		return 'PATH';
+	}
 
-module.exports = {
-	supportsColor: getSupportLevel,
-	stdout: translateLevel(supportsColor(true, tty.isatty(1))),
-	stderr: translateLevel(supportsColor(true, tty.isatty(2)))
+	return Object.keys(environment).find(key => key.toUpperCase() === 'PATH') || 'Path';
 };
 
+module.exports = pathKey;
+// TODO: Remove this for the next major release
+module.exports.default = pathKey;
+
 
 /***/ }),
-/* 241 */
+/* 246 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-module.exports = (flag, argv = process.argv) => {
-	const prefix = flag.startsWith('-') ? '' : (flag.length === 1 ? '-' : '--');
-	const position = argv.indexOf(prefix + flag);
-	const terminatorPosition = argv.indexOf('--');
-	return position !== -1 && (terminatorPosition === -1 || position < terminatorPosition);
-};
+// See http://www.robvanderwoude.com/escapechars.php
+const metaCharsRegExp = /([()\][%!^"`<>&|;, *?])/g;
+
+function escapeCommand(arg) {
+    // Escape meta chars
+    arg = arg.replace(metaCharsRegExp, '^$1');
+
+    return arg;
+}
+
+function escapeArgument(arg, doubleEscapeMetaChars) {
+    // Convert to string
+    arg = `${arg}`;
+
+    // Algorithm below is based on https://qntm.org/cmd
+
+    // Sequence of backslashes followed by a double quote:
+    // double up all the backslashes and escape the double quote
+    arg = arg.replace(/(\\*)"/g, '$1$1\\"');
+
+    // Sequence of backslashes followed by the end of the string
+    // (which will become a double quote later):
+    // double up all the backslashes
+    arg = arg.replace(/(\\*)$/, '$1$1');
+
+    // All other backslashes occur literally
+
+    // Quote the whole thing:
+    arg = `"${arg}"`;
+
+    // Escape meta chars
+    arg = arg.replace(metaCharsRegExp, '^$1');
+
+    // Double escape meta chars if necessary
+    if (doubleEscapeMetaChars) {
+        arg = arg.replace(metaCharsRegExp, '^$1');
+    }
+
+    return arg;
+}
+
+module.exports.command = escapeCommand;
+module.exports.argument = escapeArgument;
 
 
 /***/ }),
-/* 242 */
+/* 247 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const stringReplaceAll = (string, substring, replacer) => {
-	let index = string.indexOf(substring);
-	if (index === -1) {
-		return string;
-	}
+const fs = __webpack_require__(133);
+const shebangCommand = __webpack_require__(248);
 
-	const substringLength = substring.length;
-	let endIndex = 0;
-	let returnValue = '';
-	do {
-		returnValue += string.substr(endIndex, index - endIndex) + substring + replacer;
-		endIndex = index + substringLength;
-		index = string.indexOf(substring, endIndex);
-	} while (index !== -1);
+function readShebang(command) {
+    // Read the first 150 bytes from the file
+    const size = 150;
+    const buffer = Buffer.alloc(size);
 
-	returnValue += string.substr(endIndex);
-	return returnValue;
-};
+    let fd;
 
-const stringEncaseCRLFWithFirstIndex = (string, prefix, postfix, index) => {
-	let endIndex = 0;
-	let returnValue = '';
-	do {
-		const gotCR = string[index - 1] === '\r';
-		returnValue += string.substr(endIndex, (gotCR ? index - 1 : index) - endIndex) + prefix + (gotCR ? '\r\n' : '\n') + postfix;
-		endIndex = index + 1;
-		index = string.indexOf('\n', endIndex);
-	} while (index !== -1);
+    try {
+        fd = fs.openSync(command, 'r');
+        fs.readSync(fd, buffer, 0, size, 0);
+        fs.closeSync(fd);
+    } catch (e) { /* Empty */ }
 
-	returnValue += string.substr(endIndex);
-	return returnValue;
-};
+    // Attempt to extract shebang (null is returned if not a shebang)
+    return shebangCommand(buffer.toString());
+}
 
-module.exports = {
-	stringReplaceAll,
-	stringEncaseCRLFWithFirstIndex
-};
+module.exports = readShebang;
 
 
 /***/ }),
-/* 243 */
+/* 248 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const TEMPLATE_REGEX = /(?:\\(u(?:[a-f\d]{4}|\{[a-f\d]{1,6}\})|x[a-f\d]{2}|.))|(?:\{(~)?(\w+(?:\([^)]*\))?(?:\.\w+(?:\([^)]*\))?)*)(?:[ \t]|(?=\r?\n)))|(\})|((?:.|[\r\n\f])+?)/gi;
-const STYLE_REGEX = /(?:^|\.)(\w+)(?:\(([^)]*)\))?/g;
-const STRING_REGEX = /^(['"])((?:\\.|(?!\1)[^\\])*)\1$/;
-const ESCAPE_REGEX = /\\(u(?:[a-f\d]{4}|{[a-f\d]{1,6}})|x[a-f\d]{2}|.)|([^\\])/gi;
-
-const ESCAPES = new Map([
-	['n', '\n'],
-	['r', '\r'],
-	['t', '\t'],
-	['b', '\b'],
-	['f', '\f'],
-	['v', '\v'],
-	['0', '\0'],
-	['\\', '\\'],
-	['e', '\u001B'],
-	['a', '\u0007']
-]);
+const shebangRegex = __webpack_require__(249);
 
-function unescape(c) {
-	const u = c[0] === 'u';
-	const bracket = c[1] === '{';
+module.exports = (string = '') => {
+	const match = string.match(shebangRegex);
 
-	if ((u && !bracket && c.length === 5) || (c[0] === 'x' && c.length === 3)) {
-		return String.fromCharCode(parseInt(c.slice(1), 16));
+	if (!match) {
+		return null;
 	}
 
-	if (u && bracket) {
-		return String.fromCodePoint(parseInt(c.slice(2, -1), 16));
+	const [path, argument] = match[0].replace(/#! ?/, '').split(' ');
+	const binary = path.split('/').pop();
+
+	if (binary === 'env') {
+		return argument;
 	}
 
-	return ESCAPES.get(c) || c;
-}
+	return argument ? `${binary} ${argument}` : binary;
+};
 
-function parseArguments(name, arguments_) {
-	const results = [];
-	const chunks = arguments_.trim().split(/\s*,\s*/g);
-	let matches;
 
-	for (const chunk of chunks) {
-		const number = Number(chunk);
-		if (!Number.isNaN(number)) {
-			results.push(number);
-		} else if ((matches = chunk.match(STRING_REGEX))) {
-			results.push(matches[2].replace(ESCAPE_REGEX, (m, escape, character) => escape ? unescape(escape) : character));
-		} else {
-			throw new Error(`Invalid Chalk template style argument: ${chunk} (in style '${name}')`);
-		}
-	}
+/***/ }),
+/* 249 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	return results;
-}
+"use strict";
 
-function parseStyle(style) {
-	STYLE_REGEX.lastIndex = 0;
+module.exports = /^#!(.*)/;
 
-	const results = [];
-	let matches;
 
-	while ((matches = STYLE_REGEX.exec(style)) !== null) {
-		const name = matches[1];
+/***/ }),
+/* 250 */
+/***/ (function(module, exports, __webpack_require__) {
 
-		if (matches[2]) {
-			const args = parseArguments(name, matches[2]);
-			results.push([name].concat(args));
-		} else {
-			results.push([name]);
-		}
-	}
+"use strict";
 
-	return results;
+
+const isWin = process.platform === 'win32';
+
+function notFoundError(original, syscall) {
+    return Object.assign(new Error(`${syscall} ${original.command} ENOENT`), {
+        code: 'ENOENT',
+        errno: 'ENOENT',
+        syscall: `${syscall} ${original.command}`,
+        path: original.command,
+        spawnargs: original.args,
+    });
 }
 
-function buildStyle(chalk, styles) {
-	const enabled = {};
+function hookChildProcess(cp, parsed) {
+    if (!isWin) {
+        return;
+    }
 
-	for (const layer of styles) {
-		for (const style of layer.styles) {
-			enabled[style[0]] = layer.inverse ? null : style.slice(1);
-		}
-	}
+    const originalEmit = cp.emit;
 
-	let current = chalk;
-	for (const [styleName, styles] of Object.entries(enabled)) {
-		if (!Array.isArray(styles)) {
-			continue;
-		}
+    cp.emit = function (name, arg1) {
+        // If emitting "exit" event and exit code is 1, we need to check if
+        // the command exists and emit an "error" instead
+        // See https://github.com/IndigoUnited/node-cross-spawn/issues/16
+        if (name === 'exit') {
+            const err = verifyENOENT(arg1, parsed, 'spawn');
 
-		if (!(styleName in current)) {
-			throw new Error(`Unknown Chalk style: ${styleName}`);
-		}
+            if (err) {
+                return originalEmit.call(cp, 'error', err);
+            }
+        }
 
-		current = styles.length > 0 ? current[styleName](...styles) : current[styleName];
-	}
+        return originalEmit.apply(cp, arguments); // eslint-disable-line prefer-rest-params
+    };
+}
 
-	return current;
+function verifyENOENT(status, parsed) {
+    if (isWin && status === 1 && !parsed.file) {
+        return notFoundError(parsed.original, 'spawn');
+    }
+
+    return null;
 }
 
-module.exports = (chalk, temporary) => {
-	const styles = [];
-	const chunks = [];
-	let chunk = [];
+function verifyENOENTSync(status, parsed) {
+    if (isWin && status === 1 && !parsed.file) {
+        return notFoundError(parsed.original, 'spawnSync');
+    }
 
-	// eslint-disable-next-line max-params
-	temporary.replace(TEMPLATE_REGEX, (m, escapeCharacter, inverse, style, close, character) => {
-		if (escapeCharacter) {
-			chunk.push(unescape(escapeCharacter));
-		} else if (style) {
-			const string = chunk.join('');
-			chunk = [];
-			chunks.push(styles.length === 0 ? string : buildStyle(chalk, styles)(string));
-			styles.push({inverse, styles: parseStyle(style)});
-		} else if (close) {
-			if (styles.length === 0) {
-				throw new Error('Found extraneous } in Chalk template literal');
-			}
+    return null;
+}
 
-			chunks.push(buildStyle(chalk, styles)(chunk.join('')));
-			chunk = [];
-			styles.pop();
-		} else {
-			chunk.push(character);
-		}
-	});
+module.exports = {
+    hookChildProcess,
+    verifyENOENT,
+    verifyENOENTSync,
+    notFoundError,
+};
 
-	chunks.push(chunk.join(''));
 
-	if (styles.length > 0) {
-		const errMessage = `Chalk template literal is missing ${styles.length} closing bracket${styles.length === 1 ? '' : 's'} (\`}\`)`;
-		throw new Error(errMessage);
+/***/ }),
+/* 251 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+module.exports = input => {
+	const LF = typeof input === 'string' ? '\n' : '\n'.charCodeAt();
+	const CR = typeof input === 'string' ? '\r' : '\r'.charCodeAt();
+
+	if (input[input.length - 1] === LF) {
+		input = input.slice(0, input.length - 1);
 	}
 
-	return chunks.join('');
+	if (input[input.length - 1] === CR) {
+		input = input.slice(0, input.length - 1);
+	}
+
+	return input;
 };
 
 
 /***/ }),
-/* 244 */
+/* 252 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const path = __webpack_require__(4);
-const childProcess = __webpack_require__(245);
-const crossSpawn = __webpack_require__(246);
-const stripFinalNewline = __webpack_require__(259);
-const npmRunPath = __webpack_require__(260);
-const onetime = __webpack_require__(261);
-const makeError = __webpack_require__(263);
-const normalizeStdio = __webpack_require__(268);
-const {spawnedKill, spawnedCancel, setupTimeout, setExitHandler} = __webpack_require__(269);
-const {handleInput, getSpawnedResult, makeAllStream, validateInputSync} = __webpack_require__(270);
-const {mergePromise, getSpawnedPromise} = __webpack_require__(277);
-const {joinCommand, parseCommand} = __webpack_require__(278);
+const pathKey = __webpack_require__(245);
 
-const DEFAULT_MAX_BUFFER = 1000 * 1000 * 100;
+const npmRunPath = options => {
+	options = {
+		cwd: process.cwd(),
+		path: process.env[pathKey()],
+		execPath: process.execPath,
+		...options
+	};
 
-const getEnv = ({env: envOption, extendEnv, preferLocal, localDir, execPath}) => {
-	const env = extendEnv ? {...process.env, ...envOption} : envOption;
+	let previous;
+	let cwdPath = path.resolve(options.cwd);
+	const result = [];
 
-	if (preferLocal) {
-		return npmRunPath.env({env, cwd: localDir, execPath});
+	while (previous !== cwdPath) {
+		result.push(path.join(cwdPath, 'node_modules/.bin'));
+		previous = cwdPath;
+		cwdPath = path.resolve(cwdPath, '..');
 	}
 
-	return env;
+	// Ensure the running `node` binary is used
+	const execPathDir = path.resolve(options.cwd, options.execPath, '..');
+	result.push(execPathDir);
+
+	return result.concat(options.path).join(path.delimiter);
 };
 
-const handleArgs = (file, args, options = {}) => {
-	const parsed = crossSpawn._parse(file, args, options);
-	file = parsed.command;
-	args = parsed.args;
-	options = parsed.options;
+module.exports = npmRunPath;
+// TODO: Remove this for the next major release
+module.exports.default = npmRunPath;
 
+module.exports.env = options => {
 	options = {
-		maxBuffer: DEFAULT_MAX_BUFFER,
-		buffer: true,
-		stripFinalNewline: true,
-		extendEnv: true,
-		preferLocal: false,
-		localDir: options.cwd || process.cwd(),
-		execPath: process.execPath,
-		encoding: 'utf8',
-		reject: true,
-		cleanup: true,
-		all: false,
-		windowsHide: true,
+		env: process.env,
 		...options
 	};
 
-	options.env = getEnv(options);
-
-	options.stdio = normalizeStdio(options);
+	const env = {...options.env};
+	const path = pathKey({env});
 
-	if (process.platform === 'win32' && path.basename(file, '.exe') === 'cmd') {
-		// #116
-		args.unshift('/q');
-	}
+	options.path = env[path];
+	env[path] = module.exports(options);
 
-	return {file, args, options, parsed};
+	return env;
 };
 
-const handleOutput = (options, value, error) => {
-	if (typeof value !== 'string' && !Buffer.isBuffer(value)) {
-		// When `execa.sync()` errors, we normalize it to '' to mimic `execa()`
-		return error === undefined ? undefined : '';
-	}
 
-	if (options.stripFinalNewline) {
-		return stripFinalNewline(value);
-	}
+/***/ }),
+/* 253 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	return value;
-};
+"use strict";
 
-const execa = (file, args, options) => {
-	const parsed = handleArgs(file, args, options);
-	const command = joinCommand(file, args);
+const mimicFn = __webpack_require__(254);
 
-	let spawned;
-	try {
-		spawned = childProcess.spawn(parsed.file, parsed.args, parsed.options);
-	} catch (error) {
-		// Ensure the returned error is always both a promise and a child process
-		const dummySpawned = new childProcess.ChildProcess();
-		const errorPromise = Promise.reject(makeError({
-			error,
-			stdout: '',
-			stderr: '',
-			all: '',
-			command,
-			parsed,
-			timedOut: false,
-			isCanceled: false,
-			killed: false
-		}));
-		return mergePromise(dummySpawned, errorPromise);
+const calledFunctions = new WeakMap();
+
+const oneTime = (fn, options = {}) => {
+	if (typeof fn !== 'function') {
+		throw new TypeError('Expected a function');
 	}
 
-	const spawnedPromise = getSpawnedPromise(spawned);
-	const timedPromise = setupTimeout(spawned, parsed.options, spawnedPromise);
-	const processDone = setExitHandler(spawned, parsed.options, timedPromise);
+	let ret;
+	let isCalled = false;
+	let callCount = 0;
+	const functionName = fn.displayName || fn.name || '<anonymous>';
 
-	const context = {isCanceled: false};
+	const onetime = function (...args) {
+		calledFunctions.set(onetime, ++callCount);
 
-	spawned.kill = spawnedKill.bind(null, spawned.kill.bind(spawned));
-	spawned.cancel = spawnedCancel.bind(null, spawned, context);
+		if (isCalled) {
+			if (options.throw === true) {
+				throw new Error(`Function \`${functionName}\` can only be called once`);
+			}
 
-	const handlePromise = async () => {
-		const [{error, exitCode, signal, timedOut}, stdoutResult, stderrResult, allResult] = await getSpawnedResult(spawned, parsed.options, processDone);
-		const stdout = handleOutput(parsed.options, stdoutResult);
-		const stderr = handleOutput(parsed.options, stderrResult);
-		const all = handleOutput(parsed.options, allResult);
-
-		if (error || exitCode !== 0 || signal !== null) {
-			const returnedError = makeError({
-				error,
-				exitCode,
-				signal,
-				stdout,
-				stderr,
-				all,
-				command,
-				parsed,
-				timedOut,
-				isCanceled: context.isCanceled,
-				killed: spawned.killed
-			});
-
-			if (!parsed.options.reject) {
-				return returnedError;
-			}
-
-			throw returnedError;
+			return ret;
 		}
 
-		return {
-			command,
-			exitCode: 0,
-			stdout,
-			stderr,
-			all,
-			failed: false,
-			timedOut: false,
-			isCanceled: false,
-			killed: false
-		};
-	};
-
-	const handlePromiseOnce = onetime(handlePromise);
-
-	crossSpawn._enoent.hookChildProcess(spawned, parsed.parsed);
+		isCalled = true;
+		ret = fn.apply(this, args);
+		fn = null;
 
-	handleInput(spawned, parsed.options.input);
+		return ret;
+	};
 
-	spawned.all = makeAllStream(spawned, parsed.options);
+	mimicFn(onetime, fn);
+	calledFunctions.set(onetime, callCount);
 
-	return mergePromise(spawned, handlePromiseOnce);
+	return onetime;
 };
 
-module.exports = execa;
-
-module.exports.sync = (file, args, options) => {
-	const parsed = handleArgs(file, args, options);
-	const command = joinCommand(file, args);
-
-	validateInputSync(parsed.options);
+module.exports = oneTime;
+// TODO: Remove this for the next major release
+module.exports.default = oneTime;
 
-	let result;
-	try {
-		result = childProcess.spawnSync(parsed.file, parsed.args, parsed.options);
-	} catch (error) {
-		throw makeError({
-			error,
-			stdout: '',
-			stderr: '',
-			all: '',
-			command,
-			parsed,
-			timedOut: false,
-			isCanceled: false,
-			killed: false
-		});
+module.exports.callCount = fn => {
+	if (!calledFunctions.has(fn)) {
+		throw new Error(`The given function \`${fn.name}\` is not wrapped by the \`onetime\` package`);
 	}
 
-	const stdout = handleOutput(parsed.options, result.stdout, result.error);
-	const stderr = handleOutput(parsed.options, result.stderr, result.error);
+	return calledFunctions.get(fn);
+};
 
-	if (result.error || result.status !== 0 || result.signal !== null) {
-		const error = makeError({
-			stdout,
-			stderr,
-			error: result.error,
-			signal: result.signal,
-			exitCode: result.status,
-			command,
-			parsed,
-			timedOut: result.error && result.error.code === 'ETIMEDOUT',
-			isCanceled: false,
-			killed: result.signal !== null
-		});
 
-		if (!parsed.options.reject) {
-			return error;
-		}
+/***/ }),
+/* 254 */
+/***/ (function(module, exports, __webpack_require__) {
 
-		throw error;
-	}
+"use strict";
 
-	return {
-		command,
-		exitCode: 0,
-		stdout,
-		stderr,
-		failed: false,
-		timedOut: false,
-		isCanceled: false,
-		killed: false
-	};
-};
 
-module.exports.command = (command, options) => {
-	const [file, ...args] = parseCommand(command);
-	return execa(file, args, options);
-};
+const mimicFn = (to, from) => {
+	for (const prop of Reflect.ownKeys(from)) {
+		Object.defineProperty(to, prop, Object.getOwnPropertyDescriptor(from, prop));
+	}
 
-module.exports.commandSync = (command, options) => {
-	const [file, ...args] = parseCommand(command);
-	return execa.sync(file, args, options);
+	return to;
 };
 
-module.exports.node = (scriptPath, args, options = {}) => {
-	if (args && !Array.isArray(args) && typeof args === 'object') {
-		options = args;
-		args = [];
-	}
+module.exports = mimicFn;
+// TODO: Remove this for the next major release
+module.exports.default = mimicFn;
 
-	const stdio = normalizeStdio.node(options);
 
-	const {nodePath = process.execPath, nodeOptions = process.execArgv} = options;
+/***/ }),
+/* 255 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	return execa(
-		nodePath,
-		[
-			...nodeOptions,
-			scriptPath,
-			...(Array.isArray(args) ? args : [])
-		],
-		{
-			...options,
-			stdin: undefined,
-			stdout: undefined,
-			stderr: undefined,
-			stdio,
-			shell: false
-		}
-	);
-};
+"use strict";
 
+const {signalsByName} = __webpack_require__(256);
 
-/***/ }),
-/* 245 */
-/***/ (function(module, exports) {
+const getErrorPrefix = ({timedOut, timeout, errorCode, signal, signalDescription, exitCode, isCanceled}) => {
+	if (timedOut) {
+		return `timed out after ${timeout} milliseconds`;
+	}
 
-module.exports = require("child_process");
+	if (isCanceled) {
+		return 'was canceled';
+	}
 
-/***/ }),
-/* 246 */
-/***/ (function(module, exports, __webpack_require__) {
+	if (errorCode !== undefined) {
+		return `failed with ${errorCode}`;
+	}
 
-"use strict";
+	if (signal !== undefined) {
+		return `was killed with ${signal} (${signalDescription})`;
+	}
 
+	if (exitCode !== undefined) {
+		return `failed with exit code ${exitCode}`;
+	}
 
-const cp = __webpack_require__(245);
-const parse = __webpack_require__(247);
-const enoent = __webpack_require__(258);
+	return 'failed';
+};
 
-function spawn(command, args, options) {
-    // Parse the arguments
-    const parsed = parse(command, args, options);
+const makeError = ({
+	stdout,
+	stderr,
+	all,
+	error,
+	signal,
+	exitCode,
+	command,
+	timedOut,
+	isCanceled,
+	killed,
+	parsed: {options: {timeout}}
+}) => {
+	// `signal` and `exitCode` emitted on `spawned.on('exit')` event can be `null`.
+	// We normalize them to `undefined`
+	exitCode = exitCode === null ? undefined : exitCode;
+	signal = signal === null ? undefined : signal;
+	const signalDescription = signal === undefined ? undefined : signalsByName[signal].description;
 
-    // Spawn the child process
-    const spawned = cp.spawn(parsed.command, parsed.args, parsed.options);
+	const errorCode = error && error.code;
 
-    // Hook into child process "exit" event to emit an error if the command
-    // does not exists, see: https://github.com/IndigoUnited/node-cross-spawn/issues/16
-    enoent.hookChildProcess(spawned, parsed);
+	const prefix = getErrorPrefix({timedOut, timeout, errorCode, signal, signalDescription, exitCode, isCanceled});
+	const execaMessage = `Command ${prefix}: ${command}`;
+	const isError = Object.prototype.toString.call(error) === '[object Error]';
+	const shortMessage = isError ? `${execaMessage}\n${error.message}` : execaMessage;
+	const message = [shortMessage, stderr, stdout].filter(Boolean).join('\n');
 
-    return spawned;
-}
+	if (isError) {
+		error.originalMessage = error.message;
+		error.message = message;
+	} else {
+		error = new Error(message);
+	}
 
-function spawnSync(command, args, options) {
-    // Parse the arguments
-    const parsed = parse(command, args, options);
+	error.shortMessage = shortMessage;
+	error.command = command;
+	error.exitCode = exitCode;
+	error.signal = signal;
+	error.signalDescription = signalDescription;
+	error.stdout = stdout;
+	error.stderr = stderr;
 
-    // Spawn the child process
-    const result = cp.spawnSync(parsed.command, parsed.args, parsed.options);
+	if (all !== undefined) {
+		error.all = all;
+	}
 
-    // Analyze if the command does not exist, see: https://github.com/IndigoUnited/node-cross-spawn/issues/16
-    result.error = result.error || enoent.verifyENOENTSync(result.status, parsed);
+	if ('bufferedData' in error) {
+		delete error.bufferedData;
+	}
 
-    return result;
-}
+	error.failed = true;
+	error.timedOut = Boolean(timedOut);
+	error.isCanceled = isCanceled;
+	error.killed = killed && !timedOut;
 
-module.exports = spawn;
-module.exports.spawn = spawn;
-module.exports.sync = spawnSync;
+	return error;
+};
 
-module.exports._parse = parse;
-module.exports._enoent = enoent;
+module.exports = makeError;
 
 
 /***/ }),
-/* 247 */
+/* 256 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
+Object.defineProperty(exports,"__esModule",{value:true});exports.signalsByNumber=exports.signalsByName=void 0;var _os=__webpack_require__(120);
 
+var _signals=__webpack_require__(257);
+var _realtime=__webpack_require__(259);
 
-const path = __webpack_require__(4);
-const resolveCommand = __webpack_require__(248);
-const escape = __webpack_require__(254);
-const readShebang = __webpack_require__(255);
 
-const isWin = process.platform === 'win32';
-const isExecutableRegExp = /\.(?:com|exe)$/i;
-const isCmdShimRegExp = /node_modules[\\/].bin[\\/][^\\/]+\.cmd$/i;
 
-function detectShebang(parsed) {
-    parsed.file = resolveCommand(parsed);
+const getSignalsByName=function(){
+const signals=(0,_signals.getSignals)();
+return signals.reduce(getSignalByName,{});
+};
 
-    const shebang = parsed.file && readShebang(parsed.file);
+const getSignalByName=function(
+signalByNameMemo,
+{name,number,description,supported,action,forced,standard})
+{
+return{
+...signalByNameMemo,
+[name]:{name,number,description,supported,action,forced,standard}};
 
-    if (shebang) {
-        parsed.args.unshift(parsed.file);
-        parsed.command = shebang;
+};
 
-        return resolveCommand(parsed);
-    }
+const signalsByName=getSignalsByName();exports.signalsByName=signalsByName;
 
-    return parsed.file;
-}
 
-function parseNonShell(parsed) {
-    if (!isWin) {
-        return parsed;
-    }
 
-    // Detect & add support for shebangs
-    const commandFile = detectShebang(parsed);
 
-    // We don't need a shell if the command filename is an executable
-    const needsShell = !isExecutableRegExp.test(commandFile);
+const getSignalsByNumber=function(){
+const signals=(0,_signals.getSignals)();
+const length=_realtime.SIGRTMAX+1;
+const signalsA=Array.from({length},(value,number)=>
+getSignalByNumber(number,signals));
 
-    // If a shell is required, use cmd.exe and take care of escaping everything correctly
-    // Note that `forceShell` is an hidden option used only in tests
-    if (parsed.options.forceShell || needsShell) {
-        // Need to double escape meta chars if the command is a cmd-shim located in `node_modules/.bin/`
-        // The cmd-shim simply calls execute the package bin file with NodeJS, proxying any argument
-        // Because the escape of metachars with ^ gets interpreted when the cmd.exe is first called,
-        // we need to double escape them
-        const needsDoubleEscapeMetaChars = isCmdShimRegExp.test(commandFile);
+return Object.assign({},...signalsA);
+};
 
-        // Normalize posix paths into OS compatible paths (e.g.: foo/bar -> foo\bar)
-        // This is necessary otherwise it will always fail with ENOENT in those cases
-        parsed.command = path.normalize(parsed.command);
+const getSignalByNumber=function(number,signals){
+const signal=findSignalByNumber(number,signals);
 
-        // Escape command & arguments
-        parsed.command = escape.command(parsed.command);
-        parsed.args = parsed.args.map((arg) => escape.argument(arg, needsDoubleEscapeMetaChars));
+if(signal===undefined){
+return{};
+}
 
-        const shellCommand = [parsed.command].concat(parsed.args).join(' ');
+const{name,description,supported,action,forced,standard}=signal;
+return{
+[number]:{
+name,
+number,
+description,
+supported,
+action,
+forced,
+standard}};
 
-        parsed.args = ['/d', '/s', '/c', `"${shellCommand}"`];
-        parsed.command = process.env.comspec || 'cmd.exe';
-        parsed.options.windowsVerbatimArguments = true; // Tell node's spawn that the arguments are already escaped
-    }
 
-    return parsed;
-}
+};
 
-function parse(command, args, options) {
-    // Normalize arguments, similar to nodejs
-    if (args && !Array.isArray(args)) {
-        options = args;
-        args = null;
-    }
 
-    args = args ? args.slice(0) : []; // Clone array to avoid changing the original
-    options = Object.assign({}, options); // Clone object to avoid changing the original
 
-    // Build our parsed object
-    const parsed = {
-        command,
-        args,
-        options,
-        file: undefined,
-        original: {
-            command,
-            args,
-        },
-    };
+const findSignalByNumber=function(number,signals){
+const signal=signals.find(({name})=>_os.constants.signals[name]===number);
 
-    // Delegate further parsing to shell or non-shell
-    return options.shell ? parsed : parseNonShell(parsed);
+if(signal!==undefined){
+return signal;
 }
 
-module.exports = parse;
+return signals.find(signalA=>signalA.number===number);
+};
 
+const signalsByNumber=getSignalsByNumber();exports.signalsByNumber=signalsByNumber;
+//# sourceMappingURL=main.js.map
 
 /***/ }),
-/* 248 */
+/* 257 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
+Object.defineProperty(exports,"__esModule",{value:true});exports.getSignals=void 0;var _os=__webpack_require__(120);
 
+var _core=__webpack_require__(258);
+var _realtime=__webpack_require__(259);
 
-const path = __webpack_require__(4);
-const which = __webpack_require__(249);
-const pathKey = __webpack_require__(253)();
 
-function resolveCommandAttempt(parsed, withoutPathExt) {
-    const cwd = process.cwd();
-    const hasCustomCwd = parsed.options.cwd != null;
-    // Worker threads do not have process.chdir()
-    const shouldSwitchCwd = hasCustomCwd && process.chdir !== undefined;
 
-    // If a custom `cwd` was specified, we need to change the process cwd
-    // because `which` will do stat calls but does not support a custom cwd
-    if (shouldSwitchCwd) {
-        try {
-            process.chdir(parsed.options.cwd);
-        } catch (err) {
-            /* Empty */
-        }
-    }
+const getSignals=function(){
+const realtimeSignals=(0,_realtime.getRealtimeSignals)();
+const signals=[..._core.SIGNALS,...realtimeSignals].map(normalizeSignal);
+return signals;
+};exports.getSignals=getSignals;
 
-    let resolved;
 
-    try {
-        resolved = which.sync(parsed.command, {
-            path: (parsed.options.env || process.env)[pathKey],
-            pathExt: withoutPathExt ? path.delimiter : undefined,
-        });
-    } catch (e) {
-        /* Empty */
-    } finally {
-        if (shouldSwitchCwd) {
-            process.chdir(cwd);
-        }
-    }
 
-    // If we successfully resolved, ensure that an absolute path is returned
-    // Note that when a custom `cwd` was used, we need to resolve to an absolute path based on it
-    if (resolved) {
-        resolved = path.resolve(hasCustomCwd ? parsed.options.cwd : '', resolved);
-    }
 
-    return resolved;
-}
 
-function resolveCommand(parsed) {
-    return resolveCommandAttempt(parsed) || resolveCommandAttempt(parsed, true);
-}
 
-module.exports = resolveCommand;
 
+const normalizeSignal=function({
+name,
+number:defaultNumber,
+description,
+action,
+forced=false,
+standard})
+{
+const{
+signals:{[name]:constantSignal}}=
+_os.constants;
+const supported=constantSignal!==undefined;
+const number=supported?constantSignal:defaultNumber;
+return{name,number,description,supported,action,forced,standard};
+};
+//# sourceMappingURL=signals.js.map
 
 /***/ }),
-/* 249 */
+/* 258 */
 /***/ (function(module, exports, __webpack_require__) {
 
-const isWindows = process.platform === 'win32' ||
-    process.env.OSTYPE === 'cygwin' ||
-    process.env.OSTYPE === 'msys'
+"use strict";
+Object.defineProperty(exports,"__esModule",{value:true});exports.SIGNALS=void 0;
 
-const path = __webpack_require__(4)
-const COLON = isWindows ? ';' : ':'
-const isexe = __webpack_require__(250)
+const SIGNALS=[
+{
+name:"SIGHUP",
+number:1,
+action:"terminate",
+description:"Terminal closed",
+standard:"posix"},
 
-const getNotFoundError = (cmd) =>
-  Object.assign(new Error(`not found: ${cmd}`), { code: 'ENOENT' })
+{
+name:"SIGINT",
+number:2,
+action:"terminate",
+description:"User interruption with CTRL-C",
+standard:"ansi"},
 
-const getPathInfo = (cmd, opt) => {
-  const colon = opt.colon || COLON
+{
+name:"SIGQUIT",
+number:3,
+action:"core",
+description:"User interruption with CTRL-\\",
+standard:"posix"},
 
-  // If it has a slash, then we don't bother searching the pathenv.
-  // just check the file itself, and that's it.
-  const pathEnv = cmd.match(/\//) || isWindows && cmd.match(/\\/) ? ['']
-    : (
-      [
-        // windows always checks the cwd first
-        ...(isWindows ? [process.cwd()] : []),
-        ...(opt.path || process.env.PATH ||
-          /* istanbul ignore next: very unusual */ '').split(colon),
-      ]
-    )
-  const pathExtExe = isWindows
-    ? opt.pathExt || process.env.PATHEXT || '.EXE;.CMD;.BAT;.COM'
-    : ''
-  const pathExt = isWindows ? pathExtExe.split(colon) : ['']
+{
+name:"SIGILL",
+number:4,
+action:"core",
+description:"Invalid machine instruction",
+standard:"ansi"},
 
-  if (isWindows) {
-    if (cmd.indexOf('.') !== -1 && pathExt[0] !== '')
-      pathExt.unshift('')
-  }
+{
+name:"SIGTRAP",
+number:5,
+action:"core",
+description:"Debugger breakpoint",
+standard:"posix"},
 
-  return {
-    pathEnv,
-    pathExt,
-    pathExtExe,
-  }
-}
+{
+name:"SIGABRT",
+number:6,
+action:"core",
+description:"Aborted",
+standard:"ansi"},
 
-const which = (cmd, opt, cb) => {
-  if (typeof opt === 'function') {
-    cb = opt
-    opt = {}
-  }
-  if (!opt)
-    opt = {}
+{
+name:"SIGIOT",
+number:6,
+action:"core",
+description:"Aborted",
+standard:"bsd"},
 
-  const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt)
-  const found = []
+{
+name:"SIGBUS",
+number:7,
+action:"core",
+description:
+"Bus error due to misaligned, non-existing address or paging error",
+standard:"bsd"},
 
-  const step = i => new Promise((resolve, reject) => {
-    if (i === pathEnv.length)
-      return opt.all && found.length ? resolve(found)
-        : reject(getNotFoundError(cmd))
+{
+name:"SIGEMT",
+number:7,
+action:"terminate",
+description:"Command should be emulated but is not implemented",
+standard:"other"},
 
-    const ppRaw = pathEnv[i]
-    const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw
+{
+name:"SIGFPE",
+number:8,
+action:"core",
+description:"Floating point arithmetic error",
+standard:"ansi"},
 
-    const pCmd = path.join(pathPart, cmd)
-    const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd
-      : pCmd
+{
+name:"SIGKILL",
+number:9,
+action:"terminate",
+description:"Forced termination",
+standard:"posix",
+forced:true},
 
-    resolve(subStep(p, i, 0))
-  })
+{
+name:"SIGUSR1",
+number:10,
+action:"terminate",
+description:"Application-specific signal",
+standard:"posix"},
 
-  const subStep = (p, i, ii) => new Promise((resolve, reject) => {
-    if (ii === pathExt.length)
-      return resolve(step(i + 1))
-    const ext = pathExt[ii]
-    isexe(p + ext, { pathExt: pathExtExe }, (er, is) => {
-      if (!er && is) {
-        if (opt.all)
-          found.push(p + ext)
-        else
-          return resolve(p + ext)
-      }
-      return resolve(subStep(p, i, ii + 1))
-    })
-  })
+{
+name:"SIGSEGV",
+number:11,
+action:"core",
+description:"Segmentation fault",
+standard:"ansi"},
 
-  return cb ? step(0).then(res => cb(null, res), cb) : step(0)
-}
+{
+name:"SIGUSR2",
+number:12,
+action:"terminate",
+description:"Application-specific signal",
+standard:"posix"},
 
-const whichSync = (cmd, opt) => {
-  opt = opt || {}
+{
+name:"SIGPIPE",
+number:13,
+action:"terminate",
+description:"Broken pipe or socket",
+standard:"posix"},
 
-  const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt)
-  const found = []
+{
+name:"SIGALRM",
+number:14,
+action:"terminate",
+description:"Timeout or timer",
+standard:"posix"},
 
-  for (let i = 0; i < pathEnv.length; i ++) {
-    const ppRaw = pathEnv[i]
-    const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw
+{
+name:"SIGTERM",
+number:15,
+action:"terminate",
+description:"Termination",
+standard:"ansi"},
 
-    const pCmd = path.join(pathPart, cmd)
-    const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd
-      : pCmd
+{
+name:"SIGSTKFLT",
+number:16,
+action:"terminate",
+description:"Stack is empty or overflowed",
+standard:"other"},
 
-    for (let j = 0; j < pathExt.length; j ++) {
-      const cur = p + pathExt[j]
-      try {
-        const is = isexe.sync(cur, { pathExt: pathExtExe })
-        if (is) {
-          if (opt.all)
-            found.push(cur)
-          else
-            return cur
-        }
-      } catch (ex) {}
-    }
-  }
+{
+name:"SIGCHLD",
+number:17,
+action:"ignore",
+description:"Child process terminated, paused or unpaused",
+standard:"posix"},
 
-  if (opt.all && found.length)
-    return found
+{
+name:"SIGCLD",
+number:17,
+action:"ignore",
+description:"Child process terminated, paused or unpaused",
+standard:"other"},
 
-  if (opt.nothrow)
-    return null
+{
+name:"SIGCONT",
+number:18,
+action:"unpause",
+description:"Unpaused",
+standard:"posix",
+forced:true},
 
-  throw getNotFoundError(cmd)
-}
+{
+name:"SIGSTOP",
+number:19,
+action:"pause",
+description:"Paused",
+standard:"posix",
+forced:true},
 
-module.exports = which
-which.sync = whichSync
+{
+name:"SIGTSTP",
+number:20,
+action:"pause",
+description:"Paused using CTRL-Z or \"suspend\"",
+standard:"posix"},
 
+{
+name:"SIGTTIN",
+number:21,
+action:"pause",
+description:"Background process cannot read terminal input",
+standard:"posix"},
 
-/***/ }),
-/* 250 */
-/***/ (function(module, exports, __webpack_require__) {
+{
+name:"SIGBREAK",
+number:21,
+action:"terminate",
+description:"User interruption with CTRL-BREAK",
+standard:"other"},
 
-var fs = __webpack_require__(133)
-var core
-if (process.platform === 'win32' || global.TESTING_WINDOWS) {
-  core = __webpack_require__(251)
-} else {
-  core = __webpack_require__(252)
-}
+{
+name:"SIGTTOU",
+number:22,
+action:"pause",
+description:"Background process cannot write to terminal output",
+standard:"posix"},
 
-module.exports = isexe
-isexe.sync = sync
+{
+name:"SIGURG",
+number:23,
+action:"ignore",
+description:"Socket received out-of-band data",
+standard:"bsd"},
 
-function isexe (path, options, cb) {
-  if (typeof options === 'function') {
-    cb = options
-    options = {}
-  }
+{
+name:"SIGXCPU",
+number:24,
+action:"core",
+description:"Process timed out",
+standard:"bsd"},
 
-  if (!cb) {
-    if (typeof Promise !== 'function') {
-      throw new TypeError('callback not provided')
-    }
+{
+name:"SIGXFSZ",
+number:25,
+action:"core",
+description:"File too big",
+standard:"bsd"},
 
-    return new Promise(function (resolve, reject) {
-      isexe(path, options || {}, function (er, is) {
-        if (er) {
-          reject(er)
-        } else {
-          resolve(is)
-        }
-      })
-    })
-  }
+{
+name:"SIGVTALRM",
+number:26,
+action:"terminate",
+description:"Timeout or timer",
+standard:"bsd"},
 
-  core(path, options || {}, function (er, is) {
-    // ignore EACCES because that just means we aren't allowed to run it
-    if (er) {
-      if (er.code === 'EACCES' || options && options.ignoreErrors) {
-        er = null
-        is = false
-      }
-    }
-    cb(er, is)
-  })
-}
+{
+name:"SIGPROF",
+number:27,
+action:"terminate",
+description:"Timeout or timer",
+standard:"bsd"},
 
-function sync (path, options) {
-  // my kingdom for a filtered catch
-  try {
-    return core.sync(path, options || {})
-  } catch (er) {
-    if (options && options.ignoreErrors || er.code === 'EACCES') {
-      return false
-    } else {
-      throw er
-    }
-  }
-}
+{
+name:"SIGWINCH",
+number:28,
+action:"ignore",
+description:"Terminal window size changed",
+standard:"bsd"},
 
+{
+name:"SIGIO",
+number:29,
+action:"terminate",
+description:"I/O is available",
+standard:"other"},
 
-/***/ }),
-/* 251 */
-/***/ (function(module, exports, __webpack_require__) {
+{
+name:"SIGPOLL",
+number:29,
+action:"terminate",
+description:"Watched event",
+standard:"other"},
 
-module.exports = isexe
-isexe.sync = sync
+{
+name:"SIGINFO",
+number:29,
+action:"ignore",
+description:"Request for process information",
+standard:"other"},
 
-var fs = __webpack_require__(133)
+{
+name:"SIGPWR",
+number:30,
+action:"terminate",
+description:"Device running out of power",
+standard:"systemv"},
 
-function checkPathExt (path, options) {
-  var pathext = options.pathExt !== undefined ?
-    options.pathExt : process.env.PATHEXT
+{
+name:"SIGSYS",
+number:31,
+action:"core",
+description:"Invalid system call",
+standard:"other"},
 
-  if (!pathext) {
-    return true
-  }
+{
+name:"SIGUNUSED",
+number:31,
+action:"terminate",
+description:"Invalid system call",
+standard:"other"}];exports.SIGNALS=SIGNALS;
+//# sourceMappingURL=core.js.map
 
-  pathext = pathext.split(';')
-  if (pathext.indexOf('') !== -1) {
-    return true
-  }
-  for (var i = 0; i < pathext.length; i++) {
-    var p = pathext[i].toLowerCase()
-    if (p && path.substr(-p.length).toLowerCase() === p) {
-      return true
-    }
-  }
-  return false
-}
+/***/ }),
+/* 259 */
+/***/ (function(module, exports, __webpack_require__) {
 
-function checkStat (stat, path, options) {
-  if (!stat.isSymbolicLink() && !stat.isFile()) {
-    return false
-  }
-  return checkPathExt(path, options)
-}
+"use strict";
+Object.defineProperty(exports,"__esModule",{value:true});exports.SIGRTMAX=exports.getRealtimeSignals=void 0;
+const getRealtimeSignals=function(){
+const length=SIGRTMAX-SIGRTMIN+1;
+return Array.from({length},getRealtimeSignal);
+};exports.getRealtimeSignals=getRealtimeSignals;
 
-function isexe (path, options, cb) {
-  fs.stat(path, function (er, stat) {
-    cb(er, er ? false : checkStat(stat, path, options))
-  })
-}
+const getRealtimeSignal=function(value,index){
+return{
+name:`SIGRT${index+1}`,
+number:SIGRTMIN+index,
+action:"terminate",
+description:"Application-specific signal (realtime)",
+standard:"posix"};
 
-function sync (path, options) {
-  return checkStat(fs.statSync(path), path, options)
-}
+};
 
+const SIGRTMIN=34;
+const SIGRTMAX=64;exports.SIGRTMAX=SIGRTMAX;
+//# sourceMappingURL=realtime.js.map
 
 /***/ }),
-/* 252 */
+/* 260 */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = isexe
-isexe.sync = sync
-
-var fs = __webpack_require__(133)
+"use strict";
 
-function isexe (path, options, cb) {
-  fs.stat(path, function (er, stat) {
-    cb(er, er ? false : checkStat(stat, options))
-  })
-}
+const aliases = ['stdin', 'stdout', 'stderr'];
 
-function sync (path, options) {
-  return checkStat(fs.statSync(path), options)
-}
+const hasAlias = opts => aliases.some(alias => opts[alias] !== undefined);
 
-function checkStat (stat, options) {
-  return stat.isFile() && checkMode(stat, options)
-}
+const normalizeStdio = opts => {
+	if (!opts) {
+		return;
+	}
 
-function checkMode (stat, options) {
-  var mod = stat.mode
-  var uid = stat.uid
-  var gid = stat.gid
+	const {stdio} = opts;
 
-  var myUid = options.uid !== undefined ?
-    options.uid : process.getuid && process.getuid()
-  var myGid = options.gid !== undefined ?
-    options.gid : process.getgid && process.getgid()
+	if (stdio === undefined) {
+		return aliases.map(alias => opts[alias]);
+	}
 
-  var u = parseInt('100', 8)
-  var g = parseInt('010', 8)
-  var o = parseInt('001', 8)
-  var ug = u | g
+	if (hasAlias(opts)) {
+		throw new Error(`It's not possible to provide \`stdio\` in combination with one of ${aliases.map(alias => `\`${alias}\``).join(', ')}`);
+	}
 
-  var ret = (mod & o) ||
-    (mod & g) && gid === myGid ||
-    (mod & u) && uid === myUid ||
-    (mod & ug) && myUid === 0
+	if (typeof stdio === 'string') {
+		return stdio;
+	}
 
-  return ret
-}
+	if (!Array.isArray(stdio)) {
+		throw new TypeError(`Expected \`stdio\` to be of type \`string\` or \`Array\`, got \`${typeof stdio}\``);
+	}
 
+	const length = Math.max(stdio.length, aliases.length);
+	return Array.from({length}, (value, index) => stdio[index]);
+};
 
-/***/ }),
-/* 253 */
-/***/ (function(module, exports, __webpack_require__) {
+module.exports = normalizeStdio;
 
-"use strict";
+// `ipc` is pushed unless it is already present
+module.exports.node = opts => {
+	const stdio = normalizeStdio(opts);
 
+	if (stdio === 'ipc') {
+		return 'ipc';
+	}
 
-const pathKey = (options = {}) => {
-	const environment = options.env || process.env;
-	const platform = options.platform || process.platform;
+	if (stdio === undefined || typeof stdio === 'string') {
+		return [stdio, stdio, stdio, 'ipc'];
+	}
 
-	if (platform !== 'win32') {
-		return 'PATH';
+	if (stdio.includes('ipc')) {
+		return stdio;
 	}
 
-	return Object.keys(environment).find(key => key.toUpperCase() === 'PATH') || 'Path';
+	return [...stdio, 'ipc'];
 };
 
-module.exports = pathKey;
-// TODO: Remove this for the next major release
-module.exports.default = pathKey;
-
 
 /***/ }),
-/* 254 */
+/* 261 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+const os = __webpack_require__(120);
+const onExit = __webpack_require__(217);
 
-// See http://www.robvanderwoude.com/escapechars.php
-const metaCharsRegExp = /([()\][%!^"`<>&|;, *?])/g;
-
-function escapeCommand(arg) {
-    // Escape meta chars
-    arg = arg.replace(metaCharsRegExp, '^$1');
+const DEFAULT_FORCE_KILL_TIMEOUT = 1000 * 5;
 
-    return arg;
-}
+// Monkey-patches `childProcess.kill()` to add `forceKillAfterTimeout` behavior
+const spawnedKill = (kill, signal = 'SIGTERM', options = {}) => {
+	const killResult = kill(signal);
+	setKillTimeout(kill, signal, options, killResult);
+	return killResult;
+};
 
-function escapeArgument(arg, doubleEscapeMetaChars) {
-    // Convert to string
-    arg = `${arg}`;
+const setKillTimeout = (kill, signal, options, killResult) => {
+	if (!shouldForceKill(signal, options, killResult)) {
+		return;
+	}
 
-    // Algorithm below is based on https://qntm.org/cmd
+	const timeout = getForceKillAfterTimeout(options);
+	const t = setTimeout(() => {
+		kill('SIGKILL');
+	}, timeout);
 
-    // Sequence of backslashes followed by a double quote:
-    // double up all the backslashes and escape the double quote
-    arg = arg.replace(/(\\*)"/g, '$1$1\\"');
+	// Guarded because there's no `.unref()` when `execa` is used in the renderer
+	// process in Electron. This cannot be tested since we don't run tests in
+	// Electron.
+	// istanbul ignore else
+	if (t.unref) {
+		t.unref();
+	}
+};
 
-    // Sequence of backslashes followed by the end of the string
-    // (which will become a double quote later):
-    // double up all the backslashes
-    arg = arg.replace(/(\\*)$/, '$1$1');
+const shouldForceKill = (signal, {forceKillAfterTimeout}, killResult) => {
+	return isSigterm(signal) && forceKillAfterTimeout !== false && killResult;
+};
 
-    // All other backslashes occur literally
+const isSigterm = signal => {
+	return signal === os.constants.signals.SIGTERM ||
+		(typeof signal === 'string' && signal.toUpperCase() === 'SIGTERM');
+};
 
-    // Quote the whole thing:
-    arg = `"${arg}"`;
+const getForceKillAfterTimeout = ({forceKillAfterTimeout = true}) => {
+	if (forceKillAfterTimeout === true) {
+		return DEFAULT_FORCE_KILL_TIMEOUT;
+	}
 
-    // Escape meta chars
-    arg = arg.replace(metaCharsRegExp, '^$1');
+	if (!Number.isInteger(forceKillAfterTimeout) || forceKillAfterTimeout < 0) {
+		throw new TypeError(`Expected the \`forceKillAfterTimeout\` option to be a non-negative integer, got \`${forceKillAfterTimeout}\` (${typeof forceKillAfterTimeout})`);
+	}
 
-    // Double escape meta chars if necessary
-    if (doubleEscapeMetaChars) {
-        arg = arg.replace(metaCharsRegExp, '^$1');
-    }
+	return forceKillAfterTimeout;
+};
 
-    return arg;
-}
+// `childProcess.cancel()`
+const spawnedCancel = (spawned, context) => {
+	const killResult = spawned.kill();
 
-module.exports.command = escapeCommand;
-module.exports.argument = escapeArgument;
+	if (killResult) {
+		context.isCanceled = true;
+	}
+};
 
+const timeoutKill = (spawned, signal, reject) => {
+	spawned.kill(signal);
+	reject(Object.assign(new Error('Timed out'), {timedOut: true, signal}));
+};
 
-/***/ }),
-/* 255 */
-/***/ (function(module, exports, __webpack_require__) {
+// `timeout` option handling
+const setupTimeout = (spawned, {timeout, killSignal = 'SIGTERM'}, spawnedPromise) => {
+	if (timeout === 0 || timeout === undefined) {
+		return spawnedPromise;
+	}
 
-"use strict";
+	if (!Number.isInteger(timeout) || timeout < 0) {
+		throw new TypeError(`Expected the \`timeout\` option to be a non-negative integer, got \`${timeout}\` (${typeof timeout})`);
+	}
 
+	let timeoutId;
+	const timeoutPromise = new Promise((resolve, reject) => {
+		timeoutId = setTimeout(() => {
+			timeoutKill(spawned, killSignal, reject);
+		}, timeout);
+	});
 
-const fs = __webpack_require__(133);
-const shebangCommand = __webpack_require__(256);
+	const safeSpawnedPromise = spawnedPromise.finally(() => {
+		clearTimeout(timeoutId);
+	});
 
-function readShebang(command) {
-    // Read the first 150 bytes from the file
-    const size = 150;
-    const buffer = Buffer.alloc(size);
+	return Promise.race([timeoutPromise, safeSpawnedPromise]);
+};
 
-    let fd;
+// `cleanup` option handling
+const setExitHandler = async (spawned, {cleanup, detached}, timedPromise) => {
+	if (!cleanup || detached) {
+		return timedPromise;
+	}
 
-    try {
-        fd = fs.openSync(command, 'r');
-        fs.readSync(fd, buffer, 0, size, 0);
-        fs.closeSync(fd);
-    } catch (e) { /* Empty */ }
+	const removeExitHandler = onExit(() => {
+		spawned.kill();
+	});
 
-    // Attempt to extract shebang (null is returned if not a shebang)
-    return shebangCommand(buffer.toString());
-}
+	return timedPromise.finally(() => {
+		removeExitHandler();
+	});
+};
 
-module.exports = readShebang;
+module.exports = {
+	spawnedKill,
+	spawnedCancel,
+	setupTimeout,
+	setExitHandler
+};
 
 
 /***/ }),
-/* 256 */
+/* 262 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const shebangRegex = __webpack_require__(257);
-
-module.exports = (string = '') => {
-	const match = string.match(shebangRegex);
+const isStream = __webpack_require__(263);
+const getStream = __webpack_require__(264);
+const mergeStream = __webpack_require__(268);
 
-	if (!match) {
-		return null;
+// `input` option
+const handleInput = (spawned, input) => {
+	// Checking for stdin is workaround for https://github.com/nodejs/node/issues/26852
+	// TODO: Remove `|| spawned.stdin === undefined` once we drop support for Node.js <=12.2.0
+	if (input === undefined || spawned.stdin === undefined) {
+		return;
 	}
 
-	const [path, argument] = match[0].replace(/#! ?/, '').split(' ');
-	const binary = path.split('/').pop();
-
-	if (binary === 'env') {
-		return argument;
+	if (isStream(input)) {
+		input.pipe(spawned.stdin);
+	} else {
+		spawned.stdin.end(input);
 	}
-
-	return argument ? `${binary} ${argument}` : binary;
 };
 
+// `all` interleaves `stdout` and `stderr`
+const makeAllStream = (spawned, {all}) => {
+	if (!all || (!spawned.stdout && !spawned.stderr)) {
+		return;
+	}
 
-/***/ }),
-/* 257 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = /^#!(.*)/;
-
-
-/***/ }),
-/* 258 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+	const mixed = mergeStream();
 
+	if (spawned.stdout) {
+		mixed.add(spawned.stdout);
+	}
 
-const isWin = process.platform === 'win32';
+	if (spawned.stderr) {
+		mixed.add(spawned.stderr);
+	}
 
-function notFoundError(original, syscall) {
-    return Object.assign(new Error(`${syscall} ${original.command} ENOENT`), {
-        code: 'ENOENT',
-        errno: 'ENOENT',
-        syscall: `${syscall} ${original.command}`,
-        path: original.command,
-        spawnargs: original.args,
-    });
-}
+	return mixed;
+};
 
-function hookChildProcess(cp, parsed) {
-    if (!isWin) {
-        return;
-    }
+// On failure, `result.stdout|stderr|all` should contain the currently buffered stream
+const getBufferedData = async (stream, streamPromise) => {
+	if (!stream) {
+		return;
+	}
 
-    const originalEmit = cp.emit;
+	stream.destroy();
 
-    cp.emit = function (name, arg1) {
-        // If emitting "exit" event and exit code is 1, we need to check if
-        // the command exists and emit an "error" instead
-        // See https://github.com/IndigoUnited/node-cross-spawn/issues/16
-        if (name === 'exit') {
-            const err = verifyENOENT(arg1, parsed, 'spawn');
+	try {
+		return await streamPromise;
+	} catch (error) {
+		return error.bufferedData;
+	}
+};
 
-            if (err) {
-                return originalEmit.call(cp, 'error', err);
-            }
-        }
+const getStreamPromise = (stream, {encoding, buffer, maxBuffer}) => {
+	if (!stream || !buffer) {
+		return;
+	}
 
-        return originalEmit.apply(cp, arguments); // eslint-disable-line prefer-rest-params
-    };
-}
+	if (encoding) {
+		return getStream(stream, {encoding, maxBuffer});
+	}
 
-function verifyENOENT(status, parsed) {
-    if (isWin && status === 1 && !parsed.file) {
-        return notFoundError(parsed.original, 'spawn');
-    }
+	return getStream.buffer(stream, {maxBuffer});
+};
 
-    return null;
-}
+// Retrieve result of child process: exit code, signal, error, streams (stdout/stderr/all)
+const getSpawnedResult = async ({stdout, stderr, all}, {encoding, buffer, maxBuffer}, processDone) => {
+	const stdoutPromise = getStreamPromise(stdout, {encoding, buffer, maxBuffer});
+	const stderrPromise = getStreamPromise(stderr, {encoding, buffer, maxBuffer});
+	const allPromise = getStreamPromise(all, {encoding, buffer, maxBuffer: maxBuffer * 2});
 
-function verifyENOENTSync(status, parsed) {
-    if (isWin && status === 1 && !parsed.file) {
-        return notFoundError(parsed.original, 'spawnSync');
-    }
+	try {
+		return await Promise.all([processDone, stdoutPromise, stderrPromise, allPromise]);
+	} catch (error) {
+		return Promise.all([
+			{error, signal: error.signal, timedOut: error.timedOut},
+			getBufferedData(stdout, stdoutPromise),
+			getBufferedData(stderr, stderrPromise),
+			getBufferedData(all, allPromise)
+		]);
+	}
+};
 
-    return null;
-}
+const validateInputSync = ({input}) => {
+	if (isStream(input)) {
+		throw new TypeError('The `input` option cannot be a stream in sync mode');
+	}
+};
 
 module.exports = {
-    hookChildProcess,
-    verifyENOENT,
-    verifyENOENTSync,
-    notFoundError,
+	handleInput,
+	makeAllStream,
+	getSpawnedResult,
+	validateInputSync
 };
 
 
+
 /***/ }),
-/* 259 */
+/* 263 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-module.exports = input => {
-	const LF = typeof input === 'string' ? '\n' : '\n'.charCodeAt();
-	const CR = typeof input === 'string' ? '\r' : '\r'.charCodeAt();
+const isStream = stream =>
+	stream !== null &&
+	typeof stream === 'object' &&
+	typeof stream.pipe === 'function';
 
-	if (input[input.length - 1] === LF) {
-		input = input.slice(0, input.length - 1);
-	}
+isStream.writable = stream =>
+	isStream(stream) &&
+	stream.writable !== false &&
+	typeof stream._write === 'function' &&
+	typeof stream._writableState === 'object';
 
-	if (input[input.length - 1] === CR) {
-		input = input.slice(0, input.length - 1);
-	}
+isStream.readable = stream =>
+	isStream(stream) &&
+	stream.readable !== false &&
+	typeof stream._read === 'function' &&
+	typeof stream._readableState === 'object';
 
-	return input;
-};
+isStream.duplex = stream =>
+	isStream.writable(stream) &&
+	isStream.readable(stream);
+
+isStream.transform = stream =>
+	isStream.duplex(stream) &&
+	typeof stream._transform === 'function' &&
+	typeof stream._transformState === 'object';
+
+module.exports = isStream;
 
 
 /***/ }),
-/* 260 */
+/* 264 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const path = __webpack_require__(4);
-const pathKey = __webpack_require__(253);
+const pump = __webpack_require__(265);
+const bufferStream = __webpack_require__(267);
+
+class MaxBufferError extends Error {
+	constructor() {
+		super('maxBuffer exceeded');
+		this.name = 'MaxBufferError';
+	}
+}
+
+async function getStream(inputStream, options) {
+	if (!inputStream) {
+		return Promise.reject(new Error('Expected a stream'));
+	}
 
-const npmRunPath = options => {
 	options = {
-		cwd: process.cwd(),
-		path: process.env[pathKey()],
-		execPath: process.execPath,
+		maxBuffer: Infinity,
 		...options
 	};
 
-	let previous;
-	let cwdPath = path.resolve(options.cwd);
-	const result = [];
-
-	while (previous !== cwdPath) {
-		result.push(path.join(cwdPath, 'node_modules/.bin'));
-		previous = cwdPath;
-		cwdPath = path.resolve(cwdPath, '..');
-	}
+	const {maxBuffer} = options;
 
-	// Ensure the running `node` binary is used
-	const execPathDir = path.resolve(options.cwd, options.execPath, '..');
-	result.push(execPathDir);
+	let stream;
+	await new Promise((resolve, reject) => {
+		const rejectPromise = error => {
+			if (error) { // A null check
+				error.bufferedData = stream.getBufferedValue();
+			}
 
-	return result.concat(options.path).join(path.delimiter);
-};
+			reject(error);
+		};
 
-module.exports = npmRunPath;
-// TODO: Remove this for the next major release
-module.exports.default = npmRunPath;
+		stream = pump(inputStream, bufferStream(options), error => {
+			if (error) {
+				rejectPromise(error);
+				return;
+			}
 
-module.exports.env = options => {
-	options = {
-		env: process.env,
-		...options
-	};
+			resolve();
+		});
 
-	const env = {...options.env};
-	const path = pathKey({env});
+		stream.on('data', () => {
+			if (stream.getBufferedLength() > maxBuffer) {
+				rejectPromise(new MaxBufferError());
+			}
+		});
+	});
 
-	options.path = env[path];
-	env[path] = module.exports(options);
+	return stream.getBufferedValue();
+}
 
-	return env;
-};
+module.exports = getStream;
+// TODO: Remove this for the next major release
+module.exports.default = getStream;
+module.exports.buffer = (stream, options) => getStream(stream, {...options, encoding: 'buffer'});
+module.exports.array = (stream, options) => getStream(stream, {...options, array: true});
+module.exports.MaxBufferError = MaxBufferError;
 
 
 /***/ }),
-/* 261 */
+/* 265 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+var once = __webpack_require__(161)
+var eos = __webpack_require__(266)
+var fs = __webpack_require__(133) // we only need fs to get the ReadStream and WriteStream prototypes
 
-const mimicFn = __webpack_require__(262);
+var noop = function () {}
+var ancient = /^v?\.0/.test(process.version)
 
-const calledFunctions = new WeakMap();
+var isFn = function (fn) {
+  return typeof fn === 'function'
+}
 
-const oneTime = (fn, options = {}) => {
-	if (typeof fn !== 'function') {
-		throw new TypeError('Expected a function');
-	}
+var isFS = function (stream) {
+  if (!ancient) return false // newer node version do not need to care about fs is a special way
+  if (!fs) return false // browser
+  return (stream instanceof (fs.ReadStream || noop) || stream instanceof (fs.WriteStream || noop)) && isFn(stream.close)
+}
 
-	let ret;
-	let isCalled = false;
-	let callCount = 0;
-	const functionName = fn.displayName || fn.name || '<anonymous>';
+var isRequest = function (stream) {
+  return stream.setHeader && isFn(stream.abort)
+}
 
-	const onetime = function (...args) {
-		calledFunctions.set(onetime, ++callCount);
+var destroyer = function (stream, reading, writing, callback) {
+  callback = once(callback)
 
-		if (isCalled) {
-			if (options.throw === true) {
-				throw new Error(`Function \`${functionName}\` can only be called once`);
-			}
+  var closed = false
+  stream.on('close', function () {
+    closed = true
+  })
 
-			return ret;
-		}
+  eos(stream, {readable: reading, writable: writing}, function (err) {
+    if (err) return callback(err)
+    closed = true
+    callback()
+  })
 
-		isCalled = true;
-		ret = fn.apply(this, args);
-		fn = null;
+  var destroyed = false
+  return function (err) {
+    if (closed) return
+    if (destroyed) return
+    destroyed = true
 
-		return ret;
-	};
+    if (isFS(stream)) return stream.close(noop) // use close for fs streams to avoid fd leaks
+    if (isRequest(stream)) return stream.abort() // request.destroy just do .end - .abort is what we want
 
-	mimicFn(onetime, fn);
-	calledFunctions.set(onetime, callCount);
+    if (isFn(stream.destroy)) return stream.destroy()
 
-	return onetime;
-};
+    callback(err || new Error('stream was destroyed'))
+  }
+}
 
-module.exports = oneTime;
-// TODO: Remove this for the next major release
-module.exports.default = oneTime;
+var call = function (fn) {
+  fn()
+}
 
-module.exports.callCount = fn => {
-	if (!calledFunctions.has(fn)) {
-		throw new Error(`The given function \`${fn.name}\` is not wrapped by the \`onetime\` package`);
-	}
+var pipe = function (from, to) {
+  return from.pipe(to)
+}
 
-	return calledFunctions.get(fn);
-};
+var pump = function () {
+  var streams = Array.prototype.slice.call(arguments)
+  var callback = isFn(streams[streams.length - 1] || noop) && streams.pop() || noop
+
+  if (Array.isArray(streams[0])) streams = streams[0]
+  if (streams.length < 2) throw new Error('pump requires two streams per minimum')
+
+  var error
+  var destroys = streams.map(function (stream, i) {
+    var reading = i < streams.length - 1
+    var writing = i > 0
+    return destroyer(stream, reading, writing, function (err) {
+      if (!error) error = err
+      if (err) destroys.forEach(call)
+      if (reading) return
+      destroys.forEach(call)
+      callback(error)
+    })
+  })
+
+  return streams.reduce(pipe)
+}
+
+module.exports = pump
 
 
 /***/ }),
-/* 262 */
+/* 266 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
+var once = __webpack_require__(161);
 
-const mimicFn = (to, from) => {
-	for (const prop of Reflect.ownKeys(from)) {
-		Object.defineProperty(to, prop, Object.getOwnPropertyDescriptor(from, prop));
-	}
+var noop = function() {};
 
-	return to;
+var isRequest = function(stream) {
+	return stream.setHeader && typeof stream.abort === 'function';
 };
 
-module.exports = mimicFn;
-// TODO: Remove this for the next major release
-module.exports.default = mimicFn;
+var isChildProcess = function(stream) {
+	return stream.stdio && Array.isArray(stream.stdio) && stream.stdio.length === 3
+};
 
+var eos = function(stream, opts, callback) {
+	if (typeof opts === 'function') return eos(stream, null, opts);
+	if (!opts) opts = {};
 
-/***/ }),
-/* 263 */
-/***/ (function(module, exports, __webpack_require__) {
+	callback = once(callback || noop);
 
-"use strict";
+	var ws = stream._writableState;
+	var rs = stream._readableState;
+	var readable = opts.readable || (opts.readable !== false && stream.readable);
+	var writable = opts.writable || (opts.writable !== false && stream.writable);
 
-const {signalsByName} = __webpack_require__(264);
+	var onlegacyfinish = function() {
+		if (!stream.writable) onfinish();
+	};
 
-const getErrorPrefix = ({timedOut, timeout, errorCode, signal, signalDescription, exitCode, isCanceled}) => {
-	if (timedOut) {
-		return `timed out after ${timeout} milliseconds`;
-	}
+	var onfinish = function() {
+		writable = false;
+		if (!readable) callback.call(stream);
+	};
 
-	if (isCanceled) {
-		return 'was canceled';
-	}
+	var onend = function() {
+		readable = false;
+		if (!writable) callback.call(stream);
+	};
 
-	if (errorCode !== undefined) {
-		return `failed with ${errorCode}`;
-	}
+	var onexit = function(exitCode) {
+		callback.call(stream, exitCode ? new Error('exited with error code: ' + exitCode) : null);
+	};
 
-	if (signal !== undefined) {
-		return `was killed with ${signal} (${signalDescription})`;
-	}
+	var onerror = function(err) {
+		callback.call(stream, err);
+	};
 
-	if (exitCode !== undefined) {
-		return `failed with exit code ${exitCode}`;
+	var onclose = function() {
+		if (readable && !(rs && rs.ended)) return callback.call(stream, new Error('premature close'));
+		if (writable && !(ws && ws.ended)) return callback.call(stream, new Error('premature close'));
+	};
+
+	var onrequest = function() {
+		stream.req.on('finish', onfinish);
+	};
+
+	if (isRequest(stream)) {
+		stream.on('complete', onfinish);
+		stream.on('abort', onclose);
+		if (stream.req) onrequest();
+		else stream.on('request', onrequest);
+	} else if (writable && !ws) { // legacy streams
+		stream.on('end', onlegacyfinish);
+		stream.on('close', onlegacyfinish);
 	}
 
-	return 'failed';
-};
+	if (isChildProcess(stream)) stream.on('exit', onexit);
 
-const makeError = ({
-	stdout,
-	stderr,
-	all,
-	error,
-	signal,
-	exitCode,
-	command,
-	timedOut,
-	isCanceled,
-	killed,
-	parsed: {options: {timeout}}
-}) => {
-	// `signal` and `exitCode` emitted on `spawned.on('exit')` event can be `null`.
-	// We normalize them to `undefined`
-	exitCode = exitCode === null ? undefined : exitCode;
-	signal = signal === null ? undefined : signal;
-	const signalDescription = signal === undefined ? undefined : signalsByName[signal].description;
+	stream.on('end', onend);
+	stream.on('finish', onfinish);
+	if (opts.error !== false) stream.on('error', onerror);
+	stream.on('close', onclose);
 
-	const errorCode = error && error.code;
+	return function() {
+		stream.removeListener('complete', onfinish);
+		stream.removeListener('abort', onclose);
+		stream.removeListener('request', onrequest);
+		if (stream.req) stream.req.removeListener('finish', onfinish);
+		stream.removeListener('end', onlegacyfinish);
+		stream.removeListener('close', onlegacyfinish);
+		stream.removeListener('finish', onfinish);
+		stream.removeListener('exit', onexit);
+		stream.removeListener('end', onend);
+		stream.removeListener('error', onerror);
+		stream.removeListener('close', onclose);
+	};
+};
 
-	const prefix = getErrorPrefix({timedOut, timeout, errorCode, signal, signalDescription, exitCode, isCanceled});
-	const execaMessage = `Command ${prefix}: ${command}`;
-	const isError = Object.prototype.toString.call(error) === '[object Error]';
-	const shortMessage = isError ? `${execaMessage}\n${error.message}` : execaMessage;
-	const message = [shortMessage, stderr, stdout].filter(Boolean).join('\n');
+module.exports = eos;
 
-	if (isError) {
-		error.originalMessage = error.message;
-		error.message = message;
-	} else {
-		error = new Error(message);
-	}
 
-	error.shortMessage = shortMessage;
-	error.command = command;
-	error.exitCode = exitCode;
-	error.signal = signal;
-	error.signalDescription = signalDescription;
-	error.stdout = stdout;
-	error.stderr = stderr;
+/***/ }),
+/* 267 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	if (all !== undefined) {
-		error.all = all;
-	}
+"use strict";
 
-	if ('bufferedData' in error) {
-		delete error.bufferedData;
-	}
+const {PassThrough: PassThroughStream} = __webpack_require__(137);
 
-	error.failed = true;
-	error.timedOut = Boolean(timedOut);
-	error.isCanceled = isCanceled;
-	error.killed = killed && !timedOut;
+module.exports = options => {
+	options = {...options};
 
-	return error;
-};
+	const {array} = options;
+	let {encoding} = options;
+	const isBuffer = encoding === 'buffer';
+	let objectMode = false;
 
-module.exports = makeError;
+	if (array) {
+		objectMode = !(encoding || isBuffer);
+	} else {
+		encoding = encoding || 'utf8';
+	}
 
+	if (isBuffer) {
+		encoding = null;
+	}
 
-/***/ }),
-/* 264 */
-/***/ (function(module, exports, __webpack_require__) {
+	const stream = new PassThroughStream({objectMode});
 
-"use strict";
-Object.defineProperty(exports,"__esModule",{value:true});exports.signalsByNumber=exports.signalsByName=void 0;var _os=__webpack_require__(120);
+	if (encoding) {
+		stream.setEncoding(encoding);
+	}
+
+	let length = 0;
+	const chunks = [];
 
-var _signals=__webpack_require__(265);
-var _realtime=__webpack_require__(267);
+	stream.on('data', chunk => {
+		chunks.push(chunk);
 
+		if (objectMode) {
+			length = chunks.length;
+		} else {
+			length += chunk.length;
+		}
+	});
 
+	stream.getBufferedValue = () => {
+		if (array) {
+			return chunks;
+		}
 
-const getSignalsByName=function(){
-const signals=(0,_signals.getSignals)();
-return signals.reduce(getSignalByName,{});
-};
+		return isBuffer ? Buffer.concat(chunks, length) : chunks.join('');
+	};
 
-const getSignalByName=function(
-signalByNameMemo,
-{name,number,description,supported,action,forced,standard})
-{
-return{
-...signalByNameMemo,
-[name]:{name,number,description,supported,action,forced,standard}};
+	stream.getBufferedLength = () => length;
 
+	return stream;
 };
 
-const signalsByName=getSignalsByName();exports.signalsByName=signalsByName;
 
+/***/ }),
+/* 268 */
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
 
-const getSignalsByNumber=function(){
-const signals=(0,_signals.getSignals)();
-const length=_realtime.SIGRTMAX+1;
-const signalsA=Array.from({length},(value,number)=>
-getSignalByNumber(number,signals));
+const { PassThrough } = __webpack_require__(137);
 
-return Object.assign({},...signalsA);
-};
+module.exports = function (/*streams...*/) {
+  var sources = []
+  var output  = new PassThrough({objectMode: true})
 
-const getSignalByNumber=function(number,signals){
-const signal=findSignalByNumber(number,signals);
+  output.setMaxListeners(0)
 
-if(signal===undefined){
-return{};
-}
+  output.add = add
+  output.isEmpty = isEmpty
 
-const{name,description,supported,action,forced,standard}=signal;
-return{
-[number]:{
-name,
-number,
-description,
-supported,
-action,
-forced,
-standard}};
+  output.on('unpipe', remove)
 
+  Array.prototype.slice.call(arguments).forEach(add)
 
-};
+  return output
 
+  function add (source) {
+    if (Array.isArray(source)) {
+      source.forEach(add)
+      return this
+    }
 
+    sources.push(source);
+    source.once('end', remove.bind(null, source))
+    source.once('error', output.emit.bind(output, 'error'))
+    source.pipe(output, {end: false})
+    return this
+  }
 
-const findSignalByNumber=function(number,signals){
-const signal=signals.find(({name})=>_os.constants.signals[name]===number);
+  function isEmpty () {
+    return sources.length == 0;
+  }
 
-if(signal!==undefined){
-return signal;
+  function remove (source) {
+    sources = sources.filter(function (it) { return it !== source })
+    if (!sources.length && output.readable) { output.end() }
+  }
 }
 
-return signals.find(signalA=>signalA.number===number);
-};
-
-const signalsByNumber=getSignalsByNumber();exports.signalsByNumber=signalsByNumber;
-//# sourceMappingURL=main.js.map
 
 /***/ }),
-/* 265 */
+/* 269 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports,"__esModule",{value:true});exports.getSignals=void 0;var _os=__webpack_require__(120);
 
-var _core=__webpack_require__(266);
-var _realtime=__webpack_require__(267);
 
+const nativePromisePrototype = (async () => {})().constructor.prototype;
+const descriptors = ['then', 'catch', 'finally'].map(property => [
+	property,
+	Reflect.getOwnPropertyDescriptor(nativePromisePrototype, property)
+]);
 
+// The return value is a mixin of `childProcess` and `Promise`
+const mergePromise = (spawned, promise) => {
+	for (const [property, descriptor] of descriptors) {
+		// Starting the main `promise` is deferred to avoid consuming streams
+		const value = typeof promise === 'function' ?
+			(...args) => Reflect.apply(descriptor.value, promise(), args) :
+			descriptor.value.bind(promise);
 
-const getSignals=function(){
-const realtimeSignals=(0,_realtime.getRealtimeSignals)();
-const signals=[..._core.SIGNALS,...realtimeSignals].map(normalizeSignal);
-return signals;
-};exports.getSignals=getSignals;
+		Reflect.defineProperty(spawned, property, {...descriptor, value});
+	}
 
+	return spawned;
+};
 
+// Use promises instead of `child_process` events
+const getSpawnedPromise = spawned => {
+	return new Promise((resolve, reject) => {
+		spawned.on('exit', (exitCode, signal) => {
+			resolve({exitCode, signal});
+		});
 
+		spawned.on('error', error => {
+			reject(error);
+		});
 
+		if (spawned.stdin) {
+			spawned.stdin.on('error', error => {
+				reject(error);
+			});
+		}
+	});
+};
 
+module.exports = {
+	mergePromise,
+	getSpawnedPromise
+};
 
 
-const normalizeSignal=function({
-name,
-number:defaultNumber,
-description,
-action,
-forced=false,
-standard})
-{
-const{
-signals:{[name]:constantSignal}}=
-_os.constants;
-const supported=constantSignal!==undefined;
-const number=supported?constantSignal:defaultNumber;
-return{name,number,description,supported,action,forced,standard};
-};
-//# sourceMappingURL=signals.js.map
 
 /***/ }),
-/* 266 */
+/* 270 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports,"__esModule",{value:true});exports.SIGNALS=void 0;
 
-const SIGNALS=[
-{
-name:"SIGHUP",
-number:1,
-action:"terminate",
-description:"Terminal closed",
-standard:"posix"},
+const SPACES_REGEXP = / +/g;
 
-{
-name:"SIGINT",
-number:2,
-action:"terminate",
-description:"User interruption with CTRL-C",
-standard:"ansi"},
+const joinCommand = (file, args = []) => {
+	if (!Array.isArray(args)) {
+		return file;
+	}
 
-{
-name:"SIGQUIT",
-number:3,
-action:"core",
-description:"User interruption with CTRL-\\",
-standard:"posix"},
+	return [file, ...args].join(' ');
+};
 
-{
-name:"SIGILL",
-number:4,
-action:"core",
-description:"Invalid machine instruction",
-standard:"ansi"},
+// Allow spaces to be escaped by a backslash if not meant as a delimiter
+const handleEscaping = (tokens, token, index) => {
+	if (index === 0) {
+		return [token];
+	}
 
-{
-name:"SIGTRAP",
-number:5,
-action:"core",
-description:"Debugger breakpoint",
-standard:"posix"},
+	const previousToken = tokens[tokens.length - 1];
 
-{
-name:"SIGABRT",
-number:6,
-action:"core",
-description:"Aborted",
-standard:"ansi"},
+	if (previousToken.endsWith('\\')) {
+		return [...tokens.slice(0, -1), `${previousToken.slice(0, -1)} ${token}`];
+	}
 
-{
-name:"SIGIOT",
-number:6,
-action:"core",
-description:"Aborted",
-standard:"bsd"},
+	return [...tokens, token];
+};
 
-{
-name:"SIGBUS",
-number:7,
-action:"core",
-description:
-"Bus error due to misaligned, non-existing address or paging error",
-standard:"bsd"},
+// Handle `execa.command()`
+const parseCommand = command => {
+	return command
+		.trim()
+		.split(SPACES_REGEXP)
+		.reduce(handleEscaping, []);
+};
 
-{
-name:"SIGEMT",
-number:7,
-action:"terminate",
-description:"Command should be emulated but is not implemented",
-standard:"other"},
+module.exports = {
+	joinCommand,
+	parseCommand
+};
 
-{
-name:"SIGFPE",
-number:8,
-action:"core",
-description:"Floating point arithmetic error",
-standard:"ansi"},
 
-{
-name:"SIGKILL",
-number:9,
-action:"terminate",
-description:"Forced termination",
-standard:"posix",
-forced:true},
+/***/ }),
+/* 271 */
+/***/ (function(module, exports, __webpack_require__) {
 
-{
-name:"SIGUSR1",
-number:10,
-action:"terminate",
-description:"Application-specific signal",
-standard:"posix"},
+// Copyright IBM Corp. 2014,2018. All Rights Reserved.
+// Node module: strong-log-transformer
+// This file is licensed under the Apache License 2.0.
+// License text available at https://opensource.org/licenses/Apache-2.0
 
-{
-name:"SIGSEGV",
-number:11,
-action:"core",
-description:"Segmentation fault",
-standard:"ansi"},
+module.exports = __webpack_require__(272);
+module.exports.cli = __webpack_require__(276);
 
-{
-name:"SIGUSR2",
-number:12,
-action:"terminate",
-description:"Application-specific signal",
-standard:"posix"},
 
-{
-name:"SIGPIPE",
-number:13,
-action:"terminate",
-description:"Broken pipe or socket",
-standard:"posix"},
+/***/ }),
+/* 272 */
+/***/ (function(module, exports, __webpack_require__) {
 
-{
-name:"SIGALRM",
-number:14,
-action:"terminate",
-description:"Timeout or timer",
-standard:"posix"},
+"use strict";
+// Copyright IBM Corp. 2014,2018. All Rights Reserved.
+// Node module: strong-log-transformer
+// This file is licensed under the Apache License 2.0.
+// License text available at https://opensource.org/licenses/Apache-2.0
 
-{
-name:"SIGTERM",
-number:15,
-action:"terminate",
-description:"Termination",
-standard:"ansi"},
 
-{
-name:"SIGSTKFLT",
-number:16,
-action:"terminate",
-description:"Stack is empty or overflowed",
-standard:"other"},
 
-{
-name:"SIGCHLD",
-number:17,
-action:"ignore",
-description:"Child process terminated, paused or unpaused",
-standard:"posix"},
+var stream = __webpack_require__(137);
+var util = __webpack_require__(111);
+var fs = __webpack_require__(133);
 
-{
-name:"SIGCLD",
-number:17,
-action:"ignore",
-description:"Child process terminated, paused or unpaused",
-standard:"other"},
+var through = __webpack_require__(273);
+var duplexer = __webpack_require__(274);
+var StringDecoder = __webpack_require__(275).StringDecoder;
 
-{
-name:"SIGCONT",
-number:18,
-action:"unpause",
-description:"Unpaused",
-standard:"posix",
-forced:true},
+module.exports = Logger;
 
-{
-name:"SIGSTOP",
-number:19,
-action:"pause",
-description:"Paused",
-standard:"posix",
-forced:true},
+Logger.DEFAULTS = {
+  format: 'text',
+  tag: '',
+  mergeMultiline: false,
+  timeStamp: false,
+};
 
-{
-name:"SIGTSTP",
-number:20,
-action:"pause",
-description:"Paused using CTRL-Z or \"suspend\"",
-standard:"posix"},
+var formatters = {
+  text: textFormatter,
+  json: jsonFormatter,
+}
 
-{
-name:"SIGTTIN",
-number:21,
-action:"pause",
-description:"Background process cannot read terminal input",
-standard:"posix"},
+function Logger(options) {
+  var defaults = JSON.parse(JSON.stringify(Logger.DEFAULTS));
+  options = util._extend(defaults, options || {});
+  var catcher = deLiner();
+  var emitter = catcher;
+  var transforms = [
+    objectifier(),
+  ];
 
-{
-name:"SIGBREAK",
-number:21,
-action:"terminate",
-description:"User interruption with CTRL-BREAK",
-standard:"other"},
+  if (options.tag) {
+    transforms.push(staticTagger(options.tag));
+  }
 
-{
-name:"SIGTTOU",
-number:22,
-action:"pause",
-description:"Background process cannot write to terminal output",
-standard:"posix"},
+  if (options.mergeMultiline) {
+    transforms.push(lineMerger());
+  }
 
-{
-name:"SIGURG",
-number:23,
-action:"ignore",
-description:"Socket received out-of-band data",
-standard:"bsd"},
-
-{
-name:"SIGXCPU",
-number:24,
-action:"core",
-description:"Process timed out",
-standard:"bsd"},
+  // TODO
+  // if (options.pidStamp) {
+  //   transforms.push(pidStamper(options.pid));
+  // }
 
-{
-name:"SIGXFSZ",
-number:25,
-action:"core",
-description:"File too big",
-standard:"bsd"},
+  // TODO
+  // if (options.workerStamp) {
+  //   transforms.push(workerStamper(options.worker));
+  // }
 
-{
-name:"SIGVTALRM",
-number:26,
-action:"terminate",
-description:"Timeout or timer",
-standard:"bsd"},
+  transforms.push(formatters[options.format](options));
 
-{
-name:"SIGPROF",
-number:27,
-action:"terminate",
-description:"Timeout or timer",
-standard:"bsd"},
+  // restore line endings that were removed by line splitting
+  transforms.push(reLiner());
 
-{
-name:"SIGWINCH",
-number:28,
-action:"ignore",
-description:"Terminal window size changed",
-standard:"bsd"},
+  for (var t in transforms) {
+    emitter = emitter.pipe(transforms[t]);
+  }
 
-{
-name:"SIGIO",
-number:29,
-action:"terminate",
-description:"I/O is available",
-standard:"other"},
+  return duplexer(catcher, emitter);
+}
 
-{
-name:"SIGPOLL",
-number:29,
-action:"terminate",
-description:"Watched event",
-standard:"other"},
+function deLiner() {
+  var decoder = new StringDecoder('utf8');
+  var last = '';
 
-{
-name:"SIGINFO",
-number:29,
-action:"ignore",
-description:"Request for process information",
-standard:"other"},
+  return new stream.Transform({
+    transform(chunk, _enc, callback) {
+      last += decoder.write(chunk);
+      var list = last.split(/\r\n|[\n\v\f\r\x85\u2028\u2029]/g);
+      last = list.pop();
+      for (var i = 0; i < list.length; i++) {
+        // swallow empty lines
+        if (list[i]) {
+          this.push(list[i]);
+        }
+      }
+      callback();
+    },
+    flush(callback) {
+      // incomplete UTF8 sequences become UTF8 replacement characters
+      last += decoder.end();
+      if (last) {
+        this.push(last);
+      }
+      callback();
+    },
+  });
+}
 
-{
-name:"SIGPWR",
-number:30,
-action:"terminate",
-description:"Device running out of power",
-standard:"systemv"},
+function reLiner() {
+  return through(appendNewline);
 
-{
-name:"SIGSYS",
-number:31,
-action:"core",
-description:"Invalid system call",
-standard:"other"},
+  function appendNewline(line) {
+    this.emit('data', line + '\n');
+  }
+}
 
-{
-name:"SIGUNUSED",
-number:31,
-action:"terminate",
-description:"Invalid system call",
-standard:"other"}];exports.SIGNALS=SIGNALS;
-//# sourceMappingURL=core.js.map
+function objectifier() {
+  return through(objectify, null, {autoDestroy: false});
 
-/***/ }),
-/* 267 */
-/***/ (function(module, exports, __webpack_require__) {
+  function objectify(line) {
+    this.emit('data', {
+      msg: line,
+      time: Date.now(),
+    });
+  }
+}
 
-"use strict";
-Object.defineProperty(exports,"__esModule",{value:true});exports.SIGRTMAX=exports.getRealtimeSignals=void 0;
-const getRealtimeSignals=function(){
-const length=SIGRTMAX-SIGRTMIN+1;
-return Array.from({length},getRealtimeSignal);
-};exports.getRealtimeSignals=getRealtimeSignals;
+function staticTagger(tag) {
+  return through(tagger);
 
-const getRealtimeSignal=function(value,index){
-return{
-name:`SIGRT${index+1}`,
-number:SIGRTMIN+index,
-action:"terminate",
-description:"Application-specific signal (realtime)",
-standard:"posix"};
+  function tagger(logEvent) {
+    logEvent.tag = tag;
+    this.emit('data', logEvent);
+  }
+}
 
-};
+function textFormatter(options) {
+  return through(textify);
 
-const SIGRTMIN=34;
-const SIGRTMAX=64;exports.SIGRTMAX=SIGRTMAX;
-//# sourceMappingURL=realtime.js.map
+  function textify(logEvent) {
+    var line = util.format('%s%s', textifyTags(logEvent.tag),
+                           logEvent.msg.toString());
+    if (options.timeStamp) {
+      line = util.format('%s %s', new Date(logEvent.time).toISOString(), line);
+    }
+    this.emit('data', line.replace(/\n/g, '\\n'));
+  }
 
-/***/ }),
-/* 268 */
-/***/ (function(module, exports, __webpack_require__) {
+  function textifyTags(tags) {
+    var str = '';
+    if (typeof tags === 'string') {
+      str = tags + ' ';
+    } else if (typeof tags === 'object') {
+      for (var t in tags) {
+        str += t + ':' + tags[t] + ' ';
+      }
+    }
+    return str;
+  }
+}
 
-"use strict";
+function jsonFormatter(options) {
+  return through(jsonify);
 
-const aliases = ['stdin', 'stdout', 'stderr'];
+  function jsonify(logEvent) {
+    if (options.timeStamp) {
+      logEvent.time = new Date(logEvent.time).toISOString();
+    } else {
+      delete logEvent.time;
+    }
+    logEvent.msg = logEvent.msg.toString();
+    this.emit('data', JSON.stringify(logEvent));
+  }
+}
 
-const hasAlias = opts => aliases.some(alias => opts[alias] !== undefined);
+function lineMerger(host) {
+  var previousLine = null;
+  var flushTimer = null;
+  var stream = through(lineMergerWrite, lineMergerEnd);
+  var flush = _flush.bind(stream);
 
-const normalizeStdio = opts => {
-	if (!opts) {
-		return;
-	}
+  return stream;
 
-	const {stdio} = opts;
+  function lineMergerWrite(line) {
+    if (/^\s+/.test(line.msg)) {
+      if (previousLine) {
+        previousLine.msg += '\n' + line.msg;
+      } else {
+        previousLine = line;
+      }
+    } else {
+      flush();
+      previousLine = line;
+    }
+    // rolling timeout
+    clearTimeout(flushTimer);
+    flushTimer = setTimeout(flush.bind(this), 10);
+  }
 
-	if (stdio === undefined) {
-		return aliases.map(alias => opts[alias]);
-	}
+  function _flush() {
+    if (previousLine) {
+      this.emit('data', previousLine);
+      previousLine = null;
+    }
+  }
 
-	if (hasAlias(opts)) {
-		throw new Error(`It's not possible to provide \`stdio\` in combination with one of ${aliases.map(alias => `\`${alias}\``).join(', ')}`);
-	}
+  function lineMergerEnd() {
+    flush.call(this);
+    this.emit('end');
+  }
+}
 
-	if (typeof stdio === 'string') {
-		return stdio;
-	}
 
-	if (!Array.isArray(stdio)) {
-		throw new TypeError(`Expected \`stdio\` to be of type \`string\` or \`Array\`, got \`${typeof stdio}\``);
-	}
+/***/ }),
+/* 273 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	const length = Math.max(stdio.length, aliases.length);
-	return Array.from({length}, (value, index) => stdio[index]);
-};
+var Stream = __webpack_require__(137)
 
-module.exports = normalizeStdio;
+// through
+//
+// a stream that does nothing but re-emit the input.
+// useful for aggregating a series of changing but not ending streams into one stream)
 
-// `ipc` is pushed unless it is already present
-module.exports.node = opts => {
-	const stdio = normalizeStdio(opts);
+exports = module.exports = through
+through.through = through
 
-	if (stdio === 'ipc') {
-		return 'ipc';
-	}
+//create a readable writable stream.
 
-	if (stdio === undefined || typeof stdio === 'string') {
-		return [stdio, stdio, stdio, 'ipc'];
-	}
+function through (write, end, opts) {
+  write = write || function (data) { this.queue(data) }
+  end = end || function () { this.queue(null) }
 
-	if (stdio.includes('ipc')) {
-		return stdio;
-	}
+  var ended = false, destroyed = false, buffer = [], _ended = false
+  var stream = new Stream()
+  stream.readable = stream.writable = true
+  stream.paused = false
 
-	return [...stdio, 'ipc'];
-};
+//  stream.autoPause   = !(opts && opts.autoPause   === false)
+  stream.autoDestroy = !(opts && opts.autoDestroy === false)
 
+  stream.write = function (data) {
+    write.call(this, data)
+    return !stream.paused
+  }
 
-/***/ }),
-/* 269 */
-/***/ (function(module, exports, __webpack_require__) {
+  function drain() {
+    while(buffer.length && !stream.paused) {
+      var data = buffer.shift()
+      if(null === data)
+        return stream.emit('end')
+      else
+        stream.emit('data', data)
+    }
+  }
 
-"use strict";
+  stream.queue = stream.push = function (data) {
+//    console.error(ended)
+    if(_ended) return stream
+    if(data === null) _ended = true
+    buffer.push(data)
+    drain()
+    return stream
+  }
 
-const os = __webpack_require__(120);
-const onExit = __webpack_require__(225);
+  //this will be registered as the first 'end' listener
+  //must call destroy next tick, to make sure we're after any
+  //stream piped from here.
+  //this is only a problem if end is not emitted synchronously.
+  //a nicer way to do this is to make sure this is the last listener for 'end'
 
-const DEFAULT_FORCE_KILL_TIMEOUT = 1000 * 5;
+  stream.on('end', function () {
+    stream.readable = false
+    if(!stream.writable && stream.autoDestroy)
+      process.nextTick(function () {
+        stream.destroy()
+      })
+  })
 
-// Monkey-patches `childProcess.kill()` to add `forceKillAfterTimeout` behavior
-const spawnedKill = (kill, signal = 'SIGTERM', options = {}) => {
-	const killResult = kill(signal);
-	setKillTimeout(kill, signal, options, killResult);
-	return killResult;
-};
+  function _end () {
+    stream.writable = false
+    end.call(stream)
+    if(!stream.readable && stream.autoDestroy)
+      stream.destroy()
+  }
 
-const setKillTimeout = (kill, signal, options, killResult) => {
-	if (!shouldForceKill(signal, options, killResult)) {
-		return;
-	}
+  stream.end = function (data) {
+    if(ended) return
+    ended = true
+    if(arguments.length) stream.write(data)
+    _end() // will emit or queue
+    return stream
+  }
 
-	const timeout = getForceKillAfterTimeout(options);
-	const t = setTimeout(() => {
-		kill('SIGKILL');
-	}, timeout);
+  stream.destroy = function () {
+    if(destroyed) return
+    destroyed = true
+    ended = true
+    buffer.length = 0
+    stream.writable = stream.readable = false
+    stream.emit('close')
+    return stream
+  }
 
-	// Guarded because there's no `.unref()` when `execa` is used in the renderer
-	// process in Electron. This cannot be tested since we don't run tests in
-	// Electron.
-	// istanbul ignore else
-	if (t.unref) {
-		t.unref();
-	}
-};
+  stream.pause = function () {
+    if(stream.paused) return
+    stream.paused = true
+    return stream
+  }
 
-const shouldForceKill = (signal, {forceKillAfterTimeout}, killResult) => {
-	return isSigterm(signal) && forceKillAfterTimeout !== false && killResult;
-};
+  stream.resume = function () {
+    if(stream.paused) {
+      stream.paused = false
+      stream.emit('resume')
+    }
+    drain()
+    //may have become paused again,
+    //as drain emits 'data'.
+    if(!stream.paused)
+      stream.emit('drain')
+    return stream
+  }
+  return stream
+}
 
-const isSigterm = signal => {
-	return signal === os.constants.signals.SIGTERM ||
-		(typeof signal === 'string' && signal.toUpperCase() === 'SIGTERM');
-};
 
-const getForceKillAfterTimeout = ({forceKillAfterTimeout = true}) => {
-	if (forceKillAfterTimeout === true) {
-		return DEFAULT_FORCE_KILL_TIMEOUT;
-	}
 
-	if (!Number.isInteger(forceKillAfterTimeout) || forceKillAfterTimeout < 0) {
-		throw new TypeError(`Expected the \`forceKillAfterTimeout\` option to be a non-negative integer, got \`${forceKillAfterTimeout}\` (${typeof forceKillAfterTimeout})`);
-	}
+/***/ }),
+/* 274 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	return forceKillAfterTimeout;
-};
+var Stream = __webpack_require__(137)
+var writeMethods = ["write", "end", "destroy"]
+var readMethods = ["resume", "pause"]
+var readEvents = ["data", "close"]
+var slice = Array.prototype.slice
 
-// `childProcess.cancel()`
-const spawnedCancel = (spawned, context) => {
-	const killResult = spawned.kill();
+module.exports = duplex
 
-	if (killResult) {
-		context.isCanceled = true;
-	}
-};
+function forEach (arr, fn) {
+    if (arr.forEach) {
+        return arr.forEach(fn)
+    }
 
-const timeoutKill = (spawned, signal, reject) => {
-	spawned.kill(signal);
-	reject(Object.assign(new Error('Timed out'), {timedOut: true, signal}));
-};
+    for (var i = 0; i < arr.length; i++) {
+        fn(arr[i], i)
+    }
+}
 
-// `timeout` option handling
-const setupTimeout = (spawned, {timeout, killSignal = 'SIGTERM'}, spawnedPromise) => {
-	if (timeout === 0 || timeout === undefined) {
-		return spawnedPromise;
-	}
+function duplex(writer, reader) {
+    var stream = new Stream()
+    var ended = false
 
-	if (!Number.isInteger(timeout) || timeout < 0) {
-		throw new TypeError(`Expected the \`timeout\` option to be a non-negative integer, got \`${timeout}\` (${typeof timeout})`);
-	}
+    forEach(writeMethods, proxyWriter)
 
-	let timeoutId;
-	const timeoutPromise = new Promise((resolve, reject) => {
-		timeoutId = setTimeout(() => {
-			timeoutKill(spawned, killSignal, reject);
-		}, timeout);
-	});
+    forEach(readMethods, proxyReader)
 
-	const safeSpawnedPromise = spawnedPromise.finally(() => {
-		clearTimeout(timeoutId);
-	});
+    forEach(readEvents, proxyStream)
 
-	return Promise.race([timeoutPromise, safeSpawnedPromise]);
-};
+    reader.on("end", handleEnd)
 
-// `cleanup` option handling
-const setExitHandler = async (spawned, {cleanup, detached}, timedPromise) => {
-	if (!cleanup || detached) {
-		return timedPromise;
-	}
+    writer.on("drain", function() {
+      stream.emit("drain")
+    })
 
-	const removeExitHandler = onExit(() => {
-		spawned.kill();
-	});
+    writer.on("error", reemit)
+    reader.on("error", reemit)
 
-	return timedPromise.finally(() => {
-		removeExitHandler();
-	});
-};
+    stream.writable = writer.writable
+    stream.readable = reader.readable
 
-module.exports = {
-	spawnedKill,
-	spawnedCancel,
-	setupTimeout,
-	setExitHandler
-};
+    return stream
 
+    function proxyWriter(methodName) {
+        stream[methodName] = method
 
-/***/ }),
-/* 270 */
-/***/ (function(module, exports, __webpack_require__) {
+        function method() {
+            return writer[methodName].apply(writer, arguments)
+        }
+    }
 
-"use strict";
+    function proxyReader(methodName) {
+        stream[methodName] = method
 
-const isStream = __webpack_require__(271);
-const getStream = __webpack_require__(272);
-const mergeStream = __webpack_require__(276);
+        function method() {
+            stream.emit(methodName)
+            var func = reader[methodName]
+            if (func) {
+                return func.apply(reader, arguments)
+            }
+            reader.emit(methodName)
+        }
+    }
 
-// `input` option
-const handleInput = (spawned, input) => {
-	// Checking for stdin is workaround for https://github.com/nodejs/node/issues/26852
-	// TODO: Remove `|| spawned.stdin === undefined` once we drop support for Node.js <=12.2.0
-	if (input === undefined || spawned.stdin === undefined) {
-		return;
-	}
+    function proxyStream(methodName) {
+        reader.on(methodName, reemit)
 
-	if (isStream(input)) {
-		input.pipe(spawned.stdin);
-	} else {
-		spawned.stdin.end(input);
-	}
-};
+        function reemit() {
+            var args = slice.call(arguments)
+            args.unshift(methodName)
+            stream.emit.apply(stream, args)
+        }
+    }
 
-// `all` interleaves `stdout` and `stderr`
-const makeAllStream = (spawned, {all}) => {
-	if (!all || (!spawned.stdout && !spawned.stderr)) {
-		return;
-	}
+    function handleEnd() {
+        if (ended) {
+            return
+        }
+        ended = true
+        var args = slice.call(arguments)
+        args.unshift("end")
+        stream.emit.apply(stream, args)
+    }
 
-	const mixed = mergeStream();
+    function reemit(err) {
+        stream.emit("error", err)
+    }
+}
 
-	if (spawned.stdout) {
-		mixed.add(spawned.stdout);
-	}
 
-	if (spawned.stderr) {
-		mixed.add(spawned.stderr);
-	}
+/***/ }),
+/* 275 */
+/***/ (function(module, exports) {
 
-	return mixed;
-};
+module.exports = require("string_decoder");
 
-// On failure, `result.stdout|stderr|all` should contain the currently buffered stream
-const getBufferedData = async (stream, streamPromise) => {
-	if (!stream) {
-		return;
-	}
+/***/ }),
+/* 276 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	stream.destroy();
+"use strict";
+// Copyright IBM Corp. 2014,2018. All Rights Reserved.
+// Node module: strong-log-transformer
+// This file is licensed under the Apache License 2.0.
+// License text available at https://opensource.org/licenses/Apache-2.0
 
-	try {
-		return await streamPromise;
-	} catch (error) {
-		return error.bufferedData;
-	}
-};
 
-const getStreamPromise = (stream, {encoding, buffer, maxBuffer}) => {
-	if (!stream || !buffer) {
-		return;
-	}
 
-	if (encoding) {
-		return getStream(stream, {encoding, maxBuffer});
-	}
+var minimist = __webpack_require__(277);
+var path = __webpack_require__(4);
 
-	return getStream.buffer(stream, {maxBuffer});
-};
+var Logger = __webpack_require__(272);
+var pkg = __webpack_require__(278);
 
-// Retrieve result of child process: exit code, signal, error, streams (stdout/stderr/all)
-const getSpawnedResult = async ({stdout, stderr, all}, {encoding, buffer, maxBuffer}, processDone) => {
-	const stdoutPromise = getStreamPromise(stdout, {encoding, buffer, maxBuffer});
-	const stderrPromise = getStreamPromise(stderr, {encoding, buffer, maxBuffer});
-	const allPromise = getStreamPromise(all, {encoding, buffer, maxBuffer: maxBuffer * 2});
+module.exports = cli;
 
-	try {
-		return await Promise.all([processDone, stdoutPromise, stderrPromise, allPromise]);
-	} catch (error) {
-		return Promise.all([
-			{error, signal: error.signal, timedOut: error.timedOut},
-			getBufferedData(stdout, stdoutPromise),
-			getBufferedData(stderr, stderrPromise),
-			getBufferedData(all, allPromise)
-		]);
-	}
-};
+function cli(args) {
+  var opts = minimist(args.slice(2));
+  var $0 = path.basename(args[1]);
+  var p = console.log.bind(console);
+  if (opts.v || opts.version) {
+    version($0, p);
+  } else if (opts.h || opts.help) {
+    usage($0, p);
+  } else if (args.length < 3) {
+    process.stdin.pipe(Logger()).pipe(process.stdout);
+  } else {
+    process.stdin.pipe(Logger(opts)).pipe(process.stdout);
+  }
+}
 
-const validateInputSync = ({input}) => {
-	if (isStream(input)) {
-		throw new TypeError('The `input` option cannot be a stream in sync mode');
-	}
-};
+function version($0, p) {
+  p('%s v%s', pkg.name, pkg.version);
+}
 
-module.exports = {
-	handleInput,
-	makeAllStream,
-	getSpawnedResult,
-	validateInputSync
-};
+function usage($0, p) {
+  var PADDING = '               ';
+  var opt, def;
+  p('Usage: %s [options]', $0);
+  p('');
+  p('%s', pkg.description);
+  p('');
+  p('OPTIONS:');
+  for (opt in Logger.DEFAULTS) {
+    def = Logger.DEFAULTS[opt];
+    if (typeof def === 'boolean')
+      boolOpt(opt, Logger.DEFAULTS[opt]);
+    else
+      stdOpt(opt, Logger.DEFAULTS[opt]);
+  }
+  p('');
 
+  function boolOpt(name, def) {
+    name = name + PADDING.slice(0, 20-name.length);
+    p('   --%s default: %s', name, def);
+  }
 
+  function stdOpt(name, def) {
+    var value = name.toUpperCase() +
+                PADDING.slice(0, 19 - name.length*2);
+    p('   --%s %s default: %j', name, value, def);
+  }
+}
 
-/***/ }),
-/* 271 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/***/ }),
+/* 277 */
+/***/ (function(module, exports) {
 
+module.exports = function (args, opts) {
+    if (!opts) opts = {};
+    
+    var flags = { bools : {}, strings : {}, unknownFn: null };
 
-const isStream = stream =>
-	stream !== null &&
-	typeof stream === 'object' &&
-	typeof stream.pipe === 'function';
+    if (typeof opts['unknown'] === 'function') {
+        flags.unknownFn = opts['unknown'];
+    }
 
-isStream.writable = stream =>
-	isStream(stream) &&
-	stream.writable !== false &&
-	typeof stream._write === 'function' &&
-	typeof stream._writableState === 'object';
+    if (typeof opts['boolean'] === 'boolean' && opts['boolean']) {
+      flags.allBools = true;
+    } else {
+      [].concat(opts['boolean']).filter(Boolean).forEach(function (key) {
+          flags.bools[key] = true;
+      });
+    }
+    
+    var aliases = {};
+    Object.keys(opts.alias || {}).forEach(function (key) {
+        aliases[key] = [].concat(opts.alias[key]);
+        aliases[key].forEach(function (x) {
+            aliases[x] = [key].concat(aliases[key].filter(function (y) {
+                return x !== y;
+            }));
+        });
+    });
 
-isStream.readable = stream =>
-	isStream(stream) &&
-	stream.readable !== false &&
-	typeof stream._read === 'function' &&
-	typeof stream._readableState === 'object';
+    [].concat(opts.string).filter(Boolean).forEach(function (key) {
+        flags.strings[key] = true;
+        if (aliases[key]) {
+            flags.strings[aliases[key]] = true;
+        }
+     });
 
-isStream.duplex = stream =>
-	isStream.writable(stream) &&
-	isStream.readable(stream);
+    var defaults = opts['default'] || {};
+    
+    var argv = { _ : [] };
+    Object.keys(flags.bools).forEach(function (key) {
+        setArg(key, defaults[key] === undefined ? false : defaults[key]);
+    });
+    
+    var notFlags = [];
 
-isStream.transform = stream =>
-	isStream.duplex(stream) &&
-	typeof stream._transform === 'function' &&
-	typeof stream._transformState === 'object';
+    if (args.indexOf('--') !== -1) {
+        notFlags = args.slice(args.indexOf('--')+1);
+        args = args.slice(0, args.indexOf('--'));
+    }
 
-module.exports = isStream;
+    function argDefined(key, arg) {
+        return (flags.allBools && /^--[^=]+$/.test(arg)) ||
+            flags.strings[key] || flags.bools[key] || aliases[key];
+    }
 
+    function setArg (key, val, arg) {
+        if (arg && flags.unknownFn && !argDefined(key, arg)) {
+            if (flags.unknownFn(arg) === false) return;
+        }
 
-/***/ }),
-/* 272 */
-/***/ (function(module, exports, __webpack_require__) {
+        var value = !flags.strings[key] && isNumber(val)
+            ? Number(val) : val
+        ;
+        setKey(argv, key.split('.'), value);
+        
+        (aliases[key] || []).forEach(function (x) {
+            setKey(argv, x.split('.'), value);
+        });
+    }
 
-"use strict";
+    function setKey (obj, keys, value) {
+        var o = obj;
+        for (var i = 0; i < keys.length-1; i++) {
+            var key = keys[i];
+            if (key === '__proto__') return;
+            if (o[key] === undefined) o[key] = {};
+            if (o[key] === Object.prototype || o[key] === Number.prototype
+                || o[key] === String.prototype) o[key] = {};
+            if (o[key] === Array.prototype) o[key] = [];
+            o = o[key];
+        }
 
-const pump = __webpack_require__(273);
-const bufferStream = __webpack_require__(275);
+        var key = keys[keys.length - 1];
+        if (key === '__proto__') return;
+        if (o === Object.prototype || o === Number.prototype
+            || o === String.prototype) o = {};
+        if (o === Array.prototype) o = [];
+        if (o[key] === undefined || flags.bools[key] || typeof o[key] === 'boolean') {
+            o[key] = value;
+        }
+        else if (Array.isArray(o[key])) {
+            o[key].push(value);
+        }
+        else {
+            o[key] = [ o[key], value ];
+        }
+    }
+    
+    function aliasIsBoolean(key) {
+      return aliases[key].some(function (x) {
+          return flags.bools[x];
+      });
+    }
 
-class MaxBufferError extends Error {
-	constructor() {
-		super('maxBuffer exceeded');
-		this.name = 'MaxBufferError';
-	}
-}
+    for (var i = 0; i < args.length; i++) {
+        var arg = args[i];
+        
+        if (/^--.+=/.test(arg)) {
+            // Using [\s\S] instead of . because js doesn't support the
+            // 'dotall' regex modifier. See:
+            // http://stackoverflow.com/a/1068308/13216
+            var m = arg.match(/^--([^=]+)=([\s\S]*)$/);
+            var key = m[1];
+            var value = m[2];
+            if (flags.bools[key]) {
+                value = value !== 'false';
+            }
+            setArg(key, value, arg);
+        }
+        else if (/^--no-.+/.test(arg)) {
+            var key = arg.match(/^--no-(.+)/)[1];
+            setArg(key, false, arg);
+        }
+        else if (/^--.+/.test(arg)) {
+            var key = arg.match(/^--(.+)/)[1];
+            var next = args[i + 1];
+            if (next !== undefined && !/^-/.test(next)
+            && !flags.bools[key]
+            && !flags.allBools
+            && (aliases[key] ? !aliasIsBoolean(key) : true)) {
+                setArg(key, next, arg);
+                i++;
+            }
+            else if (/^(true|false)$/.test(next)) {
+                setArg(key, next === 'true', arg);
+                i++;
+            }
+            else {
+                setArg(key, flags.strings[key] ? '' : true, arg);
+            }
+        }
+        else if (/^-[^-]+/.test(arg)) {
+            var letters = arg.slice(1,-1).split('');
+            
+            var broken = false;
+            for (var j = 0; j < letters.length; j++) {
+                var next = arg.slice(j+2);
+                
+                if (next === '-') {
+                    setArg(letters[j], next, arg)
+                    continue;
+                }
+                
+                if (/[A-Za-z]/.test(letters[j]) && /=/.test(next)) {
+                    setArg(letters[j], next.split('=')[1], arg);
+                    broken = true;
+                    break;
+                }
+                
+                if (/[A-Za-z]/.test(letters[j])
+                && /-?\d+(\.\d*)?(e-?\d+)?$/.test(next)) {
+                    setArg(letters[j], next, arg);
+                    broken = true;
+                    break;
+                }
+                
+                if (letters[j+1] && letters[j+1].match(/\W/)) {
+                    setArg(letters[j], arg.slice(j+2), arg);
+                    broken = true;
+                    break;
+                }
+                else {
+                    setArg(letters[j], flags.strings[letters[j]] ? '' : true, arg);
+                }
+            }
+            
+            var key = arg.slice(-1)[0];
+            if (!broken && key !== '-') {
+                if (args[i+1] && !/^(-|--)[^-]/.test(args[i+1])
+                && !flags.bools[key]
+                && (aliases[key] ? !aliasIsBoolean(key) : true)) {
+                    setArg(key, args[i+1], arg);
+                    i++;
+                }
+                else if (args[i+1] && /^(true|false)$/.test(args[i+1])) {
+                    setArg(key, args[i+1] === 'true', arg);
+                    i++;
+                }
+                else {
+                    setArg(key, flags.strings[key] ? '' : true, arg);
+                }
+            }
+        }
+        else {
+            if (!flags.unknownFn || flags.unknownFn(arg) !== false) {
+                argv._.push(
+                    flags.strings['_'] || !isNumber(arg) ? arg : Number(arg)
+                );
+            }
+            if (opts.stopEarly) {
+                argv._.push.apply(argv._, args.slice(i + 1));
+                break;
+            }
+        }
+    }
+    
+    Object.keys(defaults).forEach(function (key) {
+        if (!hasKey(argv, key.split('.'))) {
+            setKey(argv, key.split('.'), defaults[key]);
+            
+            (aliases[key] || []).forEach(function (x) {
+                setKey(argv, x.split('.'), defaults[key]);
+            });
+        }
+    });
+    
+    if (opts['--']) {
+        argv['--'] = new Array();
+        notFlags.forEach(function(key) {
+            argv['--'].push(key);
+        });
+    }
+    else {
+        notFlags.forEach(function(key) {
+            argv._.push(key);
+        });
+    }
 
-async function getStream(inputStream, options) {
-	if (!inputStream) {
-		return Promise.reject(new Error('Expected a stream'));
-	}
+    return argv;
+};
 
-	options = {
-		maxBuffer: Infinity,
-		...options
-	};
+function hasKey (obj, keys) {
+    var o = obj;
+    keys.slice(0,-1).forEach(function (key) {
+        o = (o[key] || {});
+    });
 
-	const {maxBuffer} = options;
+    var key = keys[keys.length - 1];
+    return key in o;
+}
 
-	let stream;
-	await new Promise((resolve, reject) => {
-		const rejectPromise = error => {
-			if (error) { // A null check
-				error.bufferedData = stream.getBufferedValue();
-			}
+function isNumber (x) {
+    if (typeof x === 'number') return true;
+    if (/^0x[0-9a-f]+$/i.test(x)) return true;
+    return /^[-+]?(?:\d+(?:\.\d*)?|\.\d+)(e[-+]?\d+)?$/.test(x);
+}
 
-			reject(error);
-		};
 
-		stream = pump(inputStream, bufferStream(options), error => {
-			if (error) {
-				rejectPromise(error);
-				return;
-			}
 
-			resolve();
-		});
+/***/ }),
+/* 278 */
+/***/ (function(module) {
 
-		stream.on('data', () => {
-			if (stream.getBufferedLength() > maxBuffer) {
-				rejectPromise(new MaxBufferError());
-			}
-		});
-	});
+module.exports = JSON.parse("{\"name\":\"strong-log-transformer\",\"version\":\"2.1.0\",\"description\":\"Stream transformer that prefixes lines with timestamps and other things.\",\"author\":\"Ryan Graham <ryan@strongloop.com>\",\"license\":\"Apache-2.0\",\"repository\":{\"type\":\"git\",\"url\":\"git://github.com/strongloop/strong-log-transformer\"},\"keywords\":[\"logging\",\"streams\"],\"bugs\":{\"url\":\"https://github.com/strongloop/strong-log-transformer/issues\"},\"homepage\":\"https://github.com/strongloop/strong-log-transformer\",\"directories\":{\"test\":\"test\"},\"bin\":{\"sl-log-transformer\":\"bin/sl-log-transformer.js\"},\"main\":\"index.js\",\"scripts\":{\"test\":\"tap --100 test/test-*\"},\"dependencies\":{\"duplexer\":\"^0.1.1\",\"minimist\":\"^1.2.0\",\"through\":\"^2.3.4\"},\"devDependencies\":{\"tap\":\"^12.0.1\"},\"engines\":{\"node\":\">=4\"}}");
 
-	return stream.getBufferedValue();
-}
+/***/ }),
+/* 279 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-module.exports = getStream;
-// TODO: Remove this for the next major release
-module.exports.default = getStream;
-module.exports.buffer = (stream, options) => getStream(stream, {...options, encoding: 'buffer'});
-module.exports.array = (stream, options) => getStream(stream, {...options, array: true});
-module.exports.MaxBufferError = MaxBufferError;
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "workspacePackagePaths", function() { return workspacePackagePaths; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "copyWorkspacePackages", function() { return copyWorkspacePackages; });
+/* harmony import */ var glob__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(146);
+/* harmony import */ var glob__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(glob__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(111);
+/* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(280);
+/* harmony import */ var _fs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(130);
+/* harmony import */ var _package_json__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(164);
+/* harmony import */ var _projects__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(145);
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 
-/***/ }),
-/* 273 */
-/***/ (function(module, exports, __webpack_require__) {
 
-var once = __webpack_require__(161)
-var eos = __webpack_require__(274)
-var fs = __webpack_require__(133) // we only need fs to get the ReadStream and WriteStream prototypes
 
-var noop = function () {}
-var ancient = /^v?\.0/.test(process.version)
 
-var isFn = function (fn) {
-  return typeof fn === 'function'
-}
 
-var isFS = function (stream) {
-  if (!ancient) return false // newer node version do not need to care about fs is a special way
-  if (!fs) return false // browser
-  return (stream instanceof (fs.ReadStream || noop) || stream instanceof (fs.WriteStream || noop)) && isFn(stream.close)
-}
 
-var isRequest = function (stream) {
-  return stream.setHeader && isFn(stream.abort)
-}
+const glob = Object(util__WEBPACK_IMPORTED_MODULE_2__["promisify"])(glob__WEBPACK_IMPORTED_MODULE_0___default.a);
+async function workspacePackagePaths(rootPath) {
+  const rootPkgJson = await Object(_package_json__WEBPACK_IMPORTED_MODULE_5__["readPackageJson"])(rootPath);
 
-var destroyer = function (stream, reading, writing, callback) {
-  callback = once(callback)
+  if (!rootPkgJson.workspaces) {
+    return [];
+  }
 
-  var closed = false
-  stream.on('close', function () {
-    closed = true
-  })
-
-  eos(stream, {readable: reading, writable: writing}, function (err) {
-    if (err) return callback(err)
-    closed = true
-    callback()
-  })
-
-  var destroyed = false
-  return function (err) {
-    if (closed) return
-    if (destroyed) return
-    destroyed = true
+  const workspacesPathsPatterns = rootPkgJson.workspaces.packages;
+  let workspaceProjectsPaths = [];
 
-    if (isFS(stream)) return stream.close(noop) // use close for fs streams to avoid fd leaks
-    if (isRequest(stream)) return stream.abort() // request.destroy just do .end - .abort is what we want
+  for (const pattern of workspacesPathsPatterns) {
+    workspaceProjectsPaths = workspaceProjectsPaths.concat(await packagesFromGlobPattern({
+      pattern,
+      rootPath
+    }));
+  } // Filter out exclude glob patterns
 
-    if (isFn(stream.destroy)) return stream.destroy()
 
-    callback(err || new Error('stream was destroyed'))
+  for (const pattern of workspacesPathsPatterns) {
+    if (pattern.startsWith('!')) {
+      const pathToRemove = path__WEBPACK_IMPORTED_MODULE_1___default.a.join(rootPath, pattern.slice(1), 'package.json');
+      workspaceProjectsPaths = workspaceProjectsPaths.filter(p => p !== pathToRemove);
+    }
   }
-}
 
-var call = function (fn) {
-  fn()
+  return workspaceProjectsPaths;
 }
+async function copyWorkspacePackages(rootPath) {
+  const projectPaths = Object(_config__WEBPACK_IMPORTED_MODULE_3__["getProjectPaths"])({
+    rootPath
+  });
+  const projects = await Object(_projects__WEBPACK_IMPORTED_MODULE_6__["getProjects"])(rootPath, projectPaths);
 
-var pipe = function (from, to) {
-  return from.pipe(to)
-}
+  for (const project of projects.values()) {
+    const dest = path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(rootPath, 'node_modules', project.name);
 
-var pump = function () {
-  var streams = Array.prototype.slice.call(arguments)
-  var callback = isFn(streams[streams.length - 1] || noop) && streams.pop() || noop
+    if ((await Object(_fs__WEBPACK_IMPORTED_MODULE_4__["isSymlink"])(dest)) === false) {
+      continue;
+    } // Remove the symlink
 
-  if (Array.isArray(streams[0])) streams = streams[0]
-  if (streams.length < 2) throw new Error('pump requires two streams per minimum')
 
-  var error
-  var destroys = streams.map(function (stream, i) {
-    var reading = i < streams.length - 1
-    var writing = i > 0
-    return destroyer(stream, reading, writing, function (err) {
-      if (!error) error = err
-      if (err) destroys.forEach(call)
-      if (reading) return
-      destroys.forEach(call)
-      callback(error)
-    })
-  })
+    await Object(_fs__WEBPACK_IMPORTED_MODULE_4__["unlink"])(dest); // Copy in the package
 
-  return streams.reduce(pipe)
+    await Object(_fs__WEBPACK_IMPORTED_MODULE_4__["copyDirectory"])(project.path, dest);
+  }
 }
 
-module.exports = pump
-
+function packagesFromGlobPattern({
+  pattern,
+  rootPath
+}) {
+  const globOptions = {
+    cwd: rootPath,
+    // Should throw in case of unusual errors when reading the file system
+    strict: true,
+    // Always returns absolute paths for matched files
+    absolute: true,
+    // Do not match ** against multiple filenames
+    // (This is only specified because we currently don't have a need for it.)
+    noglobstar: true
+  };
+  return glob(path__WEBPACK_IMPORTED_MODULE_1___default.a.join(pattern, 'package.json'), globOptions);
+}
 
 /***/ }),
-/* 274 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var once = __webpack_require__(161);
+/* 280 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-var noop = function() {};
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getProjectPaths", function() { return getProjectPaths; });
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(4);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
-var isRequest = function(stream) {
-	return stream.setHeader && typeof stream.abort === 'function';
-};
 
-var isChildProcess = function(stream) {
-	return stream.stdio && Array.isArray(stream.stdio) && stream.stdio.length === 3
-};
+/**
+ * Returns all the paths where plugins are located
+ */
+function getProjectPaths({
+  rootPath,
+  ossOnly,
+  skipKibanaPlugins
+}) {
+  const projectPaths = [rootPath, Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'packages/*')]; // This is needed in order to install the dependencies for the declared
+  // plugin functional used in the selenium functional tests.
+  // As we are now using the webpack dll for the client vendors dependencies
+  // when we run the plugin functional tests against the distributable
+  // dependencies used by such plugins like @eui, react and react-dom can't
+  // be loaded from the dll as the context is different from the one declared
+  // into the webpack dll reference plugin.
+  // In anyway, have a plugin declaring their own dependencies is the
+  // correct and the expect behavior.
 
-var eos = function(stream, opts, callback) {
-	if (typeof opts === 'function') return eos(stream, null, opts);
-	if (!opts) opts = {};
+  projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'test/plugin_functional/plugins/*'));
+  projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'test/interpreter_functional/plugins/*'));
+  projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'examples/*'));
 
-	callback = once(callback || noop);
+  if (!ossOnly) {
+    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'x-pack'));
+    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'x-pack/plugins/*'));
+    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'x-pack/legacy/plugins/*'));
+    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'x-pack/test/functional_with_es_ssl/fixtures/plugins/*'));
+  }
 
-	var ws = stream._writableState;
-	var rs = stream._readableState;
-	var readable = opts.readable || (opts.readable !== false && stream.readable);
-	var writable = opts.writable || (opts.writable !== false && stream.writable);
+  if (!skipKibanaPlugins) {
+    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, '../kibana-extra/*'));
+    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, '../kibana-extra/*/packages/*'));
+    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, '../kibana-extra/*/plugins/*'));
+    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'plugins/*'));
+    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'plugins/*/packages/*'));
+    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'plugins/*/plugins/*'));
+  }
 
-	var onlegacyfinish = function() {
-		if (!stream.writable) onfinish();
-	};
+  return projectPaths;
+}
 
-	var onfinish = function() {
-		writable = false;
-		if (!readable) callback.call(stream);
-	};
+/***/ }),
+/* 281 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-	var onend = function() {
-		readable = false;
-		if (!writable) callback.call(stream);
-	};
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getAllChecksums", function() { return getAllChecksums; });
+/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(133);
+/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var crypto__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(282);
+/* harmony import */ var crypto__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(crypto__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(111);
+/* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(236);
+/* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(execa__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _yarn_lock__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(283);
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
-	var onexit = function(exitCode) {
-		callback.call(stream, exitCode ? new Error('exited with error code: ' + exitCode) : null);
-	};
 
-	var onerror = function(err) {
-		callback.call(stream, err);
-	};
 
-	var onclose = function() {
-		if (readable && !(rs && rs.ended)) return callback.call(stream, new Error('premature close'));
-		if (writable && !(ws && ws.ended)) return callback.call(stream, new Error('premature close'));
-	};
 
-	var onrequest = function() {
-		stream.req.on('finish', onfinish);
-	};
 
-	if (isRequest(stream)) {
-		stream.on('complete', onfinish);
-		stream.on('abort', onclose);
-		if (stream.req) onrequest();
-		else stream.on('request', onrequest);
-	} else if (writable && !ws) { // legacy streams
-		stream.on('end', onlegacyfinish);
-		stream.on('close', onlegacyfinish);
-	}
+const statAsync = Object(util__WEBPACK_IMPORTED_MODULE_2__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_0___default.a.stat);
 
-	if (isChildProcess(stream)) stream.on('exit', onexit);
+const projectBySpecificitySorter = (a, b) => b.path.length - a.path.length;
+/** Get the changed files for a set of projects */
 
-	stream.on('end', onend);
-	stream.on('finish', onfinish);
-	if (opts.error !== false) stream.on('error', onerror);
-	stream.on('close', onclose);
 
-	return function() {
-		stream.removeListener('complete', onfinish);
-		stream.removeListener('abort', onclose);
-		stream.removeListener('request', onrequest);
-		if (stream.req) stream.req.removeListener('finish', onfinish);
-		stream.removeListener('end', onlegacyfinish);
-		stream.removeListener('close', onlegacyfinish);
-		stream.removeListener('finish', onfinish);
-		stream.removeListener('exit', onexit);
-		stream.removeListener('end', onend);
-		stream.removeListener('error', onerror);
-		stream.removeListener('close', onclose);
-	};
-};
+async function getChangesForProjects(projects, kbn, log) {
+  log.verbose('getting changed files');
+  const {
+    stdout
+  } = await execa__WEBPACK_IMPORTED_MODULE_3___default()('git', ['ls-files', '-dmto', '--exclude-standard', '--', ...Array.from(projects.values()).filter(p => kbn.isPartOfRepo(p)).map(p => p.path)], {
+    cwd: kbn.getAbsolute()
+  });
+  const output = stdout.trim();
+  const unassignedChanges = new Map();
 
-module.exports = eos;
+  if (output) {
+    for (const line of output.split('\n')) {
+      const [tag, ...pathParts] = line.trim().split(' ');
+      const path = pathParts.join(' ');
 
+      switch (tag) {
+        case 'M':
+        case 'C':
+          // for some reason ls-files returns deleted files as both deleted
+          // and modified, so make sure not to overwrite changes already
+          // tracked as "deleted"
+          if (unassignedChanges.get(path) !== 'deleted') {
+            unassignedChanges.set(path, 'modified');
+          }
 
-/***/ }),
-/* 275 */
-/***/ (function(module, exports, __webpack_require__) {
+          break;
 
-"use strict";
+        case 'R':
+          unassignedChanges.set(path, 'deleted');
+          break;
 
-const {PassThrough: PassThroughStream} = __webpack_require__(137);
+        case '?':
+          unassignedChanges.set(path, 'untracked');
+          break;
 
-module.exports = options => {
-	options = {...options};
+        case 'H':
+        case 'S':
+        case 'K':
+        default:
+          log.warning(`unexpected modification status "${tag}" for ${path}, please report this!`);
+          unassignedChanges.set(path, 'invalid');
+          break;
+      }
+    }
+  }
 
-	const {array} = options;
-	let {encoding} = options;
-	const isBuffer = encoding === 'buffer';
-	let objectMode = false;
+  const sortedRelevantProjects = Array.from(projects.values()).sort(projectBySpecificitySorter);
+  const changesByProject = new Map();
 
-	if (array) {
-		objectMode = !(encoding || isBuffer);
-	} else {
-		encoding = encoding || 'utf8';
-	}
+  for (const project of sortedRelevantProjects) {
+    if (kbn.isOutsideRepo(project)) {
+      changesByProject.set(project, undefined);
+      continue;
+    }
 
-	if (isBuffer) {
-		encoding = null;
-	}
+    const ownChanges = new Map();
+    const prefix = kbn.getRelative(project.path);
 
-	const stream = new PassThroughStream({objectMode});
+    for (const [path, type] of unassignedChanges) {
+      if (path.startsWith(prefix)) {
+        ownChanges.set(path, type);
+        unassignedChanges.delete(path);
+      }
+    }
 
-	if (encoding) {
-		stream.setEncoding(encoding);
-	}
+    log.verbose(`[${project.name}] found ${ownChanges.size} changes`);
+    changesByProject.set(project, ownChanges);
+  }
 
-	let length = 0;
-	const chunks = [];
+  if (unassignedChanges.size) {
+    throw new Error(`unable to assign all change paths to a project: ${JSON.stringify(Array.from(unassignedChanges.entries()))}`);
+  }
 
-	stream.on('data', chunk => {
-		chunks.push(chunk);
+  return changesByProject;
+}
+/** Get the latest commit sha for a project */
 
-		if (objectMode) {
-			length = chunks.length;
-		} else {
-			length += chunk.length;
-		}
-	});
 
-	stream.getBufferedValue = () => {
-		if (array) {
-			return chunks;
-		}
+async function getLatestSha(project, kbn) {
+  if (kbn.isOutsideRepo(project)) {
+    return;
+  }
 
-		return isBuffer ? Buffer.concat(chunks, length) : chunks.join('');
-	};
+  const {
+    stdout
+  } = await execa__WEBPACK_IMPORTED_MODULE_3___default()('git', ['log', '-n', '1', '--pretty=format:%H', '--', project.path], {
+    cwd: kbn.getAbsolute()
+  });
+  return stdout.trim() || undefined;
+}
+/**
+ * Get a list of the absolute dependencies of this project, as resolved
+ * in the yarn.lock file, does not include other projects in the workspace
+ * or their dependencies
+ */
 
-	stream.getBufferedLength = () => length;
 
-	return stream;
-};
+function resolveDepsForProject(project, yarnLock, kbn, log) {
+  /** map of [name@range, name@resolved] */
+  const resolved = new Map();
+  const queue = Object.entries(project.allDependencies);
 
+  while (queue.length) {
+    const [name, versionRange] = queue.shift();
+    const req = `${name}@${versionRange}`;
 
-/***/ }),
-/* 276 */
-/***/ (function(module, exports, __webpack_require__) {
+    if (resolved.has(req)) {
+      continue;
+    }
 
-"use strict";
+    if (!kbn.hasProject(name)) {
+      const pkg = yarnLock[req];
 
+      if (!pkg) {
+        log.warning('yarn.lock file is out of date, please run `yarn kbn bootstrap` to re-enable caching');
+        return;
+      }
 
-const { PassThrough } = __webpack_require__(137);
+      const res = `${name}@${pkg.version}`;
+      resolved.set(req, res);
+      const allDepsEntries = [...Object.entries(pkg.dependencies || {}), ...Object.entries(pkg.optionalDependencies || {})];
 
-module.exports = function (/*streams...*/) {
-  var sources = []
-  var output  = new PassThrough({objectMode: true})
+      for (const [childName, childVersionRange] of allDepsEntries) {
+        queue.push([childName, childVersionRange]);
+      }
+    }
+  }
 
-  output.setMaxListeners(0)
+  return Array.from(resolved.values()).sort((a, b) => a.localeCompare(b));
+}
+/**
+ * Get the checksum for a specific project in the workspace
+ */
 
-  output.add = add
-  output.isEmpty = isEmpty
 
-  output.on('unpipe', remove)
+async function getChecksum(project, changes, yarnLock, kbn, log) {
+  const sha = await getLatestSha(project, kbn);
 
-  Array.prototype.slice.call(arguments).forEach(add)
+  if (sha) {
+    log.verbose(`[${project.name}] local sha:`, sha);
+  }
 
-  return output
+  if (!changes || Array.from(changes.values()).includes('invalid')) {
+    log.warning(`[${project.name}] unable to determine local changes, caching disabled`);
+    return;
+  }
 
-  function add (source) {
-    if (Array.isArray(source)) {
-      source.forEach(add)
-      return this
+  const changesSummary = await Promise.all(Array.from(changes).sort((a, b) => a[0].localeCompare(b[0])).map(async ([path, type]) => {
+    if (type === 'deleted') {
+      return `${path}:deleted`;
     }
 
-    sources.push(source);
-    source.once('end', remove.bind(null, source))
-    source.once('error', output.emit.bind(output, 'error'))
-    source.pipe(output, {end: false})
-    return this
-  }
+    const stats = await statAsync(kbn.getAbsolute(path));
+    log.verbose(`[${project.name}] modified time ${stats.mtimeMs} for ${path}`);
+    return `${path}:${stats.mtimeMs}`;
+  }));
+  const deps = await resolveDepsForProject(project, yarnLock, kbn, log);
 
-  function isEmpty () {
-    return sources.length == 0;
+  if (!deps) {
+    return;
   }
 
-  function remove (source) {
-    sources = sources.filter(function (it) { return it !== source })
-    if (!sources.length && output.readable) { output.end() }
-  }
-}
+  log.verbose(`[${project.name}] resolved %d deps`, deps.length);
+  const checksum = JSON.stringify({
+    sha,
+    changes: changesSummary,
+    deps
+  }, null, 2);
 
+  if (process.env.BOOTSTRAP_CACHE_DEBUG_CHECKSUM) {
+    return checksum;
+  }
 
-/***/ }),
-/* 277 */
-/***/ (function(module, exports, __webpack_require__) {
+  const hash = crypto__WEBPACK_IMPORTED_MODULE_1___default.a.createHash('sha1');
+  hash.update(checksum);
+  return hash.digest('hex');
+}
+/**
+ * Calculate checksums for all projects in the workspace based on
+ *  - last git commit to project directory
+ *  - un-committed changes
+ *  - resolved dependencies from yarn.lock referenced by project package.json
+ */
 
-"use strict";
 
+async function getAllChecksums(kbn, log) {
+  const projects = kbn.getAllProjects();
+  const changesByProject = await getChangesForProjects(projects, kbn, log);
+  const yarnLock = await Object(_yarn_lock__WEBPACK_IMPORTED_MODULE_4__["readYarnLock"])(kbn);
+  /** map of [project.name, cacheKey] */
 
-const nativePromisePrototype = (async () => {})().constructor.prototype;
-const descriptors = ['then', 'catch', 'finally'].map(property => [
-	property,
-	Reflect.getOwnPropertyDescriptor(nativePromisePrototype, property)
-]);
+  const cacheKeys = new Map();
+  await Promise.all(Array.from(projects.values()).map(async project => {
+    cacheKeys.set(project.name, await getChecksum(project, changesByProject.get(project), yarnLock, kbn, log));
+  }));
+  return cacheKeys;
+}
 
-// The return value is a mixin of `childProcess` and `Promise`
-const mergePromise = (spawned, promise) => {
-	for (const [property, descriptor] of descriptors) {
-		// Starting the main `promise` is deferred to avoid consuming streams
-		const value = typeof promise === 'function' ?
-			(...args) => Reflect.apply(descriptor.value, promise(), args) :
-			descriptor.value.bind(promise);
+/***/ }),
+/* 282 */
+/***/ (function(module, exports) {
 
-		Reflect.defineProperty(spawned, property, {...descriptor, value});
-	}
+module.exports = require("crypto");
 
-	return spawned;
-};
+/***/ }),
+/* 283 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-// Use promises instead of `child_process` events
-const getSpawnedPromise = spawned => {
-	return new Promise((resolve, reject) => {
-		spawned.on('exit', (exitCode, signal) => {
-			resolve({exitCode, signal});
-		});
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "readYarnLock", function() { return readYarnLock; });
+/* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(284);
+/* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(130);
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+// @ts-ignore published types are worthless
 
-		spawned.on('error', error => {
-			reject(error);
-		});
 
-		if (spawned.stdin) {
-			spawned.stdin.on('error', error => {
-				reject(error);
-			});
-		}
-	});
-};
+async function readYarnLock(kbn) {
+  try {
+    const contents = await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_1__["readFile"])(kbn.getAbsolute('yarn.lock'), 'utf8');
+    const yarnLock = Object(_yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__["parse"])(contents);
 
-module.exports = {
-	mergePromise,
-	getSpawnedPromise
-};
+    if (yarnLock.type === 'success') {
+      return yarnLock.object;
+    }
 
+    throw new Error('unable to read yarn.lock file, please run `yarn kbn bootstrap`');
+  } catch (error) {
+    if (error.code !== 'ENOENT') {
+      throw error;
+    }
+  }
 
+  return {};
+}
 
 /***/ }),
-/* 278 */
+/* 284 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+module.exports =
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId]) {
+/******/ 			return installedModules[moduleId].exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+/******/
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/
+/******/
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+/******/
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+/******/
+/******/ 	// identity function for calling harmony imports with the correct context
+/******/ 	__webpack_require__.i = function(value) { return value; };
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, {
+/******/ 				configurable: false,
+/******/ 				enumerable: true,
+/******/ 				get: getter
+/******/ 			});
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+/******/
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = 14);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */
+/***/ (function(module, exports) {
 
-const SPACES_REGEXP = / +/g;
+module.exports = __webpack_require__(4);
 
-const joinCommand = (file, args = []) => {
-	if (!Array.isArray(args)) {
-		return file;
-	}
+/***/ }),
+/* 1 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	return [file, ...args].join(' ');
-};
+"use strict";
 
-// Allow spaces to be escaped by a backslash if not meant as a delimiter
-const handleEscaping = (tokens, token, index) => {
-	if (index === 0) {
-		return [token];
-	}
 
-	const previousToken = tokens[tokens.length - 1];
+exports.__esModule = true;
 
-	if (previousToken.endsWith('\\')) {
-		return [...tokens.slice(0, -1), `${previousToken.slice(0, -1)} ${token}`];
-	}
+var _promise = __webpack_require__(173);
 
-	return [...tokens, token];
-};
+var _promise2 = _interopRequireDefault(_promise);
 
-// Handle `execa.command()`
-const parseCommand = command => {
-	return command
-		.trim()
-		.split(SPACES_REGEXP)
-		.reduce(handleEscaping, []);
-};
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-module.exports = {
-	joinCommand,
-	parseCommand
-};
+exports.default = function (fn) {
+  return function () {
+    var gen = fn.apply(this, arguments);
+    return new _promise2.default(function (resolve, reject) {
+      function step(key, arg) {
+        try {
+          var info = gen[key](arg);
+          var value = info.value;
+        } catch (error) {
+          reject(error);
+          return;
+        }
+
+        if (info.done) {
+          resolve(value);
+        } else {
+          return _promise2.default.resolve(value).then(function (value) {
+            step("next", value);
+          }, function (err) {
+            step("throw", err);
+          });
+        }
+      }
 
+      return step("next");
+    });
+  };
+};
 
 /***/ }),
-/* 279 */
-/***/ (function(module, exports, __webpack_require__) {
+/* 2 */
+/***/ (function(module, exports) {
 
-// Copyright IBM Corp. 2014,2018. All Rights Reserved.
-// Node module: strong-log-transformer
-// This file is licensed under the Apache License 2.0.
-// License text available at https://opensource.org/licenses/Apache-2.0
+module.exports = __webpack_require__(111);
 
-module.exports = __webpack_require__(280);
-module.exports.cli = __webpack_require__(284);
+/***/ }),
+/* 3 */
+/***/ (function(module, exports) {
 
+module.exports = __webpack_require__(133);
 
 /***/ }),
-/* 280 */
+/* 4 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-// Copyright IBM Corp. 2014,2018. All Rights Reserved.
-// Node module: strong-log-transformer
-// This file is licensed under the Apache License 2.0.
-// License text available at https://opensource.org/licenses/Apache-2.0
-
-
-
-var stream = __webpack_require__(137);
-var util = __webpack_require__(111);
-var fs = __webpack_require__(133);
 
-var through = __webpack_require__(281);
-var duplexer = __webpack_require__(282);
-var StringDecoder = __webpack_require__(283).StringDecoder;
 
-module.exports = Logger;
-
-Logger.DEFAULTS = {
-  format: 'text',
-  tag: '',
-  mergeMultiline: false,
-  timeStamp: false,
-};
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+class MessageError extends Error {
+  constructor(msg, code) {
+    super(msg);
+    this.code = code;
+  }
 
-var formatters = {
-  text: textFormatter,
-  json: jsonFormatter,
 }
 
-function Logger(options) {
-  var defaults = JSON.parse(JSON.stringify(Logger.DEFAULTS));
-  options = util._extend(defaults, options || {});
-  var catcher = deLiner();
-  var emitter = catcher;
-  var transforms = [
-    objectifier(),
-  ];
-
-  if (options.tag) {
-    transforms.push(staticTagger(options.tag));
-  }
-
-  if (options.mergeMultiline) {
-    transforms.push(lineMerger());
+exports.MessageError = MessageError;
+class ProcessSpawnError extends MessageError {
+  constructor(msg, code, process) {
+    super(msg, code);
+    this.process = process;
   }
 
-  // TODO
-  // if (options.pidStamp) {
-  //   transforms.push(pidStamper(options.pid));
-  // }
-
-  // TODO
-  // if (options.workerStamp) {
-  //   transforms.push(workerStamper(options.worker));
-  // }
+}
 
-  transforms.push(formatters[options.format](options));
+exports.ProcessSpawnError = ProcessSpawnError;
+class SecurityError extends MessageError {}
 
-  // restore line endings that were removed by line splitting
-  transforms.push(reLiner());
+exports.SecurityError = SecurityError;
+class ProcessTermError extends MessageError {}
 
-  for (var t in transforms) {
-    emitter = emitter.pipe(transforms[t]);
+exports.ProcessTermError = ProcessTermError;
+class ResponseError extends Error {
+  constructor(msg, responseCode) {
+    super(msg);
+    this.responseCode = responseCode;
   }
 
-  return duplexer(catcher, emitter);
 }
+exports.ResponseError = ResponseError;
 
-function deLiner() {
-  var decoder = new StringDecoder('utf8');
-  var last = '';
+/***/ }),
+/* 5 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  return new stream.Transform({
-    transform(chunk, _enc, callback) {
-      last += decoder.write(chunk);
-      var list = last.split(/\r\n|[\n\v\f\r\x85\u2028\u2029]/g);
-      last = list.pop();
-      for (var i = 0; i < list.length; i++) {
-        // swallow empty lines
-        if (list[i]) {
-          this.push(list[i]);
-        }
-      }
-      callback();
-    },
-    flush(callback) {
-      // incomplete UTF8 sequences become UTF8 replacement characters
-      last += decoder.end();
-      if (last) {
-        this.push(last);
-      }
-      callback();
-    },
-  });
-}
+"use strict";
 
-function reLiner() {
-  return through(appendNewline);
 
-  function appendNewline(line) {
-    this.emit('data', line + '\n');
-  }
-}
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getFirstSuitableFolder = exports.readFirstAvailableStream = exports.makeTempDir = exports.hardlinksWork = exports.writeFilePreservingEol = exports.getFileSizeOnDisk = exports.walk = exports.symlink = exports.find = exports.readJsonAndFile = exports.readJson = exports.readFileAny = exports.hardlinkBulk = exports.copyBulk = exports.unlink = exports.glob = exports.link = exports.chmod = exports.lstat = exports.exists = exports.mkdirp = exports.stat = exports.access = exports.rename = exports.readdir = exports.realpath = exports.readlink = exports.writeFile = exports.open = exports.readFileBuffer = exports.lockQueue = exports.constants = undefined;
 
-function objectifier() {
-  return through(objectify, null, {autoDestroy: false});
+var _asyncToGenerator2;
 
-  function objectify(line) {
-    this.emit('data', {
-      msg: line,
-      time: Date.now(),
-    });
-  }
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(1));
 }
 
-function staticTagger(tag) {
-  return through(tagger);
-
-  function tagger(logEvent) {
-    logEvent.tag = tag;
-    this.emit('data', logEvent);
-  }
-}
+let buildActionsForCopy = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (queue, events, possibleExtraneous, reporter) {
 
-function textFormatter(options) {
-  return through(textify);
+    //
+    let build = (() => {
+      var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data) {
+        const src = data.src,
+              dest = data.dest,
+              type = data.type;
 
-  function textify(logEvent) {
-    var line = util.format('%s%s', textifyTags(logEvent.tag),
-                           logEvent.msg.toString());
-    if (options.timeStamp) {
-      line = util.format('%s %s', new Date(logEvent.time).toISOString(), line);
-    }
-    this.emit('data', line.replace(/\n/g, '\\n'));
-  }
+        const onFresh = data.onFresh || noop;
+        const onDone = data.onDone || noop;
 
-  function textifyTags(tags) {
-    var str = '';
-    if (typeof tags === 'string') {
-      str = tags + ' ';
-    } else if (typeof tags === 'object') {
-      for (var t in tags) {
-        str += t + ':' + tags[t] + ' ';
-      }
-    }
-    return str;
-  }
-}
+        // TODO https://github.com/yarnpkg/yarn/issues/3751
+        // related to bundled dependencies handling
+        if (files.has(dest.toLowerCase())) {
+          reporter.verbose(`The case-insensitive file ${dest} shouldn't be copied twice in one bulk copy`);
+        } else {
+          files.add(dest.toLowerCase());
+        }
 
-function jsonFormatter(options) {
-  return through(jsonify);
+        if (type === 'symlink') {
+          yield mkdirp((_path || _load_path()).default.dirname(dest));
+          onFresh();
+          actions.symlink.push({
+            dest,
+            linkname: src
+          });
+          onDone();
+          return;
+        }
 
-  function jsonify(logEvent) {
-    if (options.timeStamp) {
-      logEvent.time = new Date(logEvent.time).toISOString();
-    } else {
-      delete logEvent.time;
-    }
-    logEvent.msg = logEvent.msg.toString();
-    this.emit('data', JSON.stringify(logEvent));
-  }
-}
+        if (events.ignoreBasenames.indexOf((_path || _load_path()).default.basename(src)) >= 0) {
+          // ignored file
+          return;
+        }
 
-function lineMerger(host) {
-  var previousLine = null;
-  var flushTimer = null;
-  var stream = through(lineMergerWrite, lineMergerEnd);
-  var flush = _flush.bind(stream);
+        const srcStat = yield lstat(src);
+        let srcFiles;
 
-  return stream;
+        if (srcStat.isDirectory()) {
+          srcFiles = yield readdir(src);
+        }
 
-  function lineMergerWrite(line) {
-    if (/^\s+/.test(line.msg)) {
-      if (previousLine) {
-        previousLine.msg += '\n' + line.msg;
-      } else {
-        previousLine = line;
-      }
-    } else {
-      flush();
-      previousLine = line;
-    }
-    // rolling timeout
-    clearTimeout(flushTimer);
-    flushTimer = setTimeout(flush.bind(this), 10);
-  }
+        let destStat;
+        try {
+          // try accessing the destination
+          destStat = yield lstat(dest);
+        } catch (e) {
+          // proceed if destination doesn't exist, otherwise error
+          if (e.code !== 'ENOENT') {
+            throw e;
+          }
+        }
 
-  function _flush() {
-    if (previousLine) {
-      this.emit('data', previousLine);
-      previousLine = null;
-    }
-  }
+        // if destination exists
+        if (destStat) {
+          const bothSymlinks = srcStat.isSymbolicLink() && destStat.isSymbolicLink();
+          const bothFolders = srcStat.isDirectory() && destStat.isDirectory();
+          const bothFiles = srcStat.isFile() && destStat.isFile();
 
-  function lineMergerEnd() {
-    flush.call(this);
-    this.emit('end');
-  }
-}
+          // EINVAL access errors sometimes happen which shouldn't because node shouldn't be giving
+          // us modes that aren't valid. investigate this, it's generally safe to proceed.
 
+          /* if (srcStat.mode !== destStat.mode) {
+            try {
+              await access(dest, srcStat.mode);
+            } catch (err) {}
+          } */
 
-/***/ }),
-/* 281 */
-/***/ (function(module, exports, __webpack_require__) {
+          if (bothFiles && artifactFiles.has(dest)) {
+            // this file gets changed during build, likely by a custom install script. Don't bother checking it.
+            onDone();
+            reporter.verbose(reporter.lang('verboseFileSkipArtifact', src));
+            return;
+          }
 
-var Stream = __webpack_require__(137)
+          if (bothFiles && srcStat.size === destStat.size && (0, (_fsNormalized || _load_fsNormalized()).fileDatesEqual)(srcStat.mtime, destStat.mtime)) {
+            // we can safely assume this is the same file
+            onDone();
+            reporter.verbose(reporter.lang('verboseFileSkip', src, dest, srcStat.size, +srcStat.mtime));
+            return;
+          }
 
-// through
-//
-// a stream that does nothing but re-emit the input.
-// useful for aggregating a series of changing but not ending streams into one stream)
+          if (bothSymlinks) {
+            const srcReallink = yield readlink(src);
+            if (srcReallink === (yield readlink(dest))) {
+              // if both symlinks are the same then we can continue on
+              onDone();
+              reporter.verbose(reporter.lang('verboseFileSkipSymlink', src, dest, srcReallink));
+              return;
+            }
+          }
 
-exports = module.exports = through
-through.through = through
+          if (bothFolders) {
+            // mark files that aren't in this folder as possibly extraneous
+            const destFiles = yield readdir(dest);
+            invariant(srcFiles, 'src files not initialised');
 
-//create a readable writable stream.
+            for (var _iterator4 = destFiles, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+              var _ref6;
 
-function through (write, end, opts) {
-  write = write || function (data) { this.queue(data) }
-  end = end || function () { this.queue(null) }
+              if (_isArray4) {
+                if (_i4 >= _iterator4.length) break;
+                _ref6 = _iterator4[_i4++];
+              } else {
+                _i4 = _iterator4.next();
+                if (_i4.done) break;
+                _ref6 = _i4.value;
+              }
 
-  var ended = false, destroyed = false, buffer = [], _ended = false
-  var stream = new Stream()
-  stream.readable = stream.writable = true
-  stream.paused = false
+              const file = _ref6;
 
-//  stream.autoPause   = !(opts && opts.autoPause   === false)
-  stream.autoDestroy = !(opts && opts.autoDestroy === false)
+              if (srcFiles.indexOf(file) < 0) {
+                const loc = (_path || _load_path()).default.join(dest, file);
+                possibleExtraneous.add(loc);
 
-  stream.write = function (data) {
-    write.call(this, data)
-    return !stream.paused
-  }
+                if ((yield lstat(loc)).isDirectory()) {
+                  for (var _iterator5 = yield readdir(loc), _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
+                    var _ref7;
 
-  function drain() {
-    while(buffer.length && !stream.paused) {
-      var data = buffer.shift()
-      if(null === data)
-        return stream.emit('end')
-      else
-        stream.emit('data', data)
-    }
-  }
+                    if (_isArray5) {
+                      if (_i5 >= _iterator5.length) break;
+                      _ref7 = _iterator5[_i5++];
+                    } else {
+                      _i5 = _iterator5.next();
+                      if (_i5.done) break;
+                      _ref7 = _i5.value;
+                    }
 
-  stream.queue = stream.push = function (data) {
-//    console.error(ended)
-    if(_ended) return stream
-    if(data === null) _ended = true
-    buffer.push(data)
-    drain()
-    return stream
-  }
+                    const file = _ref7;
 
-  //this will be registered as the first 'end' listener
-  //must call destroy next tick, to make sure we're after any
-  //stream piped from here.
-  //this is only a problem if end is not emitted synchronously.
-  //a nicer way to do this is to make sure this is the last listener for 'end'
+                    possibleExtraneous.add((_path || _load_path()).default.join(loc, file));
+                  }
+                }
+              }
+            }
+          }
+        }
 
-  stream.on('end', function () {
-    stream.readable = false
-    if(!stream.writable && stream.autoDestroy)
-      process.nextTick(function () {
-        stream.destroy()
-      })
-  })
+        if (destStat && destStat.isSymbolicLink()) {
+          yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(dest);
+          destStat = null;
+        }
 
-  function _end () {
-    stream.writable = false
-    end.call(stream)
-    if(!stream.readable && stream.autoDestroy)
-      stream.destroy()
-  }
+        if (srcStat.isSymbolicLink()) {
+          onFresh();
+          const linkname = yield readlink(src);
+          actions.symlink.push({
+            dest,
+            linkname
+          });
+          onDone();
+        } else if (srcStat.isDirectory()) {
+          if (!destStat) {
+            reporter.verbose(reporter.lang('verboseFileFolder', dest));
+            yield mkdirp(dest);
+          }
 
-  stream.end = function (data) {
-    if(ended) return
-    ended = true
-    if(arguments.length) stream.write(data)
-    _end() // will emit or queue
-    return stream
-  }
+          const destParts = dest.split((_path || _load_path()).default.sep);
+          while (destParts.length) {
+            files.add(destParts.join((_path || _load_path()).default.sep).toLowerCase());
+            destParts.pop();
+          }
 
-  stream.destroy = function () {
-    if(destroyed) return
-    destroyed = true
-    ended = true
-    buffer.length = 0
-    stream.writable = stream.readable = false
-    stream.emit('close')
-    return stream
-  }
+          // push all files to queue
+          invariant(srcFiles, 'src files not initialised');
+          let remaining = srcFiles.length;
+          if (!remaining) {
+            onDone();
+          }
+          for (var _iterator6 = srcFiles, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
+            var _ref8;
 
-  stream.pause = function () {
-    if(stream.paused) return
-    stream.paused = true
-    return stream
-  }
+            if (_isArray6) {
+              if (_i6 >= _iterator6.length) break;
+              _ref8 = _iterator6[_i6++];
+            } else {
+              _i6 = _iterator6.next();
+              if (_i6.done) break;
+              _ref8 = _i6.value;
+            }
 
-  stream.resume = function () {
-    if(stream.paused) {
-      stream.paused = false
-      stream.emit('resume')
-    }
-    drain()
-    //may have become paused again,
-    //as drain emits 'data'.
-    if(!stream.paused)
-      stream.emit('drain')
-    return stream
-  }
-  return stream
-}
+            const file = _ref8;
 
+            queue.push({
+              dest: (_path || _load_path()).default.join(dest, file),
+              onFresh,
+              onDone: function (_onDone) {
+                function onDone() {
+                  return _onDone.apply(this, arguments);
+                }
 
+                onDone.toString = function () {
+                  return _onDone.toString();
+                };
 
-/***/ }),
-/* 282 */
-/***/ (function(module, exports, __webpack_require__) {
+                return onDone;
+              }(function () {
+                if (--remaining === 0) {
+                  onDone();
+                }
+              }),
+              src: (_path || _load_path()).default.join(src, file)
+            });
+          }
+        } else if (srcStat.isFile()) {
+          onFresh();
+          actions.file.push({
+            src,
+            dest,
+            atime: srcStat.atime,
+            mtime: srcStat.mtime,
+            mode: srcStat.mode
+          });
+          onDone();
+        } else {
+          throw new Error(`unsure how to copy this: ${src}`);
+        }
+      });
 
-var Stream = __webpack_require__(137)
-var writeMethods = ["write", "end", "destroy"]
-var readMethods = ["resume", "pause"]
-var readEvents = ["data", "close"]
-var slice = Array.prototype.slice
+      return function build(_x5) {
+        return _ref5.apply(this, arguments);
+      };
+    })();
 
-module.exports = duplex
+    const artifactFiles = new Set(events.artifactFiles || []);
+    const files = new Set();
 
-function forEach (arr, fn) {
-    if (arr.forEach) {
-        return arr.forEach(fn)
-    }
+    // initialise events
+    for (var _iterator = queue, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref2;
 
-    for (var i = 0; i < arr.length; i++) {
-        fn(arr[i], i)
-    }
-}
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref2 = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref2 = _i.value;
+      }
 
-function duplex(writer, reader) {
-    var stream = new Stream()
-    var ended = false
+      const item = _ref2;
 
-    forEach(writeMethods, proxyWriter)
+      const onDone = item.onDone;
+      item.onDone = function () {
+        events.onProgress(item.dest);
+        if (onDone) {
+          onDone();
+        }
+      };
+    }
+    events.onStart(queue.length);
 
-    forEach(readMethods, proxyReader)
+    // start building actions
+    const actions = {
+      file: [],
+      symlink: [],
+      link: []
+    };
 
-    forEach(readEvents, proxyStream)
+    // custom concurrency logic as we're always executing stacks of CONCURRENT_QUEUE_ITEMS queue items
+    // at a time due to the requirement to push items onto the queue
+    while (queue.length) {
+      const items = queue.splice(0, CONCURRENT_QUEUE_ITEMS);
+      yield Promise.all(items.map(build));
+    }
 
-    reader.on("end", handleEnd)
+    // simulate the existence of some files to prevent considering them extraneous
+    for (var _iterator2 = artifactFiles, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+      var _ref3;
 
-    writer.on("drain", function() {
-      stream.emit("drain")
-    })
+      if (_isArray2) {
+        if (_i2 >= _iterator2.length) break;
+        _ref3 = _iterator2[_i2++];
+      } else {
+        _i2 = _iterator2.next();
+        if (_i2.done) break;
+        _ref3 = _i2.value;
+      }
 
-    writer.on("error", reemit)
-    reader.on("error", reemit)
+      const file = _ref3;
 
-    stream.writable = writer.writable
-    stream.readable = reader.readable
+      if (possibleExtraneous.has(file)) {
+        reporter.verbose(reporter.lang('verboseFilePhantomExtraneous', file));
+        possibleExtraneous.delete(file);
+      }
+    }
 
-    return stream
+    for (var _iterator3 = possibleExtraneous, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+      var _ref4;
 
-    function proxyWriter(methodName) {
-        stream[methodName] = method
+      if (_isArray3) {
+        if (_i3 >= _iterator3.length) break;
+        _ref4 = _iterator3[_i3++];
+      } else {
+        _i3 = _iterator3.next();
+        if (_i3.done) break;
+        _ref4 = _i3.value;
+      }
 
-        function method() {
-            return writer[methodName].apply(writer, arguments)
-        }
+      const loc = _ref4;
+
+      if (files.has(loc.toLowerCase())) {
+        possibleExtraneous.delete(loc);
+      }
     }
 
-    function proxyReader(methodName) {
-        stream[methodName] = method
+    return actions;
+  });
 
-        function method() {
-            stream.emit(methodName)
-            var func = reader[methodName]
-            if (func) {
-                return func.apply(reader, arguments)
-            }
-            reader.emit(methodName)
-        }
-    }
+  return function buildActionsForCopy(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+})();
 
-    function proxyStream(methodName) {
-        reader.on(methodName, reemit)
+let buildActionsForHardlink = (() => {
+  var _ref9 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (queue, events, possibleExtraneous, reporter) {
 
-        function reemit() {
-            var args = slice.call(arguments)
-            args.unshift(methodName)
-            stream.emit.apply(stream, args)
-        }
-    }
+    //
+    let build = (() => {
+      var _ref13 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data) {
+        const src = data.src,
+              dest = data.dest;
 
-    function handleEnd() {
-        if (ended) {
-            return
+        const onFresh = data.onFresh || noop;
+        const onDone = data.onDone || noop;
+        if (files.has(dest.toLowerCase())) {
+          // Fixes issue https://github.com/yarnpkg/yarn/issues/2734
+          // When bulk hardlinking we have A -> B structure that we want to hardlink to A1 -> B1,
+          // package-linker passes that modules A1 and B1 need to be hardlinked,
+          // the recursive linking algorithm of A1 ends up scheduling files in B1 to be linked twice which will case
+          // an exception.
+          onDone();
+          return;
         }
-        ended = true
-        var args = slice.call(arguments)
-        args.unshift("end")
-        stream.emit.apply(stream, args)
-    }
+        files.add(dest.toLowerCase());
 
-    function reemit(err) {
-        stream.emit("error", err)
-    }
-}
+        if (events.ignoreBasenames.indexOf((_path || _load_path()).default.basename(src)) >= 0) {
+          // ignored file
+          return;
+        }
 
+        const srcStat = yield lstat(src);
+        let srcFiles;
 
-/***/ }),
-/* 283 */
-/***/ (function(module, exports) {
+        if (srcStat.isDirectory()) {
+          srcFiles = yield readdir(src);
+        }
 
-module.exports = require("string_decoder");
+        const destExists = yield exists(dest);
+        if (destExists) {
+          const destStat = yield lstat(dest);
 
-/***/ }),
-/* 284 */
-/***/ (function(module, exports, __webpack_require__) {
+          const bothSymlinks = srcStat.isSymbolicLink() && destStat.isSymbolicLink();
+          const bothFolders = srcStat.isDirectory() && destStat.isDirectory();
+          const bothFiles = srcStat.isFile() && destStat.isFile();
 
-"use strict";
-// Copyright IBM Corp. 2014,2018. All Rights Reserved.
-// Node module: strong-log-transformer
-// This file is licensed under the Apache License 2.0.
-// License text available at https://opensource.org/licenses/Apache-2.0
+          if (srcStat.mode !== destStat.mode) {
+            try {
+              yield access(dest, srcStat.mode);
+            } catch (err) {
+              // EINVAL access errors sometimes happen which shouldn't because node shouldn't be giving
+              // us modes that aren't valid. investigate this, it's generally safe to proceed.
+              reporter.verbose(err);
+            }
+          }
 
+          if (bothFiles && artifactFiles.has(dest)) {
+            // this file gets changed during build, likely by a custom install script. Don't bother checking it.
+            onDone();
+            reporter.verbose(reporter.lang('verboseFileSkipArtifact', src));
+            return;
+          }
 
+          // correct hardlink
+          if (bothFiles && srcStat.ino !== null && srcStat.ino === destStat.ino) {
+            onDone();
+            reporter.verbose(reporter.lang('verboseFileSkip', src, dest, srcStat.ino));
+            return;
+          }
 
-var minimist = __webpack_require__(285);
-var path = __webpack_require__(4);
+          if (bothSymlinks) {
+            const srcReallink = yield readlink(src);
+            if (srcReallink === (yield readlink(dest))) {
+              // if both symlinks are the same then we can continue on
+              onDone();
+              reporter.verbose(reporter.lang('verboseFileSkipSymlink', src, dest, srcReallink));
+              return;
+            }
+          }
 
-var Logger = __webpack_require__(280);
-var pkg = __webpack_require__(286);
+          if (bothFolders) {
+            // mark files that aren't in this folder as possibly extraneous
+            const destFiles = yield readdir(dest);
+            invariant(srcFiles, 'src files not initialised');
 
-module.exports = cli;
+            for (var _iterator10 = destFiles, _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : _iterator10[Symbol.iterator]();;) {
+              var _ref14;
 
-function cli(args) {
-  var opts = minimist(args.slice(2));
-  var $0 = path.basename(args[1]);
-  var p = console.log.bind(console);
-  if (opts.v || opts.version) {
-    version($0, p);
-  } else if (opts.h || opts.help) {
-    usage($0, p);
-  } else if (args.length < 3) {
-    process.stdin.pipe(Logger()).pipe(process.stdout);
-  } else {
-    process.stdin.pipe(Logger(opts)).pipe(process.stdout);
-  }
-}
+              if (_isArray10) {
+                if (_i10 >= _iterator10.length) break;
+                _ref14 = _iterator10[_i10++];
+              } else {
+                _i10 = _iterator10.next();
+                if (_i10.done) break;
+                _ref14 = _i10.value;
+              }
 
-function version($0, p) {
-  p('%s v%s', pkg.name, pkg.version);
-}
+              const file = _ref14;
 
-function usage($0, p) {
-  var PADDING = '               ';
-  var opt, def;
-  p('Usage: %s [options]', $0);
-  p('');
-  p('%s', pkg.description);
-  p('');
-  p('OPTIONS:');
-  for (opt in Logger.DEFAULTS) {
-    def = Logger.DEFAULTS[opt];
-    if (typeof def === 'boolean')
-      boolOpt(opt, Logger.DEFAULTS[opt]);
-    else
-      stdOpt(opt, Logger.DEFAULTS[opt]);
-  }
-  p('');
+              if (srcFiles.indexOf(file) < 0) {
+                const loc = (_path || _load_path()).default.join(dest, file);
+                possibleExtraneous.add(loc);
 
-  function boolOpt(name, def) {
-    name = name + PADDING.slice(0, 20-name.length);
-    p('   --%s default: %s', name, def);
-  }
+                if ((yield lstat(loc)).isDirectory()) {
+                  for (var _iterator11 = yield readdir(loc), _isArray11 = Array.isArray(_iterator11), _i11 = 0, _iterator11 = _isArray11 ? _iterator11 : _iterator11[Symbol.iterator]();;) {
+                    var _ref15;
 
-  function stdOpt(name, def) {
-    var value = name.toUpperCase() +
-                PADDING.slice(0, 19 - name.length*2);
-    p('   --%s %s default: %j', name, value, def);
-  }
-}
+                    if (_isArray11) {
+                      if (_i11 >= _iterator11.length) break;
+                      _ref15 = _iterator11[_i11++];
+                    } else {
+                      _i11 = _iterator11.next();
+                      if (_i11.done) break;
+                      _ref15 = _i11.value;
+                    }
 
+                    const file = _ref15;
 
-/***/ }),
-/* 285 */
-/***/ (function(module, exports) {
+                    possibleExtraneous.add((_path || _load_path()).default.join(loc, file));
+                  }
+                }
+              }
+            }
+          }
+        }
 
-module.exports = function (args, opts) {
-    if (!opts) opts = {};
-    
-    var flags = { bools : {}, strings : {}, unknownFn: null };
+        if (srcStat.isSymbolicLink()) {
+          onFresh();
+          const linkname = yield readlink(src);
+          actions.symlink.push({
+            dest,
+            linkname
+          });
+          onDone();
+        } else if (srcStat.isDirectory()) {
+          reporter.verbose(reporter.lang('verboseFileFolder', dest));
+          yield mkdirp(dest);
 
-    if (typeof opts['unknown'] === 'function') {
-        flags.unknownFn = opts['unknown'];
-    }
+          const destParts = dest.split((_path || _load_path()).default.sep);
+          while (destParts.length) {
+            files.add(destParts.join((_path || _load_path()).default.sep).toLowerCase());
+            destParts.pop();
+          }
 
-    if (typeof opts['boolean'] === 'boolean' && opts['boolean']) {
-      flags.allBools = true;
-    } else {
-      [].concat(opts['boolean']).filter(Boolean).forEach(function (key) {
-          flags.bools[key] = true;
-      });
-    }
-    
-    var aliases = {};
-    Object.keys(opts.alias || {}).forEach(function (key) {
-        aliases[key] = [].concat(opts.alias[key]);
-        aliases[key].forEach(function (x) {
-            aliases[x] = [key].concat(aliases[key].filter(function (y) {
-                return x !== y;
-            }));
-        });
-    });
+          // push all files to queue
+          invariant(srcFiles, 'src files not initialised');
+          let remaining = srcFiles.length;
+          if (!remaining) {
+            onDone();
+          }
+          for (var _iterator12 = srcFiles, _isArray12 = Array.isArray(_iterator12), _i12 = 0, _iterator12 = _isArray12 ? _iterator12 : _iterator12[Symbol.iterator]();;) {
+            var _ref16;
 
-    [].concat(opts.string).filter(Boolean).forEach(function (key) {
-        flags.strings[key] = true;
-        if (aliases[key]) {
-            flags.strings[aliases[key]] = true;
-        }
-     });
+            if (_isArray12) {
+              if (_i12 >= _iterator12.length) break;
+              _ref16 = _iterator12[_i12++];
+            } else {
+              _i12 = _iterator12.next();
+              if (_i12.done) break;
+              _ref16 = _i12.value;
+            }
 
-    var defaults = opts['default'] || {};
-    
-    var argv = { _ : [] };
-    Object.keys(flags.bools).forEach(function (key) {
-        setArg(key, defaults[key] === undefined ? false : defaults[key]);
-    });
-    
-    var notFlags = [];
+            const file = _ref16;
 
-    if (args.indexOf('--') !== -1) {
-        notFlags = args.slice(args.indexOf('--')+1);
-        args = args.slice(0, args.indexOf('--'));
-    }
+            queue.push({
+              onFresh,
+              src: (_path || _load_path()).default.join(src, file),
+              dest: (_path || _load_path()).default.join(dest, file),
+              onDone: function (_onDone2) {
+                function onDone() {
+                  return _onDone2.apply(this, arguments);
+                }
 
-    function argDefined(key, arg) {
-        return (flags.allBools && /^--[^=]+$/.test(arg)) ||
-            flags.strings[key] || flags.bools[key] || aliases[key];
-    }
+                onDone.toString = function () {
+                  return _onDone2.toString();
+                };
 
-    function setArg (key, val, arg) {
-        if (arg && flags.unknownFn && !argDefined(key, arg)) {
-            if (flags.unknownFn(arg) === false) return;
+                return onDone;
+              }(function () {
+                if (--remaining === 0) {
+                  onDone();
+                }
+              })
+            });
+          }
+        } else if (srcStat.isFile()) {
+          onFresh();
+          actions.link.push({
+            src,
+            dest,
+            removeDest: destExists
+          });
+          onDone();
+        } else {
+          throw new Error(`unsure how to copy this: ${src}`);
         }
+      });
 
-        var value = !flags.strings[key] && isNumber(val)
-            ? Number(val) : val
-        ;
-        setKey(argv, key.split('.'), value);
-        
-        (aliases[key] || []).forEach(function (x) {
-            setKey(argv, x.split('.'), value);
-        });
-    }
-
-    function setKey (obj, keys, value) {
-        var o = obj;
-        for (var i = 0; i < keys.length-1; i++) {
-            var key = keys[i];
-            if (key === '__proto__') return;
-            if (o[key] === undefined) o[key] = {};
-            if (o[key] === Object.prototype || o[key] === Number.prototype
-                || o[key] === String.prototype) o[key] = {};
-            if (o[key] === Array.prototype) o[key] = [];
-            o = o[key];
-        }
+      return function build(_x10) {
+        return _ref13.apply(this, arguments);
+      };
+    })();
 
-        var key = keys[keys.length - 1];
-        if (key === '__proto__') return;
-        if (o === Object.prototype || o === Number.prototype
-            || o === String.prototype) o = {};
-        if (o === Array.prototype) o = [];
-        if (o[key] === undefined || flags.bools[key] || typeof o[key] === 'boolean') {
-            o[key] = value;
-        }
-        else if (Array.isArray(o[key])) {
-            o[key].push(value);
-        }
-        else {
-            o[key] = [ o[key], value ];
-        }
-    }
-    
-    function aliasIsBoolean(key) {
-      return aliases[key].some(function (x) {
-          return flags.bools[x];
-      });
-    }
+    const artifactFiles = new Set(events.artifactFiles || []);
+    const files = new Set();
 
-    for (var i = 0; i < args.length; i++) {
-        var arg = args[i];
-        
-        if (/^--.+=/.test(arg)) {
-            // Using [\s\S] instead of . because js doesn't support the
-            // 'dotall' regex modifier. See:
-            // http://stackoverflow.com/a/1068308/13216
-            var m = arg.match(/^--([^=]+)=([\s\S]*)$/);
-            var key = m[1];
-            var value = m[2];
-            if (flags.bools[key]) {
-                value = value !== 'false';
-            }
-            setArg(key, value, arg);
-        }
-        else if (/^--no-.+/.test(arg)) {
-            var key = arg.match(/^--no-(.+)/)[1];
-            setArg(key, false, arg);
-        }
-        else if (/^--.+/.test(arg)) {
-            var key = arg.match(/^--(.+)/)[1];
-            var next = args[i + 1];
-            if (next !== undefined && !/^-/.test(next)
-            && !flags.bools[key]
-            && !flags.allBools
-            && (aliases[key] ? !aliasIsBoolean(key) : true)) {
-                setArg(key, next, arg);
-                i++;
-            }
-            else if (/^(true|false)$/.test(next)) {
-                setArg(key, next === 'true', arg);
-                i++;
-            }
-            else {
-                setArg(key, flags.strings[key] ? '' : true, arg);
-            }
-        }
-        else if (/^-[^-]+/.test(arg)) {
-            var letters = arg.slice(1,-1).split('');
-            
-            var broken = false;
-            for (var j = 0; j < letters.length; j++) {
-                var next = arg.slice(j+2);
-                
-                if (next === '-') {
-                    setArg(letters[j], next, arg)
-                    continue;
-                }
-                
-                if (/[A-Za-z]/.test(letters[j]) && /=/.test(next)) {
-                    setArg(letters[j], next.split('=')[1], arg);
-                    broken = true;
-                    break;
-                }
-                
-                if (/[A-Za-z]/.test(letters[j])
-                && /-?\d+(\.\d*)?(e-?\d+)?$/.test(next)) {
-                    setArg(letters[j], next, arg);
-                    broken = true;
-                    break;
-                }
-                
-                if (letters[j+1] && letters[j+1].match(/\W/)) {
-                    setArg(letters[j], arg.slice(j+2), arg);
-                    broken = true;
-                    break;
-                }
-                else {
-                    setArg(letters[j], flags.strings[letters[j]] ? '' : true, arg);
-                }
-            }
-            
-            var key = arg.slice(-1)[0];
-            if (!broken && key !== '-') {
-                if (args[i+1] && !/^(-|--)[^-]/.test(args[i+1])
-                && !flags.bools[key]
-                && (aliases[key] ? !aliasIsBoolean(key) : true)) {
-                    setArg(key, args[i+1], arg);
-                    i++;
-                }
-                else if (args[i+1] && /^(true|false)$/.test(args[i+1])) {
-                    setArg(key, args[i+1] === 'true', arg);
-                    i++;
-                }
-                else {
-                    setArg(key, flags.strings[key] ? '' : true, arg);
-                }
-            }
-        }
-        else {
-            if (!flags.unknownFn || flags.unknownFn(arg) !== false) {
-                argv._.push(
-                    flags.strings['_'] || !isNumber(arg) ? arg : Number(arg)
-                );
-            }
-            if (opts.stopEarly) {
-                argv._.push.apply(argv._, args.slice(i + 1));
-                break;
-            }
-        }
-    }
-    
-    Object.keys(defaults).forEach(function (key) {
-        if (!hasKey(argv, key.split('.'))) {
-            setKey(argv, key.split('.'), defaults[key]);
-            
-            (aliases[key] || []).forEach(function (x) {
-                setKey(argv, x.split('.'), defaults[key]);
-            });
-        }
-    });
-    
-    if (opts['--']) {
-        argv['--'] = new Array();
-        notFlags.forEach(function(key) {
-            argv['--'].push(key);
-        });
-    }
-    else {
-        notFlags.forEach(function(key) {
-            argv._.push(key);
-        });
-    }
+    // initialise events
+    for (var _iterator7 = queue, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
+      var _ref10;
 
-    return argv;
-};
+      if (_isArray7) {
+        if (_i7 >= _iterator7.length) break;
+        _ref10 = _iterator7[_i7++];
+      } else {
+        _i7 = _iterator7.next();
+        if (_i7.done) break;
+        _ref10 = _i7.value;
+      }
 
-function hasKey (obj, keys) {
-    var o = obj;
-    keys.slice(0,-1).forEach(function (key) {
-        o = (o[key] || {});
-    });
+      const item = _ref10;
 
-    var key = keys[keys.length - 1];
-    return key in o;
-}
+      const onDone = item.onDone || noop;
+      item.onDone = function () {
+        events.onProgress(item.dest);
+        onDone();
+      };
+    }
+    events.onStart(queue.length);
 
-function isNumber (x) {
-    if (typeof x === 'number') return true;
-    if (/^0x[0-9a-f]+$/i.test(x)) return true;
-    return /^[-+]?(?:\d+(?:\.\d*)?|\.\d+)(e[-+]?\d+)?$/.test(x);
-}
+    // start building actions
+    const actions = {
+      file: [],
+      symlink: [],
+      link: []
+    };
 
+    // custom concurrency logic as we're always executing stacks of CONCURRENT_QUEUE_ITEMS queue items
+    // at a time due to the requirement to push items onto the queue
+    while (queue.length) {
+      const items = queue.splice(0, CONCURRENT_QUEUE_ITEMS);
+      yield Promise.all(items.map(build));
+    }
 
+    // simulate the existence of some files to prevent considering them extraneous
+    for (var _iterator8 = artifactFiles, _isArray8 = Array.isArray(_iterator8), _i8 = 0, _iterator8 = _isArray8 ? _iterator8 : _iterator8[Symbol.iterator]();;) {
+      var _ref11;
 
-/***/ }),
-/* 286 */
-/***/ (function(module) {
+      if (_isArray8) {
+        if (_i8 >= _iterator8.length) break;
+        _ref11 = _iterator8[_i8++];
+      } else {
+        _i8 = _iterator8.next();
+        if (_i8.done) break;
+        _ref11 = _i8.value;
+      }
 
-module.exports = JSON.parse("{\"name\":\"strong-log-transformer\",\"version\":\"2.1.0\",\"description\":\"Stream transformer that prefixes lines with timestamps and other things.\",\"author\":\"Ryan Graham <ryan@strongloop.com>\",\"license\":\"Apache-2.0\",\"repository\":{\"type\":\"git\",\"url\":\"git://github.com/strongloop/strong-log-transformer\"},\"keywords\":[\"logging\",\"streams\"],\"bugs\":{\"url\":\"https://github.com/strongloop/strong-log-transformer/issues\"},\"homepage\":\"https://github.com/strongloop/strong-log-transformer\",\"directories\":{\"test\":\"test\"},\"bin\":{\"sl-log-transformer\":\"bin/sl-log-transformer.js\"},\"main\":\"index.js\",\"scripts\":{\"test\":\"tap --100 test/test-*\"},\"dependencies\":{\"duplexer\":\"^0.1.1\",\"minimist\":\"^1.2.0\",\"through\":\"^2.3.4\"},\"devDependencies\":{\"tap\":\"^12.0.1\"},\"engines\":{\"node\":\">=4\"}}");
+      const file = _ref11;
 
-/***/ }),
-/* 287 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+      if (possibleExtraneous.has(file)) {
+        reporter.verbose(reporter.lang('verboseFilePhantomExtraneous', file));
+        possibleExtraneous.delete(file);
+      }
+    }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "workspacePackagePaths", function() { return workspacePackagePaths; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "copyWorkspacePackages", function() { return copyWorkspacePackages; });
-/* harmony import */ var glob__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(146);
-/* harmony import */ var glob__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(glob__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(111);
-/* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(288);
-/* harmony import */ var _fs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(130);
-/* harmony import */ var _package_json__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(164);
-/* harmony import */ var _projects__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(145);
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
+    for (var _iterator9 = possibleExtraneous, _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
+      var _ref12;
 
+      if (_isArray9) {
+        if (_i9 >= _iterator9.length) break;
+        _ref12 = _iterator9[_i9++];
+      } else {
+        _i9 = _iterator9.next();
+        if (_i9.done) break;
+        _ref12 = _i9.value;
+      }
 
+      const loc = _ref12;
 
+      if (files.has(loc.toLowerCase())) {
+        possibleExtraneous.delete(loc);
+      }
+    }
 
+    return actions;
+  });
 
+  return function buildActionsForHardlink(_x6, _x7, _x8, _x9) {
+    return _ref9.apply(this, arguments);
+  };
+})();
 
+let copyBulk = exports.copyBulk = (() => {
+  var _ref17 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (queue, reporter, _events) {
+    const events = {
+      onStart: _events && _events.onStart || noop,
+      onProgress: _events && _events.onProgress || noop,
+      possibleExtraneous: _events ? _events.possibleExtraneous : new Set(),
+      ignoreBasenames: _events && _events.ignoreBasenames || [],
+      artifactFiles: _events && _events.artifactFiles || []
+    };
 
-const glob = Object(util__WEBPACK_IMPORTED_MODULE_2__["promisify"])(glob__WEBPACK_IMPORTED_MODULE_0___default.a);
-async function workspacePackagePaths(rootPath) {
-  const rootPkgJson = await Object(_package_json__WEBPACK_IMPORTED_MODULE_5__["readPackageJson"])(rootPath);
+    const actions = yield buildActionsForCopy(queue, events, events.possibleExtraneous, reporter);
+    events.onStart(actions.file.length + actions.symlink.length + actions.link.length);
 
-  if (!rootPkgJson.workspaces) {
-    return [];
-  }
+    const fileActions = actions.file;
 
-  const workspacesPathsPatterns = rootPkgJson.workspaces.packages;
-  let workspaceProjectsPaths = [];
+    const currentlyWriting = new Map();
 
-  for (const pattern of workspacesPathsPatterns) {
-    workspaceProjectsPaths = workspaceProjectsPaths.concat(await packagesFromGlobPattern({
-      pattern,
-      rootPath
-    }));
-  } // Filter out exclude glob patterns
+    yield (_promise || _load_promise()).queue(fileActions, (() => {
+      var _ref18 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data) {
+        let writePromise;
+        while (writePromise = currentlyWriting.get(data.dest)) {
+          yield writePromise;
+        }
 
+        reporter.verbose(reporter.lang('verboseFileCopy', data.src, data.dest));
+        const copier = (0, (_fsNormalized || _load_fsNormalized()).copyFile)(data, function () {
+          return currentlyWriting.delete(data.dest);
+        });
+        currentlyWriting.set(data.dest, copier);
+        events.onProgress(data.dest);
+        return copier;
+      });
 
-  for (const pattern of workspacesPathsPatterns) {
-    if (pattern.startsWith('!')) {
-      const pathToRemove = path__WEBPACK_IMPORTED_MODULE_1___default.a.join(rootPath, pattern.slice(1), 'package.json');
-      workspaceProjectsPaths = workspaceProjectsPaths.filter(p => p !== pathToRemove);
-    }
-  }
+      return function (_x14) {
+        return _ref18.apply(this, arguments);
+      };
+    })(), CONCURRENT_QUEUE_ITEMS);
 
-  return workspaceProjectsPaths;
-}
-async function copyWorkspacePackages(rootPath) {
-  const projectPaths = Object(_config__WEBPACK_IMPORTED_MODULE_3__["getProjectPaths"])({
-    rootPath
+    // we need to copy symlinks last as they could reference files we were copying
+    const symlinkActions = actions.symlink;
+    yield (_promise || _load_promise()).queue(symlinkActions, function (data) {
+      const linkname = (_path || _load_path()).default.resolve((_path || _load_path()).default.dirname(data.dest), data.linkname);
+      reporter.verbose(reporter.lang('verboseFileSymlink', data.dest, linkname));
+      return symlink(linkname, data.dest);
+    });
   });
-  const projects = await Object(_projects__WEBPACK_IMPORTED_MODULE_6__["getProjects"])(rootPath, projectPaths);
 
-  for (const project of projects.values()) {
-    const dest = path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(rootPath, 'node_modules', project.name);
+  return function copyBulk(_x11, _x12, _x13) {
+    return _ref17.apply(this, arguments);
+  };
+})();
 
-    if ((await Object(_fs__WEBPACK_IMPORTED_MODULE_4__["isSymlink"])(dest)) === false) {
-      continue;
-    } // Remove the symlink
+let hardlinkBulk = exports.hardlinkBulk = (() => {
+  var _ref19 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (queue, reporter, _events) {
+    const events = {
+      onStart: _events && _events.onStart || noop,
+      onProgress: _events && _events.onProgress || noop,
+      possibleExtraneous: _events ? _events.possibleExtraneous : new Set(),
+      artifactFiles: _events && _events.artifactFiles || [],
+      ignoreBasenames: []
+    };
 
+    const actions = yield buildActionsForHardlink(queue, events, events.possibleExtraneous, reporter);
+    events.onStart(actions.file.length + actions.symlink.length + actions.link.length);
 
-    await Object(_fs__WEBPACK_IMPORTED_MODULE_4__["unlink"])(dest); // Copy in the package
+    const fileActions = actions.link;
 
-    await Object(_fs__WEBPACK_IMPORTED_MODULE_4__["copyDirectory"])(project.path, dest);
-  }
-}
+    yield (_promise || _load_promise()).queue(fileActions, (() => {
+      var _ref20 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data) {
+        reporter.verbose(reporter.lang('verboseFileLink', data.src, data.dest));
+        if (data.removeDest) {
+          yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(data.dest);
+        }
+        yield link(data.src, data.dest);
+      });
 
-function packagesFromGlobPattern({
-  pattern,
-  rootPath
-}) {
-  const globOptions = {
-    cwd: rootPath,
-    // Should throw in case of unusual errors when reading the file system
-    strict: true,
-    // Always returns absolute paths for matched files
-    absolute: true,
-    // Do not match ** against multiple filenames
-    // (This is only specified because we currently don't have a need for it.)
-    noglobstar: true
-  };
-  return glob(path__WEBPACK_IMPORTED_MODULE_1___default.a.join(pattern, 'package.json'), globOptions);
-}
+      return function (_x18) {
+        return _ref20.apply(this, arguments);
+      };
+    })(), CONCURRENT_QUEUE_ITEMS);
 
-/***/ }),
-/* 288 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    // we need to copy symlinks last as they could reference files we were copying
+    const symlinkActions = actions.symlink;
+    yield (_promise || _load_promise()).queue(symlinkActions, function (data) {
+      const linkname = (_path || _load_path()).default.resolve((_path || _load_path()).default.dirname(data.dest), data.linkname);
+      reporter.verbose(reporter.lang('verboseFileSymlink', data.dest, linkname));
+      return symlink(linkname, data.dest);
+    });
+  });
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getProjectPaths", function() { return getProjectPaths; });
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(4);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
+  return function hardlinkBulk(_x15, _x16, _x17) {
+    return _ref19.apply(this, arguments);
+  };
+})();
 
+let readFileAny = exports.readFileAny = (() => {
+  var _ref21 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (files) {
+    for (var _iterator13 = files, _isArray13 = Array.isArray(_iterator13), _i13 = 0, _iterator13 = _isArray13 ? _iterator13 : _iterator13[Symbol.iterator]();;) {
+      var _ref22;
 
-/**
- * Returns all the paths where plugins are located
- */
-function getProjectPaths({
-  rootPath,
-  ossOnly,
-  skipKibanaPlugins
-}) {
-  const projectPaths = [rootPath, Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'packages/*')]; // This is needed in order to install the dependencies for the declared
-  // plugin functional used in the selenium functional tests.
-  // As we are now using the webpack dll for the client vendors dependencies
-  // when we run the plugin functional tests against the distributable
-  // dependencies used by such plugins like @eui, react and react-dom can't
-  // be loaded from the dll as the context is different from the one declared
-  // into the webpack dll reference plugin.
-  // In anyway, have a plugin declaring their own dependencies is the
-  // correct and the expect behavior.
+      if (_isArray13) {
+        if (_i13 >= _iterator13.length) break;
+        _ref22 = _iterator13[_i13++];
+      } else {
+        _i13 = _iterator13.next();
+        if (_i13.done) break;
+        _ref22 = _i13.value;
+      }
 
-  projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'test/plugin_functional/plugins/*'));
-  projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'test/interpreter_functional/plugins/*'));
-  projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'examples/*'));
+      const file = _ref22;
 
-  if (!ossOnly) {
-    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'x-pack'));
-    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'x-pack/plugins/*'));
-    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'x-pack/legacy/plugins/*'));
-    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'x-pack/test/functional_with_es_ssl/fixtures/plugins/*'));
-  }
+      if (yield exists(file)) {
+        return readFile(file);
+      }
+    }
+    return null;
+  });
 
-  if (!skipKibanaPlugins) {
-    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, '../kibana-extra/*'));
-    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, '../kibana-extra/*/packages/*'));
-    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, '../kibana-extra/*/plugins/*'));
-    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'plugins/*'));
-    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'plugins/*/packages/*'));
-    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'plugins/*/plugins/*'));
-  }
+  return function readFileAny(_x19) {
+    return _ref21.apply(this, arguments);
+  };
+})();
 
-  return projectPaths;
-}
+let readJson = exports.readJson = (() => {
+  var _ref23 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (loc) {
+    return (yield readJsonAndFile(loc)).object;
+  });
 
-/***/ }),
-/* 289 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  return function readJson(_x20) {
+    return _ref23.apply(this, arguments);
+  };
+})();
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getAllChecksums", function() { return getAllChecksums; });
-/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(133);
-/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var crypto__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(290);
-/* harmony import */ var crypto__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(crypto__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(111);
-/* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(244);
-/* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(execa__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _yarn_lock__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(291);
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
+let readJsonAndFile = exports.readJsonAndFile = (() => {
+  var _ref24 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (loc) {
+    const file = yield readFile(loc);
+    try {
+      return {
+        object: (0, (_map || _load_map()).default)(JSON.parse(stripBOM(file))),
+        content: file
+      };
+    } catch (err) {
+      err.message = `${loc}: ${err.message}`;
+      throw err;
+    }
+  });
 
+  return function readJsonAndFile(_x21) {
+    return _ref24.apply(this, arguments);
+  };
+})();
 
+let find = exports.find = (() => {
+  var _ref25 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (filename, dir) {
+    const parts = dir.split((_path || _load_path()).default.sep);
 
+    while (parts.length) {
+      const loc = parts.concat(filename).join((_path || _load_path()).default.sep);
 
+      if (yield exists(loc)) {
+        return loc;
+      } else {
+        parts.pop();
+      }
+    }
 
-const statAsync = Object(util__WEBPACK_IMPORTED_MODULE_2__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_0___default.a.stat);
+    return false;
+  });
 
-const projectBySpecificitySorter = (a, b) => b.path.length - a.path.length;
-/** Get the changed files for a set of projects */
+  return function find(_x22, _x23) {
+    return _ref25.apply(this, arguments);
+  };
+})();
 
+let symlink = exports.symlink = (() => {
+  var _ref26 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (src, dest) {
+    try {
+      const stats = yield lstat(dest);
+      if (stats.isSymbolicLink()) {
+        const resolved = yield realpath(dest);
+        if (resolved === src) {
+          return;
+        }
+      }
+    } catch (err) {
+      if (err.code !== 'ENOENT') {
+        throw err;
+      }
+    }
+    // We use rimraf for unlink which never throws an ENOENT on missing target
+    yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(dest);
 
-async function getChangesForProjects(projects, kbn, log) {
-  log.verbose('getting changed files');
-  const {
-    stdout
-  } = await execa__WEBPACK_IMPORTED_MODULE_3___default()('git', ['ls-files', '-dmto', '--exclude-standard', '--', ...Array.from(projects.values()).filter(p => kbn.isPartOfRepo(p)).map(p => p.path)], {
-    cwd: kbn.getAbsolute()
+    if (process.platform === 'win32') {
+      // use directory junctions if possible on win32, this requires absolute paths
+      yield fsSymlink(src, dest, 'junction');
+    } else {
+      // use relative paths otherwise which will be retained if the directory is moved
+      let relative;
+      try {
+        relative = (_path || _load_path()).default.relative((_fs || _load_fs()).default.realpathSync((_path || _load_path()).default.dirname(dest)), (_fs || _load_fs()).default.realpathSync(src));
+      } catch (err) {
+        if (err.code !== 'ENOENT') {
+          throw err;
+        }
+        relative = (_path || _load_path()).default.relative((_path || _load_path()).default.dirname(dest), src);
+      }
+      // When path.relative returns an empty string for the current directory, we should instead use
+      // '.', which is a valid fs.symlink target.
+      yield fsSymlink(relative || '.', dest);
+    }
   });
-  const output = stdout.trim();
-  const unassignedChanges = new Map();
-
-  if (output) {
-    for (const line of output.split('\n')) {
-      const [tag, ...pathParts] = line.trim().split(' ');
-      const path = pathParts.join(' ');
 
-      switch (tag) {
-        case 'M':
-        case 'C':
-          // for some reason ls-files returns deleted files as both deleted
-          // and modified, so make sure not to overwrite changes already
-          // tracked as "deleted"
-          if (unassignedChanges.get(path) !== 'deleted') {
-            unassignedChanges.set(path, 'modified');
-          }
+  return function symlink(_x24, _x25) {
+    return _ref26.apply(this, arguments);
+  };
+})();
 
-          break;
+let walk = exports.walk = (() => {
+  var _ref27 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (dir, relativeDir, ignoreBasenames = new Set()) {
+    let files = [];
 
-        case 'R':
-          unassignedChanges.set(path, 'deleted');
-          break;
+    let filenames = yield readdir(dir);
+    if (ignoreBasenames.size) {
+      filenames = filenames.filter(function (name) {
+        return !ignoreBasenames.has(name);
+      });
+    }
 
-        case '?':
-          unassignedChanges.set(path, 'untracked');
-          break;
+    for (var _iterator14 = filenames, _isArray14 = Array.isArray(_iterator14), _i14 = 0, _iterator14 = _isArray14 ? _iterator14 : _iterator14[Symbol.iterator]();;) {
+      var _ref28;
 
-        case 'H':
-        case 'S':
-        case 'K':
-        default:
-          log.warning(`unexpected modification status "${tag}" for ${path}, please report this!`);
-          unassignedChanges.set(path, 'invalid');
-          break;
+      if (_isArray14) {
+        if (_i14 >= _iterator14.length) break;
+        _ref28 = _iterator14[_i14++];
+      } else {
+        _i14 = _iterator14.next();
+        if (_i14.done) break;
+        _ref28 = _i14.value;
       }
-    }
-  }
 
-  const sortedRelevantProjects = Array.from(projects.values()).sort(projectBySpecificitySorter);
-  const changesByProject = new Map();
+      const name = _ref28;
 
-  for (const project of sortedRelevantProjects) {
-    if (kbn.isOutsideRepo(project)) {
-      changesByProject.set(project, undefined);
-      continue;
-    }
+      const relative = relativeDir ? (_path || _load_path()).default.join(relativeDir, name) : name;
+      const loc = (_path || _load_path()).default.join(dir, name);
+      const stat = yield lstat(loc);
 
-    const ownChanges = new Map();
-    const prefix = kbn.getRelative(project.path);
+      files.push({
+        relative,
+        basename: name,
+        absolute: loc,
+        mtime: +stat.mtime
+      });
 
-    for (const [path, type] of unassignedChanges) {
-      if (path.startsWith(prefix)) {
-        ownChanges.set(path, type);
-        unassignedChanges.delete(path);
+      if (stat.isDirectory()) {
+        files = files.concat((yield walk(loc, relative, ignoreBasenames)));
       }
     }
 
-    log.verbose(`[${project.name}] found ${ownChanges.size} changes`);
-    changesByProject.set(project, ownChanges);
-  }
-
-  if (unassignedChanges.size) {
-    throw new Error(`unable to assign all change paths to a project: ${JSON.stringify(Array.from(unassignedChanges.entries()))}`);
-  }
+    return files;
+  });
 
-  return changesByProject;
-}
-/** Get the latest commit sha for a project */
+  return function walk(_x26, _x27) {
+    return _ref27.apply(this, arguments);
+  };
+})();
 
+let getFileSizeOnDisk = exports.getFileSizeOnDisk = (() => {
+  var _ref29 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (loc) {
+    const stat = yield lstat(loc);
+    const size = stat.size,
+          blockSize = stat.blksize;
 
-async function getLatestSha(project, kbn) {
-  if (kbn.isOutsideRepo(project)) {
-    return;
-  }
 
-  const {
-    stdout
-  } = await execa__WEBPACK_IMPORTED_MODULE_3___default()('git', ['log', '-n', '1', '--pretty=format:%H', '--', project.path], {
-    cwd: kbn.getAbsolute()
+    return Math.ceil(size / blockSize) * blockSize;
   });
-  return stdout.trim() || undefined;
-}
-/**
- * Get a list of the absolute dependencies of this project, as resolved
- * in the yarn.lock file, does not include other projects in the workspace
- * or their dependencies
- */
 
+  return function getFileSizeOnDisk(_x28) {
+    return _ref29.apply(this, arguments);
+  };
+})();
 
-function resolveDepsForProject(project, yarnLock, kbn, log) {
-  /** map of [name@range, name@resolved] */
-  const resolved = new Map();
-  const queue = Object.entries(project.allDependencies);
+let getEolFromFile = (() => {
+  var _ref30 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (path) {
+    if (!(yield exists(path))) {
+      return undefined;
+    }
 
-  while (queue.length) {
-    const [name, versionRange] = queue.shift();
-    const req = `${name}@${versionRange}`;
+    const buffer = yield readFileBuffer(path);
 
-    if (resolved.has(req)) {
-      continue;
+    for (let i = 0; i < buffer.length; ++i) {
+      if (buffer[i] === cr) {
+        return '\r\n';
+      }
+      if (buffer[i] === lf) {
+        return '\n';
+      }
     }
+    return undefined;
+  });
 
-    if (!kbn.hasProject(name)) {
-      const pkg = yarnLock[req];
+  return function getEolFromFile(_x29) {
+    return _ref30.apply(this, arguments);
+  };
+})();
 
-      if (!pkg) {
-        log.warning('yarn.lock file is out of date, please run `yarn kbn bootstrap` to re-enable caching');
-        return;
-      }
+let writeFilePreservingEol = exports.writeFilePreservingEol = (() => {
+  var _ref31 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (path, data) {
+    const eol = (yield getEolFromFile(path)) || (_os || _load_os()).default.EOL;
+    if (eol !== '\n') {
+      data = data.replace(/\n/g, eol);
+    }
+    yield writeFile(path, data);
+  });
 
-      const res = `${name}@${pkg.version}`;
-      resolved.set(req, res);
-      const allDepsEntries = [...Object.entries(pkg.dependencies || {}), ...Object.entries(pkg.optionalDependencies || {})];
+  return function writeFilePreservingEol(_x30, _x31) {
+    return _ref31.apply(this, arguments);
+  };
+})();
 
-      for (const [childName, childVersionRange] of allDepsEntries) {
-        queue.push([childName, childVersionRange]);
-      }
+let hardlinksWork = exports.hardlinksWork = (() => {
+  var _ref32 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (dir) {
+    const filename = 'test-file' + Math.random();
+    const file = (_path || _load_path()).default.join(dir, filename);
+    const fileLink = (_path || _load_path()).default.join(dir, filename + '-link');
+    try {
+      yield writeFile(file, 'test');
+      yield link(file, fileLink);
+    } catch (err) {
+      return false;
+    } finally {
+      yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(file);
+      yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(fileLink);
     }
-  }
+    return true;
+  });
 
-  return Array.from(resolved.values()).sort((a, b) => a.localeCompare(b));
-}
-/**
- * Get the checksum for a specific project in the workspace
- */
+  return function hardlinksWork(_x32) {
+    return _ref32.apply(this, arguments);
+  };
+})();
 
+// not a strict polyfill for Node's fs.mkdtemp
 
-async function getChecksum(project, changes, yarnLock, kbn, log) {
-  const sha = await getLatestSha(project, kbn);
 
-  if (sha) {
-    log.verbose(`[${project.name}] local sha:`, sha);
-  }
+let makeTempDir = exports.makeTempDir = (() => {
+  var _ref33 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (prefix) {
+    const dir = (_path || _load_path()).default.join((_os || _load_os()).default.tmpdir(), `yarn-${prefix || ''}-${Date.now()}-${Math.random()}`);
+    yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(dir);
+    yield mkdirp(dir);
+    return dir;
+  });
 
-  if (!changes || Array.from(changes.values()).includes('invalid')) {
-    log.warning(`[${project.name}] unable to determine local changes, caching disabled`);
-    return;
-  }
+  return function makeTempDir(_x33) {
+    return _ref33.apply(this, arguments);
+  };
+})();
 
-  const changesSummary = await Promise.all(Array.from(changes).sort((a, b) => a[0].localeCompare(b[0])).map(async ([path, type]) => {
-    if (type === 'deleted') {
-      return `${path}:deleted`;
-    }
+let readFirstAvailableStream = exports.readFirstAvailableStream = (() => {
+  var _ref34 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (paths) {
+    for (var _iterator15 = paths, _isArray15 = Array.isArray(_iterator15), _i15 = 0, _iterator15 = _isArray15 ? _iterator15 : _iterator15[Symbol.iterator]();;) {
+      var _ref35;
 
-    const stats = await statAsync(kbn.getAbsolute(path));
-    log.verbose(`[${project.name}] modified time ${stats.mtimeMs} for ${path}`);
-    return `${path}:${stats.mtimeMs}`;
-  }));
-  const deps = await resolveDepsForProject(project, yarnLock, kbn, log);
+      if (_isArray15) {
+        if (_i15 >= _iterator15.length) break;
+        _ref35 = _iterator15[_i15++];
+      } else {
+        _i15 = _iterator15.next();
+        if (_i15.done) break;
+        _ref35 = _i15.value;
+      }
 
-  if (!deps) {
-    return;
-  }
+      const path = _ref35;
 
-  log.verbose(`[${project.name}] resolved %d deps`, deps.length);
-  const checksum = JSON.stringify({
-    sha,
-    changes: changesSummary,
-    deps
-  }, null, 2);
+      try {
+        const fd = yield open(path, 'r');
+        return (_fs || _load_fs()).default.createReadStream(path, { fd });
+      } catch (err) {
+        // Try the next one
+      }
+    }
+    return null;
+  });
 
-  if (process.env.BOOTSTRAP_CACHE_DEBUG_CHECKSUM) {
-    return checksum;
-  }
+  return function readFirstAvailableStream(_x34) {
+    return _ref34.apply(this, arguments);
+  };
+})();
 
-  const hash = crypto__WEBPACK_IMPORTED_MODULE_1___default.a.createHash('sha1');
-  hash.update(checksum);
-  return hash.digest('hex');
-}
-/**
- * Calculate checksums for all projects in the workspace based on
- *  - last git commit to project directory
- *  - un-committed changes
- *  - resolved dependencies from yarn.lock referenced by project package.json
- */
+let getFirstSuitableFolder = exports.getFirstSuitableFolder = (() => {
+  var _ref36 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (paths, mode = constants.W_OK | constants.X_OK) {
+    const result = {
+      skipped: [],
+      folder: null
+    };
 
+    for (var _iterator16 = paths, _isArray16 = Array.isArray(_iterator16), _i16 = 0, _iterator16 = _isArray16 ? _iterator16 : _iterator16[Symbol.iterator]();;) {
+      var _ref37;
 
-async function getAllChecksums(kbn, log) {
-  const projects = kbn.getAllProjects();
-  const changesByProject = await getChangesForProjects(projects, kbn, log);
-  const yarnLock = await Object(_yarn_lock__WEBPACK_IMPORTED_MODULE_4__["readYarnLock"])(kbn);
-  /** map of [project.name, cacheKey] */
+      if (_isArray16) {
+        if (_i16 >= _iterator16.length) break;
+        _ref37 = _iterator16[_i16++];
+      } else {
+        _i16 = _iterator16.next();
+        if (_i16.done) break;
+        _ref37 = _i16.value;
+      }
 
-  const cacheKeys = new Map();
-  await Promise.all(Array.from(projects.values()).map(async project => {
-    cacheKeys.set(project.name, await getChecksum(project, changesByProject.get(project), yarnLock, kbn, log));
-  }));
-  return cacheKeys;
-}
+      const folder = _ref37;
 
-/***/ }),
-/* 290 */
-/***/ (function(module, exports) {
+      try {
+        yield mkdirp(folder);
+        yield access(folder, mode);
 
-module.exports = require("crypto");
+        result.folder = folder;
 
-/***/ }),
-/* 291 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+        return result;
+      } catch (error) {
+        result.skipped.push({
+          error,
+          folder
+        });
+      }
+    }
+    return result;
+  });
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "readYarnLock", function() { return readYarnLock; });
-/* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(292);
-/* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(130);
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-// @ts-ignore published types are worthless
+  return function getFirstSuitableFolder(_x35) {
+    return _ref36.apply(this, arguments);
+  };
+})();
 
+exports.copy = copy;
+exports.readFile = readFile;
+exports.readFileRaw = readFileRaw;
+exports.normalizeOS = normalizeOS;
 
-async function readYarnLock(kbn) {
-  try {
-    const contents = await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_1__["readFile"])(kbn.getAbsolute('yarn.lock'), 'utf8');
-    const yarnLock = Object(_yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__["parse"])(contents);
+var _fs;
 
-    if (yarnLock.type === 'success') {
-      return yarnLock.object;
-    }
+function _load_fs() {
+  return _fs = _interopRequireDefault(__webpack_require__(3));
+}
 
-    throw new Error('unable to read yarn.lock file, please run `yarn kbn bootstrap`');
-  } catch (error) {
-    if (error.code !== 'ENOENT') {
-      throw error;
-    }
-  }
+var _glob;
 
-  return {};
+function _load_glob() {
+  return _glob = _interopRequireDefault(__webpack_require__(75));
 }
 
-/***/ }),
-/* 292 */
-/***/ (function(module, exports, __webpack_require__) {
+var _os;
 
-module.exports =
-/******/ (function(modules) { // webpackBootstrap
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
-/******/
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-/******/
-/******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId]) {
-/******/ 			return installedModules[moduleId].exports;
-/******/ 		}
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			i: moduleId,
-/******/ 			l: false,
-/******/ 			exports: {}
-/******/ 		};
-/******/
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-/******/
-/******/ 		// Flag the module as loaded
-/******/ 		module.l = true;
-/******/
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-/******/
-/******/
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__webpack_require__.m = modules;
-/******/
-/******/ 	// expose the module cache
-/******/ 	__webpack_require__.c = installedModules;
-/******/
-/******/ 	// identity function for calling harmony imports with the correct context
-/******/ 	__webpack_require__.i = function(value) { return value; };
-/******/
-/******/ 	// define getter function for harmony exports
-/******/ 	__webpack_require__.d = function(exports, name, getter) {
-/******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
-/******/ 		}
-/******/ 	};
-/******/
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-/******/ 	__webpack_require__.n = function(module) {
-/******/ 		var getter = module && module.__esModule ?
-/******/ 			function getDefault() { return module['default']; } :
-/******/ 			function getModuleExports() { return module; };
-/******/ 		__webpack_require__.d(getter, 'a', getter);
-/******/ 		return getter;
-/******/ 	};
-/******/
-/******/ 	// Object.prototype.hasOwnProperty.call
-/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-/******/
-/******/ 	// __webpack_public_path__
-/******/ 	__webpack_require__.p = "";
-/******/
-/******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 14);
-/******/ })
-/************************************************************************/
-/******/ ([
-/* 0 */
-/***/ (function(module, exports) {
+function _load_os() {
+  return _os = _interopRequireDefault(__webpack_require__(36));
+}
 
-module.exports = __webpack_require__(4);
+var _path;
 
-/***/ }),
-/* 1 */
-/***/ (function(module, exports, __webpack_require__) {
+function _load_path() {
+  return _path = _interopRequireDefault(__webpack_require__(0));
+}
 
-"use strict";
+var _blockingQueue;
 
+function _load_blockingQueue() {
+  return _blockingQueue = _interopRequireDefault(__webpack_require__(84));
+}
 
-exports.__esModule = true;
+var _promise;
 
-var _promise = __webpack_require__(173);
+function _load_promise() {
+  return _promise = _interopRequireWildcard(__webpack_require__(40));
+}
 
-var _promise2 = _interopRequireDefault(_promise);
+var _promise2;
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _load_promise2() {
+  return _promise2 = __webpack_require__(40);
+}
 
-exports.default = function (fn) {
-  return function () {
-    var gen = fn.apply(this, arguments);
-    return new _promise2.default(function (resolve, reject) {
-      function step(key, arg) {
-        try {
-          var info = gen[key](arg);
-          var value = info.value;
-        } catch (error) {
-          reject(error);
-          return;
-        }
+var _map;
 
-        if (info.done) {
-          resolve(value);
-        } else {
-          return _promise2.default.resolve(value).then(function (value) {
-            step("next", value);
-          }, function (err) {
-            step("throw", err);
-          });
-        }
-      }
+function _load_map() {
+  return _map = _interopRequireDefault(__webpack_require__(20));
+}
 
-      return step("next");
-    });
-  };
-};
+var _fsNormalized;
 
-/***/ }),
-/* 2 */
-/***/ (function(module, exports) {
+function _load_fsNormalized() {
+  return _fsNormalized = __webpack_require__(164);
+}
 
-module.exports = __webpack_require__(111);
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
-/***/ }),
-/* 3 */
-/***/ (function(module, exports) {
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-module.exports = __webpack_require__(133);
+const constants = exports.constants = typeof (_fs || _load_fs()).default.constants !== 'undefined' ? (_fs || _load_fs()).default.constants : {
+  R_OK: (_fs || _load_fs()).default.R_OK,
+  W_OK: (_fs || _load_fs()).default.W_OK,
+  X_OK: (_fs || _load_fs()).default.X_OK
+};
 
-/***/ }),
-/* 4 */
-/***/ (function(module, exports, __webpack_require__) {
+const lockQueue = exports.lockQueue = new (_blockingQueue || _load_blockingQueue()).default('fs lock');
 
-"use strict";
+const readFileBuffer = exports.readFileBuffer = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.readFile);
+const open = exports.open = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.open);
+const writeFile = exports.writeFile = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.writeFile);
+const readlink = exports.readlink = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.readlink);
+const realpath = exports.realpath = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.realpath);
+const readdir = exports.readdir = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.readdir);
+const rename = exports.rename = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.rename);
+const access = exports.access = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.access);
+const stat = exports.stat = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.stat);
+const mkdirp = exports.mkdirp = (0, (_promise2 || _load_promise2()).promisify)(__webpack_require__(116));
+const exists = exports.exists = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.exists, true);
+const lstat = exports.lstat = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.lstat);
+const chmod = exports.chmod = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.chmod);
+const link = exports.link = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.link);
+const glob = exports.glob = (0, (_promise2 || _load_promise2()).promisify)((_glob || _load_glob()).default);
+exports.unlink = (_fsNormalized || _load_fsNormalized()).unlink;
 
+// fs.copyFile uses the native file copying instructions on the system, performing much better
+// than any JS-based solution and consumes fewer resources. Repeated testing to fine tune the
+// concurrency level revealed 128 as the sweet spot on a quad-core, 16 CPU Intel system with SSD.
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-class MessageError extends Error {
-  constructor(msg, code) {
-    super(msg);
-    this.code = code;
-  }
+const CONCURRENT_QUEUE_ITEMS = (_fs || _load_fs()).default.copyFile ? 128 : 4;
 
-}
+const fsSymlink = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.symlink);
+const invariant = __webpack_require__(7);
+const stripBOM = __webpack_require__(122);
 
-exports.MessageError = MessageError;
-class ProcessSpawnError extends MessageError {
-  constructor(msg, code, process) {
-    super(msg, code);
-    this.process = process;
-  }
+const noop = () => {};
 
+function copy(src, dest, reporter) {
+  return copyBulk([{ src, dest }], reporter);
 }
 
-exports.ProcessSpawnError = ProcessSpawnError;
-class SecurityError extends MessageError {}
+function _readFile(loc, encoding) {
+  return new Promise((resolve, reject) => {
+    (_fs || _load_fs()).default.readFile(loc, encoding, function (err, content) {
+      if (err) {
+        reject(err);
+      } else {
+        resolve(content);
+      }
+    });
+  });
+}
 
-exports.SecurityError = SecurityError;
-class ProcessTermError extends MessageError {}
+function readFile(loc) {
+  return _readFile(loc, 'utf8').then(normalizeOS);
+}
 
-exports.ProcessTermError = ProcessTermError;
-class ResponseError extends Error {
-  constructor(msg, responseCode) {
-    super(msg);
-    this.responseCode = responseCode;
-  }
+function readFileRaw(loc) {
+  return _readFile(loc, 'binary');
+}
 
+function normalizeOS(body) {
+  return body.replace(/\r\n/g, '\n');
 }
-exports.ResponseError = ResponseError;
+
+const cr = '\r'.charCodeAt(0);
+const lf = '\n'.charCodeAt(0);
 
 /***/ }),
-/* 5 */
+/* 6 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -30863,1181 +30528,867 @@ exports.ResponseError = ResponseError;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getFirstSuitableFolder = exports.readFirstAvailableStream = exports.makeTempDir = exports.hardlinksWork = exports.writeFilePreservingEol = exports.getFileSizeOnDisk = exports.walk = exports.symlink = exports.find = exports.readJsonAndFile = exports.readJson = exports.readFileAny = exports.hardlinkBulk = exports.copyBulk = exports.unlink = exports.glob = exports.link = exports.chmod = exports.lstat = exports.exists = exports.mkdirp = exports.stat = exports.access = exports.rename = exports.readdir = exports.realpath = exports.readlink = exports.writeFile = exports.open = exports.readFileBuffer = exports.lockQueue = exports.constants = undefined;
+exports.getPathKey = getPathKey;
+const os = __webpack_require__(36);
+const path = __webpack_require__(0);
+const userHome = __webpack_require__(45).default;
 
-var _asyncToGenerator2;
+var _require = __webpack_require__(171);
 
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(1));
-}
+const getCacheDir = _require.getCacheDir,
+      getConfigDir = _require.getConfigDir,
+      getDataDir = _require.getDataDir;
 
-let buildActionsForCopy = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (queue, events, possibleExtraneous, reporter) {
+const isWebpackBundle = __webpack_require__(227);
 
-    //
-    let build = (() => {
-      var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data) {
-        const src = data.src,
-              dest = data.dest,
-              type = data.type;
+const DEPENDENCY_TYPES = exports.DEPENDENCY_TYPES = ['devDependencies', 'dependencies', 'optionalDependencies', 'peerDependencies'];
+const RESOLUTIONS = exports.RESOLUTIONS = 'resolutions';
+const MANIFEST_FIELDS = exports.MANIFEST_FIELDS = [RESOLUTIONS, ...DEPENDENCY_TYPES];
 
-        const onFresh = data.onFresh || noop;
-        const onDone = data.onDone || noop;
+const SUPPORTED_NODE_VERSIONS = exports.SUPPORTED_NODE_VERSIONS = '^4.8.0 || ^5.7.0 || ^6.2.2 || >=8.0.0';
 
-        // TODO https://github.com/yarnpkg/yarn/issues/3751
-        // related to bundled dependencies handling
-        if (files.has(dest.toLowerCase())) {
-          reporter.verbose(`The case-insensitive file ${dest} shouldn't be copied twice in one bulk copy`);
-        } else {
-          files.add(dest.toLowerCase());
-        }
+const YARN_REGISTRY = exports.YARN_REGISTRY = 'https://registry.yarnpkg.com';
 
-        if (type === 'symlink') {
-          yield mkdirp((_path || _load_path()).default.dirname(dest));
-          onFresh();
-          actions.symlink.push({
-            dest,
-            linkname: src
-          });
-          onDone();
-          return;
-        }
+const YARN_DOCS = exports.YARN_DOCS = 'https://yarnpkg.com/en/docs/cli/';
+const YARN_INSTALLER_SH = exports.YARN_INSTALLER_SH = 'https://yarnpkg.com/install.sh';
+const YARN_INSTALLER_MSI = exports.YARN_INSTALLER_MSI = 'https://yarnpkg.com/latest.msi';
 
-        if (events.ignoreBasenames.indexOf((_path || _load_path()).default.basename(src)) >= 0) {
-          // ignored file
-          return;
-        }
+const SELF_UPDATE_VERSION_URL = exports.SELF_UPDATE_VERSION_URL = 'https://yarnpkg.com/latest-version';
 
-        const srcStat = yield lstat(src);
-        let srcFiles;
+// cache version, bump whenever we make backwards incompatible changes
+const CACHE_VERSION = exports.CACHE_VERSION = 2;
 
-        if (srcStat.isDirectory()) {
-          srcFiles = yield readdir(src);
-        }
+// lockfile version, bump whenever we make backwards incompatible changes
+const LOCKFILE_VERSION = exports.LOCKFILE_VERSION = 1;
 
-        let destStat;
-        try {
-          // try accessing the destination
-          destStat = yield lstat(dest);
-        } catch (e) {
-          // proceed if destination doesn't exist, otherwise error
-          if (e.code !== 'ENOENT') {
-            throw e;
-          }
-        }
+// max amount of network requests to perform concurrently
+const NETWORK_CONCURRENCY = exports.NETWORK_CONCURRENCY = 8;
 
-        // if destination exists
-        if (destStat) {
-          const bothSymlinks = srcStat.isSymbolicLink() && destStat.isSymbolicLink();
-          const bothFolders = srcStat.isDirectory() && destStat.isDirectory();
-          const bothFiles = srcStat.isFile() && destStat.isFile();
+// HTTP timeout used when downloading packages
+const NETWORK_TIMEOUT = exports.NETWORK_TIMEOUT = 30 * 1000; // in milliseconds
 
-          // EINVAL access errors sometimes happen which shouldn't because node shouldn't be giving
-          // us modes that aren't valid. investigate this, it's generally safe to proceed.
+// max amount of child processes to execute concurrently
+const CHILD_CONCURRENCY = exports.CHILD_CONCURRENCY = 5;
 
-          /* if (srcStat.mode !== destStat.mode) {
-            try {
-              await access(dest, srcStat.mode);
-            } catch (err) {}
-          } */
+const REQUIRED_PACKAGE_KEYS = exports.REQUIRED_PACKAGE_KEYS = ['name', 'version', '_uid'];
 
-          if (bothFiles && artifactFiles.has(dest)) {
-            // this file gets changed during build, likely by a custom install script. Don't bother checking it.
-            onDone();
-            reporter.verbose(reporter.lang('verboseFileSkipArtifact', src));
-            return;
-          }
+function getPreferredCacheDirectories() {
+  const preferredCacheDirectories = [getCacheDir()];
 
-          if (bothFiles && srcStat.size === destStat.size && (0, (_fsNormalized || _load_fsNormalized()).fileDatesEqual)(srcStat.mtime, destStat.mtime)) {
-            // we can safely assume this is the same file
-            onDone();
-            reporter.verbose(reporter.lang('verboseFileSkip', src, dest, srcStat.size, +srcStat.mtime));
-            return;
-          }
+  if (process.getuid) {
+    // $FlowFixMe: process.getuid exists, dammit
+    preferredCacheDirectories.push(path.join(os.tmpdir(), `.yarn-cache-${process.getuid()}`));
+  }
 
-          if (bothSymlinks) {
-            const srcReallink = yield readlink(src);
-            if (srcReallink === (yield readlink(dest))) {
-              // if both symlinks are the same then we can continue on
-              onDone();
-              reporter.verbose(reporter.lang('verboseFileSkipSymlink', src, dest, srcReallink));
-              return;
-            }
-          }
+  preferredCacheDirectories.push(path.join(os.tmpdir(), `.yarn-cache`));
 
-          if (bothFolders) {
-            // mark files that aren't in this folder as possibly extraneous
-            const destFiles = yield readdir(dest);
-            invariant(srcFiles, 'src files not initialised');
+  return preferredCacheDirectories;
+}
 
-            for (var _iterator4 = destFiles, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-              var _ref6;
+const PREFERRED_MODULE_CACHE_DIRECTORIES = exports.PREFERRED_MODULE_CACHE_DIRECTORIES = getPreferredCacheDirectories();
+const CONFIG_DIRECTORY = exports.CONFIG_DIRECTORY = getConfigDir();
+const DATA_DIRECTORY = exports.DATA_DIRECTORY = getDataDir();
+const LINK_REGISTRY_DIRECTORY = exports.LINK_REGISTRY_DIRECTORY = path.join(DATA_DIRECTORY, 'link');
+const GLOBAL_MODULE_DIRECTORY = exports.GLOBAL_MODULE_DIRECTORY = path.join(DATA_DIRECTORY, 'global');
 
-              if (_isArray4) {
-                if (_i4 >= _iterator4.length) break;
-                _ref6 = _iterator4[_i4++];
-              } else {
-                _i4 = _iterator4.next();
-                if (_i4.done) break;
-                _ref6 = _i4.value;
-              }
+const NODE_BIN_PATH = exports.NODE_BIN_PATH = process.execPath;
+const YARN_BIN_PATH = exports.YARN_BIN_PATH = getYarnBinPath();
 
-              const file = _ref6;
+// Webpack needs to be configured with node.__dirname/__filename = false
+function getYarnBinPath() {
+  if (isWebpackBundle) {
+    return __filename;
+  } else {
+    return path.join(__dirname, '..', 'bin', 'yarn.js');
+  }
+}
 
-              if (srcFiles.indexOf(file) < 0) {
-                const loc = (_path || _load_path()).default.join(dest, file);
-                possibleExtraneous.add(loc);
+const NODE_MODULES_FOLDER = exports.NODE_MODULES_FOLDER = 'node_modules';
+const NODE_PACKAGE_JSON = exports.NODE_PACKAGE_JSON = 'package.json';
 
-                if ((yield lstat(loc)).isDirectory()) {
-                  for (var _iterator5 = yield readdir(loc), _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
-                    var _ref7;
+const POSIX_GLOBAL_PREFIX = exports.POSIX_GLOBAL_PREFIX = `${process.env.DESTDIR || ''}/usr/local`;
+const FALLBACK_GLOBAL_PREFIX = exports.FALLBACK_GLOBAL_PREFIX = path.join(userHome, '.yarn');
 
-                    if (_isArray5) {
-                      if (_i5 >= _iterator5.length) break;
-                      _ref7 = _iterator5[_i5++];
-                    } else {
-                      _i5 = _iterator5.next();
-                      if (_i5.done) break;
-                      _ref7 = _i5.value;
-                    }
+const META_FOLDER = exports.META_FOLDER = '.yarn-meta';
+const INTEGRITY_FILENAME = exports.INTEGRITY_FILENAME = '.yarn-integrity';
+const LOCKFILE_FILENAME = exports.LOCKFILE_FILENAME = 'yarn.lock';
+const METADATA_FILENAME = exports.METADATA_FILENAME = '.yarn-metadata.json';
+const TARBALL_FILENAME = exports.TARBALL_FILENAME = '.yarn-tarball.tgz';
+const CLEAN_FILENAME = exports.CLEAN_FILENAME = '.yarnclean';
 
-                    const file = _ref7;
+const NPM_LOCK_FILENAME = exports.NPM_LOCK_FILENAME = 'package-lock.json';
+const NPM_SHRINKWRAP_FILENAME = exports.NPM_SHRINKWRAP_FILENAME = 'npm-shrinkwrap.json';
 
-                    possibleExtraneous.add((_path || _load_path()).default.join(loc, file));
-                  }
-                }
-              }
-            }
-          }
-        }
+const DEFAULT_INDENT = exports.DEFAULT_INDENT = '  ';
+const SINGLE_INSTANCE_PORT = exports.SINGLE_INSTANCE_PORT = 31997;
+const SINGLE_INSTANCE_FILENAME = exports.SINGLE_INSTANCE_FILENAME = '.yarn-single-instance';
 
-        if (destStat && destStat.isSymbolicLink()) {
-          yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(dest);
-          destStat = null;
-        }
+const ENV_PATH_KEY = exports.ENV_PATH_KEY = getPathKey(process.platform, process.env);
 
-        if (srcStat.isSymbolicLink()) {
-          onFresh();
-          const linkname = yield readlink(src);
-          actions.symlink.push({
-            dest,
-            linkname
-          });
-          onDone();
-        } else if (srcStat.isDirectory()) {
-          if (!destStat) {
-            reporter.verbose(reporter.lang('verboseFileFolder', dest));
-            yield mkdirp(dest);
-          }
+function getPathKey(platform, env) {
+  let pathKey = 'PATH';
 
-          const destParts = dest.split((_path || _load_path()).default.sep);
-          while (destParts.length) {
-            files.add(destParts.join((_path || _load_path()).default.sep).toLowerCase());
-            destParts.pop();
-          }
-
-          // push all files to queue
-          invariant(srcFiles, 'src files not initialised');
-          let remaining = srcFiles.length;
-          if (!remaining) {
-            onDone();
-          }
-          for (var _iterator6 = srcFiles, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
-            var _ref8;
-
-            if (_isArray6) {
-              if (_i6 >= _iterator6.length) break;
-              _ref8 = _iterator6[_i6++];
-            } else {
-              _i6 = _iterator6.next();
-              if (_i6.done) break;
-              _ref8 = _i6.value;
-            }
+  // windows calls its path "Path" usually, but this is not guaranteed.
+  if (platform === 'win32') {
+    pathKey = 'Path';
 
-            const file = _ref8;
+    for (const key in env) {
+      if (key.toLowerCase() === 'path') {
+        pathKey = key;
+      }
+    }
+  }
 
-            queue.push({
-              dest: (_path || _load_path()).default.join(dest, file),
-              onFresh,
-              onDone: function (_onDone) {
-                function onDone() {
-                  return _onDone.apply(this, arguments);
-                }
+  return pathKey;
+}
 
-                onDone.toString = function () {
-                  return _onDone.toString();
-                };
+const VERSION_COLOR_SCHEME = exports.VERSION_COLOR_SCHEME = {
+  major: 'red',
+  premajor: 'red',
+  minor: 'yellow',
+  preminor: 'yellow',
+  patch: 'green',
+  prepatch: 'green',
+  prerelease: 'red',
+  unchanged: 'white',
+  unknown: 'red'
+};
 
-                return onDone;
-              }(function () {
-                if (--remaining === 0) {
-                  onDone();
-                }
-              }),
-              src: (_path || _load_path()).default.join(src, file)
-            });
-          }
-        } else if (srcStat.isFile()) {
-          onFresh();
-          actions.file.push({
-            src,
-            dest,
-            atime: srcStat.atime,
-            mtime: srcStat.mtime,
-            mode: srcStat.mode
-          });
-          onDone();
-        } else {
-          throw new Error(`unsure how to copy this: ${src}`);
-        }
-      });
+/***/ }),
+/* 7 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      return function build(_x5) {
-        return _ref5.apply(this, arguments);
-      };
-    })();
+"use strict";
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
 
-    const artifactFiles = new Set(events.artifactFiles || []);
-    const files = new Set();
 
-    // initialise events
-    for (var _iterator = queue, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref2;
 
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref2 = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref2 = _i.value;
-      }
+/**
+ * Use invariant() to assert state which your program assumes to be true.
+ *
+ * Provide sprintf-style format (only %s is supported) and arguments
+ * to provide information about what broke and what you were
+ * expecting.
+ *
+ * The invariant message will be stripped in production, but the invariant
+ * will remain to ensure logic does not differ in production.
+ */
 
-      const item = _ref2;
+var NODE_ENV = "none";
 
-      const onDone = item.onDone;
-      item.onDone = function () {
-        events.onProgress(item.dest);
-        if (onDone) {
-          onDone();
-        }
-      };
+var invariant = function(condition, format, a, b, c, d, e, f) {
+  if (NODE_ENV !== 'production') {
+    if (format === undefined) {
+      throw new Error('invariant requires an error message argument');
     }
-    events.onStart(queue.length);
-
-    // start building actions
-    const actions = {
-      file: [],
-      symlink: [],
-      link: []
-    };
+  }
 
-    // custom concurrency logic as we're always executing stacks of CONCURRENT_QUEUE_ITEMS queue items
-    // at a time due to the requirement to push items onto the queue
-    while (queue.length) {
-      const items = queue.splice(0, CONCURRENT_QUEUE_ITEMS);
-      yield Promise.all(items.map(build));
+  if (!condition) {
+    var error;
+    if (format === undefined) {
+      error = new Error(
+        'Minified exception occurred; use the non-minified dev environment ' +
+        'for the full error message and additional helpful warnings.'
+      );
+    } else {
+      var args = [a, b, c, d, e, f];
+      var argIndex = 0;
+      error = new Error(
+        format.replace(/%s/g, function() { return args[argIndex++]; })
+      );
+      error.name = 'Invariant Violation';
     }
 
-    // simulate the existence of some files to prevent considering them extraneous
-    for (var _iterator2 = artifactFiles, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-      var _ref3;
+    error.framesToPop = 1; // we don't care about invariant's own frame
+    throw error;
+  }
+};
 
-      if (_isArray2) {
-        if (_i2 >= _iterator2.length) break;
-        _ref3 = _iterator2[_i2++];
-      } else {
-        _i2 = _iterator2.next();
-        if (_i2.done) break;
-        _ref3 = _i2.value;
-      }
+module.exports = invariant;
 
-      const file = _ref3;
 
-      if (possibleExtraneous.has(file)) {
-        reporter.verbose(reporter.lang('verboseFilePhantomExtraneous', file));
-        possibleExtraneous.delete(file);
-      }
-    }
+/***/ }),
+/* 8 */,
+/* 9 */
+/***/ (function(module, exports) {
 
-    for (var _iterator3 = possibleExtraneous, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-      var _ref4;
+module.exports = __webpack_require__(282);
 
-      if (_isArray3) {
-        if (_i3 >= _iterator3.length) break;
-        _ref4 = _iterator3[_i3++];
-      } else {
-        _i3 = _iterator3.next();
-        if (_i3.done) break;
-        _ref4 = _i3.value;
-      }
+/***/ }),
+/* 10 */,
+/* 11 */
+/***/ (function(module, exports) {
 
-      const loc = _ref4;
+// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
+var global = module.exports = typeof window != 'undefined' && window.Math == Math
+  ? window : typeof self != 'undefined' && self.Math == Math ? self
+  // eslint-disable-next-line no-new-func
+  : Function('return this')();
+if (typeof __g == 'number') __g = global; // eslint-disable-line no-undef
 
-      if (files.has(loc.toLowerCase())) {
-        possibleExtraneous.delete(loc);
-      }
-    }
 
-    return actions;
-  });
+/***/ }),
+/* 12 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  return function buildActionsForCopy(_x, _x2, _x3, _x4) {
-    return _ref.apply(this, arguments);
-  };
-})();
+"use strict";
 
-let buildActionsForHardlink = (() => {
-  var _ref9 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (queue, events, possibleExtraneous, reporter) {
 
-    //
-    let build = (() => {
-      var _ref13 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data) {
-        const src = data.src,
-              dest = data.dest;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.sortAlpha = sortAlpha;
+exports.entries = entries;
+exports.removePrefix = removePrefix;
+exports.removeSuffix = removeSuffix;
+exports.addSuffix = addSuffix;
+exports.hyphenate = hyphenate;
+exports.camelCase = camelCase;
+exports.compareSortedArrays = compareSortedArrays;
+exports.sleep = sleep;
+const _camelCase = __webpack_require__(176);
 
-        const onFresh = data.onFresh || noop;
-        const onDone = data.onDone || noop;
-        if (files.has(dest.toLowerCase())) {
-          // Fixes issue https://github.com/yarnpkg/yarn/issues/2734
-          // When bulk hardlinking we have A -> B structure that we want to hardlink to A1 -> B1,
-          // package-linker passes that modules A1 and B1 need to be hardlinked,
-          // the recursive linking algorithm of A1 ends up scheduling files in B1 to be linked twice which will case
-          // an exception.
-          onDone();
-          return;
-        }
-        files.add(dest.toLowerCase());
+function sortAlpha(a, b) {
+  // sort alphabetically in a deterministic way
+  const shortLen = Math.min(a.length, b.length);
+  for (let i = 0; i < shortLen; i++) {
+    const aChar = a.charCodeAt(i);
+    const bChar = b.charCodeAt(i);
+    if (aChar !== bChar) {
+      return aChar - bChar;
+    }
+  }
+  return a.length - b.length;
+}
 
-        if (events.ignoreBasenames.indexOf((_path || _load_path()).default.basename(src)) >= 0) {
-          // ignored file
-          return;
-        }
+function entries(obj) {
+  const entries = [];
+  if (obj) {
+    for (const key in obj) {
+      entries.push([key, obj[key]]);
+    }
+  }
+  return entries;
+}
 
-        const srcStat = yield lstat(src);
-        let srcFiles;
+function removePrefix(pattern, prefix) {
+  if (pattern.startsWith(prefix)) {
+    pattern = pattern.slice(prefix.length);
+  }
 
-        if (srcStat.isDirectory()) {
-          srcFiles = yield readdir(src);
-        }
+  return pattern;
+}
 
-        const destExists = yield exists(dest);
-        if (destExists) {
-          const destStat = yield lstat(dest);
+function removeSuffix(pattern, suffix) {
+  if (pattern.endsWith(suffix)) {
+    return pattern.slice(0, -suffix.length);
+  }
 
-          const bothSymlinks = srcStat.isSymbolicLink() && destStat.isSymbolicLink();
-          const bothFolders = srcStat.isDirectory() && destStat.isDirectory();
-          const bothFiles = srcStat.isFile() && destStat.isFile();
+  return pattern;
+}
 
-          if (srcStat.mode !== destStat.mode) {
-            try {
-              yield access(dest, srcStat.mode);
-            } catch (err) {
-              // EINVAL access errors sometimes happen which shouldn't because node shouldn't be giving
-              // us modes that aren't valid. investigate this, it's generally safe to proceed.
-              reporter.verbose(err);
-            }
-          }
+function addSuffix(pattern, suffix) {
+  if (!pattern.endsWith(suffix)) {
+    return pattern + suffix;
+  }
 
-          if (bothFiles && artifactFiles.has(dest)) {
-            // this file gets changed during build, likely by a custom install script. Don't bother checking it.
-            onDone();
-            reporter.verbose(reporter.lang('verboseFileSkipArtifact', src));
-            return;
-          }
+  return pattern;
+}
 
-          // correct hardlink
-          if (bothFiles && srcStat.ino !== null && srcStat.ino === destStat.ino) {
-            onDone();
-            reporter.verbose(reporter.lang('verboseFileSkip', src, dest, srcStat.ino));
-            return;
-          }
+function hyphenate(str) {
+  return str.replace(/[A-Z]/g, match => {
+    return '-' + match.charAt(0).toLowerCase();
+  });
+}
 
-          if (bothSymlinks) {
-            const srcReallink = yield readlink(src);
-            if (srcReallink === (yield readlink(dest))) {
-              // if both symlinks are the same then we can continue on
-              onDone();
-              reporter.verbose(reporter.lang('verboseFileSkipSymlink', src, dest, srcReallink));
-              return;
-            }
-          }
+function camelCase(str) {
+  if (/[A-Z]/.test(str)) {
+    return null;
+  } else {
+    return _camelCase(str);
+  }
+}
 
-          if (bothFolders) {
-            // mark files that aren't in this folder as possibly extraneous
-            const destFiles = yield readdir(dest);
-            invariant(srcFiles, 'src files not initialised');
+function compareSortedArrays(array1, array2) {
+  if (array1.length !== array2.length) {
+    return false;
+  }
+  for (let i = 0, len = array1.length; i < len; i++) {
+    if (array1[i] !== array2[i]) {
+      return false;
+    }
+  }
+  return true;
+}
 
-            for (var _iterator10 = destFiles, _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : _iterator10[Symbol.iterator]();;) {
-              var _ref14;
+function sleep(ms) {
+  return new Promise(resolve => {
+    setTimeout(resolve, ms);
+  });
+}
 
-              if (_isArray10) {
-                if (_i10 >= _iterator10.length) break;
-                _ref14 = _iterator10[_i10++];
-              } else {
-                _i10 = _iterator10.next();
-                if (_i10.done) break;
-                _ref14 = _i10.value;
-              }
+/***/ }),
+/* 13 */
+/***/ (function(module, exports, __webpack_require__) {
 
-              const file = _ref14;
+var store = __webpack_require__(107)('wks');
+var uid = __webpack_require__(111);
+var Symbol = __webpack_require__(11).Symbol;
+var USE_SYMBOL = typeof Symbol == 'function';
 
-              if (srcFiles.indexOf(file) < 0) {
-                const loc = (_path || _load_path()).default.join(dest, file);
-                possibleExtraneous.add(loc);
+var $exports = module.exports = function (name) {
+  return store[name] || (store[name] =
+    USE_SYMBOL && Symbol[name] || (USE_SYMBOL ? Symbol : uid)('Symbol.' + name));
+};
 
-                if ((yield lstat(loc)).isDirectory()) {
-                  for (var _iterator11 = yield readdir(loc), _isArray11 = Array.isArray(_iterator11), _i11 = 0, _iterator11 = _isArray11 ? _iterator11 : _iterator11[Symbol.iterator]();;) {
-                    var _ref15;
+$exports.store = store;
 
-                    if (_isArray11) {
-                      if (_i11 >= _iterator11.length) break;
-                      _ref15 = _iterator11[_i11++];
-                    } else {
-                      _i11 = _iterator11.next();
-                      if (_i11.done) break;
-                      _ref15 = _i11.value;
-                    }
 
-                    const file = _ref15;
+/***/ }),
+/* 14 */
+/***/ (function(module, exports, __webpack_require__) {
 
-                    possibleExtraneous.add((_path || _load_path()).default.join(loc, file));
-                  }
-                }
-              }
-            }
-          }
-        }
+"use strict";
 
-        if (srcStat.isSymbolicLink()) {
-          onFresh();
-          const linkname = yield readlink(src);
-          actions.symlink.push({
-            dest,
-            linkname
-          });
-          onDone();
-        } else if (srcStat.isDirectory()) {
-          reporter.verbose(reporter.lang('verboseFileFolder', dest));
-          yield mkdirp(dest);
 
-          const destParts = dest.split((_path || _load_path()).default.sep);
-          while (destParts.length) {
-            files.add(destParts.join((_path || _load_path()).default.sep).toLowerCase());
-            destParts.pop();
-          }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.stringify = exports.parse = undefined;
 
-          // push all files to queue
-          invariant(srcFiles, 'src files not initialised');
-          let remaining = srcFiles.length;
-          if (!remaining) {
-            onDone();
-          }
-          for (var _iterator12 = srcFiles, _isArray12 = Array.isArray(_iterator12), _i12 = 0, _iterator12 = _isArray12 ? _iterator12 : _iterator12[Symbol.iterator]();;) {
-            var _ref16;
+var _asyncToGenerator2;
 
-            if (_isArray12) {
-              if (_i12 >= _iterator12.length) break;
-              _ref16 = _iterator12[_i12++];
-            } else {
-              _i12 = _iterator12.next();
-              if (_i12.done) break;
-              _ref16 = _i12.value;
-            }
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(1));
+}
 
-            const file = _ref16;
+var _parse;
 
-            queue.push({
-              onFresh,
-              src: (_path || _load_path()).default.join(src, file),
-              dest: (_path || _load_path()).default.join(dest, file),
-              onDone: function (_onDone2) {
-                function onDone() {
-                  return _onDone2.apply(this, arguments);
-                }
+function _load_parse() {
+  return _parse = __webpack_require__(81);
+}
 
-                onDone.toString = function () {
-                  return _onDone2.toString();
-                };
+Object.defineProperty(exports, 'parse', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_parse || _load_parse()).default;
+  }
+});
 
-                return onDone;
-              }(function () {
-                if (--remaining === 0) {
-                  onDone();
-                }
-              })
-            });
-          }
-        } else if (srcStat.isFile()) {
-          onFresh();
-          actions.link.push({
-            src,
-            dest,
-            removeDest: destExists
-          });
-          onDone();
-        } else {
-          throw new Error(`unsure how to copy this: ${src}`);
-        }
-      });
+var _stringify;
 
-      return function build(_x10) {
-        return _ref13.apply(this, arguments);
-      };
-    })();
+function _load_stringify() {
+  return _stringify = __webpack_require__(150);
+}
 
-    const artifactFiles = new Set(events.artifactFiles || []);
-    const files = new Set();
+Object.defineProperty(exports, 'stringify', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_stringify || _load_stringify()).default;
+  }
+});
+exports.implodeEntry = implodeEntry;
+exports.explodeEntry = explodeEntry;
 
-    // initialise events
-    for (var _iterator7 = queue, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
-      var _ref10;
-
-      if (_isArray7) {
-        if (_i7 >= _iterator7.length) break;
-        _ref10 = _iterator7[_i7++];
-      } else {
-        _i7 = _iterator7.next();
-        if (_i7.done) break;
-        _ref10 = _i7.value;
-      }
-
-      const item = _ref10;
-
-      const onDone = item.onDone || noop;
-      item.onDone = function () {
-        events.onProgress(item.dest);
-        onDone();
-      };
-    }
-    events.onStart(queue.length);
+var _misc;
 
-    // start building actions
-    const actions = {
-      file: [],
-      symlink: [],
-      link: []
-    };
+function _load_misc() {
+  return _misc = __webpack_require__(12);
+}
 
-    // custom concurrency logic as we're always executing stacks of CONCURRENT_QUEUE_ITEMS queue items
-    // at a time due to the requirement to push items onto the queue
-    while (queue.length) {
-      const items = queue.splice(0, CONCURRENT_QUEUE_ITEMS);
-      yield Promise.all(items.map(build));
-    }
+var _normalizePattern;
 
-    // simulate the existence of some files to prevent considering them extraneous
-    for (var _iterator8 = artifactFiles, _isArray8 = Array.isArray(_iterator8), _i8 = 0, _iterator8 = _isArray8 ? _iterator8 : _iterator8[Symbol.iterator]();;) {
-      var _ref11;
+function _load_normalizePattern() {
+  return _normalizePattern = __webpack_require__(29);
+}
 
-      if (_isArray8) {
-        if (_i8 >= _iterator8.length) break;
-        _ref11 = _iterator8[_i8++];
-      } else {
-        _i8 = _iterator8.next();
-        if (_i8.done) break;
-        _ref11 = _i8.value;
-      }
+var _parse2;
 
-      const file = _ref11;
+function _load_parse2() {
+  return _parse2 = _interopRequireDefault(__webpack_require__(81));
+}
 
-      if (possibleExtraneous.has(file)) {
-        reporter.verbose(reporter.lang('verboseFilePhantomExtraneous', file));
-        possibleExtraneous.delete(file);
-      }
-    }
+var _constants;
 
-    for (var _iterator9 = possibleExtraneous, _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
-      var _ref12;
+function _load_constants() {
+  return _constants = __webpack_require__(6);
+}
 
-      if (_isArray9) {
-        if (_i9 >= _iterator9.length) break;
-        _ref12 = _iterator9[_i9++];
-      } else {
-        _i9 = _iterator9.next();
-        if (_i9.done) break;
-        _ref12 = _i9.value;
-      }
+var _fs;
 
-      const loc = _ref12;
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
+}
 
-      if (files.has(loc.toLowerCase())) {
-        possibleExtraneous.delete(loc);
-      }
-    }
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
-    return actions;
-  });
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-  return function buildActionsForHardlink(_x6, _x7, _x8, _x9) {
-    return _ref9.apply(this, arguments);
-  };
-})();
+const invariant = __webpack_require__(7);
 
-let copyBulk = exports.copyBulk = (() => {
-  var _ref17 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (queue, reporter, _events) {
-    const events = {
-      onStart: _events && _events.onStart || noop,
-      onProgress: _events && _events.onProgress || noop,
-      possibleExtraneous: _events ? _events.possibleExtraneous : new Set(),
-      ignoreBasenames: _events && _events.ignoreBasenames || [],
-      artifactFiles: _events && _events.artifactFiles || []
-    };
+const path = __webpack_require__(0);
+const ssri = __webpack_require__(55);
 
-    const actions = yield buildActionsForCopy(queue, events, events.possibleExtraneous, reporter);
-    events.onStart(actions.file.length + actions.symlink.length + actions.link.length);
+function getName(pattern) {
+  return (0, (_normalizePattern || _load_normalizePattern()).normalizePattern)(pattern).name;
+}
 
-    const fileActions = actions.file;
+function blankObjectUndefined(obj) {
+  return obj && Object.keys(obj).length ? obj : undefined;
+}
 
-    const currentlyWriting = new Map();
+function keyForRemote(remote) {
+  return remote.resolved || (remote.reference && remote.hash ? `${remote.reference}#${remote.hash}` : null);
+}
 
-    yield (_promise || _load_promise()).queue(fileActions, (() => {
-      var _ref18 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data) {
-        let writePromise;
-        while (writePromise = currentlyWriting.get(data.dest)) {
-          yield writePromise;
-        }
+function serializeIntegrity(integrity) {
+  // We need this because `Integrity.toString()` does not use sorting to ensure a stable string output
+  // See https://git.io/vx2Hy
+  return integrity.toString().split(' ').sort().join(' ');
+}
 
-        reporter.verbose(reporter.lang('verboseFileCopy', data.src, data.dest));
-        const copier = (0, (_fsNormalized || _load_fsNormalized()).copyFile)(data, function () {
-          return currentlyWriting.delete(data.dest);
-        });
-        currentlyWriting.set(data.dest, copier);
-        events.onProgress(data.dest);
-        return copier;
-      });
+function implodeEntry(pattern, obj) {
+  const inferredName = getName(pattern);
+  const integrity = obj.integrity ? serializeIntegrity(obj.integrity) : '';
+  const imploded = {
+    name: inferredName === obj.name ? undefined : obj.name,
+    version: obj.version,
+    uid: obj.uid === obj.version ? undefined : obj.uid,
+    resolved: obj.resolved,
+    registry: obj.registry === 'npm' ? undefined : obj.registry,
+    dependencies: blankObjectUndefined(obj.dependencies),
+    optionalDependencies: blankObjectUndefined(obj.optionalDependencies),
+    permissions: blankObjectUndefined(obj.permissions),
+    prebuiltVariants: blankObjectUndefined(obj.prebuiltVariants)
+  };
+  if (integrity) {
+    imploded.integrity = integrity;
+  }
+  return imploded;
+}
 
-      return function (_x14) {
-        return _ref18.apply(this, arguments);
-      };
-    })(), CONCURRENT_QUEUE_ITEMS);
+function explodeEntry(pattern, obj) {
+  obj.optionalDependencies = obj.optionalDependencies || {};
+  obj.dependencies = obj.dependencies || {};
+  obj.uid = obj.uid || obj.version;
+  obj.permissions = obj.permissions || {};
+  obj.registry = obj.registry || 'npm';
+  obj.name = obj.name || getName(pattern);
+  const integrity = obj.integrity;
+  if (integrity && integrity.isIntegrity) {
+    obj.integrity = ssri.parse(integrity);
+  }
+  return obj;
+}
 
-    // we need to copy symlinks last as they could reference files we were copying
-    const symlinkActions = actions.symlink;
-    yield (_promise || _load_promise()).queue(symlinkActions, function (data) {
-      const linkname = (_path || _load_path()).default.resolve((_path || _load_path()).default.dirname(data.dest), data.linkname);
-      reporter.verbose(reporter.lang('verboseFileSymlink', data.dest, linkname));
-      return symlink(linkname, data.dest);
-    });
-  });
+class Lockfile {
+  constructor({ cache, source, parseResultType } = {}) {
+    this.source = source || '';
+    this.cache = cache;
+    this.parseResultType = parseResultType;
+  }
 
-  return function copyBulk(_x11, _x12, _x13) {
-    return _ref17.apply(this, arguments);
-  };
-})();
+  // source string if the `cache` was parsed
 
-let hardlinkBulk = exports.hardlinkBulk = (() => {
-  var _ref19 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (queue, reporter, _events) {
-    const events = {
-      onStart: _events && _events.onStart || noop,
-      onProgress: _events && _events.onProgress || noop,
-      possibleExtraneous: _events ? _events.possibleExtraneous : new Set(),
-      artifactFiles: _events && _events.artifactFiles || [],
-      ignoreBasenames: []
-    };
 
-    const actions = yield buildActionsForHardlink(queue, events, events.possibleExtraneous, reporter);
-    events.onStart(actions.file.length + actions.symlink.length + actions.link.length);
+  // if true, we're parsing an old yarn file and need to update integrity fields
+  hasEntriesExistWithoutIntegrity() {
+    if (!this.cache) {
+      return false;
+    }
 
-    const fileActions = actions.link;
+    for (const key in this.cache) {
+      // $FlowFixMe - `this.cache` is clearly defined at this point
+      if (!/^.*@(file:|http)/.test(key) && this.cache[key] && !this.cache[key].integrity) {
+        return true;
+      }
+    }
 
-    yield (_promise || _load_promise()).queue(fileActions, (() => {
-      var _ref20 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data) {
-        reporter.verbose(reporter.lang('verboseFileLink', data.src, data.dest));
-        if (data.removeDest) {
-          yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(data.dest);
-        }
-        yield link(data.src, data.dest);
-      });
+    return false;
+  }
 
-      return function (_x18) {
-        return _ref20.apply(this, arguments);
-      };
-    })(), CONCURRENT_QUEUE_ITEMS);
+  static fromDirectory(dir, reporter) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      // read the manifest in this directory
+      const lockfileLoc = path.join(dir, (_constants || _load_constants()).LOCKFILE_FILENAME);
 
-    // we need to copy symlinks last as they could reference files we were copying
-    const symlinkActions = actions.symlink;
-    yield (_promise || _load_promise()).queue(symlinkActions, function (data) {
-      const linkname = (_path || _load_path()).default.resolve((_path || _load_path()).default.dirname(data.dest), data.linkname);
-      reporter.verbose(reporter.lang('verboseFileSymlink', data.dest, linkname));
-      return symlink(linkname, data.dest);
-    });
-  });
+      let lockfile;
+      let rawLockfile = '';
+      let parseResult;
 
-  return function hardlinkBulk(_x15, _x16, _x17) {
-    return _ref19.apply(this, arguments);
-  };
-})();
+      if (yield (_fs || _load_fs()).exists(lockfileLoc)) {
+        rawLockfile = yield (_fs || _load_fs()).readFile(lockfileLoc);
+        parseResult = (0, (_parse2 || _load_parse2()).default)(rawLockfile, lockfileLoc);
 
-let readFileAny = exports.readFileAny = (() => {
-  var _ref21 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (files) {
-    for (var _iterator13 = files, _isArray13 = Array.isArray(_iterator13), _i13 = 0, _iterator13 = _isArray13 ? _iterator13 : _iterator13[Symbol.iterator]();;) {
-      var _ref22;
+        if (reporter) {
+          if (parseResult.type === 'merge') {
+            reporter.info(reporter.lang('lockfileMerged'));
+          } else if (parseResult.type === 'conflict') {
+            reporter.warn(reporter.lang('lockfileConflict'));
+          }
+        }
 
-      if (_isArray13) {
-        if (_i13 >= _iterator13.length) break;
-        _ref22 = _iterator13[_i13++];
-      } else {
-        _i13 = _iterator13.next();
-        if (_i13.done) break;
-        _ref22 = _i13.value;
+        lockfile = parseResult.object;
+      } else if (reporter) {
+        reporter.info(reporter.lang('noLockfileFound'));
       }
 
-      const file = _ref22;
+      return new Lockfile({ cache: lockfile, source: rawLockfile, parseResultType: parseResult && parseResult.type });
+    })();
+  }
 
-      if (yield exists(file)) {
-        return readFile(file);
-      }
+  getLocked(pattern) {
+    const cache = this.cache;
+    if (!cache) {
+      return undefined;
     }
-    return null;
-  });
 
-  return function readFileAny(_x19) {
-    return _ref21.apply(this, arguments);
-  };
-})();
+    const shrunk = pattern in cache && cache[pattern];
 
-let readJson = exports.readJson = (() => {
-  var _ref23 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (loc) {
-    return (yield readJsonAndFile(loc)).object;
-  });
+    if (typeof shrunk === 'string') {
+      return this.getLocked(shrunk);
+    } else if (shrunk) {
+      explodeEntry(pattern, shrunk);
+      return shrunk;
+    }
 
-  return function readJson(_x20) {
-    return _ref23.apply(this, arguments);
-  };
-})();
+    return undefined;
+  }
 
-let readJsonAndFile = exports.readJsonAndFile = (() => {
-  var _ref24 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (loc) {
-    const file = yield readFile(loc);
-    try {
-      return {
-        object: (0, (_map || _load_map()).default)(JSON.parse(stripBOM(file))),
-        content: file
-      };
-    } catch (err) {
-      err.message = `${loc}: ${err.message}`;
-      throw err;
+  removePattern(pattern) {
+    const cache = this.cache;
+    if (!cache) {
+      return;
     }
-  });
+    delete cache[pattern];
+  }
 
-  return function readJsonAndFile(_x21) {
-    return _ref24.apply(this, arguments);
-  };
-})();
+  getLockfile(patterns) {
+    const lockfile = {};
+    const seen = new Map();
 
-let find = exports.find = (() => {
-  var _ref25 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (filename, dir) {
-    const parts = dir.split((_path || _load_path()).default.sep);
+    // order by name so that lockfile manifest is assigned to the first dependency with this manifest
+    // the others that have the same remoteKey will just refer to the first
+    // ordering allows for consistency in lockfile when it is serialized
+    const sortedPatternsKeys = Object.keys(patterns).sort((_misc || _load_misc()).sortAlpha);
 
-    while (parts.length) {
-      const loc = parts.concat(filename).join((_path || _load_path()).default.sep);
+    for (var _iterator = sortedPatternsKeys, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref;
 
-      if (yield exists(loc)) {
-        return loc;
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref = _iterator[_i++];
       } else {
-        parts.pop();
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref = _i.value;
       }
-    }
 
-    return false;
-  });
+      const pattern = _ref;
 
-  return function find(_x22, _x23) {
-    return _ref25.apply(this, arguments);
-  };
-})();
+      const pkg = patterns[pattern];
+      const remote = pkg._remote,
+            ref = pkg._reference;
 
-let symlink = exports.symlink = (() => {
-  var _ref26 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (src, dest) {
-    try {
-      const stats = yield lstat(dest);
-      if (stats.isSymbolicLink()) {
-        const resolved = yield realpath(dest);
-        if (resolved === src) {
-          return;
+      invariant(ref, 'Package is missing a reference');
+      invariant(remote, 'Package is missing a remote');
+
+      const remoteKey = keyForRemote(remote);
+      const seenPattern = remoteKey && seen.get(remoteKey);
+      if (seenPattern) {
+        // no point in duplicating it
+        lockfile[pattern] = seenPattern;
+
+        // if we're relying on our name being inferred and two of the patterns have
+        // different inferred names then we need to set it
+        if (!seenPattern.name && getName(pattern) !== pkg.name) {
+          seenPattern.name = pkg.name;
         }
+        continue;
       }
-    } catch (err) {
-      if (err.code !== 'ENOENT') {
-        throw err;
-      }
-    }
-    // We use rimraf for unlink which never throws an ENOENT on missing target
-    yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(dest);
+      const obj = implodeEntry(pattern, {
+        name: pkg.name,
+        version: pkg.version,
+        uid: pkg._uid,
+        resolved: remote.resolved,
+        integrity: remote.integrity,
+        registry: remote.registry,
+        dependencies: pkg.dependencies,
+        peerDependencies: pkg.peerDependencies,
+        optionalDependencies: pkg.optionalDependencies,
+        permissions: ref.permissions,
+        prebuiltVariants: pkg.prebuiltVariants
+      });
 
-    if (process.platform === 'win32') {
-      // use directory junctions if possible on win32, this requires absolute paths
-      yield fsSymlink(src, dest, 'junction');
-    } else {
-      // use relative paths otherwise which will be retained if the directory is moved
-      let relative;
-      try {
-        relative = (_path || _load_path()).default.relative((_fs || _load_fs()).default.realpathSync((_path || _load_path()).default.dirname(dest)), (_fs || _load_fs()).default.realpathSync(src));
-      } catch (err) {
-        if (err.code !== 'ENOENT') {
-          throw err;
-        }
-        relative = (_path || _load_path()).default.relative((_path || _load_path()).default.dirname(dest), src);
+      lockfile[pattern] = obj;
+
+      if (remoteKey) {
+        seen.set(remoteKey, obj);
       }
-      // When path.relative returns an empty string for the current directory, we should instead use
-      // '.', which is a valid fs.symlink target.
-      yield fsSymlink(relative || '.', dest);
     }
-  });
 
-  return function symlink(_x24, _x25) {
-    return _ref26.apply(this, arguments);
-  };
-})();
+    return lockfile;
+  }
+}
+exports.default = Lockfile;
 
-let walk = exports.walk = (() => {
-  var _ref27 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (dir, relativeDir, ignoreBasenames = new Set()) {
-    let files = [];
+/***/ }),
+/* 15 */,
+/* 16 */,
+/* 17 */
+/***/ (function(module, exports) {
 
-    let filenames = yield readdir(dir);
-    if (ignoreBasenames.size) {
-      filenames = filenames.filter(function (name) {
-        return !ignoreBasenames.has(name);
-      });
-    }
+module.exports = __webpack_require__(137);
 
-    for (var _iterator14 = filenames, _isArray14 = Array.isArray(_iterator14), _i14 = 0, _iterator14 = _isArray14 ? _iterator14 : _iterator14[Symbol.iterator]();;) {
-      var _ref28;
+/***/ }),
+/* 18 */,
+/* 19 */,
+/* 20 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      if (_isArray14) {
-        if (_i14 >= _iterator14.length) break;
-        _ref28 = _iterator14[_i14++];
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = nullify;
+function nullify(obj = {}) {
+  if (Array.isArray(obj)) {
+    for (var _iterator = obj, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref = _iterator[_i++];
       } else {
-        _i14 = _iterator14.next();
-        if (_i14.done) break;
-        _ref28 = _i14.value;
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref = _i.value;
       }
 
-      const name = _ref28;
-
-      const relative = relativeDir ? (_path || _load_path()).default.join(relativeDir, name) : name;
-      const loc = (_path || _load_path()).default.join(dir, name);
-      const stat = yield lstat(loc);
+      const item = _ref;
 
-      files.push({
-        relative,
-        basename: name,
-        absolute: loc,
-        mtime: +stat.mtime
-      });
+      nullify(item);
+    }
+  } else if (obj !== null && typeof obj === 'object' || typeof obj === 'function') {
+    Object.setPrototypeOf(obj, null);
 
-      if (stat.isDirectory()) {
-        files = files.concat((yield walk(loc, relative, ignoreBasenames)));
+    // for..in can only be applied to 'object', not 'function'
+    if (typeof obj === 'object') {
+      for (const key in obj) {
+        nullify(obj[key]);
       }
     }
+  }
 
-    return files;
-  });
-
-  return function walk(_x26, _x27) {
-    return _ref27.apply(this, arguments);
-  };
-})();
+  return obj;
+}
 
-let getFileSizeOnDisk = exports.getFileSizeOnDisk = (() => {
-  var _ref29 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (loc) {
-    const stat = yield lstat(loc);
-    const size = stat.size,
-          blockSize = stat.blksize;
-
-
-    return Math.ceil(size / blockSize) * blockSize;
-  });
-
-  return function getFileSizeOnDisk(_x28) {
-    return _ref29.apply(this, arguments);
-  };
-})();
+/***/ }),
+/* 21 */,
+/* 22 */
+/***/ (function(module, exports) {
 
-let getEolFromFile = (() => {
-  var _ref30 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (path) {
-    if (!(yield exists(path))) {
-      return undefined;
-    }
+module.exports = __webpack_require__(139);
 
-    const buffer = yield readFileBuffer(path);
+/***/ }),
+/* 23 */
+/***/ (function(module, exports) {
 
-    for (let i = 0; i < buffer.length; ++i) {
-      if (buffer[i] === cr) {
-        return '\r\n';
-      }
-      if (buffer[i] === lf) {
-        return '\n';
-      }
-    }
-    return undefined;
-  });
+var core = module.exports = { version: '2.5.7' };
+if (typeof __e == 'number') __e = core; // eslint-disable-line no-undef
 
-  return function getEolFromFile(_x29) {
-    return _ref30.apply(this, arguments);
-  };
-})();
 
-let writeFilePreservingEol = exports.writeFilePreservingEol = (() => {
-  var _ref31 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (path, data) {
-    const eol = (yield getEolFromFile(path)) || (_os || _load_os()).default.EOL;
-    if (eol !== '\n') {
-      data = data.replace(/\n/g, eol);
-    }
-    yield writeFile(path, data);
-  });
+/***/ }),
+/* 24 */,
+/* 25 */,
+/* 26 */,
+/* 27 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  return function writeFilePreservingEol(_x30, _x31) {
-    return _ref31.apply(this, arguments);
-  };
-})();
+var isObject = __webpack_require__(34);
+module.exports = function (it) {
+  if (!isObject(it)) throw TypeError(it + ' is not an object!');
+  return it;
+};
 
-let hardlinksWork = exports.hardlinksWork = (() => {
-  var _ref32 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (dir) {
-    const filename = 'test-file' + Math.random();
-    const file = (_path || _load_path()).default.join(dir, filename);
-    const fileLink = (_path || _load_path()).default.join(dir, filename + '-link');
-    try {
-      yield writeFile(file, 'test');
-      yield link(file, fileLink);
-    } catch (err) {
-      return false;
-    } finally {
-      yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(file);
-      yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(fileLink);
-    }
-    return true;
-  });
 
-  return function hardlinksWork(_x32) {
-    return _ref32.apply(this, arguments);
-  };
-})();
+/***/ }),
+/* 28 */,
+/* 29 */
+/***/ (function(module, exports, __webpack_require__) {
 
-// not a strict polyfill for Node's fs.mkdtemp
+"use strict";
 
 
-let makeTempDir = exports.makeTempDir = (() => {
-  var _ref33 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (prefix) {
-    const dir = (_path || _load_path()).default.join((_os || _load_os()).default.tmpdir(), `yarn-${prefix || ''}-${Date.now()}-${Math.random()}`);
-    yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(dir);
-    yield mkdirp(dir);
-    return dir;
-  });
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.normalizePattern = normalizePattern;
 
-  return function makeTempDir(_x33) {
-    return _ref33.apply(this, arguments);
-  };
-})();
+/**
+ * Explode and normalize a pattern into its name and range.
+ */
 
-let readFirstAvailableStream = exports.readFirstAvailableStream = (() => {
-  var _ref34 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (paths) {
-    for (var _iterator15 = paths, _isArray15 = Array.isArray(_iterator15), _i15 = 0, _iterator15 = _isArray15 ? _iterator15 : _iterator15[Symbol.iterator]();;) {
-      var _ref35;
+function normalizePattern(pattern) {
+  let hasVersion = false;
+  let range = 'latest';
+  let name = pattern;
 
-      if (_isArray15) {
-        if (_i15 >= _iterator15.length) break;
-        _ref35 = _iterator15[_i15++];
-      } else {
-        _i15 = _iterator15.next();
-        if (_i15.done) break;
-        _ref35 = _i15.value;
-      }
+  // if we're a scope then remove the @ and add it back later
+  let isScoped = false;
+  if (name[0] === '@') {
+    isScoped = true;
+    name = name.slice(1);
+  }
 
-      const path = _ref35;
+  // take first part as the name
+  const parts = name.split('@');
+  if (parts.length > 1) {
+    name = parts.shift();
+    range = parts.join('@');
 
-      try {
-        const fd = yield open(path, 'r');
-        return (_fs || _load_fs()).default.createReadStream(path, { fd });
-      } catch (err) {
-        // Try the next one
-      }
+    if (range) {
+      hasVersion = true;
+    } else {
+      range = '*';
     }
-    return null;
-  });
-
-  return function readFirstAvailableStream(_x34) {
-    return _ref34.apply(this, arguments);
-  };
-})();
-
-let getFirstSuitableFolder = exports.getFirstSuitableFolder = (() => {
-  var _ref36 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (paths, mode = constants.W_OK | constants.X_OK) {
-    const result = {
-      skipped: [],
-      folder: null
-    };
-
-    for (var _iterator16 = paths, _isArray16 = Array.isArray(_iterator16), _i16 = 0, _iterator16 = _isArray16 ? _iterator16 : _iterator16[Symbol.iterator]();;) {
-      var _ref37;
-
-      if (_isArray16) {
-        if (_i16 >= _iterator16.length) break;
-        _ref37 = _iterator16[_i16++];
-      } else {
-        _i16 = _iterator16.next();
-        if (_i16.done) break;
-        _ref37 = _i16.value;
-      }
+  }
 
-      const folder = _ref37;
+  // add back @ scope suffix
+  if (isScoped) {
+    name = `@${name}`;
+  }
 
-      try {
-        yield mkdirp(folder);
-        yield access(folder, mode);
+  return { name, range, hasVersion };
+}
 
-        result.folder = folder;
+/***/ }),
+/* 30 */,
+/* 31 */
+/***/ (function(module, exports, __webpack_require__) {
 
-        return result;
-      } catch (error) {
-        result.skipped.push({
-          error,
-          folder
-        });
-      }
-    }
-    return result;
-  });
+var dP = __webpack_require__(50);
+var createDesc = __webpack_require__(106);
+module.exports = __webpack_require__(33) ? function (object, key, value) {
+  return dP.f(object, key, createDesc(1, value));
+} : function (object, key, value) {
+  object[key] = value;
+  return object;
+};
 
-  return function getFirstSuitableFolder(_x35) {
-    return _ref36.apply(this, arguments);
-  };
-})();
 
-exports.copy = copy;
-exports.readFile = readFile;
-exports.readFileRaw = readFileRaw;
-exports.normalizeOS = normalizeOS;
+/***/ }),
+/* 32 */
+/***/ (function(module, exports, __webpack_require__) {
 
-var _fs;
+/* eslint-disable node/no-deprecated-api */
+var buffer = __webpack_require__(63)
+var Buffer = buffer.Buffer
 
-function _load_fs() {
-  return _fs = _interopRequireDefault(__webpack_require__(3));
+// alternative to using Object.keys for old browsers
+function copyProps (src, dst) {
+  for (var key in src) {
+    dst[key] = src[key]
+  }
 }
-
-var _glob;
-
-function _load_glob() {
-  return _glob = _interopRequireDefault(__webpack_require__(75));
+if (Buffer.from && Buffer.alloc && Buffer.allocUnsafe && Buffer.allocUnsafeSlow) {
+  module.exports = buffer
+} else {
+  // Copy properties from require('buffer')
+  copyProps(buffer, exports)
+  exports.Buffer = SafeBuffer
 }
 
-var _os;
-
-function _load_os() {
-  return _os = _interopRequireDefault(__webpack_require__(36));
+function SafeBuffer (arg, encodingOrOffset, length) {
+  return Buffer(arg, encodingOrOffset, length)
 }
 
-var _path;
+// Copy static methods from Buffer
+copyProps(Buffer, SafeBuffer)
 
-function _load_path() {
-  return _path = _interopRequireDefault(__webpack_require__(0));
+SafeBuffer.from = function (arg, encodingOrOffset, length) {
+  if (typeof arg === 'number') {
+    throw new TypeError('Argument must not be a number')
+  }
+  return Buffer(arg, encodingOrOffset, length)
 }
 
-var _blockingQueue;
-
-function _load_blockingQueue() {
-  return _blockingQueue = _interopRequireDefault(__webpack_require__(84));
+SafeBuffer.alloc = function (size, fill, encoding) {
+  if (typeof size !== 'number') {
+    throw new TypeError('Argument must be a number')
+  }
+  var buf = Buffer(size)
+  if (fill !== undefined) {
+    if (typeof encoding === 'string') {
+      buf.fill(fill, encoding)
+    } else {
+      buf.fill(fill)
+    }
+  } else {
+    buf.fill(0)
+  }
+  return buf
 }
 
-var _promise;
-
-function _load_promise() {
-  return _promise = _interopRequireWildcard(__webpack_require__(40));
+SafeBuffer.allocUnsafe = function (size) {
+  if (typeof size !== 'number') {
+    throw new TypeError('Argument must be a number')
+  }
+  return Buffer(size)
 }
 
-var _promise2;
-
-function _load_promise2() {
-  return _promise2 = __webpack_require__(40);
+SafeBuffer.allocUnsafeSlow = function (size) {
+  if (typeof size !== 'number') {
+    throw new TypeError('Argument must be a number')
+  }
+  return buffer.SlowBuffer(size)
 }
 
-var _map;
-
-function _load_map() {
-  return _map = _interopRequireDefault(__webpack_require__(20));
-}
 
-var _fsNormalized;
+/***/ }),
+/* 33 */
+/***/ (function(module, exports, __webpack_require__) {
 
-function _load_fsNormalized() {
-  return _fsNormalized = __webpack_require__(164);
-}
+// Thank's IE8 for his funny defineProperty
+module.exports = !__webpack_require__(85)(function () {
+  return Object.defineProperty({}, 'a', { get: function () { return 7; } }).a != 7;
+});
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/***/ }),
+/* 34 */
+/***/ (function(module, exports) {
 
-const constants = exports.constants = typeof (_fs || _load_fs()).default.constants !== 'undefined' ? (_fs || _load_fs()).default.constants : {
-  R_OK: (_fs || _load_fs()).default.R_OK,
-  W_OK: (_fs || _load_fs()).default.W_OK,
-  X_OK: (_fs || _load_fs()).default.X_OK
+module.exports = function (it) {
+  return typeof it === 'object' ? it !== null : typeof it === 'function';
 };
 
-const lockQueue = exports.lockQueue = new (_blockingQueue || _load_blockingQueue()).default('fs lock');
-
-const readFileBuffer = exports.readFileBuffer = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.readFile);
-const open = exports.open = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.open);
-const writeFile = exports.writeFile = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.writeFile);
-const readlink = exports.readlink = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.readlink);
-const realpath = exports.realpath = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.realpath);
-const readdir = exports.readdir = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.readdir);
-const rename = exports.rename = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.rename);
-const access = exports.access = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.access);
-const stat = exports.stat = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.stat);
-const mkdirp = exports.mkdirp = (0, (_promise2 || _load_promise2()).promisify)(__webpack_require__(116));
-const exists = exports.exists = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.exists, true);
-const lstat = exports.lstat = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.lstat);
-const chmod = exports.chmod = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.chmod);
-const link = exports.link = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.link);
-const glob = exports.glob = (0, (_promise2 || _load_promise2()).promisify)((_glob || _load_glob()).default);
-exports.unlink = (_fsNormalized || _load_fsNormalized()).unlink;
-
-// fs.copyFile uses the native file copying instructions on the system, performing much better
-// than any JS-based solution and consumes fewer resources. Repeated testing to fine tune the
-// concurrency level revealed 128 as the sweet spot on a quad-core, 16 CPU Intel system with SSD.
-
-const CONCURRENT_QUEUE_ITEMS = (_fs || _load_fs()).default.copyFile ? 128 : 4;
-
-const fsSymlink = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.symlink);
-const invariant = __webpack_require__(7);
-const stripBOM = __webpack_require__(122);
-
-const noop = () => {};
-
-function copy(src, dest, reporter) {
-  return copyBulk([{ src, dest }], reporter);
-}
 
-function _readFile(loc, encoding) {
-  return new Promise((resolve, reject) => {
-    (_fs || _load_fs()).default.readFile(loc, encoding, function (err, content) {
-      if (err) {
-        reject(err);
-      } else {
-        resolve(content);
-      }
-    });
-  });
-}
+/***/ }),
+/* 35 */
+/***/ (function(module, exports) {
 
-function readFile(loc) {
-  return _readFile(loc, 'utf8').then(normalizeOS);
-}
+module.exports = {};
 
-function readFileRaw(loc) {
-  return _readFile(loc, 'binary');
-}
 
-function normalizeOS(body) {
-  return body.replace(/\r\n/g, '\n');
-}
+/***/ }),
+/* 36 */
+/***/ (function(module, exports) {
 
-const cr = '\r'.charCodeAt(0);
-const lf = '\n'.charCodeAt(0);
+module.exports = __webpack_require__(120);
 
 /***/ }),
-/* 6 */
+/* 37 */,
+/* 38 */,
+/* 39 */,
+/* 40 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -32046,9807 +31397,9900 @@ const lf = '\n'.charCodeAt(0);
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getPathKey = getPathKey;
-const os = __webpack_require__(36);
-const path = __webpack_require__(0);
-const userHome = __webpack_require__(45).default;
-
-var _require = __webpack_require__(171);
-
-const getCacheDir = _require.getCacheDir,
-      getConfigDir = _require.getConfigDir,
-      getDataDir = _require.getDataDir;
-
-const isWebpackBundle = __webpack_require__(227);
-
-const DEPENDENCY_TYPES = exports.DEPENDENCY_TYPES = ['devDependencies', 'dependencies', 'optionalDependencies', 'peerDependencies'];
-const RESOLUTIONS = exports.RESOLUTIONS = 'resolutions';
-const MANIFEST_FIELDS = exports.MANIFEST_FIELDS = [RESOLUTIONS, ...DEPENDENCY_TYPES];
-
-const SUPPORTED_NODE_VERSIONS = exports.SUPPORTED_NODE_VERSIONS = '^4.8.0 || ^5.7.0 || ^6.2.2 || >=8.0.0';
-
-const YARN_REGISTRY = exports.YARN_REGISTRY = 'https://registry.yarnpkg.com';
+exports.wait = wait;
+exports.promisify = promisify;
+exports.queue = queue;
+function wait(delay) {
+  return new Promise(resolve => {
+    setTimeout(resolve, delay);
+  });
+}
 
-const YARN_DOCS = exports.YARN_DOCS = 'https://yarnpkg.com/en/docs/cli/';
-const YARN_INSTALLER_SH = exports.YARN_INSTALLER_SH = 'https://yarnpkg.com/install.sh';
-const YARN_INSTALLER_MSI = exports.YARN_INSTALLER_MSI = 'https://yarnpkg.com/latest.msi';
+function promisify(fn, firstData) {
+  return function (...args) {
+    return new Promise(function (resolve, reject) {
+      args.push(function (err, ...result) {
+        let res = result;
 
-const SELF_UPDATE_VERSION_URL = exports.SELF_UPDATE_VERSION_URL = 'https://yarnpkg.com/latest-version';
+        if (result.length <= 1) {
+          res = result[0];
+        }
 
-// cache version, bump whenever we make backwards incompatible changes
-const CACHE_VERSION = exports.CACHE_VERSION = 2;
+        if (firstData) {
+          res = err;
+          err = null;
+        }
 
-// lockfile version, bump whenever we make backwards incompatible changes
-const LOCKFILE_VERSION = exports.LOCKFILE_VERSION = 1;
+        if (err) {
+          reject(err);
+        } else {
+          resolve(res);
+        }
+      });
 
-// max amount of network requests to perform concurrently
-const NETWORK_CONCURRENCY = exports.NETWORK_CONCURRENCY = 8;
+      fn.apply(null, args);
+    });
+  };
+}
 
-// HTTP timeout used when downloading packages
-const NETWORK_TIMEOUT = exports.NETWORK_TIMEOUT = 30 * 1000; // in milliseconds
+function queue(arr, promiseProducer, concurrency = Infinity) {
+  concurrency = Math.min(concurrency, arr.length);
 
-// max amount of child processes to execute concurrently
-const CHILD_CONCURRENCY = exports.CHILD_CONCURRENCY = 5;
+  // clone
+  arr = arr.slice();
 
-const REQUIRED_PACKAGE_KEYS = exports.REQUIRED_PACKAGE_KEYS = ['name', 'version', '_uid'];
+  const results = [];
+  let total = arr.length;
+  if (!total) {
+    return Promise.resolve(results);
+  }
 
-function getPreferredCacheDirectories() {
-  const preferredCacheDirectories = [getCacheDir()];
+  return new Promise((resolve, reject) => {
+    for (let i = 0; i < concurrency; i++) {
+      next();
+    }
 
-  if (process.getuid) {
-    // $FlowFixMe: process.getuid exists, dammit
-    preferredCacheDirectories.push(path.join(os.tmpdir(), `.yarn-cache-${process.getuid()}`));
-  }
+    function next() {
+      const item = arr.shift();
+      const promise = promiseProducer(item);
 
-  preferredCacheDirectories.push(path.join(os.tmpdir(), `.yarn-cache`));
+      promise.then(function (result) {
+        results.push(result);
 
-  return preferredCacheDirectories;
+        total--;
+        if (total === 0) {
+          resolve(results);
+        } else {
+          if (arr.length) {
+            next();
+          }
+        }
+      }, reject);
+    }
+  });
 }
 
-const PREFERRED_MODULE_CACHE_DIRECTORIES = exports.PREFERRED_MODULE_CACHE_DIRECTORIES = getPreferredCacheDirectories();
-const CONFIG_DIRECTORY = exports.CONFIG_DIRECTORY = getConfigDir();
-const DATA_DIRECTORY = exports.DATA_DIRECTORY = getDataDir();
-const LINK_REGISTRY_DIRECTORY = exports.LINK_REGISTRY_DIRECTORY = path.join(DATA_DIRECTORY, 'link');
-const GLOBAL_MODULE_DIRECTORY = exports.GLOBAL_MODULE_DIRECTORY = path.join(DATA_DIRECTORY, 'global');
+/***/ }),
+/* 41 */
+/***/ (function(module, exports, __webpack_require__) {
 
-const NODE_BIN_PATH = exports.NODE_BIN_PATH = process.execPath;
-const YARN_BIN_PATH = exports.YARN_BIN_PATH = getYarnBinPath();
+var global = __webpack_require__(11);
+var core = __webpack_require__(23);
+var ctx = __webpack_require__(48);
+var hide = __webpack_require__(31);
+var has = __webpack_require__(49);
+var PROTOTYPE = 'prototype';
 
-// Webpack needs to be configured with node.__dirname/__filename = false
-function getYarnBinPath() {
-  if (isWebpackBundle) {
-    return __filename;
-  } else {
-    return path.join(__dirname, '..', 'bin', 'yarn.js');
+var $export = function (type, name, source) {
+  var IS_FORCED = type & $export.F;
+  var IS_GLOBAL = type & $export.G;
+  var IS_STATIC = type & $export.S;
+  var IS_PROTO = type & $export.P;
+  var IS_BIND = type & $export.B;
+  var IS_WRAP = type & $export.W;
+  var exports = IS_GLOBAL ? core : core[name] || (core[name] = {});
+  var expProto = exports[PROTOTYPE];
+  var target = IS_GLOBAL ? global : IS_STATIC ? global[name] : (global[name] || {})[PROTOTYPE];
+  var key, own, out;
+  if (IS_GLOBAL) source = name;
+  for (key in source) {
+    // contains in native
+    own = !IS_FORCED && target && target[key] !== undefined;
+    if (own && has(exports, key)) continue;
+    // export native or passed
+    out = own ? target[key] : source[key];
+    // prevent global pollution for namespaces
+    exports[key] = IS_GLOBAL && typeof target[key] != 'function' ? source[key]
+    // bind timers to global for call from export context
+    : IS_BIND && own ? ctx(out, global)
+    // wrap global constructors for prevent change them in library
+    : IS_WRAP && target[key] == out ? (function (C) {
+      var F = function (a, b, c) {
+        if (this instanceof C) {
+          switch (arguments.length) {
+            case 0: return new C();
+            case 1: return new C(a);
+            case 2: return new C(a, b);
+          } return new C(a, b, c);
+        } return C.apply(this, arguments);
+      };
+      F[PROTOTYPE] = C[PROTOTYPE];
+      return F;
+    // make static versions for prototype methods
+    })(out) : IS_PROTO && typeof out == 'function' ? ctx(Function.call, out) : out;
+    // export proto methods to core.%CONSTRUCTOR%.methods.%NAME%
+    if (IS_PROTO) {
+      (exports.virtual || (exports.virtual = {}))[key] = out;
+      // export proto methods to core.%CONSTRUCTOR%.prototype.%NAME%
+      if (type & $export.R && expProto && !expProto[key]) hide(expProto, key, out);
+    }
   }
-}
-
-const NODE_MODULES_FOLDER = exports.NODE_MODULES_FOLDER = 'node_modules';
-const NODE_PACKAGE_JSON = exports.NODE_PACKAGE_JSON = 'package.json';
-
-const POSIX_GLOBAL_PREFIX = exports.POSIX_GLOBAL_PREFIX = `${process.env.DESTDIR || ''}/usr/local`;
-const FALLBACK_GLOBAL_PREFIX = exports.FALLBACK_GLOBAL_PREFIX = path.join(userHome, '.yarn');
-
-const META_FOLDER = exports.META_FOLDER = '.yarn-meta';
-const INTEGRITY_FILENAME = exports.INTEGRITY_FILENAME = '.yarn-integrity';
-const LOCKFILE_FILENAME = exports.LOCKFILE_FILENAME = 'yarn.lock';
-const METADATA_FILENAME = exports.METADATA_FILENAME = '.yarn-metadata.json';
-const TARBALL_FILENAME = exports.TARBALL_FILENAME = '.yarn-tarball.tgz';
-const CLEAN_FILENAME = exports.CLEAN_FILENAME = '.yarnclean';
-
-const NPM_LOCK_FILENAME = exports.NPM_LOCK_FILENAME = 'package-lock.json';
-const NPM_SHRINKWRAP_FILENAME = exports.NPM_SHRINKWRAP_FILENAME = 'npm-shrinkwrap.json';
-
-const DEFAULT_INDENT = exports.DEFAULT_INDENT = '  ';
-const SINGLE_INSTANCE_PORT = exports.SINGLE_INSTANCE_PORT = 31997;
-const SINGLE_INSTANCE_FILENAME = exports.SINGLE_INSTANCE_FILENAME = '.yarn-single-instance';
-
-const ENV_PATH_KEY = exports.ENV_PATH_KEY = getPathKey(process.platform, process.env);
-
-function getPathKey(platform, env) {
-  let pathKey = 'PATH';
+};
+// type bitmap
+$export.F = 1;   // forced
+$export.G = 2;   // global
+$export.S = 4;   // static
+$export.P = 8;   // proto
+$export.B = 16;  // bind
+$export.W = 32;  // wrap
+$export.U = 64;  // safe
+$export.R = 128; // real proto method for `library`
+module.exports = $export;
 
-  // windows calls its path "Path" usually, but this is not guaranteed.
-  if (platform === 'win32') {
-    pathKey = 'Path';
 
-    for (const key in env) {
-      if (key.toLowerCase() === 'path') {
-        pathKey = key;
-      }
-    }
-  }
+/***/ }),
+/* 42 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  return pathKey;
+try {
+  var util = __webpack_require__(2);
+  if (typeof util.inherits !== 'function') throw '';
+  module.exports = util.inherits;
+} catch (e) {
+  module.exports = __webpack_require__(224);
 }
 
-const VERSION_COLOR_SCHEME = exports.VERSION_COLOR_SCHEME = {
-  major: 'red',
-  premajor: 'red',
-  minor: 'yellow',
-  preminor: 'yellow',
-  patch: 'green',
-  prepatch: 'green',
-  prerelease: 'red',
-  unchanged: 'white',
-  unknown: 'red'
-};
 
 /***/ }),
-/* 7 */
+/* 43 */,
+/* 44 */,
+/* 45 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
 
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.home = undefined;
 
-/**
- * Use invariant() to assert state which your program assumes to be true.
- *
- * Provide sprintf-style format (only %s is supported) and arguments
- * to provide information about what broke and what you were
- * expecting.
- *
- * The invariant message will be stripped in production, but the invariant
- * will remain to ensure logic does not differ in production.
- */
+var _rootUser;
 
-var NODE_ENV = "none";
+function _load_rootUser() {
+  return _rootUser = _interopRequireDefault(__webpack_require__(169));
+}
 
-var invariant = function(condition, format, a, b, c, d, e, f) {
-  if (NODE_ENV !== 'production') {
-    if (format === undefined) {
-      throw new Error('invariant requires an error message argument');
-    }
-  }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-  if (!condition) {
-    var error;
-    if (format === undefined) {
-      error = new Error(
-        'Minified exception occurred; use the non-minified dev environment ' +
-        'for the full error message and additional helpful warnings.'
-      );
-    } else {
-      var args = [a, b, c, d, e, f];
-      var argIndex = 0;
-      error = new Error(
-        format.replace(/%s/g, function() { return args[argIndex++]; })
-      );
-      error.name = 'Invariant Violation';
-    }
+const path = __webpack_require__(0);
 
-    error.framesToPop = 1; // we don't care about invariant's own frame
-    throw error;
-  }
-};
+const home = exports.home = __webpack_require__(36).homedir();
 
-module.exports = invariant;
+const userHomeDir = (_rootUser || _load_rootUser()).default ? path.resolve('/usr/local/share') : home;
 
+exports.default = userHomeDir;
 
 /***/ }),
-/* 8 */,
-/* 9 */
+/* 46 */
 /***/ (function(module, exports) {
 
-module.exports = __webpack_require__(290);
+module.exports = function (it) {
+  if (typeof it != 'function') throw TypeError(it + ' is not a function!');
+  return it;
+};
+
 
 /***/ }),
-/* 10 */,
-/* 11 */
+/* 47 */
 /***/ (function(module, exports) {
 
-// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
-var global = module.exports = typeof window != 'undefined' && window.Math == Math
-  ? window : typeof self != 'undefined' && self.Math == Math ? self
-  // eslint-disable-next-line no-new-func
-  : Function('return this')();
-if (typeof __g == 'number') __g = global; // eslint-disable-line no-undef
+var toString = {}.toString;
+
+module.exports = function (it) {
+  return toString.call(it).slice(8, -1);
+};
 
 
 /***/ }),
-/* 12 */
+/* 48 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.sortAlpha = sortAlpha;
-exports.entries = entries;
-exports.removePrefix = removePrefix;
-exports.removeSuffix = removeSuffix;
-exports.addSuffix = addSuffix;
-exports.hyphenate = hyphenate;
-exports.camelCase = camelCase;
-exports.compareSortedArrays = compareSortedArrays;
-exports.sleep = sleep;
-const _camelCase = __webpack_require__(176);
-
-function sortAlpha(a, b) {
-  // sort alphabetically in a deterministic way
-  const shortLen = Math.min(a.length, b.length);
-  for (let i = 0; i < shortLen; i++) {
-    const aChar = a.charCodeAt(i);
-    const bChar = b.charCodeAt(i);
-    if (aChar !== bChar) {
-      return aChar - bChar;
-    }
-  }
-  return a.length - b.length;
-}
-
-function entries(obj) {
-  const entries = [];
-  if (obj) {
-    for (const key in obj) {
-      entries.push([key, obj[key]]);
-    }
-  }
-  return entries;
-}
-
-function removePrefix(pattern, prefix) {
-  if (pattern.startsWith(prefix)) {
-    pattern = pattern.slice(prefix.length);
-  }
-
-  return pattern;
-}
-
-function removeSuffix(pattern, suffix) {
-  if (pattern.endsWith(suffix)) {
-    return pattern.slice(0, -suffix.length);
-  }
-
-  return pattern;
-}
-
-function addSuffix(pattern, suffix) {
-  if (!pattern.endsWith(suffix)) {
-    return pattern + suffix;
+// optional / simple context binding
+var aFunction = __webpack_require__(46);
+module.exports = function (fn, that, length) {
+  aFunction(fn);
+  if (that === undefined) return fn;
+  switch (length) {
+    case 1: return function (a) {
+      return fn.call(that, a);
+    };
+    case 2: return function (a, b) {
+      return fn.call(that, a, b);
+    };
+    case 3: return function (a, b, c) {
+      return fn.call(that, a, b, c);
+    };
   }
+  return function (/* ...args */) {
+    return fn.apply(that, arguments);
+  };
+};
 
-  return pattern;
-}
-
-function hyphenate(str) {
-  return str.replace(/[A-Z]/g, match => {
-    return '-' + match.charAt(0).toLowerCase();
-  });
-}
 
-function camelCase(str) {
-  if (/[A-Z]/.test(str)) {
-    return null;
-  } else {
-    return _camelCase(str);
-  }
-}
+/***/ }),
+/* 49 */
+/***/ (function(module, exports) {
 
-function compareSortedArrays(array1, array2) {
-  if (array1.length !== array2.length) {
-    return false;
-  }
-  for (let i = 0, len = array1.length; i < len; i++) {
-    if (array1[i] !== array2[i]) {
-      return false;
-    }
-  }
-  return true;
-}
+var hasOwnProperty = {}.hasOwnProperty;
+module.exports = function (it, key) {
+  return hasOwnProperty.call(it, key);
+};
 
-function sleep(ms) {
-  return new Promise(resolve => {
-    setTimeout(resolve, ms);
-  });
-}
 
 /***/ }),
-/* 13 */
+/* 50 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var store = __webpack_require__(107)('wks');
-var uid = __webpack_require__(111);
-var Symbol = __webpack_require__(11).Symbol;
-var USE_SYMBOL = typeof Symbol == 'function';
+var anObject = __webpack_require__(27);
+var IE8_DOM_DEFINE = __webpack_require__(184);
+var toPrimitive = __webpack_require__(201);
+var dP = Object.defineProperty;
 
-var $exports = module.exports = function (name) {
-  return store[name] || (store[name] =
-    USE_SYMBOL && Symbol[name] || (USE_SYMBOL ? Symbol : uid)('Symbol.' + name));
+exports.f = __webpack_require__(33) ? Object.defineProperty : function defineProperty(O, P, Attributes) {
+  anObject(O);
+  P = toPrimitive(P, true);
+  anObject(Attributes);
+  if (IE8_DOM_DEFINE) try {
+    return dP(O, P, Attributes);
+  } catch (e) { /* empty */ }
+  if ('get' in Attributes || 'set' in Attributes) throw TypeError('Accessors not supported!');
+  if ('value' in Attributes) O[P] = Attributes.value;
+  return O;
 };
 
-$exports.store = store;
 
+/***/ }),
+/* 51 */,
+/* 52 */,
+/* 53 */,
+/* 54 */
+/***/ (function(module, exports) {
+
+module.exports = __webpack_require__(155);
 
 /***/ }),
-/* 14 */
+/* 55 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.stringify = exports.parse = undefined;
+const Buffer = __webpack_require__(32).Buffer
 
-var _asyncToGenerator2;
+const crypto = __webpack_require__(9)
+const Transform = __webpack_require__(17).Transform
 
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(1));
-}
+const SPEC_ALGORITHMS = ['sha256', 'sha384', 'sha512']
 
-var _parse;
+const BASE64_REGEX = /^[a-z0-9+/]+(?:=?=?)$/i
+const SRI_REGEX = /^([^-]+)-([^?]+)([?\S*]*)$/
+const STRICT_SRI_REGEX = /^([^-]+)-([A-Za-z0-9+/=]{44,88})(\?[\x21-\x7E]*)*$/
+const VCHAR_REGEX = /^[\x21-\x7E]+$/
 
-function _load_parse() {
-  return _parse = __webpack_require__(81);
-}
+class Hash {
+  get isHash () { return true }
+  constructor (hash, opts) {
+    const strict = !!(opts && opts.strict)
+    this.source = hash.trim()
+    // 3.1. Integrity metadata (called "Hash" by ssri)
+    // https://w3c.github.io/webappsec-subresource-integrity/#integrity-metadata-description
+    const match = this.source.match(
+      strict
+      ? STRICT_SRI_REGEX
+      : SRI_REGEX
+    )
+    if (!match) { return }
+    if (strict && !SPEC_ALGORITHMS.some(a => a === match[1])) { return }
+    this.algorithm = match[1]
+    this.digest = match[2]
 
-Object.defineProperty(exports, 'parse', {
-  enumerable: true,
-  get: function get() {
-    return _interopRequireDefault(_parse || _load_parse()).default;
+    const rawOpts = match[3]
+    this.options = rawOpts ? rawOpts.slice(1).split('?') : []
   }
-});
-
-var _stringify;
-
-function _load_stringify() {
-  return _stringify = __webpack_require__(150);
-}
-
-Object.defineProperty(exports, 'stringify', {
-  enumerable: true,
-  get: function get() {
-    return _interopRequireDefault(_stringify || _load_stringify()).default;
+  hexDigest () {
+    return this.digest && Buffer.from(this.digest, 'base64').toString('hex')
+  }
+  toJSON () {
+    return this.toString()
+  }
+  toString (opts) {
+    if (opts && opts.strict) {
+      // Strict mode enforces the standard as close to the foot of the
+      // letter as it can.
+      if (!(
+        // The spec has very restricted productions for algorithms.
+        // https://www.w3.org/TR/CSP2/#source-list-syntax
+        SPEC_ALGORITHMS.some(x => x === this.algorithm) &&
+        // Usually, if someone insists on using a "different" base64, we
+        // leave it as-is, since there's multiple standards, and the
+        // specified is not a URL-safe variant.
+        // https://www.w3.org/TR/CSP2/#base64_value
+        this.digest.match(BASE64_REGEX) &&
+        // Option syntax is strictly visual chars.
+        // https://w3c.github.io/webappsec-subresource-integrity/#grammardef-option-expression
+        // https://tools.ietf.org/html/rfc5234#appendix-B.1
+        (this.options || []).every(opt => opt.match(VCHAR_REGEX))
+      )) {
+        return ''
+      }
+    }
+    const options = this.options && this.options.length
+    ? `?${this.options.join('?')}`
+    : ''
+    return `${this.algorithm}-${this.digest}${options}`
   }
-});
-exports.implodeEntry = implodeEntry;
-exports.explodeEntry = explodeEntry;
-
-var _misc;
-
-function _load_misc() {
-  return _misc = __webpack_require__(12);
 }
 
-var _normalizePattern;
-
-function _load_normalizePattern() {
-  return _normalizePattern = __webpack_require__(29);
+class Integrity {
+  get isIntegrity () { return true }
+  toJSON () {
+    return this.toString()
+  }
+  toString (opts) {
+    opts = opts || {}
+    let sep = opts.sep || ' '
+    if (opts.strict) {
+      // Entries must be separated by whitespace, according to spec.
+      sep = sep.replace(/\S+/g, ' ')
+    }
+    return Object.keys(this).map(k => {
+      return this[k].map(hash => {
+        return Hash.prototype.toString.call(hash, opts)
+      }).filter(x => x.length).join(sep)
+    }).filter(x => x.length).join(sep)
+  }
+  concat (integrity, opts) {
+    const other = typeof integrity === 'string'
+    ? integrity
+    : stringify(integrity, opts)
+    return parse(`${this.toString(opts)} ${other}`, opts)
+  }
+  hexDigest () {
+    return parse(this, {single: true}).hexDigest()
+  }
+  match (integrity, opts) {
+    const other = parse(integrity, opts)
+    const algo = other.pickAlgorithm(opts)
+    return (
+      this[algo] &&
+      other[algo] &&
+      this[algo].find(hash =>
+        other[algo].find(otherhash =>
+          hash.digest === otherhash.digest
+        )
+      )
+    ) || false
+  }
+  pickAlgorithm (opts) {
+    const pickAlgorithm = (opts && opts.pickAlgorithm) || getPrioritizedHash
+    const keys = Object.keys(this)
+    if (!keys.length) {
+      throw new Error(`No algorithms available for ${
+        JSON.stringify(this.toString())
+      }`)
+    }
+    return keys.reduce((acc, algo) => {
+      return pickAlgorithm(acc, algo) || acc
+    })
+  }
 }
 
-var _parse2;
-
-function _load_parse2() {
-  return _parse2 = _interopRequireDefault(__webpack_require__(81));
+module.exports.parse = parse
+function parse (sri, opts) {
+  opts = opts || {}
+  if (typeof sri === 'string') {
+    return _parse(sri, opts)
+  } else if (sri.algorithm && sri.digest) {
+    const fullSri = new Integrity()
+    fullSri[sri.algorithm] = [sri]
+    return _parse(stringify(fullSri, opts), opts)
+  } else {
+    return _parse(stringify(sri, opts), opts)
+  }
 }
 
-var _constants;
-
-function _load_constants() {
-  return _constants = __webpack_require__(6);
+function _parse (integrity, opts) {
+  // 3.4.3. Parse metadata
+  // https://w3c.github.io/webappsec-subresource-integrity/#parse-metadata
+  if (opts.single) {
+    return new Hash(integrity, opts)
+  }
+  return integrity.trim().split(/\s+/).reduce((acc, string) => {
+    const hash = new Hash(string, opts)
+    if (hash.algorithm && hash.digest) {
+      const algo = hash.algorithm
+      if (!acc[algo]) { acc[algo] = [] }
+      acc[algo].push(hash)
+    }
+    return acc
+  }, new Integrity())
 }
 
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(5));
+module.exports.stringify = stringify
+function stringify (obj, opts) {
+  if (obj.algorithm && obj.digest) {
+    return Hash.prototype.toString.call(obj, opts)
+  } else if (typeof obj === 'string') {
+    return stringify(parse(obj, opts), opts)
+  } else {
+    return Integrity.prototype.toString.call(obj, opts)
+  }
 }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const invariant = __webpack_require__(7);
-
-const path = __webpack_require__(0);
-const ssri = __webpack_require__(55);
+module.exports.fromHex = fromHex
+function fromHex (hexDigest, algorithm, opts) {
+  const optString = (opts && opts.options && opts.options.length)
+  ? `?${opts.options.join('?')}`
+  : ''
+  return parse(
+    `${algorithm}-${
+      Buffer.from(hexDigest, 'hex').toString('base64')
+    }${optString}`, opts
+  )
+}
 
-function getName(pattern) {
-  return (0, (_normalizePattern || _load_normalizePattern()).normalizePattern)(pattern).name;
+module.exports.fromData = fromData
+function fromData (data, opts) {
+  opts = opts || {}
+  const algorithms = opts.algorithms || ['sha512']
+  const optString = opts.options && opts.options.length
+  ? `?${opts.options.join('?')}`
+  : ''
+  return algorithms.reduce((acc, algo) => {
+    const digest = crypto.createHash(algo).update(data).digest('base64')
+    const hash = new Hash(
+      `${algo}-${digest}${optString}`,
+       opts
+    )
+    if (hash.algorithm && hash.digest) {
+      const algo = hash.algorithm
+      if (!acc[algo]) { acc[algo] = [] }
+      acc[algo].push(hash)
+    }
+    return acc
+  }, new Integrity())
 }
 
-function blankObjectUndefined(obj) {
-  return obj && Object.keys(obj).length ? obj : undefined;
+module.exports.fromStream = fromStream
+function fromStream (stream, opts) {
+  opts = opts || {}
+  const P = opts.Promise || Promise
+  const istream = integrityStream(opts)
+  return new P((resolve, reject) => {
+    stream.pipe(istream)
+    stream.on('error', reject)
+    istream.on('error', reject)
+    let sri
+    istream.on('integrity', s => { sri = s })
+    istream.on('end', () => resolve(sri))
+    istream.on('data', () => {})
+  })
 }
 
-function keyForRemote(remote) {
-  return remote.resolved || (remote.reference && remote.hash ? `${remote.reference}#${remote.hash}` : null);
+module.exports.checkData = checkData
+function checkData (data, sri, opts) {
+  opts = opts || {}
+  sri = parse(sri, opts)
+  if (!Object.keys(sri).length) {
+    if (opts.error) {
+      throw Object.assign(
+        new Error('No valid integrity hashes to check against'), {
+          code: 'EINTEGRITY'
+        }
+      )
+    } else {
+      return false
+    }
+  }
+  const algorithm = sri.pickAlgorithm(opts)
+  const digest = crypto.createHash(algorithm).update(data).digest('base64')
+  const newSri = parse({algorithm, digest})
+  const match = newSri.match(sri, opts)
+  if (match || !opts.error) {
+    return match
+  } else if (typeof opts.size === 'number' && (data.length !== opts.size)) {
+    const err = new Error(`data size mismatch when checking ${sri}.\n  Wanted: ${opts.size}\n  Found: ${data.length}`)
+    err.code = 'EBADSIZE'
+    err.found = data.length
+    err.expected = opts.size
+    err.sri = sri
+    throw err
+  } else {
+    const err = new Error(`Integrity checksum failed when using ${algorithm}: Wanted ${sri}, but got ${newSri}. (${data.length} bytes)`)
+    err.code = 'EINTEGRITY'
+    err.found = newSri
+    err.expected = sri
+    err.algorithm = algorithm
+    err.sri = sri
+    throw err
+  }
 }
 
-function serializeIntegrity(integrity) {
-  // We need this because `Integrity.toString()` does not use sorting to ensure a stable string output
-  // See https://git.io/vx2Hy
-  return integrity.toString().split(' ').sort().join(' ');
+module.exports.checkStream = checkStream
+function checkStream (stream, sri, opts) {
+  opts = opts || {}
+  const P = opts.Promise || Promise
+  const checker = integrityStream(Object.assign({}, opts, {
+    integrity: sri
+  }))
+  return new P((resolve, reject) => {
+    stream.pipe(checker)
+    stream.on('error', reject)
+    checker.on('error', reject)
+    let sri
+    checker.on('verified', s => { sri = s })
+    checker.on('end', () => resolve(sri))
+    checker.on('data', () => {})
+  })
 }
 
-function implodeEntry(pattern, obj) {
-  const inferredName = getName(pattern);
-  const integrity = obj.integrity ? serializeIntegrity(obj.integrity) : '';
-  const imploded = {
-    name: inferredName === obj.name ? undefined : obj.name,
-    version: obj.version,
-    uid: obj.uid === obj.version ? undefined : obj.uid,
-    resolved: obj.resolved,
-    registry: obj.registry === 'npm' ? undefined : obj.registry,
-    dependencies: blankObjectUndefined(obj.dependencies),
-    optionalDependencies: blankObjectUndefined(obj.optionalDependencies),
-    permissions: blankObjectUndefined(obj.permissions),
-    prebuiltVariants: blankObjectUndefined(obj.prebuiltVariants)
-  };
-  if (integrity) {
-    imploded.integrity = integrity;
-  }
-  return imploded;
+module.exports.integrityStream = integrityStream
+function integrityStream (opts) {
+  opts = opts || {}
+  // For verification
+  const sri = opts.integrity && parse(opts.integrity, opts)
+  const goodSri = sri && Object.keys(sri).length
+  const algorithm = goodSri && sri.pickAlgorithm(opts)
+  const digests = goodSri && sri[algorithm]
+  // Calculating stream
+  const algorithms = Array.from(
+    new Set(
+      (opts.algorithms || ['sha512'])
+      .concat(algorithm ? [algorithm] : [])
+    )
+  )
+  const hashes = algorithms.map(crypto.createHash)
+  let streamSize = 0
+  const stream = new Transform({
+    transform (chunk, enc, cb) {
+      streamSize += chunk.length
+      hashes.forEach(h => h.update(chunk, enc))
+      cb(null, chunk, enc)
+    }
+  }).on('end', () => {
+    const optString = (opts.options && opts.options.length)
+    ? `?${opts.options.join('?')}`
+    : ''
+    const newSri = parse(hashes.map((h, i) => {
+      return `${algorithms[i]}-${h.digest('base64')}${optString}`
+    }).join(' '), opts)
+    // Integrity verification mode
+    const match = goodSri && newSri.match(sri, opts)
+    if (typeof opts.size === 'number' && streamSize !== opts.size) {
+      const err = new Error(`stream size mismatch when checking ${sri}.\n  Wanted: ${opts.size}\n  Found: ${streamSize}`)
+      err.code = 'EBADSIZE'
+      err.found = streamSize
+      err.expected = opts.size
+      err.sri = sri
+      stream.emit('error', err)
+    } else if (opts.integrity && !match) {
+      const err = new Error(`${sri} integrity checksum failed when using ${algorithm}: wanted ${digests} but got ${newSri}. (${streamSize} bytes)`)
+      err.code = 'EINTEGRITY'
+      err.found = newSri
+      err.expected = digests
+      err.algorithm = algorithm
+      err.sri = sri
+      stream.emit('error', err)
+    } else {
+      stream.emit('size', streamSize)
+      stream.emit('integrity', newSri)
+      match && stream.emit('verified', match)
+    }
+  })
+  return stream
 }
 
-function explodeEntry(pattern, obj) {
-  obj.optionalDependencies = obj.optionalDependencies || {};
-  obj.dependencies = obj.dependencies || {};
-  obj.uid = obj.uid || obj.version;
-  obj.permissions = obj.permissions || {};
-  obj.registry = obj.registry || 'npm';
-  obj.name = obj.name || getName(pattern);
-  const integrity = obj.integrity;
-  if (integrity && integrity.isIntegrity) {
-    obj.integrity = ssri.parse(integrity);
+module.exports.create = createIntegrity
+function createIntegrity (opts) {
+  opts = opts || {}
+  const algorithms = opts.algorithms || ['sha512']
+  const optString = opts.options && opts.options.length
+  ? `?${opts.options.join('?')}`
+  : ''
+
+  const hashes = algorithms.map(crypto.createHash)
+
+  return {
+    update: function (chunk, enc) {
+      hashes.forEach(h => h.update(chunk, enc))
+      return this
+    },
+    digest: function (enc) {
+      const integrity = algorithms.reduce((acc, algo) => {
+        const digest = hashes.shift().digest('base64')
+        const hash = new Hash(
+          `${algo}-${digest}${optString}`,
+          opts
+        )
+        if (hash.algorithm && hash.digest) {
+          const algo = hash.algorithm
+          if (!acc[algo]) { acc[algo] = [] }
+          acc[algo].push(hash)
+        }
+        return acc
+      }, new Integrity())
+
+      return integrity
+    }
   }
-  return obj;
 }
 
-class Lockfile {
-  constructor({ cache, source, parseResultType } = {}) {
-    this.source = source || '';
-    this.cache = cache;
-    this.parseResultType = parseResultType;
-  }
+const NODE_HASHES = new Set(crypto.getHashes())
 
-  // source string if the `cache` was parsed
+// This is a Best Effort™ at a reasonable priority for hash algos
+const DEFAULT_PRIORITY = [
+  'md5', 'whirlpool', 'sha1', 'sha224', 'sha256', 'sha384', 'sha512',
+  // TODO - it's unclear _which_ of these Node will actually use as its name
+  //        for the algorithm, so we guesswork it based on the OpenSSL names.
+  'sha3',
+  'sha3-256', 'sha3-384', 'sha3-512',
+  'sha3_256', 'sha3_384', 'sha3_512'
+].filter(algo => NODE_HASHES.has(algo))
 
+function getPrioritizedHash (algo1, algo2) {
+  return DEFAULT_PRIORITY.indexOf(algo1.toLowerCase()) >= DEFAULT_PRIORITY.indexOf(algo2.toLowerCase())
+  ? algo1
+  : algo2
+}
 
-  // if true, we're parsing an old yarn file and need to update integrity fields
-  hasEntriesExistWithoutIntegrity() {
-    if (!this.cache) {
-      return false;
-    }
 
-    for (const key in this.cache) {
-      // $FlowFixMe - `this.cache` is clearly defined at this point
-      if (!/^.*@(file:|http)/.test(key) && this.cache[key] && !this.cache[key].integrity) {
-        return true;
-      }
-    }
+/***/ }),
+/* 56 */,
+/* 57 */,
+/* 58 */,
+/* 59 */,
+/* 60 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    return false;
-  }
+module.exports = minimatch
+minimatch.Minimatch = Minimatch
 
-  static fromDirectory(dir, reporter) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      // read the manifest in this directory
-      const lockfileLoc = path.join(dir, (_constants || _load_constants()).LOCKFILE_FILENAME);
+var path = { sep: '/' }
+try {
+  path = __webpack_require__(0)
+} catch (er) {}
 
-      let lockfile;
-      let rawLockfile = '';
-      let parseResult;
+var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}
+var expand = __webpack_require__(175)
 
-      if (yield (_fs || _load_fs()).exists(lockfileLoc)) {
-        rawLockfile = yield (_fs || _load_fs()).readFile(lockfileLoc);
-        parseResult = (0, (_parse2 || _load_parse2()).default)(rawLockfile, lockfileLoc);
+var plTypes = {
+  '!': { open: '(?:(?!(?:', close: '))[^/]*?)'},
+  '?': { open: '(?:', close: ')?' },
+  '+': { open: '(?:', close: ')+' },
+  '*': { open: '(?:', close: ')*' },
+  '@': { open: '(?:', close: ')' }
+}
 
-        if (reporter) {
-          if (parseResult.type === 'merge') {
-            reporter.info(reporter.lang('lockfileMerged'));
-          } else if (parseResult.type === 'conflict') {
-            reporter.warn(reporter.lang('lockfileConflict'));
-          }
-        }
+// any single thing other than /
+// don't need to escape / when using new RegExp()
+var qmark = '[^/]'
 
-        lockfile = parseResult.object;
-      } else if (reporter) {
-        reporter.info(reporter.lang('noLockfileFound'));
-      }
+// * => any number of characters
+var star = qmark + '*?'
 
-      return new Lockfile({ cache: lockfile, source: rawLockfile, parseResultType: parseResult && parseResult.type });
-    })();
-  }
+// ** when dots are allowed.  Anything goes, except .. and .
+// not (^ or / followed by one or two dots followed by $ or /),
+// followed by anything, any number of times.
+var twoStarDot = '(?:(?!(?:\\\/|^)(?:\\.{1,2})($|\\\/)).)*?'
 
-  getLocked(pattern) {
-    const cache = this.cache;
-    if (!cache) {
-      return undefined;
-    }
+// not a ^ or / followed by a dot,
+// followed by anything, any number of times.
+var twoStarNoDot = '(?:(?!(?:\\\/|^)\\.).)*?'
 
-    const shrunk = pattern in cache && cache[pattern];
+// characters that need to be escaped in RegExp.
+var reSpecials = charSet('().*{}+?[]^$\\!')
 
-    if (typeof shrunk === 'string') {
-      return this.getLocked(shrunk);
-    } else if (shrunk) {
-      explodeEntry(pattern, shrunk);
-      return shrunk;
-    }
+// "abc" -> { a:true, b:true, c:true }
+function charSet (s) {
+  return s.split('').reduce(function (set, c) {
+    set[c] = true
+    return set
+  }, {})
+}
 
-    return undefined;
-  }
+// normalizes slashes.
+var slashSplit = /\/+/
 
-  removePattern(pattern) {
-    const cache = this.cache;
-    if (!cache) {
-      return;
-    }
-    delete cache[pattern];
+minimatch.filter = filter
+function filter (pattern, options) {
+  options = options || {}
+  return function (p, i, list) {
+    return minimatch(p, pattern, options)
   }
+}
 
-  getLockfile(patterns) {
-    const lockfile = {};
-    const seen = new Map();
+function ext (a, b) {
+  a = a || {}
+  b = b || {}
+  var t = {}
+  Object.keys(b).forEach(function (k) {
+    t[k] = b[k]
+  })
+  Object.keys(a).forEach(function (k) {
+    t[k] = a[k]
+  })
+  return t
+}
 
-    // order by name so that lockfile manifest is assigned to the first dependency with this manifest
-    // the others that have the same remoteKey will just refer to the first
-    // ordering allows for consistency in lockfile when it is serialized
-    const sortedPatternsKeys = Object.keys(patterns).sort((_misc || _load_misc()).sortAlpha);
+minimatch.defaults = function (def) {
+  if (!def || !Object.keys(def).length) return minimatch
 
-    for (var _iterator = sortedPatternsKeys, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref;
+  var orig = minimatch
 
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref = _i.value;
-      }
+  var m = function minimatch (p, pattern, options) {
+    return orig.minimatch(p, pattern, ext(def, options))
+  }
 
-      const pattern = _ref;
+  m.Minimatch = function Minimatch (pattern, options) {
+    return new orig.Minimatch(pattern, ext(def, options))
+  }
 
-      const pkg = patterns[pattern];
-      const remote = pkg._remote,
-            ref = pkg._reference;
+  return m
+}
 
-      invariant(ref, 'Package is missing a reference');
-      invariant(remote, 'Package is missing a remote');
+Minimatch.defaults = function (def) {
+  if (!def || !Object.keys(def).length) return Minimatch
+  return minimatch.defaults(def).Minimatch
+}
 
-      const remoteKey = keyForRemote(remote);
-      const seenPattern = remoteKey && seen.get(remoteKey);
-      if (seenPattern) {
-        // no point in duplicating it
-        lockfile[pattern] = seenPattern;
+function minimatch (p, pattern, options) {
+  if (typeof pattern !== 'string') {
+    throw new TypeError('glob pattern string required')
+  }
 
-        // if we're relying on our name being inferred and two of the patterns have
-        // different inferred names then we need to set it
-        if (!seenPattern.name && getName(pattern) !== pkg.name) {
-          seenPattern.name = pkg.name;
-        }
-        continue;
-      }
-      const obj = implodeEntry(pattern, {
-        name: pkg.name,
-        version: pkg.version,
-        uid: pkg._uid,
-        resolved: remote.resolved,
-        integrity: remote.integrity,
-        registry: remote.registry,
-        dependencies: pkg.dependencies,
-        peerDependencies: pkg.peerDependencies,
-        optionalDependencies: pkg.optionalDependencies,
-        permissions: ref.permissions,
-        prebuiltVariants: pkg.prebuiltVariants
-      });
+  if (!options) options = {}
 
-      lockfile[pattern] = obj;
+  // shortcut: comments match nothing.
+  if (!options.nocomment && pattern.charAt(0) === '#') {
+    return false
+  }
 
-      if (remoteKey) {
-        seen.set(remoteKey, obj);
-      }
-    }
+  // "" only matches ""
+  if (pattern.trim() === '') return p === ''
 
-    return lockfile;
-  }
+  return new Minimatch(pattern, options).match(p)
 }
-exports.default = Lockfile;
 
-/***/ }),
-/* 15 */,
-/* 16 */,
-/* 17 */
-/***/ (function(module, exports) {
+function Minimatch (pattern, options) {
+  if (!(this instanceof Minimatch)) {
+    return new Minimatch(pattern, options)
+  }
 
-module.exports = __webpack_require__(137);
+  if (typeof pattern !== 'string') {
+    throw new TypeError('glob pattern string required')
+  }
 
-/***/ }),
-/* 18 */,
-/* 19 */,
-/* 20 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (!options) options = {}
+  pattern = pattern.trim()
 
-"use strict";
+  // windows support: need to use /, not \
+  if (path.sep !== '/') {
+    pattern = pattern.split(path.sep).join('/')
+  }
 
+  this.options = options
+  this.set = []
+  this.pattern = pattern
+  this.regexp = null
+  this.negate = false
+  this.comment = false
+  this.empty = false
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = nullify;
-function nullify(obj = {}) {
-  if (Array.isArray(obj)) {
-    for (var _iterator = obj, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref;
-
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref = _i.value;
-      }
-
-      const item = _ref;
-
-      nullify(item);
-    }
-  } else if (obj !== null && typeof obj === 'object' || typeof obj === 'function') {
-    Object.setPrototypeOf(obj, null);
-
-    // for..in can only be applied to 'object', not 'function'
-    if (typeof obj === 'object') {
-      for (const key in obj) {
-        nullify(obj[key]);
-      }
-    }
-  }
-
-  return obj;
+  // make the set of regexps etc.
+  this.make()
 }
 
-/***/ }),
-/* 21 */,
-/* 22 */
-/***/ (function(module, exports) {
-
-module.exports = __webpack_require__(139);
-
-/***/ }),
-/* 23 */
-/***/ (function(module, exports) {
-
-var core = module.exports = { version: '2.5.7' };
-if (typeof __e == 'number') __e = core; // eslint-disable-line no-undef
-
+Minimatch.prototype.debug = function () {}
 
-/***/ }),
-/* 24 */,
-/* 25 */,
-/* 26 */,
-/* 27 */
-/***/ (function(module, exports, __webpack_require__) {
+Minimatch.prototype.make = make
+function make () {
+  // don't do it more than once.
+  if (this._made) return
 
-var isObject = __webpack_require__(34);
-module.exports = function (it) {
-  if (!isObject(it)) throw TypeError(it + ' is not an object!');
-  return it;
-};
+  var pattern = this.pattern
+  var options = this.options
 
+  // empty patterns and comments match nothing.
+  if (!options.nocomment && pattern.charAt(0) === '#') {
+    this.comment = true
+    return
+  }
+  if (!pattern) {
+    this.empty = true
+    return
+  }
 
-/***/ }),
-/* 28 */,
-/* 29 */
-/***/ (function(module, exports, __webpack_require__) {
+  // step 1: figure out negation, etc.
+  this.parseNegate()
 
-"use strict";
+  // step 2: expand braces
+  var set = this.globSet = this.braceExpand()
 
+  if (options.debug) this.debug = console.error
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.normalizePattern = normalizePattern;
+  this.debug(this.pattern, set)
 
-/**
- * Explode and normalize a pattern into its name and range.
- */
+  // step 3: now we have a set, so turn each one into a series of path-portion
+  // matching patterns.
+  // These will be regexps, except in the case of "**", which is
+  // set to the GLOBSTAR object for globstar behavior,
+  // and will not contain any / characters
+  set = this.globParts = set.map(function (s) {
+    return s.split(slashSplit)
+  })
 
-function normalizePattern(pattern) {
-  let hasVersion = false;
-  let range = 'latest';
-  let name = pattern;
+  this.debug(this.pattern, set)
 
-  // if we're a scope then remove the @ and add it back later
-  let isScoped = false;
-  if (name[0] === '@') {
-    isScoped = true;
-    name = name.slice(1);
-  }
+  // glob --> regexps
+  set = set.map(function (s, si, set) {
+    return s.map(this.parse, this)
+  }, this)
 
-  // take first part as the name
-  const parts = name.split('@');
-  if (parts.length > 1) {
-    name = parts.shift();
-    range = parts.join('@');
+  this.debug(this.pattern, set)
 
-    if (range) {
-      hasVersion = true;
-    } else {
-      range = '*';
-    }
-  }
+  // filter out everything that didn't compile properly.
+  set = set.filter(function (s) {
+    return s.indexOf(false) === -1
+  })
 
-  // add back @ scope suffix
-  if (isScoped) {
-    name = `@${name}`;
-  }
+  this.debug(this.pattern, set)
 
-  return { name, range, hasVersion };
+  this.set = set
 }
 
-/***/ }),
-/* 30 */,
-/* 31 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var dP = __webpack_require__(50);
-var createDesc = __webpack_require__(106);
-module.exports = __webpack_require__(33) ? function (object, key, value) {
-  return dP.f(object, key, createDesc(1, value));
-} : function (object, key, value) {
-  object[key] = value;
-  return object;
-};
-
-
-/***/ }),
-/* 32 */
-/***/ (function(module, exports, __webpack_require__) {
+Minimatch.prototype.parseNegate = parseNegate
+function parseNegate () {
+  var pattern = this.pattern
+  var negate = false
+  var options = this.options
+  var negateOffset = 0
 
-/* eslint-disable node/no-deprecated-api */
-var buffer = __webpack_require__(63)
-var Buffer = buffer.Buffer
+  if (options.nonegate) return
 
-// alternative to using Object.keys for old browsers
-function copyProps (src, dst) {
-  for (var key in src) {
-    dst[key] = src[key]
+  for (var i = 0, l = pattern.length
+    ; i < l && pattern.charAt(i) === '!'
+    ; i++) {
+    negate = !negate
+    negateOffset++
   }
-}
-if (Buffer.from && Buffer.alloc && Buffer.allocUnsafe && Buffer.allocUnsafeSlow) {
-  module.exports = buffer
-} else {
-  // Copy properties from require('buffer')
-  copyProps(buffer, exports)
-  exports.Buffer = SafeBuffer
-}
 
-function SafeBuffer (arg, encodingOrOffset, length) {
-  return Buffer(arg, encodingOrOffset, length)
+  if (negateOffset) this.pattern = pattern.substr(negateOffset)
+  this.negate = negate
 }
 
-// Copy static methods from Buffer
-copyProps(Buffer, SafeBuffer)
-
-SafeBuffer.from = function (arg, encodingOrOffset, length) {
-  if (typeof arg === 'number') {
-    throw new TypeError('Argument must not be a number')
-  }
-  return Buffer(arg, encodingOrOffset, length)
+// Brace expansion:
+// a{b,c}d -> abd acd
+// a{b,}c -> abc ac
+// a{0..3}d -> a0d a1d a2d a3d
+// a{b,c{d,e}f}g -> abg acdfg acefg
+// a{b,c}d{e,f}g -> abdeg acdeg abdeg abdfg
+//
+// Invalid sets are not expanded.
+// a{2..}b -> a{2..}b
+// a{b}c -> a{b}c
+minimatch.braceExpand = function (pattern, options) {
+  return braceExpand(pattern, options)
 }
 
-SafeBuffer.alloc = function (size, fill, encoding) {
-  if (typeof size !== 'number') {
-    throw new TypeError('Argument must be a number')
-  }
-  var buf = Buffer(size)
-  if (fill !== undefined) {
-    if (typeof encoding === 'string') {
-      buf.fill(fill, encoding)
+Minimatch.prototype.braceExpand = braceExpand
+
+function braceExpand (pattern, options) {
+  if (!options) {
+    if (this instanceof Minimatch) {
+      options = this.options
     } else {
-      buf.fill(fill)
+      options = {}
     }
-  } else {
-    buf.fill(0)
   }
-  return buf
-}
 
-SafeBuffer.allocUnsafe = function (size) {
-  if (typeof size !== 'number') {
-    throw new TypeError('Argument must be a number')
-  }
-  return Buffer(size)
-}
+  pattern = typeof pattern === 'undefined'
+    ? this.pattern : pattern
 
-SafeBuffer.allocUnsafeSlow = function (size) {
-  if (typeof size !== 'number') {
-    throw new TypeError('Argument must be a number')
+  if (typeof pattern === 'undefined') {
+    throw new TypeError('undefined pattern')
   }
-  return buffer.SlowBuffer(size)
-}
 
+  if (options.nobrace ||
+    !pattern.match(/\{.*\}/)) {
+    // shortcut. no need to expand.
+    return [pattern]
+  }
 
-/***/ }),
-/* 33 */
-/***/ (function(module, exports, __webpack_require__) {
+  return expand(pattern)
+}
 
-// Thank's IE8 for his funny defineProperty
-module.exports = !__webpack_require__(85)(function () {
-  return Object.defineProperty({}, 'a', { get: function () { return 7; } }).a != 7;
-});
+// parse a component of the expanded set.
+// At this point, no pattern may contain "/" in it
+// so we're going to return a 2d array, where each entry is the full
+// pattern, split on '/', and then turned into a regular expression.
+// A regexp is made at the end which joins each array with an
+// escaped /, and another full one which joins each regexp with |.
+//
+// Following the lead of Bash 4.1, note that "**" only has special meaning
+// when it is the *only* thing in a path portion.  Otherwise, any series
+// of * is equivalent to a single *.  Globstar behavior is enabled by
+// default, and can be disabled by setting options.noglobstar.
+Minimatch.prototype.parse = parse
+var SUBPARSE = {}
+function parse (pattern, isSub) {
+  if (pattern.length > 1024 * 64) {
+    throw new TypeError('pattern is too long')
+  }
 
+  var options = this.options
 
-/***/ }),
-/* 34 */
-/***/ (function(module, exports) {
+  // shortcuts
+  if (!options.noglobstar && pattern === '**') return GLOBSTAR
+  if (pattern === '') return ''
 
-module.exports = function (it) {
-  return typeof it === 'object' ? it !== null : typeof it === 'function';
-};
+  var re = ''
+  var hasMagic = !!options.nocase
+  var escaping = false
+  // ? => one single character
+  var patternListStack = []
+  var negativeLists = []
+  var stateChar
+  var inClass = false
+  var reClassStart = -1
+  var classStart = -1
+  // . and .. never match anything that doesn't start with .,
+  // even when options.dot is set.
+  var patternStart = pattern.charAt(0) === '.' ? '' // anything
+  // not (start or / followed by . or .. followed by / or end)
+  : options.dot ? '(?!(?:^|\\\/)\\.{1,2}(?:$|\\\/))'
+  : '(?!\\.)'
+  var self = this
 
+  function clearStateChar () {
+    if (stateChar) {
+      // we had some state-tracking character
+      // that wasn't consumed by this pass.
+      switch (stateChar) {
+        case '*':
+          re += star
+          hasMagic = true
+        break
+        case '?':
+          re += qmark
+          hasMagic = true
+        break
+        default:
+          re += '\\' + stateChar
+        break
+      }
+      self.debug('clearStateChar %j %j', stateChar, re)
+      stateChar = false
+    }
+  }
 
-/***/ }),
-/* 35 */
-/***/ (function(module, exports) {
+  for (var i = 0, len = pattern.length, c
+    ; (i < len) && (c = pattern.charAt(i))
+    ; i++) {
+    this.debug('%s\t%s %s %j', pattern, i, re, c)
 
-module.exports = {};
+    // skip over any that are escaped.
+    if (escaping && reSpecials[c]) {
+      re += '\\' + c
+      escaping = false
+      continue
+    }
 
+    switch (c) {
+      case '/':
+        // completely not allowed, even escaped.
+        // Should already be path-split by now.
+        return false
 
-/***/ }),
-/* 36 */
-/***/ (function(module, exports) {
+      case '\\':
+        clearStateChar()
+        escaping = true
+      continue
 
-module.exports = __webpack_require__(120);
+      // the various stateChar values
+      // for the "extglob" stuff.
+      case '?':
+      case '*':
+      case '+':
+      case '@':
+      case '!':
+        this.debug('%s\t%s %s %j <-- stateChar', pattern, i, re, c)
 
-/***/ }),
-/* 37 */,
-/* 38 */,
-/* 39 */,
-/* 40 */
-/***/ (function(module, exports, __webpack_require__) {
+        // all of those are literals inside a class, except that
+        // the glob [!a] means [^a] in regexp
+        if (inClass) {
+          this.debug('  in class')
+          if (c === '!' && i === classStart + 1) c = '^'
+          re += c
+          continue
+        }
 
-"use strict";
+        // if we already have a stateChar, then it means
+        // that there was something like ** or +? in there.
+        // Handle the stateChar, then proceed with this one.
+        self.debug('call clearStateChar %j', stateChar)
+        clearStateChar()
+        stateChar = c
+        // if extglob is disabled, then +(asdf|foo) isn't a thing.
+        // just clear the statechar *now*, rather than even diving into
+        // the patternList stuff.
+        if (options.noext) clearStateChar()
+      continue
 
+      case '(':
+        if (inClass) {
+          re += '('
+          continue
+        }
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.wait = wait;
-exports.promisify = promisify;
-exports.queue = queue;
-function wait(delay) {
-  return new Promise(resolve => {
-    setTimeout(resolve, delay);
-  });
-}
+        if (!stateChar) {
+          re += '\\('
+          continue
+        }
 
-function promisify(fn, firstData) {
-  return function (...args) {
-    return new Promise(function (resolve, reject) {
-      args.push(function (err, ...result) {
-        let res = result;
+        patternListStack.push({
+          type: stateChar,
+          start: i - 1,
+          reStart: re.length,
+          open: plTypes[stateChar].open,
+          close: plTypes[stateChar].close
+        })
+        // negation is (?:(?!js)[^/]*)
+        re += stateChar === '!' ? '(?:(?!(?:' : '(?:'
+        this.debug('plType %j %j', stateChar, re)
+        stateChar = false
+      continue
 
-        if (result.length <= 1) {
-          res = result[0];
+      case ')':
+        if (inClass || !patternListStack.length) {
+          re += '\\)'
+          continue
         }
 
-        if (firstData) {
-          res = err;
-          err = null;
+        clearStateChar()
+        hasMagic = true
+        var pl = patternListStack.pop()
+        // negation is (?:(?!js)[^/]*)
+        // The others are (?:<pattern>)<type>
+        re += pl.close
+        if (pl.type === '!') {
+          negativeLists.push(pl)
         }
+        pl.reEnd = re.length
+      continue
 
-        if (err) {
-          reject(err);
-        } else {
-          resolve(res);
+      case '|':
+        if (inClass || !patternListStack.length || escaping) {
+          re += '\\|'
+          escaping = false
+          continue
         }
-      });
-
-      fn.apply(null, args);
-    });
-  };
-}
-
-function queue(arr, promiseProducer, concurrency = Infinity) {
-  concurrency = Math.min(concurrency, arr.length);
 
-  // clone
-  arr = arr.slice();
+        clearStateChar()
+        re += '|'
+      continue
 
-  const results = [];
-  let total = arr.length;
-  if (!total) {
-    return Promise.resolve(results);
-  }
+      // these are mostly the same in regexp and glob
+      case '[':
+        // swallow any state-tracking char before the [
+        clearStateChar()
 
-  return new Promise((resolve, reject) => {
-    for (let i = 0; i < concurrency; i++) {
-      next();
-    }
+        if (inClass) {
+          re += '\\' + c
+          continue
+        }
 
-    function next() {
-      const item = arr.shift();
-      const promise = promiseProducer(item);
+        inClass = true
+        classStart = i
+        reClassStart = re.length
+        re += c
+      continue
 
-      promise.then(function (result) {
-        results.push(result);
+      case ']':
+        //  a right bracket shall lose its special
+        //  meaning and represent itself in
+        //  a bracket expression if it occurs
+        //  first in the list.  -- POSIX.2 2.8.3.2
+        if (i === classStart + 1 || !inClass) {
+          re += '\\' + c
+          escaping = false
+          continue
+        }
 
-        total--;
-        if (total === 0) {
-          resolve(results);
-        } else {
-          if (arr.length) {
-            next();
+        // handle the case where we left a class open.
+        // "[z-a]" is valid, equivalent to "\[z-a\]"
+        if (inClass) {
+          // split where the last [ was, make sure we don't have
+          // an invalid re. if so, re-walk the contents of the
+          // would-be class to re-translate any characters that
+          // were passed through as-is
+          // TODO: It would probably be faster to determine this
+          // without a try/catch and a new RegExp, but it's tricky
+          // to do safely.  For now, this is safe and works.
+          var cs = pattern.substring(classStart + 1, i)
+          try {
+            RegExp('[' + cs + ']')
+          } catch (er) {
+            // not a valid class!
+            var sp = this.parse(cs, SUBPARSE)
+            re = re.substr(0, reClassStart) + '\\[' + sp[0] + '\\]'
+            hasMagic = hasMagic || sp[1]
+            inClass = false
+            continue
           }
         }
-      }, reject);
-    }
-  });
-}
 
-/***/ }),
-/* 41 */
-/***/ (function(module, exports, __webpack_require__) {
+        // finish up the class.
+        hasMagic = true
+        inClass = false
+        re += c
+      continue
 
-var global = __webpack_require__(11);
-var core = __webpack_require__(23);
-var ctx = __webpack_require__(48);
-var hide = __webpack_require__(31);
-var has = __webpack_require__(49);
-var PROTOTYPE = 'prototype';
+      default:
+        // swallow any state char that wasn't consumed
+        clearStateChar()
 
-var $export = function (type, name, source) {
-  var IS_FORCED = type & $export.F;
-  var IS_GLOBAL = type & $export.G;
-  var IS_STATIC = type & $export.S;
-  var IS_PROTO = type & $export.P;
-  var IS_BIND = type & $export.B;
-  var IS_WRAP = type & $export.W;
-  var exports = IS_GLOBAL ? core : core[name] || (core[name] = {});
-  var expProto = exports[PROTOTYPE];
-  var target = IS_GLOBAL ? global : IS_STATIC ? global[name] : (global[name] || {})[PROTOTYPE];
-  var key, own, out;
-  if (IS_GLOBAL) source = name;
-  for (key in source) {
-    // contains in native
-    own = !IS_FORCED && target && target[key] !== undefined;
-    if (own && has(exports, key)) continue;
-    // export native or passed
-    out = own ? target[key] : source[key];
-    // prevent global pollution for namespaces
-    exports[key] = IS_GLOBAL && typeof target[key] != 'function' ? source[key]
-    // bind timers to global for call from export context
-    : IS_BIND && own ? ctx(out, global)
-    // wrap global constructors for prevent change them in library
-    : IS_WRAP && target[key] == out ? (function (C) {
-      var F = function (a, b, c) {
-        if (this instanceof C) {
-          switch (arguments.length) {
-            case 0: return new C();
-            case 1: return new C(a);
-            case 2: return new C(a, b);
-          } return new C(a, b, c);
-        } return C.apply(this, arguments);
-      };
-      F[PROTOTYPE] = C[PROTOTYPE];
-      return F;
-    // make static versions for prototype methods
-    })(out) : IS_PROTO && typeof out == 'function' ? ctx(Function.call, out) : out;
-    // export proto methods to core.%CONSTRUCTOR%.methods.%NAME%
-    if (IS_PROTO) {
-      (exports.virtual || (exports.virtual = {}))[key] = out;
-      // export proto methods to core.%CONSTRUCTOR%.prototype.%NAME%
-      if (type & $export.R && expProto && !expProto[key]) hide(expProto, key, out);
-    }
-  }
-};
-// type bitmap
-$export.F = 1;   // forced
-$export.G = 2;   // global
-$export.S = 4;   // static
-$export.P = 8;   // proto
-$export.B = 16;  // bind
-$export.W = 32;  // wrap
-$export.U = 64;  // safe
-$export.R = 128; // real proto method for `library`
-module.exports = $export;
+        if (escaping) {
+          // no need
+          escaping = false
+        } else if (reSpecials[c]
+          && !(c === '^' && inClass)) {
+          re += '\\'
+        }
 
+        re += c
 
-/***/ }),
-/* 42 */
-/***/ (function(module, exports, __webpack_require__) {
+    } // switch
+  } // for
 
-try {
-  var util = __webpack_require__(2);
-  if (typeof util.inherits !== 'function') throw '';
-  module.exports = util.inherits;
-} catch (e) {
-  module.exports = __webpack_require__(224);
-}
+  // handle the case where we left a class open.
+  // "[abc" is valid, equivalent to "\[abc"
+  if (inClass) {
+    // split where the last [ was, and escape it
+    // this is a huge pita.  We now have to re-walk
+    // the contents of the would-be class to re-translate
+    // any characters that were passed through as-is
+    cs = pattern.substr(classStart + 1)
+    sp = this.parse(cs, SUBPARSE)
+    re = re.substr(0, reClassStart) + '\\[' + sp[0]
+    hasMagic = hasMagic || sp[1]
+  }
 
+  // handle the case where we had a +( thing at the *end*
+  // of the pattern.
+  // each pattern list stack adds 3 chars, and we need to go through
+  // and escape any | chars that were passed through as-is for the regexp.
+  // Go through and escape them, taking care not to double-escape any
+  // | chars that were already escaped.
+  for (pl = patternListStack.pop(); pl; pl = patternListStack.pop()) {
+    var tail = re.slice(pl.reStart + pl.open.length)
+    this.debug('setting tail', re, pl)
+    // maybe some even number of \, then maybe 1 \, followed by a |
+    tail = tail.replace(/((?:\\{2}){0,64})(\\?)\|/g, function (_, $1, $2) {
+      if (!$2) {
+        // the | isn't already escaped, so escape it.
+        $2 = '\\'
+      }
 
-/***/ }),
-/* 43 */,
-/* 44 */,
-/* 45 */
-/***/ (function(module, exports, __webpack_require__) {
+      // need to escape all those slashes *again*, without escaping the
+      // one that we need for escaping the | character.  As it works out,
+      // escaping an even number of slashes can be done by simply repeating
+      // it exactly after itself.  That's why this trick works.
+      //
+      // I am sorry that you have to see this.
+      return $1 + $1 + $2 + '|'
+    })
 
-"use strict";
+    this.debug('tail=%j\n   %s', tail, tail, pl, re)
+    var t = pl.type === '*' ? star
+      : pl.type === '?' ? qmark
+      : '\\' + pl.type
 
+    hasMagic = true
+    re = re.slice(0, pl.reStart) + t + '\\(' + tail
+  }
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.home = undefined;
+  // handle trailing things that only matter at the very end.
+  clearStateChar()
+  if (escaping) {
+    // trailing \\
+    re += '\\\\'
+  }
 
-var _rootUser;
+  // only need to apply the nodot start if the re starts with
+  // something that could conceivably capture a dot
+  var addPatternStart = false
+  switch (re.charAt(0)) {
+    case '.':
+    case '[':
+    case '(': addPatternStart = true
+  }
 
-function _load_rootUser() {
-  return _rootUser = _interopRequireDefault(__webpack_require__(169));
-}
+  // Hack to work around lack of negative lookbehind in JS
+  // A pattern like: *.!(x).!(y|z) needs to ensure that a name
+  // like 'a.xyz.yz' doesn't match.  So, the first negative
+  // lookahead, has to look ALL the way ahead, to the end of
+  // the pattern.
+  for (var n = negativeLists.length - 1; n > -1; n--) {
+    var nl = negativeLists[n]
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+    var nlBefore = re.slice(0, nl.reStart)
+    var nlFirst = re.slice(nl.reStart, nl.reEnd - 8)
+    var nlLast = re.slice(nl.reEnd - 8, nl.reEnd)
+    var nlAfter = re.slice(nl.reEnd)
 
-const path = __webpack_require__(0);
+    nlLast += nlAfter
 
-const home = exports.home = __webpack_require__(36).homedir();
+    // Handle nested stuff like *(*.js|!(*.json)), where open parens
+    // mean that we should *not* include the ) in the bit that is considered
+    // "after" the negated section.
+    var openParensBefore = nlBefore.split('(').length - 1
+    var cleanAfter = nlAfter
+    for (i = 0; i < openParensBefore; i++) {
+      cleanAfter = cleanAfter.replace(/\)[+*?]?/, '')
+    }
+    nlAfter = cleanAfter
 
-const userHomeDir = (_rootUser || _load_rootUser()).default ? path.resolve('/usr/local/share') : home;
+    var dollar = ''
+    if (nlAfter === '' && isSub !== SUBPARSE) {
+      dollar = '$'
+    }
+    var newRe = nlBefore + nlFirst + nlAfter + dollar + nlLast
+    re = newRe
+  }
 
-exports.default = userHomeDir;
+  // if the re is not "" at this point, then we need to make sure
+  // it doesn't match against an empty path part.
+  // Otherwise a/* will match a/, which it should not.
+  if (re !== '' && hasMagic) {
+    re = '(?=.)' + re
+  }
 
-/***/ }),
-/* 46 */
-/***/ (function(module, exports) {
+  if (addPatternStart) {
+    re = patternStart + re
+  }
 
-module.exports = function (it) {
-  if (typeof it != 'function') throw TypeError(it + ' is not a function!');
-  return it;
-};
+  // parsing just a piece of a larger pattern.
+  if (isSub === SUBPARSE) {
+    return [re, hasMagic]
+  }
 
+  // skip the regexp for non-magical patterns
+  // unescape anything in it, though, so that it'll be
+  // an exact match against a file etc.
+  if (!hasMagic) {
+    return globUnescape(pattern)
+  }
 
-/***/ }),
-/* 47 */
-/***/ (function(module, exports) {
+  var flags = options.nocase ? 'i' : ''
+  try {
+    var regExp = new RegExp('^' + re + '$', flags)
+  } catch (er) {
+    // If it was an invalid regular expression, then it can't match
+    // anything.  This trick looks for a character after the end of
+    // the string, which is of course impossible, except in multi-line
+    // mode, but it's not a /m regex.
+    return new RegExp('$.')
+  }
 
-var toString = {}.toString;
+  regExp._glob = pattern
+  regExp._src = re
 
-module.exports = function (it) {
-  return toString.call(it).slice(8, -1);
-};
+  return regExp
+}
 
+minimatch.makeRe = function (pattern, options) {
+  return new Minimatch(pattern, options || {}).makeRe()
+}
 
-/***/ }),
-/* 48 */
-/***/ (function(module, exports, __webpack_require__) {
+Minimatch.prototype.makeRe = makeRe
+function makeRe () {
+  if (this.regexp || this.regexp === false) return this.regexp
 
-// optional / simple context binding
-var aFunction = __webpack_require__(46);
-module.exports = function (fn, that, length) {
-  aFunction(fn);
-  if (that === undefined) return fn;
-  switch (length) {
-    case 1: return function (a) {
-      return fn.call(that, a);
-    };
-    case 2: return function (a, b) {
-      return fn.call(that, a, b);
-    };
-    case 3: return function (a, b, c) {
-      return fn.call(that, a, b, c);
-    };
+  // at this point, this.set is a 2d array of partial
+  // pattern strings, or "**".
+  //
+  // It's better to use .match().  This function shouldn't
+  // be used, really, but it's pretty convenient sometimes,
+  // when you just want to work with a regex.
+  var set = this.set
+
+  if (!set.length) {
+    this.regexp = false
+    return this.regexp
   }
-  return function (/* ...args */) {
-    return fn.apply(that, arguments);
-  };
-};
+  var options = this.options
 
+  var twoStar = options.noglobstar ? star
+    : options.dot ? twoStarDot
+    : twoStarNoDot
+  var flags = options.nocase ? 'i' : ''
 
-/***/ }),
-/* 49 */
-/***/ (function(module, exports) {
+  var re = set.map(function (pattern) {
+    return pattern.map(function (p) {
+      return (p === GLOBSTAR) ? twoStar
+      : (typeof p === 'string') ? regExpEscape(p)
+      : p._src
+    }).join('\\\/')
+  }).join('|')
 
-var hasOwnProperty = {}.hasOwnProperty;
-module.exports = function (it, key) {
-  return hasOwnProperty.call(it, key);
-};
+  // must match entire pattern
+  // ending in a * or ** will make it less strict.
+  re = '^(?:' + re + ')$'
 
+  // can match anything, as long as it's not this.
+  if (this.negate) re = '^(?!' + re + ').*$'
 
-/***/ }),
-/* 50 */
-/***/ (function(module, exports, __webpack_require__) {
+  try {
+    this.regexp = new RegExp(re, flags)
+  } catch (ex) {
+    this.regexp = false
+  }
+  return this.regexp
+}
 
-var anObject = __webpack_require__(27);
-var IE8_DOM_DEFINE = __webpack_require__(184);
-var toPrimitive = __webpack_require__(201);
-var dP = Object.defineProperty;
+minimatch.match = function (list, pattern, options) {
+  options = options || {}
+  var mm = new Minimatch(pattern, options)
+  list = list.filter(function (f) {
+    return mm.match(f)
+  })
+  if (mm.options.nonull && !list.length) {
+    list.push(pattern)
+  }
+  return list
+}
 
-exports.f = __webpack_require__(33) ? Object.defineProperty : function defineProperty(O, P, Attributes) {
-  anObject(O);
-  P = toPrimitive(P, true);
-  anObject(Attributes);
-  if (IE8_DOM_DEFINE) try {
-    return dP(O, P, Attributes);
-  } catch (e) { /* empty */ }
-  if ('get' in Attributes || 'set' in Attributes) throw TypeError('Accessors not supported!');
-  if ('value' in Attributes) O[P] = Attributes.value;
-  return O;
-};
+Minimatch.prototype.match = match
+function match (f, partial) {
+  this.debug('match', f, this.pattern)
+  // short-circuit in the case of busted things.
+  // comments, etc.
+  if (this.comment) return false
+  if (this.empty) return f === ''
 
+  if (f === '/' && partial) return true
 
-/***/ }),
-/* 51 */,
-/* 52 */,
-/* 53 */,
-/* 54 */
-/***/ (function(module, exports) {
+  var options = this.options
 
-module.exports = __webpack_require__(155);
+  // windows: need to use /, not \
+  if (path.sep !== '/') {
+    f = f.split(path.sep).join('/')
+  }
 
-/***/ }),
-/* 55 */
-/***/ (function(module, exports, __webpack_require__) {
+  // treat the test path as a set of pathparts.
+  f = f.split(slashSplit)
+  this.debug(this.pattern, 'split', f)
 
-"use strict";
+  // just ONE of the pattern sets in this.set needs to match
+  // in order for it to be valid.  If negating, then just one
+  // match means that we have failed.
+  // Either way, return on the first hit.
 
+  var set = this.set
+  this.debug(this.pattern, 'set', set)
 
-const Buffer = __webpack_require__(32).Buffer
+  // Find the basename of the path by looking for the last non-empty segment
+  var filename
+  var i
+  for (i = f.length - 1; i >= 0; i--) {
+    filename = f[i]
+    if (filename) break
+  }
 
-const crypto = __webpack_require__(9)
-const Transform = __webpack_require__(17).Transform
+  for (i = 0; i < set.length; i++) {
+    var pattern = set[i]
+    var file = f
+    if (options.matchBase && pattern.length === 1) {
+      file = [filename]
+    }
+    var hit = this.matchOne(file, pattern, partial)
+    if (hit) {
+      if (options.flipNegate) return true
+      return !this.negate
+    }
+  }
 
-const SPEC_ALGORITHMS = ['sha256', 'sha384', 'sha512']
+  // didn't get any hits.  this is success if it's a negative
+  // pattern, failure otherwise.
+  if (options.flipNegate) return false
+  return this.negate
+}
 
-const BASE64_REGEX = /^[a-z0-9+/]+(?:=?=?)$/i
-const SRI_REGEX = /^([^-]+)-([^?]+)([?\S*]*)$/
-const STRICT_SRI_REGEX = /^([^-]+)-([A-Za-z0-9+/=]{44,88})(\?[\x21-\x7E]*)*$/
-const VCHAR_REGEX = /^[\x21-\x7E]+$/
+// set partial to true to test if, for example,
+// "/a/b" matches the start of "/*/b/*/d"
+// Partial means, if you run out of file before you run
+// out of pattern, then that's fine, as long as all
+// the parts match.
+Minimatch.prototype.matchOne = function (file, pattern, partial) {
+  var options = this.options
 
-class Hash {
-  get isHash () { return true }
-  constructor (hash, opts) {
-    const strict = !!(opts && opts.strict)
-    this.source = hash.trim()
-    // 3.1. Integrity metadata (called "Hash" by ssri)
-    // https://w3c.github.io/webappsec-subresource-integrity/#integrity-metadata-description
-    const match = this.source.match(
-      strict
-      ? STRICT_SRI_REGEX
-      : SRI_REGEX
-    )
-    if (!match) { return }
-    if (strict && !SPEC_ALGORITHMS.some(a => a === match[1])) { return }
-    this.algorithm = match[1]
-    this.digest = match[2]
+  this.debug('matchOne',
+    { 'this': this, file: file, pattern: pattern })
 
-    const rawOpts = match[3]
-    this.options = rawOpts ? rawOpts.slice(1).split('?') : []
-  }
-  hexDigest () {
-    return this.digest && Buffer.from(this.digest, 'base64').toString('hex')
-  }
-  toJSON () {
-    return this.toString()
-  }
-  toString (opts) {
-    if (opts && opts.strict) {
-      // Strict mode enforces the standard as close to the foot of the
-      // letter as it can.
-      if (!(
-        // The spec has very restricted productions for algorithms.
-        // https://www.w3.org/TR/CSP2/#source-list-syntax
-        SPEC_ALGORITHMS.some(x => x === this.algorithm) &&
-        // Usually, if someone insists on using a "different" base64, we
-        // leave it as-is, since there's multiple standards, and the
-        // specified is not a URL-safe variant.
-        // https://www.w3.org/TR/CSP2/#base64_value
-        this.digest.match(BASE64_REGEX) &&
-        // Option syntax is strictly visual chars.
-        // https://w3c.github.io/webappsec-subresource-integrity/#grammardef-option-expression
-        // https://tools.ietf.org/html/rfc5234#appendix-B.1
-        (this.options || []).every(opt => opt.match(VCHAR_REGEX))
-      )) {
-        return ''
-      }
-    }
-    const options = this.options && this.options.length
-    ? `?${this.options.join('?')}`
-    : ''
-    return `${this.algorithm}-${this.digest}${options}`
-  }
-}
+  this.debug('matchOne', file.length, pattern.length)
 
-class Integrity {
-  get isIntegrity () { return true }
-  toJSON () {
-    return this.toString()
-  }
-  toString (opts) {
-    opts = opts || {}
-    let sep = opts.sep || ' '
-    if (opts.strict) {
-      // Entries must be separated by whitespace, according to spec.
-      sep = sep.replace(/\S+/g, ' ')
-    }
-    return Object.keys(this).map(k => {
-      return this[k].map(hash => {
-        return Hash.prototype.toString.call(hash, opts)
-      }).filter(x => x.length).join(sep)
-    }).filter(x => x.length).join(sep)
-  }
-  concat (integrity, opts) {
-    const other = typeof integrity === 'string'
-    ? integrity
-    : stringify(integrity, opts)
-    return parse(`${this.toString(opts)} ${other}`, opts)
-  }
-  hexDigest () {
-    return parse(this, {single: true}).hexDigest()
-  }
-  match (integrity, opts) {
-    const other = parse(integrity, opts)
-    const algo = other.pickAlgorithm(opts)
-    return (
-      this[algo] &&
-      other[algo] &&
-      this[algo].find(hash =>
-        other[algo].find(otherhash =>
-          hash.digest === otherhash.digest
-        )
-      )
-    ) || false
-  }
-  pickAlgorithm (opts) {
-    const pickAlgorithm = (opts && opts.pickAlgorithm) || getPrioritizedHash
-    const keys = Object.keys(this)
-    if (!keys.length) {
-      throw new Error(`No algorithms available for ${
-        JSON.stringify(this.toString())
-      }`)
-    }
-    return keys.reduce((acc, algo) => {
-      return pickAlgorithm(acc, algo) || acc
-    })
-  }
-}
+  for (var fi = 0,
+      pi = 0,
+      fl = file.length,
+      pl = pattern.length
+      ; (fi < fl) && (pi < pl)
+      ; fi++, pi++) {
+    this.debug('matchOne loop')
+    var p = pattern[pi]
+    var f = file[fi]
 
-module.exports.parse = parse
-function parse (sri, opts) {
-  opts = opts || {}
-  if (typeof sri === 'string') {
-    return _parse(sri, opts)
-  } else if (sri.algorithm && sri.digest) {
-    const fullSri = new Integrity()
-    fullSri[sri.algorithm] = [sri]
-    return _parse(stringify(fullSri, opts), opts)
-  } else {
-    return _parse(stringify(sri, opts), opts)
-  }
-}
+    this.debug(pattern, p, f)
 
-function _parse (integrity, opts) {
-  // 3.4.3. Parse metadata
-  // https://w3c.github.io/webappsec-subresource-integrity/#parse-metadata
-  if (opts.single) {
-    return new Hash(integrity, opts)
-  }
-  return integrity.trim().split(/\s+/).reduce((acc, string) => {
-    const hash = new Hash(string, opts)
-    if (hash.algorithm && hash.digest) {
-      const algo = hash.algorithm
-      if (!acc[algo]) { acc[algo] = [] }
-      acc[algo].push(hash)
-    }
-    return acc
-  }, new Integrity())
-}
+    // should be impossible.
+    // some invalid regexp stuff in the set.
+    if (p === false) return false
 
-module.exports.stringify = stringify
-function stringify (obj, opts) {
-  if (obj.algorithm && obj.digest) {
-    return Hash.prototype.toString.call(obj, opts)
-  } else if (typeof obj === 'string') {
-    return stringify(parse(obj, opts), opts)
-  } else {
-    return Integrity.prototype.toString.call(obj, opts)
-  }
-}
+    if (p === GLOBSTAR) {
+      this.debug('GLOBSTAR', [pattern, p, f])
 
-module.exports.fromHex = fromHex
-function fromHex (hexDigest, algorithm, opts) {
-  const optString = (opts && opts.options && opts.options.length)
-  ? `?${opts.options.join('?')}`
-  : ''
-  return parse(
-    `${algorithm}-${
-      Buffer.from(hexDigest, 'hex').toString('base64')
-    }${optString}`, opts
-  )
-}
+      // "**"
+      // a/**/b/**/c would match the following:
+      // a/b/x/y/z/c
+      // a/x/y/z/b/c
+      // a/b/x/b/x/c
+      // a/b/c
+      // To do this, take the rest of the pattern after
+      // the **, and see if it would match the file remainder.
+      // If so, return success.
+      // If not, the ** "swallows" a segment, and try again.
+      // This is recursively awful.
+      //
+      // a/**/b/**/c matching a/b/x/y/z/c
+      // - a matches a
+      // - doublestar
+      //   - matchOne(b/x/y/z/c, b/**/c)
+      //     - b matches b
+      //     - doublestar
+      //       - matchOne(x/y/z/c, c) -> no
+      //       - matchOne(y/z/c, c) -> no
+      //       - matchOne(z/c, c) -> no
+      //       - matchOne(c, c) yes, hit
+      var fr = fi
+      var pr = pi + 1
+      if (pr === pl) {
+        this.debug('** at the end')
+        // a ** at the end will just swallow the rest.
+        // We have found a match.
+        // however, it will not swallow /.x, unless
+        // options.dot is set.
+        // . and .. are *never* matched by **, for explosively
+        // exponential reasons.
+        for (; fi < fl; fi++) {
+          if (file[fi] === '.' || file[fi] === '..' ||
+            (!options.dot && file[fi].charAt(0) === '.')) return false
+        }
+        return true
+      }
 
-module.exports.fromData = fromData
-function fromData (data, opts) {
-  opts = opts || {}
-  const algorithms = opts.algorithms || ['sha512']
-  const optString = opts.options && opts.options.length
-  ? `?${opts.options.join('?')}`
-  : ''
-  return algorithms.reduce((acc, algo) => {
-    const digest = crypto.createHash(algo).update(data).digest('base64')
-    const hash = new Hash(
-      `${algo}-${digest}${optString}`,
-       opts
-    )
-    if (hash.algorithm && hash.digest) {
-      const algo = hash.algorithm
-      if (!acc[algo]) { acc[algo] = [] }
-      acc[algo].push(hash)
-    }
-    return acc
-  }, new Integrity())
-}
+      // ok, let's see if we can swallow whatever we can.
+      while (fr < fl) {
+        var swallowee = file[fr]
 
-module.exports.fromStream = fromStream
-function fromStream (stream, opts) {
-  opts = opts || {}
-  const P = opts.Promise || Promise
-  const istream = integrityStream(opts)
-  return new P((resolve, reject) => {
-    stream.pipe(istream)
-    stream.on('error', reject)
-    istream.on('error', reject)
-    let sri
-    istream.on('integrity', s => { sri = s })
-    istream.on('end', () => resolve(sri))
-    istream.on('data', () => {})
-  })
-}
+        this.debug('\nglobstar while', file, fr, pattern, pr, swallowee)
 
-module.exports.checkData = checkData
-function checkData (data, sri, opts) {
-  opts = opts || {}
-  sri = parse(sri, opts)
-  if (!Object.keys(sri).length) {
-    if (opts.error) {
-      throw Object.assign(
-        new Error('No valid integrity hashes to check against'), {
-          code: 'EINTEGRITY'
+        // XXX remove this slice.  Just pass the start index.
+        if (this.matchOne(file.slice(fr), pattern.slice(pr), partial)) {
+          this.debug('globstar found match!', fr, fl, swallowee)
+          // found a match.
+          return true
+        } else {
+          // can't swallow "." or ".." ever.
+          // can only swallow ".foo" when explicitly asked.
+          if (swallowee === '.' || swallowee === '..' ||
+            (!options.dot && swallowee.charAt(0) === '.')) {
+            this.debug('dot detected!', file, fr, pattern, pr)
+            break
+          }
+
+          // ** swallows a segment, and continue.
+          this.debug('globstar swallow a segment, and continue')
+          fr++
         }
-      )
-    } else {
+      }
+
+      // no match was found.
+      // However, in partial mode, we can't say this is necessarily over.
+      // If there's more *pattern* left, then
+      if (partial) {
+        // ran out of file
+        this.debug('\n>>> no match, partial?', file, fr, pattern, pr)
+        if (fr === fl) return true
+      }
       return false
     }
+
+    // something other than **
+    // non-magic patterns just have to match exactly
+    // patterns with magic have been turned into regexps.
+    var hit
+    if (typeof p === 'string') {
+      if (options.nocase) {
+        hit = f.toLowerCase() === p.toLowerCase()
+      } else {
+        hit = f === p
+      }
+      this.debug('string match', p, f, hit)
+    } else {
+      hit = f.match(p)
+      this.debug('pattern match', p, f, hit)
+    }
+
+    if (!hit) return false
   }
-  const algorithm = sri.pickAlgorithm(opts)
-  const digest = crypto.createHash(algorithm).update(data).digest('base64')
-  const newSri = parse({algorithm, digest})
-  const match = newSri.match(sri, opts)
-  if (match || !opts.error) {
-    return match
-  } else if (typeof opts.size === 'number' && (data.length !== opts.size)) {
-    const err = new Error(`data size mismatch when checking ${sri}.\n  Wanted: ${opts.size}\n  Found: ${data.length}`)
-    err.code = 'EBADSIZE'
-    err.found = data.length
-    err.expected = opts.size
-    err.sri = sri
-    throw err
-  } else {
-    const err = new Error(`Integrity checksum failed when using ${algorithm}: Wanted ${sri}, but got ${newSri}. (${data.length} bytes)`)
-    err.code = 'EINTEGRITY'
-    err.found = newSri
-    err.expected = sri
-    err.algorithm = algorithm
-    err.sri = sri
-    throw err
+
+  // Note: ending in / means that we'll get a final ""
+  // at the end of the pattern.  This can only match a
+  // corresponding "" at the end of the file.
+  // If the file ends in /, then it can only match a
+  // a pattern that ends in /, unless the pattern just
+  // doesn't have any more for it. But, a/b/ should *not*
+  // match "a/b/*", even though "" matches against the
+  // [^/]*? pattern, except in partial mode, where it might
+  // simply not be reached yet.
+  // However, a/b/ should still satisfy a/*
+
+  // now either we fell off the end of the pattern, or we're done.
+  if (fi === fl && pi === pl) {
+    // ran out of pattern and filename at the same time.
+    // an exact hit!
+    return true
+  } else if (fi === fl) {
+    // ran out of file, but still had pattern left.
+    // this is ok if we're doing the match as part of
+    // a glob fs traversal.
+    return partial
+  } else if (pi === pl) {
+    // ran out of pattern, still have file left.
+    // this is only acceptable if we're on the very last
+    // empty segment of a file with a trailing slash.
+    // a/* should match a/b/
+    var emptyFileEnd = (fi === fl - 1) && (file[fi] === '')
+    return emptyFileEnd
   }
+
+  // should be unreachable.
+  throw new Error('wtf?')
 }
 
-module.exports.checkStream = checkStream
-function checkStream (stream, sri, opts) {
-  opts = opts || {}
-  const P = opts.Promise || Promise
-  const checker = integrityStream(Object.assign({}, opts, {
-    integrity: sri
-  }))
-  return new P((resolve, reject) => {
-    stream.pipe(checker)
-    stream.on('error', reject)
-    checker.on('error', reject)
-    let sri
-    checker.on('verified', s => { sri = s })
-    checker.on('end', () => resolve(sri))
-    checker.on('data', () => {})
-  })
+// replace stuff like \* with *
+function globUnescape (s) {
+  return s.replace(/\\(.)/g, '$1')
 }
 
-module.exports.integrityStream = integrityStream
-function integrityStream (opts) {
-  opts = opts || {}
-  // For verification
-  const sri = opts.integrity && parse(opts.integrity, opts)
-  const goodSri = sri && Object.keys(sri).length
-  const algorithm = goodSri && sri.pickAlgorithm(opts)
-  const digests = goodSri && sri[algorithm]
-  // Calculating stream
-  const algorithms = Array.from(
-    new Set(
-      (opts.algorithms || ['sha512'])
-      .concat(algorithm ? [algorithm] : [])
-    )
-  )
-  const hashes = algorithms.map(crypto.createHash)
-  let streamSize = 0
-  const stream = new Transform({
-    transform (chunk, enc, cb) {
-      streamSize += chunk.length
-      hashes.forEach(h => h.update(chunk, enc))
-      cb(null, chunk, enc)
-    }
-  }).on('end', () => {
-    const optString = (opts.options && opts.options.length)
-    ? `?${opts.options.join('?')}`
-    : ''
-    const newSri = parse(hashes.map((h, i) => {
-      return `${algorithms[i]}-${h.digest('base64')}${optString}`
-    }).join(' '), opts)
-    // Integrity verification mode
-    const match = goodSri && newSri.match(sri, opts)
-    if (typeof opts.size === 'number' && streamSize !== opts.size) {
-      const err = new Error(`stream size mismatch when checking ${sri}.\n  Wanted: ${opts.size}\n  Found: ${streamSize}`)
-      err.code = 'EBADSIZE'
-      err.found = streamSize
-      err.expected = opts.size
-      err.sri = sri
-      stream.emit('error', err)
-    } else if (opts.integrity && !match) {
-      const err = new Error(`${sri} integrity checksum failed when using ${algorithm}: wanted ${digests} but got ${newSri}. (${streamSize} bytes)`)
-      err.code = 'EINTEGRITY'
-      err.found = newSri
-      err.expected = digests
-      err.algorithm = algorithm
-      err.sri = sri
-      stream.emit('error', err)
-    } else {
-      stream.emit('size', streamSize)
-      stream.emit('integrity', newSri)
-      match && stream.emit('verified', match)
-    }
-  })
-  return stream
+function regExpEscape (s) {
+  return s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&')
 }
 
-module.exports.create = createIntegrity
-function createIntegrity (opts) {
-  opts = opts || {}
-  const algorithms = opts.algorithms || ['sha512']
-  const optString = opts.options && opts.options.length
-  ? `?${opts.options.join('?')}`
-  : ''
 
-  const hashes = algorithms.map(crypto.createHash)
+/***/ }),
+/* 61 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  return {
-    update: function (chunk, enc) {
-      hashes.forEach(h => h.update(chunk, enc))
-      return this
+var wrappy = __webpack_require__(123)
+module.exports = wrappy(once)
+module.exports.strict = wrappy(onceStrict)
+
+once.proto = once(function () {
+  Object.defineProperty(Function.prototype, 'once', {
+    value: function () {
+      return once(this)
     },
-    digest: function (enc) {
-      const integrity = algorithms.reduce((acc, algo) => {
-        const digest = hashes.shift().digest('base64')
-        const hash = new Hash(
-          `${algo}-${digest}${optString}`,
-          opts
-        )
-        if (hash.algorithm && hash.digest) {
-          const algo = hash.algorithm
-          if (!acc[algo]) { acc[algo] = [] }
-          acc[algo].push(hash)
-        }
-        return acc
-      }, new Integrity())
+    configurable: true
+  })
 
-      return integrity
-    }
+  Object.defineProperty(Function.prototype, 'onceStrict', {
+    value: function () {
+      return onceStrict(this)
+    },
+    configurable: true
+  })
+})
+
+function once (fn) {
+  var f = function () {
+    if (f.called) return f.value
+    f.called = true
+    return f.value = fn.apply(this, arguments)
   }
+  f.called = false
+  return f
 }
 
-const NODE_HASHES = new Set(crypto.getHashes())
+function onceStrict (fn) {
+  var f = function () {
+    if (f.called)
+      throw new Error(f.onceError)
+    f.called = true
+    return f.value = fn.apply(this, arguments)
+  }
+  var name = fn.name || 'Function wrapped with `once`'
+  f.onceError = name + " shouldn't be called more than once"
+  f.called = false
+  return f
+}
 
-// This is a Best Effort™ at a reasonable priority for hash algos
-const DEFAULT_PRIORITY = [
-  'md5', 'whirlpool', 'sha1', 'sha224', 'sha256', 'sha384', 'sha512',
-  // TODO - it's unclear _which_ of these Node will actually use as its name
-  //        for the algorithm, so we guesswork it based on the OpenSSL names.
-  'sha3',
-  'sha3-256', 'sha3-384', 'sha3-512',
-  'sha3_256', 'sha3_384', 'sha3_512'
-].filter(algo => NODE_HASHES.has(algo))
 
-function getPrioritizedHash (algo1, algo2) {
-  return DEFAULT_PRIORITY.indexOf(algo1.toLowerCase()) >= DEFAULT_PRIORITY.indexOf(algo2.toLowerCase())
-  ? algo1
-  : algo2
-}
+/***/ }),
+/* 62 */,
+/* 63 */
+/***/ (function(module, exports) {
 
+module.exports = __webpack_require__(285);
 
 /***/ }),
-/* 56 */,
-/* 57 */,
-/* 58 */,
-/* 59 */,
-/* 60 */
-/***/ (function(module, exports, __webpack_require__) {
+/* 64 */,
+/* 65 */,
+/* 66 */,
+/* 67 */
+/***/ (function(module, exports) {
 
-module.exports = minimatch
-minimatch.Minimatch = Minimatch
+// 7.2.1 RequireObjectCoercible(argument)
+module.exports = function (it) {
+  if (it == undefined) throw TypeError("Can't call method on  " + it);
+  return it;
+};
 
-var path = { sep: '/' }
-try {
-  path = __webpack_require__(0)
-} catch (er) {}
 
-var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}
-var expand = __webpack_require__(175)
+/***/ }),
+/* 68 */
+/***/ (function(module, exports, __webpack_require__) {
 
-var plTypes = {
-  '!': { open: '(?:(?!(?:', close: '))[^/]*?)'},
-  '?': { open: '(?:', close: ')?' },
-  '+': { open: '(?:', close: ')+' },
-  '*': { open: '(?:', close: ')*' },
-  '@': { open: '(?:', close: ')' }
-}
+var isObject = __webpack_require__(34);
+var document = __webpack_require__(11).document;
+// typeof document.createElement is 'object' in old IE
+var is = isObject(document) && isObject(document.createElement);
+module.exports = function (it) {
+  return is ? document.createElement(it) : {};
+};
 
-// any single thing other than /
-// don't need to escape / when using new RegExp()
-var qmark = '[^/]'
 
-// * => any number of characters
-var star = qmark + '*?'
+/***/ }),
+/* 69 */
+/***/ (function(module, exports) {
 
-// ** when dots are allowed.  Anything goes, except .. and .
-// not (^ or / followed by one or two dots followed by $ or /),
-// followed by anything, any number of times.
-var twoStarDot = '(?:(?!(?:\\\/|^)(?:\\.{1,2})($|\\\/)).)*?'
+module.exports = true;
 
-// not a ^ or / followed by a dot,
-// followed by anything, any number of times.
-var twoStarNoDot = '(?:(?!(?:\\\/|^)\\.).)*?'
 
-// characters that need to be escaped in RegExp.
-var reSpecials = charSet('().*{}+?[]^$\\!')
+/***/ }),
+/* 70 */
+/***/ (function(module, exports, __webpack_require__) {
 
-// "abc" -> { a:true, b:true, c:true }
-function charSet (s) {
-  return s.split('').reduce(function (set, c) {
-    set[c] = true
-    return set
-  }, {})
-}
+"use strict";
 
-// normalizes slashes.
-var slashSplit = /\/+/
+// 25.4.1.5 NewPromiseCapability(C)
+var aFunction = __webpack_require__(46);
 
-minimatch.filter = filter
-function filter (pattern, options) {
-  options = options || {}
-  return function (p, i, list) {
-    return minimatch(p, pattern, options)
-  }
+function PromiseCapability(C) {
+  var resolve, reject;
+  this.promise = new C(function ($$resolve, $$reject) {
+    if (resolve !== undefined || reject !== undefined) throw TypeError('Bad Promise constructor');
+    resolve = $$resolve;
+    reject = $$reject;
+  });
+  this.resolve = aFunction(resolve);
+  this.reject = aFunction(reject);
 }
 
-function ext (a, b) {
-  a = a || {}
-  b = b || {}
-  var t = {}
-  Object.keys(b).forEach(function (k) {
-    t[k] = b[k]
-  })
-  Object.keys(a).forEach(function (k) {
-    t[k] = a[k]
-  })
-  return t
-}
+module.exports.f = function (C) {
+  return new PromiseCapability(C);
+};
 
-minimatch.defaults = function (def) {
-  if (!def || !Object.keys(def).length) return minimatch
 
-  var orig = minimatch
+/***/ }),
+/* 71 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  var m = function minimatch (p, pattern, options) {
-    return orig.minimatch(p, pattern, ext(def, options))
-  }
+var def = __webpack_require__(50).f;
+var has = __webpack_require__(49);
+var TAG = __webpack_require__(13)('toStringTag');
 
-  m.Minimatch = function Minimatch (pattern, options) {
-    return new orig.Minimatch(pattern, ext(def, options))
-  }
+module.exports = function (it, tag, stat) {
+  if (it && !has(it = stat ? it : it.prototype, TAG)) def(it, TAG, { configurable: true, value: tag });
+};
 
-  return m
-}
 
-Minimatch.defaults = function (def) {
-  if (!def || !Object.keys(def).length) return Minimatch
-  return minimatch.defaults(def).Minimatch
-}
+/***/ }),
+/* 72 */
+/***/ (function(module, exports, __webpack_require__) {
 
-function minimatch (p, pattern, options) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('glob pattern string required')
-  }
+var shared = __webpack_require__(107)('keys');
+var uid = __webpack_require__(111);
+module.exports = function (key) {
+  return shared[key] || (shared[key] = uid(key));
+};
 
-  if (!options) options = {}
 
-  // shortcut: comments match nothing.
-  if (!options.nocomment && pattern.charAt(0) === '#') {
-    return false
-  }
+/***/ }),
+/* 73 */
+/***/ (function(module, exports) {
 
-  // "" only matches ""
-  if (pattern.trim() === '') return p === ''
+// 7.1.4 ToInteger
+var ceil = Math.ceil;
+var floor = Math.floor;
+module.exports = function (it) {
+  return isNaN(it = +it) ? 0 : (it > 0 ? floor : ceil)(it);
+};
 
-  return new Minimatch(pattern, options).match(p)
-}
 
-function Minimatch (pattern, options) {
-  if (!(this instanceof Minimatch)) {
-    return new Minimatch(pattern, options)
-  }
+/***/ }),
+/* 74 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (typeof pattern !== 'string') {
-    throw new TypeError('glob pattern string required')
-  }
+// to indexed object, toObject with fallback for non-array-like ES3 strings
+var IObject = __webpack_require__(131);
+var defined = __webpack_require__(67);
+module.exports = function (it) {
+  return IObject(defined(it));
+};
 
-  if (!options) options = {}
-  pattern = pattern.trim()
 
-  // windows support: need to use /, not \
-  if (path.sep !== '/') {
-    pattern = pattern.split(path.sep).join('/')
-  }
+/***/ }),
+/* 75 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  this.options = options
-  this.set = []
-  this.pattern = pattern
-  this.regexp = null
-  this.negate = false
-  this.comment = false
-  this.empty = false
+// Approach:
+//
+// 1. Get the minimatch set
+// 2. For each pattern in the set, PROCESS(pattern, false)
+// 3. Store matches per-set, then uniq them
+//
+// PROCESS(pattern, inGlobStar)
+// Get the first [n] items from pattern that are all strings
+// Join these together.  This is PREFIX.
+//   If there is no more remaining, then stat(PREFIX) and
+//   add to matches if it succeeds.  END.
+//
+// If inGlobStar and PREFIX is symlink and points to dir
+//   set ENTRIES = []
+// else readdir(PREFIX) as ENTRIES
+//   If fail, END
+//
+// with ENTRIES
+//   If pattern[n] is GLOBSTAR
+//     // handle the case where the globstar match is empty
+//     // by pruning it out, and testing the resulting pattern
+//     PROCESS(pattern[0..n] + pattern[n+1 .. $], false)
+//     // handle other cases.
+//     for ENTRY in ENTRIES (not dotfiles)
+//       // attach globstar + tail onto the entry
+//       // Mark that this entry is a globstar match
+//       PROCESS(pattern[0..n] + ENTRY + pattern[n .. $], true)
+//
+//   else // not globstar
+//     for ENTRY in ENTRIES (not dotfiles, unless pattern[n] is dot)
+//       Test ENTRY against pattern[n]
+//       If fails, continue
+//       If passes, PROCESS(pattern[0..n] + item + pattern[n+1 .. $])
+//
+// Caveat:
+//   Cache all stats and readdirs results to minimize syscall.  Since all
+//   we ever care about is existence and directory-ness, we can just keep
+//   `true` for files, and [children,...] for directories, or `false` for
+//   things that don't exist.
 
-  // make the set of regexps etc.
-  this.make()
-}
+module.exports = glob
 
-Minimatch.prototype.debug = function () {}
+var fs = __webpack_require__(3)
+var rp = __webpack_require__(114)
+var minimatch = __webpack_require__(60)
+var Minimatch = minimatch.Minimatch
+var inherits = __webpack_require__(42)
+var EE = __webpack_require__(54).EventEmitter
+var path = __webpack_require__(0)
+var assert = __webpack_require__(22)
+var isAbsolute = __webpack_require__(76)
+var globSync = __webpack_require__(218)
+var common = __webpack_require__(115)
+var alphasort = common.alphasort
+var alphasorti = common.alphasorti
+var setopts = common.setopts
+var ownProp = common.ownProp
+var inflight = __webpack_require__(223)
+var util = __webpack_require__(2)
+var childrenIgnored = common.childrenIgnored
+var isIgnored = common.isIgnored
 
-Minimatch.prototype.make = make
-function make () {
-  // don't do it more than once.
-  if (this._made) return
+var once = __webpack_require__(61)
 
-  var pattern = this.pattern
-  var options = this.options
+function glob (pattern, options, cb) {
+  if (typeof options === 'function') cb = options, options = {}
+  if (!options) options = {}
 
-  // empty patterns and comments match nothing.
-  if (!options.nocomment && pattern.charAt(0) === '#') {
-    this.comment = true
-    return
-  }
-  if (!pattern) {
-    this.empty = true
-    return
+  if (options.sync) {
+    if (cb)
+      throw new TypeError('callback provided to sync glob')
+    return globSync(pattern, options)
   }
 
-  // step 1: figure out negation, etc.
-  this.parseNegate()
+  return new Glob(pattern, options, cb)
+}
 
-  // step 2: expand braces
-  var set = this.globSet = this.braceExpand()
+glob.sync = globSync
+var GlobSync = glob.GlobSync = globSync.GlobSync
 
-  if (options.debug) this.debug = console.error
+// old api surface
+glob.glob = glob
 
-  this.debug(this.pattern, set)
+function extend (origin, add) {
+  if (add === null || typeof add !== 'object') {
+    return origin
+  }
 
-  // step 3: now we have a set, so turn each one into a series of path-portion
-  // matching patterns.
-  // These will be regexps, except in the case of "**", which is
-  // set to the GLOBSTAR object for globstar behavior,
-  // and will not contain any / characters
-  set = this.globParts = set.map(function (s) {
-    return s.split(slashSplit)
-  })
+  var keys = Object.keys(add)
+  var i = keys.length
+  while (i--) {
+    origin[keys[i]] = add[keys[i]]
+  }
+  return origin
+}
 
-  this.debug(this.pattern, set)
+glob.hasMagic = function (pattern, options_) {
+  var options = extend({}, options_)
+  options.noprocess = true
 
-  // glob --> regexps
-  set = set.map(function (s, si, set) {
-    return s.map(this.parse, this)
-  }, this)
+  var g = new Glob(pattern, options)
+  var set = g.minimatch.set
 
-  this.debug(this.pattern, set)
+  if (!pattern)
+    return false
 
-  // filter out everything that didn't compile properly.
-  set = set.filter(function (s) {
-    return s.indexOf(false) === -1
-  })
+  if (set.length > 1)
+    return true
 
-  this.debug(this.pattern, set)
+  for (var j = 0; j < set[0].length; j++) {
+    if (typeof set[0][j] !== 'string')
+      return true
+  }
 
-  this.set = set
+  return false
 }
 
-Minimatch.prototype.parseNegate = parseNegate
-function parseNegate () {
-  var pattern = this.pattern
-  var negate = false
-  var options = this.options
-  var negateOffset = 0
-
-  if (options.nonegate) return
-
-  for (var i = 0, l = pattern.length
-    ; i < l && pattern.charAt(i) === '!'
-    ; i++) {
-    negate = !negate
-    negateOffset++
+glob.Glob = Glob
+inherits(Glob, EE)
+function Glob (pattern, options, cb) {
+  if (typeof options === 'function') {
+    cb = options
+    options = null
   }
 
-  if (negateOffset) this.pattern = pattern.substr(negateOffset)
-  this.negate = negate
-}
-
-// Brace expansion:
-// a{b,c}d -> abd acd
-// a{b,}c -> abc ac
-// a{0..3}d -> a0d a1d a2d a3d
-// a{b,c{d,e}f}g -> abg acdfg acefg
-// a{b,c}d{e,f}g -> abdeg acdeg abdeg abdfg
-//
-// Invalid sets are not expanded.
-// a{2..}b -> a{2..}b
-// a{b}c -> a{b}c
-minimatch.braceExpand = function (pattern, options) {
-  return braceExpand(pattern, options)
-}
+  if (options && options.sync) {
+    if (cb)
+      throw new TypeError('callback provided to sync glob')
+    return new GlobSync(pattern, options)
+  }
 
-Minimatch.prototype.braceExpand = braceExpand
+  if (!(this instanceof Glob))
+    return new Glob(pattern, options, cb)
 
-function braceExpand (pattern, options) {
-  if (!options) {
-    if (this instanceof Minimatch) {
-      options = this.options
-    } else {
-      options = {}
-    }
-  }
+  setopts(this, pattern, options)
+  this._didRealPath = false
 
-  pattern = typeof pattern === 'undefined'
-    ? this.pattern : pattern
+  // process each pattern in the minimatch set
+  var n = this.minimatch.set.length
 
-  if (typeof pattern === 'undefined') {
-    throw new TypeError('undefined pattern')
-  }
+  // The matches are stored as {<filename>: true,...} so that
+  // duplicates are automagically pruned.
+  // Later, we do an Object.keys() on these.
+  // Keep them as a list so we can fill in when nonull is set.
+  this.matches = new Array(n)
 
-  if (options.nobrace ||
-    !pattern.match(/\{.*\}/)) {
-    // shortcut. no need to expand.
-    return [pattern]
+  if (typeof cb === 'function') {
+    cb = once(cb)
+    this.on('error', cb)
+    this.on('end', function (matches) {
+      cb(null, matches)
+    })
   }
 
-  return expand(pattern)
-}
+  var self = this
+  this._processing = 0
 
-// parse a component of the expanded set.
-// At this point, no pattern may contain "/" in it
-// so we're going to return a 2d array, where each entry is the full
-// pattern, split on '/', and then turned into a regular expression.
-// A regexp is made at the end which joins each array with an
-// escaped /, and another full one which joins each regexp with |.
-//
-// Following the lead of Bash 4.1, note that "**" only has special meaning
-// when it is the *only* thing in a path portion.  Otherwise, any series
-// of * is equivalent to a single *.  Globstar behavior is enabled by
-// default, and can be disabled by setting options.noglobstar.
-Minimatch.prototype.parse = parse
-var SUBPARSE = {}
-function parse (pattern, isSub) {
-  if (pattern.length > 1024 * 64) {
-    throw new TypeError('pattern is too long')
-  }
+  this._emitQueue = []
+  this._processQueue = []
+  this.paused = false
 
-  var options = this.options
+  if (this.noprocess)
+    return this
 
-  // shortcuts
-  if (!options.noglobstar && pattern === '**') return GLOBSTAR
-  if (pattern === '') return ''
+  if (n === 0)
+    return done()
 
-  var re = ''
-  var hasMagic = !!options.nocase
-  var escaping = false
-  // ? => one single character
-  var patternListStack = []
-  var negativeLists = []
-  var stateChar
-  var inClass = false
-  var reClassStart = -1
-  var classStart = -1
-  // . and .. never match anything that doesn't start with .,
-  // even when options.dot is set.
-  var patternStart = pattern.charAt(0) === '.' ? '' // anything
-  // not (start or / followed by . or .. followed by / or end)
-  : options.dot ? '(?!(?:^|\\\/)\\.{1,2}(?:$|\\\/))'
-  : '(?!\\.)'
-  var self = this
+  var sync = true
+  for (var i = 0; i < n; i ++) {
+    this._process(this.minimatch.set[i], i, false, done)
+  }
+  sync = false
 
-  function clearStateChar () {
-    if (stateChar) {
-      // we had some state-tracking character
-      // that wasn't consumed by this pass.
-      switch (stateChar) {
-        case '*':
-          re += star
-          hasMagic = true
-        break
-        case '?':
-          re += qmark
-          hasMagic = true
-        break
-        default:
-          re += '\\' + stateChar
-        break
+  function done () {
+    --self._processing
+    if (self._processing <= 0) {
+      if (sync) {
+        process.nextTick(function () {
+          self._finish()
+        })
+      } else {
+        self._finish()
       }
-      self.debug('clearStateChar %j %j', stateChar, re)
-      stateChar = false
     }
   }
+}
 
-  for (var i = 0, len = pattern.length, c
-    ; (i < len) && (c = pattern.charAt(i))
-    ; i++) {
-    this.debug('%s\t%s %s %j', pattern, i, re, c)
+Glob.prototype._finish = function () {
+  assert(this instanceof Glob)
+  if (this.aborted)
+    return
 
-    // skip over any that are escaped.
-    if (escaping && reSpecials[c]) {
-      re += '\\' + c
-      escaping = false
-      continue
-    }
+  if (this.realpath && !this._didRealpath)
+    return this._realpath()
 
-    switch (c) {
-      case '/':
-        // completely not allowed, even escaped.
-        // Should already be path-split by now.
-        return false
+  common.finish(this)
+  this.emit('end', this.found)
+}
 
-      case '\\':
-        clearStateChar()
-        escaping = true
-      continue
+Glob.prototype._realpath = function () {
+  if (this._didRealpath)
+    return
 
-      // the various stateChar values
-      // for the "extglob" stuff.
-      case '?':
-      case '*':
-      case '+':
-      case '@':
-      case '!':
-        this.debug('%s\t%s %s %j <-- stateChar', pattern, i, re, c)
+  this._didRealpath = true
 
-        // all of those are literals inside a class, except that
-        // the glob [!a] means [^a] in regexp
-        if (inClass) {
-          this.debug('  in class')
-          if (c === '!' && i === classStart + 1) c = '^'
-          re += c
-          continue
-        }
+  var n = this.matches.length
+  if (n === 0)
+    return this._finish()
 
-        // if we already have a stateChar, then it means
-        // that there was something like ** or +? in there.
-        // Handle the stateChar, then proceed with this one.
-        self.debug('call clearStateChar %j', stateChar)
-        clearStateChar()
-        stateChar = c
-        // if extglob is disabled, then +(asdf|foo) isn't a thing.
-        // just clear the statechar *now*, rather than even diving into
-        // the patternList stuff.
-        if (options.noext) clearStateChar()
-      continue
+  var self = this
+  for (var i = 0; i < this.matches.length; i++)
+    this._realpathSet(i, next)
 
-      case '(':
-        if (inClass) {
-          re += '('
-          continue
-        }
+  function next () {
+    if (--n === 0)
+      self._finish()
+  }
+}
 
-        if (!stateChar) {
-          re += '\\('
-          continue
-        }
+Glob.prototype._realpathSet = function (index, cb) {
+  var matchset = this.matches[index]
+  if (!matchset)
+    return cb()
 
-        patternListStack.push({
-          type: stateChar,
-          start: i - 1,
-          reStart: re.length,
-          open: plTypes[stateChar].open,
-          close: plTypes[stateChar].close
-        })
-        // negation is (?:(?!js)[^/]*)
-        re += stateChar === '!' ? '(?:(?!(?:' : '(?:'
-        this.debug('plType %j %j', stateChar, re)
-        stateChar = false
-      continue
+  var found = Object.keys(matchset)
+  var self = this
+  var n = found.length
 
-      case ')':
-        if (inClass || !patternListStack.length) {
-          re += '\\)'
-          continue
-        }
+  if (n === 0)
+    return cb()
 
-        clearStateChar()
-        hasMagic = true
-        var pl = patternListStack.pop()
-        // negation is (?:(?!js)[^/]*)
-        // The others are (?:<pattern>)<type>
-        re += pl.close
-        if (pl.type === '!') {
-          negativeLists.push(pl)
-        }
-        pl.reEnd = re.length
-      continue
+  var set = this.matches[index] = Object.create(null)
+  found.forEach(function (p, i) {
+    // If there's a problem with the stat, then it means that
+    // one or more of the links in the realpath couldn't be
+    // resolved.  just return the abs value in that case.
+    p = self._makeAbs(p)
+    rp.realpath(p, self.realpathCache, function (er, real) {
+      if (!er)
+        set[real] = true
+      else if (er.syscall === 'stat')
+        set[p] = true
+      else
+        self.emit('error', er) // srsly wtf right here
 
-      case '|':
-        if (inClass || !patternListStack.length || escaping) {
-          re += '\\|'
-          escaping = false
-          continue
-        }
+      if (--n === 0) {
+        self.matches[index] = set
+        cb()
+      }
+    })
+  })
+}
 
-        clearStateChar()
-        re += '|'
-      continue
+Glob.prototype._mark = function (p) {
+  return common.mark(this, p)
+}
 
-      // these are mostly the same in regexp and glob
-      case '[':
-        // swallow any state-tracking char before the [
-        clearStateChar()
+Glob.prototype._makeAbs = function (f) {
+  return common.makeAbs(this, f)
+}
 
-        if (inClass) {
-          re += '\\' + c
-          continue
-        }
+Glob.prototype.abort = function () {
+  this.aborted = true
+  this.emit('abort')
+}
 
-        inClass = true
-        classStart = i
-        reClassStart = re.length
-        re += c
-      continue
+Glob.prototype.pause = function () {
+  if (!this.paused) {
+    this.paused = true
+    this.emit('pause')
+  }
+}
 
-      case ']':
-        //  a right bracket shall lose its special
-        //  meaning and represent itself in
-        //  a bracket expression if it occurs
-        //  first in the list.  -- POSIX.2 2.8.3.2
-        if (i === classStart + 1 || !inClass) {
-          re += '\\' + c
-          escaping = false
-          continue
-        }
+Glob.prototype.resume = function () {
+  if (this.paused) {
+    this.emit('resume')
+    this.paused = false
+    if (this._emitQueue.length) {
+      var eq = this._emitQueue.slice(0)
+      this._emitQueue.length = 0
+      for (var i = 0; i < eq.length; i ++) {
+        var e = eq[i]
+        this._emitMatch(e[0], e[1])
+      }
+    }
+    if (this._processQueue.length) {
+      var pq = this._processQueue.slice(0)
+      this._processQueue.length = 0
+      for (var i = 0; i < pq.length; i ++) {
+        var p = pq[i]
+        this._processing--
+        this._process(p[0], p[1], p[2], p[3])
+      }
+    }
+  }
+}
 
-        // handle the case where we left a class open.
-        // "[z-a]" is valid, equivalent to "\[z-a\]"
-        if (inClass) {
-          // split where the last [ was, make sure we don't have
-          // an invalid re. if so, re-walk the contents of the
-          // would-be class to re-translate any characters that
-          // were passed through as-is
-          // TODO: It would probably be faster to determine this
-          // without a try/catch and a new RegExp, but it's tricky
-          // to do safely.  For now, this is safe and works.
-          var cs = pattern.substring(classStart + 1, i)
-          try {
-            RegExp('[' + cs + ']')
-          } catch (er) {
-            // not a valid class!
-            var sp = this.parse(cs, SUBPARSE)
-            re = re.substr(0, reClassStart) + '\\[' + sp[0] + '\\]'
-            hasMagic = hasMagic || sp[1]
-            inClass = false
-            continue
-          }
-        }
+Glob.prototype._process = function (pattern, index, inGlobStar, cb) {
+  assert(this instanceof Glob)
+  assert(typeof cb === 'function')
 
-        // finish up the class.
-        hasMagic = true
-        inClass = false
-        re += c
-      continue
+  if (this.aborted)
+    return
 
-      default:
-        // swallow any state char that wasn't consumed
-        clearStateChar()
+  this._processing++
+  if (this.paused) {
+    this._processQueue.push([pattern, index, inGlobStar, cb])
+    return
+  }
 
-        if (escaping) {
-          // no need
-          escaping = false
-        } else if (reSpecials[c]
-          && !(c === '^' && inClass)) {
-          re += '\\'
-        }
+  //console.error('PROCESS %d', this._processing, pattern)
 
-        re += c
+  // Get the first [n] parts of pattern that are all strings.
+  var n = 0
+  while (typeof pattern[n] === 'string') {
+    n ++
+  }
+  // now n is the index of the first one that is *not* a string.
 
-    } // switch
-  } // for
+  // see if there's anything else
+  var prefix
+  switch (n) {
+    // if not, then this is rather simple
+    case pattern.length:
+      this._processSimple(pattern.join('/'), index, cb)
+      return
 
-  // handle the case where we left a class open.
-  // "[abc" is valid, equivalent to "\[abc"
-  if (inClass) {
-    // split where the last [ was, and escape it
-    // this is a huge pita.  We now have to re-walk
-    // the contents of the would-be class to re-translate
-    // any characters that were passed through as-is
-    cs = pattern.substr(classStart + 1)
-    sp = this.parse(cs, SUBPARSE)
-    re = re.substr(0, reClassStart) + '\\[' + sp[0]
-    hasMagic = hasMagic || sp[1]
-  }
+    case 0:
+      // pattern *starts* with some non-trivial item.
+      // going to readdir(cwd), but not include the prefix in matches.
+      prefix = null
+      break
 
-  // handle the case where we had a +( thing at the *end*
-  // of the pattern.
-  // each pattern list stack adds 3 chars, and we need to go through
-  // and escape any | chars that were passed through as-is for the regexp.
-  // Go through and escape them, taking care not to double-escape any
-  // | chars that were already escaped.
-  for (pl = patternListStack.pop(); pl; pl = patternListStack.pop()) {
-    var tail = re.slice(pl.reStart + pl.open.length)
-    this.debug('setting tail', re, pl)
-    // maybe some even number of \, then maybe 1 \, followed by a |
-    tail = tail.replace(/((?:\\{2}){0,64})(\\?)\|/g, function (_, $1, $2) {
-      if (!$2) {
-        // the | isn't already escaped, so escape it.
-        $2 = '\\'
-      }
+    default:
+      // pattern has some string bits in the front.
+      // whatever it starts with, whether that's 'absolute' like /foo/bar,
+      // or 'relative' like '../baz'
+      prefix = pattern.slice(0, n).join('/')
+      break
+  }
 
-      // need to escape all those slashes *again*, without escaping the
-      // one that we need for escaping the | character.  As it works out,
-      // escaping an even number of slashes can be done by simply repeating
-      // it exactly after itself.  That's why this trick works.
-      //
-      // I am sorry that you have to see this.
-      return $1 + $1 + $2 + '|'
-    })
+  var remain = pattern.slice(n)
 
-    this.debug('tail=%j\n   %s', tail, tail, pl, re)
-    var t = pl.type === '*' ? star
-      : pl.type === '?' ? qmark
-      : '\\' + pl.type
+  // get the list of entries.
+  var read
+  if (prefix === null)
+    read = '.'
+  else if (isAbsolute(prefix) || isAbsolute(pattern.join('/'))) {
+    if (!prefix || !isAbsolute(prefix))
+      prefix = '/' + prefix
+    read = prefix
+  } else
+    read = prefix
 
-    hasMagic = true
-    re = re.slice(0, pl.reStart) + t + '\\(' + tail
-  }
+  var abs = this._makeAbs(read)
 
-  // handle trailing things that only matter at the very end.
-  clearStateChar()
-  if (escaping) {
-    // trailing \\
-    re += '\\\\'
-  }
+  //if ignored, skip _processing
+  if (childrenIgnored(this, read))
+    return cb()
 
-  // only need to apply the nodot start if the re starts with
-  // something that could conceivably capture a dot
-  var addPatternStart = false
-  switch (re.charAt(0)) {
-    case '.':
-    case '[':
-    case '(': addPatternStart = true
-  }
+  var isGlobStar = remain[0] === minimatch.GLOBSTAR
+  if (isGlobStar)
+    this._processGlobStar(prefix, read, abs, remain, index, inGlobStar, cb)
+  else
+    this._processReaddir(prefix, read, abs, remain, index, inGlobStar, cb)
+}
 
-  // Hack to work around lack of negative lookbehind in JS
-  // A pattern like: *.!(x).!(y|z) needs to ensure that a name
-  // like 'a.xyz.yz' doesn't match.  So, the first negative
-  // lookahead, has to look ALL the way ahead, to the end of
-  // the pattern.
-  for (var n = negativeLists.length - 1; n > -1; n--) {
-    var nl = negativeLists[n]
+Glob.prototype._processReaddir = function (prefix, read, abs, remain, index, inGlobStar, cb) {
+  var self = this
+  this._readdir(abs, inGlobStar, function (er, entries) {
+    return self._processReaddir2(prefix, read, abs, remain, index, inGlobStar, entries, cb)
+  })
+}
 
-    var nlBefore = re.slice(0, nl.reStart)
-    var nlFirst = re.slice(nl.reStart, nl.reEnd - 8)
-    var nlLast = re.slice(nl.reEnd - 8, nl.reEnd)
-    var nlAfter = re.slice(nl.reEnd)
+Glob.prototype._processReaddir2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) {
 
-    nlLast += nlAfter
+  // if the abs isn't a dir, then nothing can match!
+  if (!entries)
+    return cb()
 
-    // Handle nested stuff like *(*.js|!(*.json)), where open parens
-    // mean that we should *not* include the ) in the bit that is considered
-    // "after" the negated section.
-    var openParensBefore = nlBefore.split('(').length - 1
-    var cleanAfter = nlAfter
-    for (i = 0; i < openParensBefore; i++) {
-      cleanAfter = cleanAfter.replace(/\)[+*?]?/, '')
-    }
-    nlAfter = cleanAfter
+  // It will only match dot entries if it starts with a dot, or if
+  // dot is set.  Stuff like @(.foo|.bar) isn't allowed.
+  var pn = remain[0]
+  var negate = !!this.minimatch.negate
+  var rawGlob = pn._glob
+  var dotOk = this.dot || rawGlob.charAt(0) === '.'
 
-    var dollar = ''
-    if (nlAfter === '' && isSub !== SUBPARSE) {
-      dollar = '$'
+  var matchedEntries = []
+  for (var i = 0; i < entries.length; i++) {
+    var e = entries[i]
+    if (e.charAt(0) !== '.' || dotOk) {
+      var m
+      if (negate && !prefix) {
+        m = !e.match(pn)
+      } else {
+        m = e.match(pn)
+      }
+      if (m)
+        matchedEntries.push(e)
     }
-    var newRe = nlBefore + nlFirst + nlAfter + dollar + nlLast
-    re = newRe
-  }
-
-  // if the re is not "" at this point, then we need to make sure
-  // it doesn't match against an empty path part.
-  // Otherwise a/* will match a/, which it should not.
-  if (re !== '' && hasMagic) {
-    re = '(?=.)' + re
   }
 
-  if (addPatternStart) {
-    re = patternStart + re
-  }
+  //console.error('prd2', prefix, entries, remain[0]._glob, matchedEntries)
 
-  // parsing just a piece of a larger pattern.
-  if (isSub === SUBPARSE) {
-    return [re, hasMagic]
-  }
+  var len = matchedEntries.length
+  // If there are no matched entries, then nothing matches.
+  if (len === 0)
+    return cb()
 
-  // skip the regexp for non-magical patterns
-  // unescape anything in it, though, so that it'll be
-  // an exact match against a file etc.
-  if (!hasMagic) {
-    return globUnescape(pattern)
-  }
+  // if this is the last remaining pattern bit, then no need for
+  // an additional stat *unless* the user has specified mark or
+  // stat explicitly.  We know they exist, since readdir returned
+  // them.
 
-  var flags = options.nocase ? 'i' : ''
-  try {
-    var regExp = new RegExp('^' + re + '$', flags)
-  } catch (er) {
-    // If it was an invalid regular expression, then it can't match
-    // anything.  This trick looks for a character after the end of
-    // the string, which is of course impossible, except in multi-line
-    // mode, but it's not a /m regex.
-    return new RegExp('$.')
-  }
+  if (remain.length === 1 && !this.mark && !this.stat) {
+    if (!this.matches[index])
+      this.matches[index] = Object.create(null)
 
-  regExp._glob = pattern
-  regExp._src = re
+    for (var i = 0; i < len; i ++) {
+      var e = matchedEntries[i]
+      if (prefix) {
+        if (prefix !== '/')
+          e = prefix + '/' + e
+        else
+          e = prefix + e
+      }
 
-  return regExp
-}
+      if (e.charAt(0) === '/' && !this.nomount) {
+        e = path.join(this.root, e)
+      }
+      this._emitMatch(index, e)
+    }
+    // This was the last one, and no stats were needed
+    return cb()
+  }
 
-minimatch.makeRe = function (pattern, options) {
-  return new Minimatch(pattern, options || {}).makeRe()
+  // now test all matched entries as stand-ins for that part
+  // of the pattern.
+  remain.shift()
+  for (var i = 0; i < len; i ++) {
+    var e = matchedEntries[i]
+    var newPattern
+    if (prefix) {
+      if (prefix !== '/')
+        e = prefix + '/' + e
+      else
+        e = prefix + e
+    }
+    this._process([e].concat(remain), index, inGlobStar, cb)
+  }
+  cb()
 }
 
-Minimatch.prototype.makeRe = makeRe
-function makeRe () {
-  if (this.regexp || this.regexp === false) return this.regexp
+Glob.prototype._emitMatch = function (index, e) {
+  if (this.aborted)
+    return
 
-  // at this point, this.set is a 2d array of partial
-  // pattern strings, or "**".
-  //
-  // It's better to use .match().  This function shouldn't
-  // be used, really, but it's pretty convenient sometimes,
-  // when you just want to work with a regex.
-  var set = this.set
+  if (isIgnored(this, e))
+    return
 
-  if (!set.length) {
-    this.regexp = false
-    return this.regexp
+  if (this.paused) {
+    this._emitQueue.push([index, e])
+    return
   }
-  var options = this.options
 
-  var twoStar = options.noglobstar ? star
-    : options.dot ? twoStarDot
-    : twoStarNoDot
-  var flags = options.nocase ? 'i' : ''
+  var abs = isAbsolute(e) ? e : this._makeAbs(e)
 
-  var re = set.map(function (pattern) {
-    return pattern.map(function (p) {
-      return (p === GLOBSTAR) ? twoStar
-      : (typeof p === 'string') ? regExpEscape(p)
-      : p._src
-    }).join('\\\/')
-  }).join('|')
+  if (this.mark)
+    e = this._mark(e)
 
-  // must match entire pattern
-  // ending in a * or ** will make it less strict.
-  re = '^(?:' + re + ')$'
+  if (this.absolute)
+    e = abs
 
-  // can match anything, as long as it's not this.
-  if (this.negate) re = '^(?!' + re + ').*$'
+  if (this.matches[index][e])
+    return
 
-  try {
-    this.regexp = new RegExp(re, flags)
-  } catch (ex) {
-    this.regexp = false
+  if (this.nodir) {
+    var c = this.cache[abs]
+    if (c === 'DIR' || Array.isArray(c))
+      return
   }
-  return this.regexp
-}
 
-minimatch.match = function (list, pattern, options) {
-  options = options || {}
-  var mm = new Minimatch(pattern, options)
-  list = list.filter(function (f) {
-    return mm.match(f)
-  })
-  if (mm.options.nonull && !list.length) {
-    list.push(pattern)
-  }
-  return list
+  this.matches[index][e] = true
+
+  var st = this.statCache[abs]
+  if (st)
+    this.emit('stat', e, st)
+
+  this.emit('match', e)
 }
 
-Minimatch.prototype.match = match
-function match (f, partial) {
-  this.debug('match', f, this.pattern)
-  // short-circuit in the case of busted things.
-  // comments, etc.
-  if (this.comment) return false
-  if (this.empty) return f === ''
+Glob.prototype._readdirInGlobStar = function (abs, cb) {
+  if (this.aborted)
+    return
 
-  if (f === '/' && partial) return true
+  // follow all symlinked directories forever
+  // just proceed as if this is a non-globstar situation
+  if (this.follow)
+    return this._readdir(abs, false, cb)
 
-  var options = this.options
+  var lstatkey = 'lstat\0' + abs
+  var self = this
+  var lstatcb = inflight(lstatkey, lstatcb_)
 
-  // windows: need to use /, not \
-  if (path.sep !== '/') {
-    f = f.split(path.sep).join('/')
-  }
+  if (lstatcb)
+    fs.lstat(abs, lstatcb)
 
-  // treat the test path as a set of pathparts.
-  f = f.split(slashSplit)
-  this.debug(this.pattern, 'split', f)
+  function lstatcb_ (er, lstat) {
+    if (er && er.code === 'ENOENT')
+      return cb()
 
-  // just ONE of the pattern sets in this.set needs to match
-  // in order for it to be valid.  If negating, then just one
-  // match means that we have failed.
-  // Either way, return on the first hit.
-
-  var set = this.set
-  this.debug(this.pattern, 'set', set)
-
-  // Find the basename of the path by looking for the last non-empty segment
-  var filename
-  var i
-  for (i = f.length - 1; i >= 0; i--) {
-    filename = f[i]
-    if (filename) break
-  }
+    var isSym = lstat && lstat.isSymbolicLink()
+    self.symlinks[abs] = isSym
 
-  for (i = 0; i < set.length; i++) {
-    var pattern = set[i]
-    var file = f
-    if (options.matchBase && pattern.length === 1) {
-      file = [filename]
-    }
-    var hit = this.matchOne(file, pattern, partial)
-    if (hit) {
-      if (options.flipNegate) return true
-      return !this.negate
-    }
+    // If it's not a symlink or a dir, then it's definitely a regular file.
+    // don't bother doing a readdir in that case.
+    if (!isSym && lstat && !lstat.isDirectory()) {
+      self.cache[abs] = 'FILE'
+      cb()
+    } else
+      self._readdir(abs, false, cb)
   }
-
-  // didn't get any hits.  this is success if it's a negative
-  // pattern, failure otherwise.
-  if (options.flipNegate) return false
-  return this.negate
 }
 
-// set partial to true to test if, for example,
-// "/a/b" matches the start of "/*/b/*/d"
-// Partial means, if you run out of file before you run
-// out of pattern, then that's fine, as long as all
-// the parts match.
-Minimatch.prototype.matchOne = function (file, pattern, partial) {
-  var options = this.options
+Glob.prototype._readdir = function (abs, inGlobStar, cb) {
+  if (this.aborted)
+    return
 
-  this.debug('matchOne',
-    { 'this': this, file: file, pattern: pattern })
+  cb = inflight('readdir\0'+abs+'\0'+inGlobStar, cb)
+  if (!cb)
+    return
 
-  this.debug('matchOne', file.length, pattern.length)
+  //console.error('RD %j %j', +inGlobStar, abs)
+  if (inGlobStar && !ownProp(this.symlinks, abs))
+    return this._readdirInGlobStar(abs, cb)
 
-  for (var fi = 0,
-      pi = 0,
-      fl = file.length,
-      pl = pattern.length
-      ; (fi < fl) && (pi < pl)
-      ; fi++, pi++) {
-    this.debug('matchOne loop')
-    var p = pattern[pi]
-    var f = file[fi]
+  if (ownProp(this.cache, abs)) {
+    var c = this.cache[abs]
+    if (!c || c === 'FILE')
+      return cb()
 
-    this.debug(pattern, p, f)
+    if (Array.isArray(c))
+      return cb(null, c)
+  }
 
-    // should be impossible.
-    // some invalid regexp stuff in the set.
-    if (p === false) return false
+  var self = this
+  fs.readdir(abs, readdirCb(this, abs, cb))
+}
 
-    if (p === GLOBSTAR) {
-      this.debug('GLOBSTAR', [pattern, p, f])
+function readdirCb (self, abs, cb) {
+  return function (er, entries) {
+    if (er)
+      self._readdirError(abs, er, cb)
+    else
+      self._readdirEntries(abs, entries, cb)
+  }
+}
 
-      // "**"
-      // a/**/b/**/c would match the following:
-      // a/b/x/y/z/c
-      // a/x/y/z/b/c
-      // a/b/x/b/x/c
-      // a/b/c
-      // To do this, take the rest of the pattern after
-      // the **, and see if it would match the file remainder.
-      // If so, return success.
-      // If not, the ** "swallows" a segment, and try again.
-      // This is recursively awful.
-      //
-      // a/**/b/**/c matching a/b/x/y/z/c
-      // - a matches a
-      // - doublestar
-      //   - matchOne(b/x/y/z/c, b/**/c)
-      //     - b matches b
-      //     - doublestar
-      //       - matchOne(x/y/z/c, c) -> no
-      //       - matchOne(y/z/c, c) -> no
-      //       - matchOne(z/c, c) -> no
-      //       - matchOne(c, c) yes, hit
-      var fr = fi
-      var pr = pi + 1
-      if (pr === pl) {
-        this.debug('** at the end')
-        // a ** at the end will just swallow the rest.
-        // We have found a match.
-        // however, it will not swallow /.x, unless
-        // options.dot is set.
-        // . and .. are *never* matched by **, for explosively
-        // exponential reasons.
-        for (; fi < fl; fi++) {
-          if (file[fi] === '.' || file[fi] === '..' ||
-            (!options.dot && file[fi].charAt(0) === '.')) return false
-        }
-        return true
-      }
+Glob.prototype._readdirEntries = function (abs, entries, cb) {
+  if (this.aborted)
+    return
 
-      // ok, let's see if we can swallow whatever we can.
-      while (fr < fl) {
-        var swallowee = file[fr]
+  // if we haven't asked to stat everything, then just
+  // assume that everything in there exists, so we can avoid
+  // having to stat it a second time.
+  if (!this.mark && !this.stat) {
+    for (var i = 0; i < entries.length; i ++) {
+      var e = entries[i]
+      if (abs === '/')
+        e = abs + e
+      else
+        e = abs + '/' + e
+      this.cache[e] = true
+    }
+  }
 
-        this.debug('\nglobstar while', file, fr, pattern, pr, swallowee)
+  this.cache[abs] = entries
+  return cb(null, entries)
+}
 
-        // XXX remove this slice.  Just pass the start index.
-        if (this.matchOne(file.slice(fr), pattern.slice(pr), partial)) {
-          this.debug('globstar found match!', fr, fl, swallowee)
-          // found a match.
-          return true
-        } else {
-          // can't swallow "." or ".." ever.
-          // can only swallow ".foo" when explicitly asked.
-          if (swallowee === '.' || swallowee === '..' ||
-            (!options.dot && swallowee.charAt(0) === '.')) {
-            this.debug('dot detected!', file, fr, pattern, pr)
-            break
-          }
+Glob.prototype._readdirError = function (f, er, cb) {
+  if (this.aborted)
+    return
 
-          // ** swallows a segment, and continue.
-          this.debug('globstar swallow a segment, and continue')
-          fr++
-        }
+  // handle errors, and cache the information
+  switch (er.code) {
+    case 'ENOTSUP': // https://github.com/isaacs/node-glob/issues/205
+    case 'ENOTDIR': // totally normal. means it *does* exist.
+      var abs = this._makeAbs(f)
+      this.cache[abs] = 'FILE'
+      if (abs === this.cwdAbs) {
+        var error = new Error(er.code + ' invalid cwd ' + this.cwd)
+        error.path = this.cwd
+        error.code = er.code
+        this.emit('error', error)
+        this.abort()
       }
+      break
 
-      // no match was found.
-      // However, in partial mode, we can't say this is necessarily over.
-      // If there's more *pattern* left, then
-      if (partial) {
-        // ran out of file
-        this.debug('\n>>> no match, partial?', file, fr, pattern, pr)
-        if (fr === fl) return true
-      }
-      return false
-    }
+    case 'ENOENT': // not terribly unusual
+    case 'ELOOP':
+    case 'ENAMETOOLONG':
+    case 'UNKNOWN':
+      this.cache[this._makeAbs(f)] = false
+      break
 
-    // something other than **
-    // non-magic patterns just have to match exactly
-    // patterns with magic have been turned into regexps.
-    var hit
-    if (typeof p === 'string') {
-      if (options.nocase) {
-        hit = f.toLowerCase() === p.toLowerCase()
-      } else {
-        hit = f === p
+    default: // some unusual error.  Treat as failure.
+      this.cache[this._makeAbs(f)] = false
+      if (this.strict) {
+        this.emit('error', er)
+        // If the error is handled, then we abort
+        // if not, we threw out of here
+        this.abort()
       }
-      this.debug('string match', p, f, hit)
-    } else {
-      hit = f.match(p)
-      this.debug('pattern match', p, f, hit)
-    }
-
-    if (!hit) return false
-  }
-
-  // Note: ending in / means that we'll get a final ""
-  // at the end of the pattern.  This can only match a
-  // corresponding "" at the end of the file.
-  // If the file ends in /, then it can only match a
-  // a pattern that ends in /, unless the pattern just
-  // doesn't have any more for it. But, a/b/ should *not*
-  // match "a/b/*", even though "" matches against the
-  // [^/]*? pattern, except in partial mode, where it might
-  // simply not be reached yet.
-  // However, a/b/ should still satisfy a/*
-
-  // now either we fell off the end of the pattern, or we're done.
-  if (fi === fl && pi === pl) {
-    // ran out of pattern and filename at the same time.
-    // an exact hit!
-    return true
-  } else if (fi === fl) {
-    // ran out of file, but still had pattern left.
-    // this is ok if we're doing the match as part of
-    // a glob fs traversal.
-    return partial
-  } else if (pi === pl) {
-    // ran out of pattern, still have file left.
-    // this is only acceptable if we're on the very last
-    // empty segment of a file with a trailing slash.
-    // a/* should match a/b/
-    var emptyFileEnd = (fi === fl - 1) && (file[fi] === '')
-    return emptyFileEnd
+      if (!this.silent)
+        console.error('glob error', er)
+      break
   }
 
-  // should be unreachable.
-  throw new Error('wtf?')
+  return cb()
 }
 
-// replace stuff like \* with *
-function globUnescape (s) {
-  return s.replace(/\\(.)/g, '$1')
+Glob.prototype._processGlobStar = function (prefix, read, abs, remain, index, inGlobStar, cb) {
+  var self = this
+  this._readdir(abs, inGlobStar, function (er, entries) {
+    self._processGlobStar2(prefix, read, abs, remain, index, inGlobStar, entries, cb)
+  })
 }
 
-function regExpEscape (s) {
-  return s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&')
-}
 
+Glob.prototype._processGlobStar2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) {
+  //console.error('pgs2', prefix, remain[0], entries)
 
-/***/ }),
-/* 61 */
-/***/ (function(module, exports, __webpack_require__) {
+  // no entries means not a dir, so it can never have matches
+  // foo.txt/** doesn't match foo.txt
+  if (!entries)
+    return cb()
 
-var wrappy = __webpack_require__(123)
-module.exports = wrappy(once)
-module.exports.strict = wrappy(onceStrict)
+  // test without the globstar, and with every child both below
+  // and replacing the globstar.
+  var remainWithoutGlobStar = remain.slice(1)
+  var gspref = prefix ? [ prefix ] : []
+  var noGlobStar = gspref.concat(remainWithoutGlobStar)
 
-once.proto = once(function () {
-  Object.defineProperty(Function.prototype, 'once', {
-    value: function () {
-      return once(this)
-    },
-    configurable: true
-  })
+  // the noGlobStar pattern exits the inGlobStar state
+  this._process(noGlobStar, index, false, cb)
 
-  Object.defineProperty(Function.prototype, 'onceStrict', {
-    value: function () {
-      return onceStrict(this)
-    },
-    configurable: true
-  })
-})
+  var isSym = this.symlinks[abs]
+  var len = entries.length
 
-function once (fn) {
-  var f = function () {
-    if (f.called) return f.value
-    f.called = true
-    return f.value = fn.apply(this, arguments)
+  // If it's a symlink, and we're in a globstar, then stop
+  if (isSym && inGlobStar)
+    return cb()
+
+  for (var i = 0; i < len; i++) {
+    var e = entries[i]
+    if (e.charAt(0) === '.' && !this.dot)
+      continue
+
+    // these two cases enter the inGlobStar state
+    var instead = gspref.concat(entries[i], remainWithoutGlobStar)
+    this._process(instead, index, true, cb)
+
+    var below = gspref.concat(entries[i], remain)
+    this._process(below, index, true, cb)
   }
-  f.called = false
-  return f
+
+  cb()
 }
 
-function onceStrict (fn) {
-  var f = function () {
-    if (f.called)
-      throw new Error(f.onceError)
-    f.called = true
-    return f.value = fn.apply(this, arguments)
-  }
-  var name = fn.name || 'Function wrapped with `once`'
-  f.onceError = name + " shouldn't be called more than once"
-  f.called = false
-  return f
+Glob.prototype._processSimple = function (prefix, index, cb) {
+  // XXX review this.  Shouldn't it be doing the mounting etc
+  // before doing stat?  kinda weird?
+  var self = this
+  this._stat(prefix, function (er, exists) {
+    self._processSimple2(prefix, index, er, exists, cb)
+  })
 }
+Glob.prototype._processSimple2 = function (prefix, index, er, exists, cb) {
 
+  //console.error('ps2', prefix, exists)
 
-/***/ }),
-/* 62 */,
-/* 63 */
-/***/ (function(module, exports) {
+  if (!this.matches[index])
+    this.matches[index] = Object.create(null)
 
-module.exports = __webpack_require__(293);
+  // If it doesn't exist, then just mark the lack of results
+  if (!exists)
+    return cb()
 
-/***/ }),
-/* 64 */,
-/* 65 */,
-/* 66 */,
-/* 67 */
-/***/ (function(module, exports) {
+  if (prefix && isAbsolute(prefix) && !this.nomount) {
+    var trail = /[\/\\]$/.test(prefix)
+    if (prefix.charAt(0) === '/') {
+      prefix = path.join(this.root, prefix)
+    } else {
+      prefix = path.resolve(this.root, prefix)
+      if (trail)
+        prefix += '/'
+    }
+  }
 
-// 7.2.1 RequireObjectCoercible(argument)
-module.exports = function (it) {
-  if (it == undefined) throw TypeError("Can't call method on  " + it);
-  return it;
-};
+  if (process.platform === 'win32')
+    prefix = prefix.replace(/\\/g, '/')
 
+  // Mark this as a match
+  this._emitMatch(index, prefix)
+  cb()
+}
 
-/***/ }),
-/* 68 */
-/***/ (function(module, exports, __webpack_require__) {
+// Returns either 'DIR', 'FILE', or false
+Glob.prototype._stat = function (f, cb) {
+  var abs = this._makeAbs(f)
+  var needDir = f.slice(-1) === '/'
 
-var isObject = __webpack_require__(34);
-var document = __webpack_require__(11).document;
-// typeof document.createElement is 'object' in old IE
-var is = isObject(document) && isObject(document.createElement);
-module.exports = function (it) {
-  return is ? document.createElement(it) : {};
-};
+  if (f.length > this.maxLength)
+    return cb()
 
+  if (!this.stat && ownProp(this.cache, abs)) {
+    var c = this.cache[abs]
 
-/***/ }),
-/* 69 */
-/***/ (function(module, exports) {
+    if (Array.isArray(c))
+      c = 'DIR'
 
-module.exports = true;
+    // It exists, but maybe not how we need it
+    if (!needDir || c === 'DIR')
+      return cb(null, c)
 
+    if (needDir && c === 'FILE')
+      return cb()
 
-/***/ }),
-/* 70 */
-/***/ (function(module, exports, __webpack_require__) {
+    // otherwise we have to stat, because maybe c=true
+    // if we know it exists, but not what it is.
+  }
 
-"use strict";
+  var exists
+  var stat = this.statCache[abs]
+  if (stat !== undefined) {
+    if (stat === false)
+      return cb(null, stat)
+    else {
+      var type = stat.isDirectory() ? 'DIR' : 'FILE'
+      if (needDir && type === 'FILE')
+        return cb()
+      else
+        return cb(null, type, stat)
+    }
+  }
 
-// 25.4.1.5 NewPromiseCapability(C)
-var aFunction = __webpack_require__(46);
+  var self = this
+  var statcb = inflight('stat\0' + abs, lstatcb_)
+  if (statcb)
+    fs.lstat(abs, statcb)
 
-function PromiseCapability(C) {
-  var resolve, reject;
-  this.promise = new C(function ($$resolve, $$reject) {
-    if (resolve !== undefined || reject !== undefined) throw TypeError('Bad Promise constructor');
-    resolve = $$resolve;
-    reject = $$reject;
-  });
-  this.resolve = aFunction(resolve);
-  this.reject = aFunction(reject);
+  function lstatcb_ (er, lstat) {
+    if (lstat && lstat.isSymbolicLink()) {
+      // If it's a symlink, then treat it as the target, unless
+      // the target does not exist, then treat it as a file.
+      return fs.stat(abs, function (er, stat) {
+        if (er)
+          self._stat2(f, abs, null, lstat, cb)
+        else
+          self._stat2(f, abs, er, stat, cb)
+      })
+    } else {
+      self._stat2(f, abs, er, lstat, cb)
+    }
+  }
 }
 
-module.exports.f = function (C) {
-  return new PromiseCapability(C);
-};
+Glob.prototype._stat2 = function (f, abs, er, stat, cb) {
+  if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) {
+    this.statCache[abs] = false
+    return cb()
+  }
 
+  var needDir = f.slice(-1) === '/'
+  this.statCache[abs] = stat
 
-/***/ }),
-/* 71 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (abs.slice(-1) === '/' && stat && !stat.isDirectory())
+    return cb(null, false, stat)
 
-var def = __webpack_require__(50).f;
-var has = __webpack_require__(49);
-var TAG = __webpack_require__(13)('toStringTag');
+  var c = true
+  if (stat)
+    c = stat.isDirectory() ? 'DIR' : 'FILE'
+  this.cache[abs] = this.cache[abs] || c
 
-module.exports = function (it, tag, stat) {
-  if (it && !has(it = stat ? it : it.prototype, TAG)) def(it, TAG, { configurable: true, value: tag });
-};
+  if (needDir && c === 'FILE')
+    return cb()
+
+  return cb(null, c, stat)
+}
 
 
 /***/ }),
-/* 72 */
+/* 76 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var shared = __webpack_require__(107)('keys');
-var uid = __webpack_require__(111);
-module.exports = function (key) {
-  return shared[key] || (shared[key] = uid(key));
-};
+"use strict";
 
 
-/***/ }),
-/* 73 */
-/***/ (function(module, exports) {
+function posix(path) {
+	return path.charAt(0) === '/';
+}
 
-// 7.1.4 ToInteger
-var ceil = Math.ceil;
-var floor = Math.floor;
-module.exports = function (it) {
-  return isNaN(it = +it) ? 0 : (it > 0 ? floor : ceil)(it);
-};
+function win32(path) {
+	// https://github.com/nodejs/node/blob/b3fcc245fb25539909ef1d5eaa01dbf92e168633/lib/path.js#L56
+	var splitDeviceRe = /^([a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/]+[^\\\/]+)?([\\\/])?([\s\S]*?)$/;
+	var result = splitDeviceRe.exec(path);
+	var device = result[1] || '';
+	var isUnc = Boolean(device && device.charAt(1) !== ':');
 
+	// UNC paths are always absolute
+	return Boolean(result[2] || isUnc);
+}
 
-/***/ }),
-/* 74 */
-/***/ (function(module, exports, __webpack_require__) {
+module.exports = process.platform === 'win32' ? win32 : posix;
+module.exports.posix = posix;
+module.exports.win32 = win32;
 
-// to indexed object, toObject with fallback for non-array-like ES3 strings
-var IObject = __webpack_require__(131);
-var defined = __webpack_require__(67);
-module.exports = function (it) {
-  return IObject(defined(it));
-};
 
+/***/ }),
+/* 77 */,
+/* 78 */,
+/* 79 */
+/***/ (function(module, exports) {
+
+module.exports = __webpack_require__(121);
 
 /***/ }),
-/* 75 */
+/* 80 */,
+/* 81 */
 /***/ (function(module, exports, __webpack_require__) {
 
-// Approach:
-//
-// 1. Get the minimatch set
-// 2. For each pattern in the set, PROCESS(pattern, false)
-// 3. Store matches per-set, then uniq them
-//
-// PROCESS(pattern, inGlobStar)
-// Get the first [n] items from pattern that are all strings
-// Join these together.  This is PREFIX.
-//   If there is no more remaining, then stat(PREFIX) and
-//   add to matches if it succeeds.  END.
-//
-// If inGlobStar and PREFIX is symlink and points to dir
-//   set ENTRIES = []
-// else readdir(PREFIX) as ENTRIES
-//   If fail, END
-//
-// with ENTRIES
-//   If pattern[n] is GLOBSTAR
-//     // handle the case where the globstar match is empty
-//     // by pruning it out, and testing the resulting pattern
-//     PROCESS(pattern[0..n] + pattern[n+1 .. $], false)
-//     // handle other cases.
-//     for ENTRY in ENTRIES (not dotfiles)
-//       // attach globstar + tail onto the entry
-//       // Mark that this entry is a globstar match
-//       PROCESS(pattern[0..n] + ENTRY + pattern[n .. $], true)
-//
-//   else // not globstar
-//     for ENTRY in ENTRIES (not dotfiles, unless pattern[n] is dot)
-//       Test ENTRY against pattern[n]
-//       If fails, continue
-//       If passes, PROCESS(pattern[0..n] + item + pattern[n+1 .. $])
-//
-// Caveat:
-//   Cache all stats and readdirs results to minimize syscall.  Since all
-//   we ever care about is existence and directory-ness, we can just keep
-//   `true` for files, and [children,...] for directories, or `false` for
-//   things that don't exist.
-
-module.exports = glob
+"use strict";
 
-var fs = __webpack_require__(3)
-var rp = __webpack_require__(114)
-var minimatch = __webpack_require__(60)
-var Minimatch = minimatch.Minimatch
-var inherits = __webpack_require__(42)
-var EE = __webpack_require__(54).EventEmitter
-var path = __webpack_require__(0)
-var assert = __webpack_require__(22)
-var isAbsolute = __webpack_require__(76)
-var globSync = __webpack_require__(218)
-var common = __webpack_require__(115)
-var alphasort = common.alphasort
-var alphasorti = common.alphasorti
-var setopts = common.setopts
-var ownProp = common.ownProp
-var inflight = __webpack_require__(223)
-var util = __webpack_require__(2)
-var childrenIgnored = common.childrenIgnored
-var isIgnored = common.isIgnored
 
-var once = __webpack_require__(61)
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 
-function glob (pattern, options, cb) {
-  if (typeof options === 'function') cb = options, options = {}
-  if (!options) options = {}
+exports.default = function (str, fileLoc = 'lockfile') {
+  str = (0, (_stripBom || _load_stripBom()).default)(str);
+  return hasMergeConflicts(str) ? parseWithConflict(str, fileLoc) : { type: 'success', object: parse(str, fileLoc) };
+};
 
-  if (options.sync) {
-    if (cb)
-      throw new TypeError('callback provided to sync glob')
-    return globSync(pattern, options)
-  }
+var _util;
 
-  return new Glob(pattern, options, cb)
+function _load_util() {
+  return _util = _interopRequireDefault(__webpack_require__(2));
 }
 
-glob.sync = globSync
-var GlobSync = glob.GlobSync = globSync.GlobSync
+var _invariant;
 
-// old api surface
-glob.glob = glob
+function _load_invariant() {
+  return _invariant = _interopRequireDefault(__webpack_require__(7));
+}
 
-function extend (origin, add) {
-  if (add === null || typeof add !== 'object') {
-    return origin
-  }
+var _stripBom;
 
-  var keys = Object.keys(add)
-  var i = keys.length
-  while (i--) {
-    origin[keys[i]] = add[keys[i]]
-  }
-  return origin
+function _load_stripBom() {
+  return _stripBom = _interopRequireDefault(__webpack_require__(122));
 }
 
-glob.hasMagic = function (pattern, options_) {
-  var options = extend({}, options_)
-  options.noprocess = true
+var _constants;
 
-  var g = new Glob(pattern, options)
-  var set = g.minimatch.set
+function _load_constants() {
+  return _constants = __webpack_require__(6);
+}
 
-  if (!pattern)
-    return false
+var _errors;
 
-  if (set.length > 1)
-    return true
+function _load_errors() {
+  return _errors = __webpack_require__(4);
+}
 
-  for (var j = 0; j < set[0].length; j++) {
-    if (typeof set[0][j] !== 'string')
-      return true
-  }
+var _map;
 
-  return false
+function _load_map() {
+  return _map = _interopRequireDefault(__webpack_require__(20));
 }
 
-glob.Glob = Glob
-inherits(Glob, EE)
-function Glob (pattern, options, cb) {
-  if (typeof options === 'function') {
-    cb = options
-    options = null
-  }
-
-  if (options && options.sync) {
-    if (cb)
-      throw new TypeError('callback provided to sync glob')
-    return new GlobSync(pattern, options)
-  }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-  if (!(this instanceof Glob))
-    return new Glob(pattern, options, cb)
+/* eslint quotes: 0 */
 
-  setopts(this, pattern, options)
-  this._didRealPath = false
+const VERSION_REGEX = /^yarn lockfile v(\d+)$/;
 
-  // process each pattern in the minimatch set
-  var n = this.minimatch.set.length
+const TOKEN_TYPES = {
+  boolean: 'BOOLEAN',
+  string: 'STRING',
+  identifier: 'IDENTIFIER',
+  eof: 'EOF',
+  colon: 'COLON',
+  newline: 'NEWLINE',
+  comment: 'COMMENT',
+  indent: 'INDENT',
+  invalid: 'INVALID',
+  number: 'NUMBER',
+  comma: 'COMMA'
+};
 
-  // The matches are stored as {<filename>: true,...} so that
-  // duplicates are automagically pruned.
-  // Later, we do an Object.keys() on these.
-  // Keep them as a list so we can fill in when nonull is set.
-  this.matches = new Array(n)
+const VALID_PROP_VALUE_TOKENS = [TOKEN_TYPES.boolean, TOKEN_TYPES.string, TOKEN_TYPES.number];
 
-  if (typeof cb === 'function') {
-    cb = once(cb)
-    this.on('error', cb)
-    this.on('end', function (matches) {
-      cb(null, matches)
-    })
-  }
+function isValidPropValueToken(token) {
+  return VALID_PROP_VALUE_TOKENS.indexOf(token.type) >= 0;
+}
 
-  var self = this
-  this._processing = 0
+function* tokenise(input) {
+  let lastNewline = false;
+  let line = 1;
+  let col = 0;
 
-  this._emitQueue = []
-  this._processQueue = []
-  this.paused = false
+  function buildToken(type, value) {
+    return { line, col, type, value };
+  }
 
-  if (this.noprocess)
-    return this
+  while (input.length) {
+    let chop = 0;
 
-  if (n === 0)
-    return done()
+    if (input[0] === '\n' || input[0] === '\r') {
+      chop++;
+      // If this is a \r\n line, ignore both chars but only add one new line
+      if (input[1] === '\n') {
+        chop++;
+      }
+      line++;
+      col = 0;
+      yield buildToken(TOKEN_TYPES.newline);
+    } else if (input[0] === '#') {
+      chop++;
 
-  var sync = true
-  for (var i = 0; i < n; i ++) {
-    this._process(this.minimatch.set[i], i, false, done)
-  }
-  sync = false
+      let val = '';
+      while (input[chop] !== '\n') {
+        val += input[chop];
+        chop++;
+      }
+      yield buildToken(TOKEN_TYPES.comment, val);
+    } else if (input[0] === ' ') {
+      if (lastNewline) {
+        let indent = '';
+        for (let i = 0; input[i] === ' '; i++) {
+          indent += input[i];
+        }
 
-  function done () {
-    --self._processing
-    if (self._processing <= 0) {
-      if (sync) {
-        process.nextTick(function () {
-          self._finish()
-        })
+        if (indent.length % 2) {
+          throw new TypeError('Invalid number of spaces');
+        } else {
+          chop = indent.length;
+          yield buildToken(TOKEN_TYPES.indent, indent.length / 2);
+        }
       } else {
-        self._finish()
+        chop++;
       }
-    }
-  }
-}
+    } else if (input[0] === '"') {
+      let val = '';
 
-Glob.prototype._finish = function () {
-  assert(this instanceof Glob)
-  if (this.aborted)
-    return
+      for (let i = 0;; i++) {
+        const currentChar = input[i];
+        val += currentChar;
 
-  if (this.realpath && !this._didRealpath)
-    return this._realpath()
+        if (i > 0 && currentChar === '"') {
+          const isEscaped = input[i - 1] === '\\' && input[i - 2] !== '\\';
+          if (!isEscaped) {
+            break;
+          }
+        }
+      }
 
-  common.finish(this)
-  this.emit('end', this.found)
-}
+      chop = val.length;
 
-Glob.prototype._realpath = function () {
-  if (this._didRealpath)
-    return
+      try {
+        yield buildToken(TOKEN_TYPES.string, JSON.parse(val));
+      } catch (err) {
+        if (err instanceof SyntaxError) {
+          yield buildToken(TOKEN_TYPES.invalid);
+        } else {
+          throw err;
+        }
+      }
+    } else if (/^[0-9]/.test(input)) {
+      let val = '';
+      for (let i = 0; /^[0-9]$/.test(input[i]); i++) {
+        val += input[i];
+      }
+      chop = val.length;
 
-  this._didRealpath = true
+      yield buildToken(TOKEN_TYPES.number, +val);
+    } else if (/^true/.test(input)) {
+      yield buildToken(TOKEN_TYPES.boolean, true);
+      chop = 4;
+    } else if (/^false/.test(input)) {
+      yield buildToken(TOKEN_TYPES.boolean, false);
+      chop = 5;
+    } else if (input[0] === ':') {
+      yield buildToken(TOKEN_TYPES.colon);
+      chop++;
+    } else if (input[0] === ',') {
+      yield buildToken(TOKEN_TYPES.comma);
+      chop++;
+    } else if (/^[a-zA-Z\/-]/g.test(input)) {
+      let name = '';
+      for (let i = 0; i < input.length; i++) {
+        const char = input[i];
+        if (char === ':' || char === ' ' || char === '\n' || char === '\r' || char === ',') {
+          break;
+        } else {
+          name += char;
+        }
+      }
+      chop = name.length;
 
-  var n = this.matches.length
-  if (n === 0)
-    return this._finish()
+      yield buildToken(TOKEN_TYPES.string, name);
+    } else {
+      yield buildToken(TOKEN_TYPES.invalid);
+    }
 
-  var self = this
-  for (var i = 0; i < this.matches.length; i++)
-    this._realpathSet(i, next)
+    if (!chop) {
+      // will trigger infinite recursion
+      yield buildToken(TOKEN_TYPES.invalid);
+    }
 
-  function next () {
-    if (--n === 0)
-      self._finish()
+    col += chop;
+    lastNewline = input[0] === '\n' || input[0] === '\r' && input[1] === '\n';
+    input = input.slice(chop);
   }
-}
 
-Glob.prototype._realpathSet = function (index, cb) {
-  var matchset = this.matches[index]
-  if (!matchset)
-    return cb()
+  yield buildToken(TOKEN_TYPES.eof);
+}
 
-  var found = Object.keys(matchset)
-  var self = this
-  var n = found.length
+class Parser {
+  constructor(input, fileLoc = 'lockfile') {
+    this.comments = [];
+    this.tokens = tokenise(input);
+    this.fileLoc = fileLoc;
+  }
 
-  if (n === 0)
-    return cb()
+  onComment(token) {
+    const value = token.value;
+    (0, (_invariant || _load_invariant()).default)(typeof value === 'string', 'expected token value to be a string');
 
-  var set = this.matches[index] = Object.create(null)
-  found.forEach(function (p, i) {
-    // If there's a problem with the stat, then it means that
-    // one or more of the links in the realpath couldn't be
-    // resolved.  just return the abs value in that case.
-    p = self._makeAbs(p)
-    rp.realpath(p, self.realpathCache, function (er, real) {
-      if (!er)
-        set[real] = true
-      else if (er.syscall === 'stat')
-        set[p] = true
-      else
-        self.emit('error', er) // srsly wtf right here
+    const comment = value.trim();
 
-      if (--n === 0) {
-        self.matches[index] = set
-        cb()
+    const versionMatch = comment.match(VERSION_REGEX);
+    if (versionMatch) {
+      const version = +versionMatch[1];
+      if (version > (_constants || _load_constants()).LOCKFILE_VERSION) {
+        throw new (_errors || _load_errors()).MessageError(`Can't install from a lockfile of version ${version} as you're on an old yarn version that only supports ` + `versions up to ${(_constants || _load_constants()).LOCKFILE_VERSION}. Run \`$ yarn self-update\` to upgrade to the latest version.`);
       }
-    })
-  })
-}
-
-Glob.prototype._mark = function (p) {
-  return common.mark(this, p)
-}
+    }
 
-Glob.prototype._makeAbs = function (f) {
-  return common.makeAbs(this, f)
-}
+    this.comments.push(comment);
+  }
 
-Glob.prototype.abort = function () {
-  this.aborted = true
-  this.emit('abort')
-}
+  next() {
+    const item = this.tokens.next();
+    (0, (_invariant || _load_invariant()).default)(item, 'expected a token');
 
-Glob.prototype.pause = function () {
-  if (!this.paused) {
-    this.paused = true
-    this.emit('pause')
-  }
-}
+    const done = item.done,
+          value = item.value;
 
-Glob.prototype.resume = function () {
-  if (this.paused) {
-    this.emit('resume')
-    this.paused = false
-    if (this._emitQueue.length) {
-      var eq = this._emitQueue.slice(0)
-      this._emitQueue.length = 0
-      for (var i = 0; i < eq.length; i ++) {
-        var e = eq[i]
-        this._emitMatch(e[0], e[1])
-      }
-    }
-    if (this._processQueue.length) {
-      var pq = this._processQueue.slice(0)
-      this._processQueue.length = 0
-      for (var i = 0; i < pq.length; i ++) {
-        var p = pq[i]
-        this._processing--
-        this._process(p[0], p[1], p[2], p[3])
-      }
+    if (done || !value) {
+      throw new Error('No more tokens');
+    } else if (value.type === TOKEN_TYPES.comment) {
+      this.onComment(value);
+      return this.next();
+    } else {
+      return this.token = value;
     }
   }
-}
-
-Glob.prototype._process = function (pattern, index, inGlobStar, cb) {
-  assert(this instanceof Glob)
-  assert(typeof cb === 'function')
 
-  if (this.aborted)
-    return
-
-  this._processing++
-  if (this.paused) {
-    this._processQueue.push([pattern, index, inGlobStar, cb])
-    return
+  unexpected(msg = 'Unexpected token') {
+    throw new SyntaxError(`${msg} ${this.token.line}:${this.token.col} in ${this.fileLoc}`);
   }
 
-  //console.error('PROCESS %d', this._processing, pattern)
+  expect(tokType) {
+    if (this.token.type === tokType) {
+      this.next();
+    } else {
+      this.unexpected();
+    }
+  }
 
-  // Get the first [n] parts of pattern that are all strings.
-  var n = 0
-  while (typeof pattern[n] === 'string') {
-    n ++
+  eat(tokType) {
+    if (this.token.type === tokType) {
+      this.next();
+      return true;
+    } else {
+      return false;
+    }
   }
-  // now n is the index of the first one that is *not* a string.
 
-  // see if there's anything else
-  var prefix
-  switch (n) {
-    // if not, then this is rather simple
-    case pattern.length:
-      this._processSimple(pattern.join('/'), index, cb)
-      return
+  parse(indent = 0) {
+    const obj = (0, (_map || _load_map()).default)();
 
-    case 0:
-      // pattern *starts* with some non-trivial item.
-      // going to readdir(cwd), but not include the prefix in matches.
-      prefix = null
-      break
+    while (true) {
+      const propToken = this.token;
 
-    default:
-      // pattern has some string bits in the front.
-      // whatever it starts with, whether that's 'absolute' like /foo/bar,
-      // or 'relative' like '../baz'
-      prefix = pattern.slice(0, n).join('/')
-      break
-  }
+      if (propToken.type === TOKEN_TYPES.newline) {
+        const nextToken = this.next();
+        if (!indent) {
+          // if we have 0 indentation then the next token doesn't matter
+          continue;
+        }
 
-  var remain = pattern.slice(n)
+        if (nextToken.type !== TOKEN_TYPES.indent) {
+          // if we have no indentation after a newline then we've gone down a level
+          break;
+        }
 
-  // get the list of entries.
-  var read
-  if (prefix === null)
-    read = '.'
-  else if (isAbsolute(prefix) || isAbsolute(pattern.join('/'))) {
-    if (!prefix || !isAbsolute(prefix))
-      prefix = '/' + prefix
-    read = prefix
-  } else
-    read = prefix
+        if (nextToken.value === indent) {
+          // all is good, the indent is on our level
+          this.next();
+        } else {
+          // the indentation is less than our level
+          break;
+        }
+      } else if (propToken.type === TOKEN_TYPES.indent) {
+        if (propToken.value === indent) {
+          this.next();
+        } else {
+          break;
+        }
+      } else if (propToken.type === TOKEN_TYPES.eof) {
+        break;
+      } else if (propToken.type === TOKEN_TYPES.string) {
+        // property key
+        const key = propToken.value;
+        (0, (_invariant || _load_invariant()).default)(key, 'Expected a key');
 
-  var abs = this._makeAbs(read)
+        const keys = [key];
+        this.next();
 
-  //if ignored, skip _processing
-  if (childrenIgnored(this, read))
-    return cb()
+        // support multiple keys
+        while (this.token.type === TOKEN_TYPES.comma) {
+          this.next(); // skip comma
 
-  var isGlobStar = remain[0] === minimatch.GLOBSTAR
-  if (isGlobStar)
-    this._processGlobStar(prefix, read, abs, remain, index, inGlobStar, cb)
-  else
-    this._processReaddir(prefix, read, abs, remain, index, inGlobStar, cb)
-}
+          const keyToken = this.token;
+          if (keyToken.type !== TOKEN_TYPES.string) {
+            this.unexpected('Expected string');
+          }
 
-Glob.prototype._processReaddir = function (prefix, read, abs, remain, index, inGlobStar, cb) {
-  var self = this
-  this._readdir(abs, inGlobStar, function (er, entries) {
-    return self._processReaddir2(prefix, read, abs, remain, index, inGlobStar, entries, cb)
-  })
-}
+          const key = keyToken.value;
+          (0, (_invariant || _load_invariant()).default)(key, 'Expected a key');
+          keys.push(key);
+          this.next();
+        }
 
-Glob.prototype._processReaddir2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) {
+        const valToken = this.token;
 
-  // if the abs isn't a dir, then nothing can match!
-  if (!entries)
-    return cb()
+        if (valToken.type === TOKEN_TYPES.colon) {
+          // object
+          this.next();
 
-  // It will only match dot entries if it starts with a dot, or if
-  // dot is set.  Stuff like @(.foo|.bar) isn't allowed.
-  var pn = remain[0]
-  var negate = !!this.minimatch.negate
-  var rawGlob = pn._glob
-  var dotOk = this.dot || rawGlob.charAt(0) === '.'
+          // parse object
+          const val = this.parse(indent + 1);
 
-  var matchedEntries = []
-  for (var i = 0; i < entries.length; i++) {
-    var e = entries[i]
-    if (e.charAt(0) !== '.' || dotOk) {
-      var m
-      if (negate && !prefix) {
-        m = !e.match(pn)
-      } else {
-        m = e.match(pn)
-      }
-      if (m)
-        matchedEntries.push(e)
-    }
-  }
+          for (var _iterator = keys, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+            var _ref;
 
-  //console.error('prd2', prefix, entries, remain[0]._glob, matchedEntries)
+            if (_isArray) {
+              if (_i >= _iterator.length) break;
+              _ref = _iterator[_i++];
+            } else {
+              _i = _iterator.next();
+              if (_i.done) break;
+              _ref = _i.value;
+            }
 
-  var len = matchedEntries.length
-  // If there are no matched entries, then nothing matches.
-  if (len === 0)
-    return cb()
+            const key = _ref;
 
-  // if this is the last remaining pattern bit, then no need for
-  // an additional stat *unless* the user has specified mark or
-  // stat explicitly.  We know they exist, since readdir returned
-  // them.
+            obj[key] = val;
+          }
 
-  if (remain.length === 1 && !this.mark && !this.stat) {
-    if (!this.matches[index])
-      this.matches[index] = Object.create(null)
+          if (indent && this.token.type !== TOKEN_TYPES.indent) {
+            break;
+          }
+        } else if (isValidPropValueToken(valToken)) {
+          // plain value
+          for (var _iterator2 = keys, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+            var _ref2;
 
-    for (var i = 0; i < len; i ++) {
-      var e = matchedEntries[i]
-      if (prefix) {
-        if (prefix !== '/')
-          e = prefix + '/' + e
-        else
-          e = prefix + e
-      }
+            if (_isArray2) {
+              if (_i2 >= _iterator2.length) break;
+              _ref2 = _iterator2[_i2++];
+            } else {
+              _i2 = _iterator2.next();
+              if (_i2.done) break;
+              _ref2 = _i2.value;
+            }
 
-      if (e.charAt(0) === '/' && !this.nomount) {
-        e = path.join(this.root, e)
+            const key = _ref2;
+
+            obj[key] = valToken.value;
+          }
+
+          this.next();
+        } else {
+          this.unexpected('Invalid value type');
+        }
+      } else {
+        this.unexpected(`Unknown token: ${(_util || _load_util()).default.inspect(propToken)}`);
       }
-      this._emitMatch(index, e)
     }
-    // This was the last one, and no stats were needed
-    return cb()
-  }
 
-  // now test all matched entries as stand-ins for that part
-  // of the pattern.
-  remain.shift()
-  for (var i = 0; i < len; i ++) {
-    var e = matchedEntries[i]
-    var newPattern
-    if (prefix) {
-      if (prefix !== '/')
-        e = prefix + '/' + e
-      else
-        e = prefix + e
-    }
-    this._process([e].concat(remain), index, inGlobStar, cb)
+    return obj;
   }
-  cb()
 }
 
-Glob.prototype._emitMatch = function (index, e) {
-  if (this.aborted)
-    return
-
-  if (isIgnored(this, e))
-    return
-
-  if (this.paused) {
-    this._emitQueue.push([index, e])
-    return
-  }
-
-  var abs = isAbsolute(e) ? e : this._makeAbs(e)
-
-  if (this.mark)
-    e = this._mark(e)
+const MERGE_CONFLICT_ANCESTOR = '|||||||';
+const MERGE_CONFLICT_END = '>>>>>>>';
+const MERGE_CONFLICT_SEP = '=======';
+const MERGE_CONFLICT_START = '<<<<<<<';
 
-  if (this.absolute)
-    e = abs
+/**
+ * Extract the two versions of the lockfile from a merge conflict.
+ */
+function extractConflictVariants(str) {
+  const variants = [[], []];
+  const lines = str.split(/\r?\n/g);
+  let skip = false;
 
-  if (this.matches[index][e])
-    return
+  while (lines.length) {
+    const line = lines.shift();
+    if (line.startsWith(MERGE_CONFLICT_START)) {
+      // get the first variant
+      while (lines.length) {
+        const conflictLine = lines.shift();
+        if (conflictLine === MERGE_CONFLICT_SEP) {
+          skip = false;
+          break;
+        } else if (skip || conflictLine.startsWith(MERGE_CONFLICT_ANCESTOR)) {
+          skip = true;
+          continue;
+        } else {
+          variants[0].push(conflictLine);
+        }
+      }
 
-  if (this.nodir) {
-    var c = this.cache[abs]
-    if (c === 'DIR' || Array.isArray(c))
-      return
+      // get the second variant
+      while (lines.length) {
+        const conflictLine = lines.shift();
+        if (conflictLine.startsWith(MERGE_CONFLICT_END)) {
+          break;
+        } else {
+          variants[1].push(conflictLine);
+        }
+      }
+    } else {
+      variants[0].push(line);
+      variants[1].push(line);
+    }
   }
 
-  this.matches[index][e] = true
+  return [variants[0].join('\n'), variants[1].join('\n')];
+}
 
-  var st = this.statCache[abs]
-  if (st)
-    this.emit('stat', e, st)
+/**
+ * Check if a lockfile has merge conflicts.
+ */
+function hasMergeConflicts(str) {
+  return str.includes(MERGE_CONFLICT_START) && str.includes(MERGE_CONFLICT_SEP) && str.includes(MERGE_CONFLICT_END);
+}
 
-  this.emit('match', e)
+/**
+ * Parse the lockfile.
+ */
+function parse(str, fileLoc) {
+  const parser = new Parser(str, fileLoc);
+  parser.next();
+  return parser.parse();
 }
 
-Glob.prototype._readdirInGlobStar = function (abs, cb) {
-  if (this.aborted)
-    return
+/**
+ * Parse and merge the two variants in a conflicted lockfile.
+ */
+function parseWithConflict(str, fileLoc) {
+  const variants = extractConflictVariants(str);
+  try {
+    return { type: 'merge', object: Object.assign({}, parse(variants[0], fileLoc), parse(variants[1], fileLoc)) };
+  } catch (err) {
+    if (err instanceof SyntaxError) {
+      return { type: 'conflict', object: {} };
+    } else {
+      throw err;
+    }
+  }
+}
 
-  // follow all symlinked directories forever
-  // just proceed as if this is a non-globstar situation
-  if (this.follow)
-    return this._readdir(abs, false, cb)
+/***/ }),
+/* 82 */,
+/* 83 */,
+/* 84 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  var lstatkey = 'lstat\0' + abs
-  var self = this
-  var lstatcb = inflight(lstatkey, lstatcb_)
+"use strict";
 
-  if (lstatcb)
-    fs.lstat(abs, lstatcb)
 
-  function lstatcb_ (er, lstat) {
-    if (er && er.code === 'ENOENT')
-      return cb()
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 
-    var isSym = lstat && lstat.isSymbolicLink()
-    self.symlinks[abs] = isSym
+var _map;
 
-    // If it's not a symlink or a dir, then it's definitely a regular file.
-    // don't bother doing a readdir in that case.
-    if (!isSym && lstat && !lstat.isDirectory()) {
-      self.cache[abs] = 'FILE'
-      cb()
-    } else
-      self._readdir(abs, false, cb)
-  }
+function _load_map() {
+  return _map = _interopRequireDefault(__webpack_require__(20));
 }
 
-Glob.prototype._readdir = function (abs, inGlobStar, cb) {
-  if (this.aborted)
-    return
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-  cb = inflight('readdir\0'+abs+'\0'+inGlobStar, cb)
-  if (!cb)
-    return
+const debug = __webpack_require__(212)('yarn');
 
-  //console.error('RD %j %j', +inGlobStar, abs)
-  if (inGlobStar && !ownProp(this.symlinks, abs))
-    return this._readdirInGlobStar(abs, cb)
+class BlockingQueue {
+  constructor(alias, maxConcurrency = Infinity) {
+    this.concurrencyQueue = [];
+    this.maxConcurrency = maxConcurrency;
+    this.runningCount = 0;
+    this.warnedStuck = false;
+    this.alias = alias;
+    this.first = true;
 
-  if (ownProp(this.cache, abs)) {
-    var c = this.cache[abs]
-    if (!c || c === 'FILE')
-      return cb()
+    this.running = (0, (_map || _load_map()).default)();
+    this.queue = (0, (_map || _load_map()).default)();
 
-    if (Array.isArray(c))
-      return cb(null, c)
+    this.stuckTick = this.stuckTick.bind(this);
   }
 
-  var self = this
-  fs.readdir(abs, readdirCb(this, abs, cb))
-}
+  stillActive() {
+    if (this.stuckTimer) {
+      clearTimeout(this.stuckTimer);
+    }
 
-function readdirCb (self, abs, cb) {
-  return function (er, entries) {
-    if (er)
-      self._readdirError(abs, er, cb)
-    else
-      self._readdirEntries(abs, entries, cb)
-  }
-}
+    this.stuckTimer = setTimeout(this.stuckTick, 5000);
 
-Glob.prototype._readdirEntries = function (abs, entries, cb) {
-  if (this.aborted)
-    return
+    // We need to check the existence of unref because of https://github.com/facebook/jest/issues/4559
+    // $FlowFixMe: Node's setInterval returns a Timeout, not a Number
+    this.stuckTimer.unref && this.stuckTimer.unref();
+  }
 
-  // if we haven't asked to stat everything, then just
-  // assume that everything in there exists, so we can avoid
-  // having to stat it a second time.
-  if (!this.mark && !this.stat) {
-    for (var i = 0; i < entries.length; i ++) {
-      var e = entries[i]
-      if (abs === '/')
-        e = abs + e
-      else
-        e = abs + '/' + e
-      this.cache[e] = true
+  stuckTick() {
+    if (this.runningCount === 1) {
+      this.warnedStuck = true;
+      debug(`The ${JSON.stringify(this.alias)} blocking queue may be stuck. 5 seconds ` + `without any activity with 1 worker: ${Object.keys(this.running)[0]}`);
     }
   }
 
-  this.cache[abs] = entries
-  return cb(null, entries)
-}
-
-Glob.prototype._readdirError = function (f, er, cb) {
-  if (this.aborted)
-    return
-
-  // handle errors, and cache the information
-  switch (er.code) {
-    case 'ENOTSUP': // https://github.com/isaacs/node-glob/issues/205
-    case 'ENOTDIR': // totally normal. means it *does* exist.
-      var abs = this._makeAbs(f)
-      this.cache[abs] = 'FILE'
-      if (abs === this.cwdAbs) {
-        var error = new Error(er.code + ' invalid cwd ' + this.cwd)
-        error.path = this.cwd
-        error.code = er.code
-        this.emit('error', error)
-        this.abort()
-      }
-      break
+  push(key, factory) {
+    if (this.first) {
+      this.first = false;
+    } else {
+      this.stillActive();
+    }
 
-    case 'ENOENT': // not terribly unusual
-    case 'ELOOP':
-    case 'ENAMETOOLONG':
-    case 'UNKNOWN':
-      this.cache[this._makeAbs(f)] = false
-      break
+    return new Promise((resolve, reject) => {
+      // we're already running so push ourselves to the queue
+      const queue = this.queue[key] = this.queue[key] || [];
+      queue.push({ factory, resolve, reject });
 
-    default: // some unusual error.  Treat as failure.
-      this.cache[this._makeAbs(f)] = false
-      if (this.strict) {
-        this.emit('error', er)
-        // If the error is handled, then we abort
-        // if not, we threw out of here
-        this.abort()
+      if (!this.running[key]) {
+        this.shift(key);
       }
-      if (!this.silent)
-        console.error('glob error', er)
-      break
+    });
   }
 
-  return cb()
-}
+  shift(key) {
+    if (this.running[key]) {
+      delete this.running[key];
+      this.runningCount--;
 
-Glob.prototype._processGlobStar = function (prefix, read, abs, remain, index, inGlobStar, cb) {
-  var self = this
-  this._readdir(abs, inGlobStar, function (er, entries) {
-    self._processGlobStar2(prefix, read, abs, remain, index, inGlobStar, entries, cb)
-  })
-}
+      if (this.stuckTimer) {
+        clearTimeout(this.stuckTimer);
+        this.stuckTimer = null;
+      }
 
+      if (this.warnedStuck) {
+        this.warnedStuck = false;
+        debug(`${JSON.stringify(this.alias)} blocking queue finally resolved. Nothing to worry about.`);
+      }
+    }
 
-Glob.prototype._processGlobStar2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) {
-  //console.error('pgs2', prefix, remain[0], entries)
+    const queue = this.queue[key];
+    if (!queue) {
+      return;
+    }
 
-  // no entries means not a dir, so it can never have matches
-  // foo.txt/** doesn't match foo.txt
-  if (!entries)
-    return cb()
+    var _queue$shift = queue.shift();
 
-  // test without the globstar, and with every child both below
-  // and replacing the globstar.
-  var remainWithoutGlobStar = remain.slice(1)
-  var gspref = prefix ? [ prefix ] : []
-  var noGlobStar = gspref.concat(remainWithoutGlobStar)
+    const resolve = _queue$shift.resolve,
+          reject = _queue$shift.reject,
+          factory = _queue$shift.factory;
 
-  // the noGlobStar pattern exits the inGlobStar state
-  this._process(noGlobStar, index, false, cb)
+    if (!queue.length) {
+      delete this.queue[key];
+    }
 
-  var isSym = this.symlinks[abs]
-  var len = entries.length
+    const next = () => {
+      this.shift(key);
+      this.shiftConcurrencyQueue();
+    };
 
-  // If it's a symlink, and we're in a globstar, then stop
-  if (isSym && inGlobStar)
-    return cb()
+    const run = () => {
+      this.running[key] = true;
+      this.runningCount++;
 
-  for (var i = 0; i < len; i++) {
-    var e = entries[i]
-    if (e.charAt(0) === '.' && !this.dot)
-      continue
+      factory().then(function (val) {
+        resolve(val);
+        next();
+        return null;
+      }).catch(function (err) {
+        reject(err);
+        next();
+      });
+    };
 
-    // these two cases enter the inGlobStar state
-    var instead = gspref.concat(entries[i], remainWithoutGlobStar)
-    this._process(instead, index, true, cb)
+    this.maybePushConcurrencyQueue(run);
+  }
 
-    var below = gspref.concat(entries[i], remain)
-    this._process(below, index, true, cb)
+  maybePushConcurrencyQueue(run) {
+    if (this.runningCount < this.maxConcurrency) {
+      run();
+    } else {
+      this.concurrencyQueue.push(run);
+    }
   }
 
-  cb()
+  shiftConcurrencyQueue() {
+    if (this.runningCount < this.maxConcurrency) {
+      const fn = this.concurrencyQueue.shift();
+      if (fn) {
+        fn();
+      }
+    }
+  }
 }
+exports.default = BlockingQueue;
 
-Glob.prototype._processSimple = function (prefix, index, cb) {
-  // XXX review this.  Shouldn't it be doing the mounting etc
-  // before doing stat?  kinda weird?
-  var self = this
-  this._stat(prefix, function (er, exists) {
-    self._processSimple2(prefix, index, er, exists, cb)
-  })
-}
-Glob.prototype._processSimple2 = function (prefix, index, er, exists, cb) {
+/***/ }),
+/* 85 */
+/***/ (function(module, exports) {
 
-  //console.error('ps2', prefix, exists)
+module.exports = function (exec) {
+  try {
+    return !!exec();
+  } catch (e) {
+    return true;
+  }
+};
 
-  if (!this.matches[index])
-    this.matches[index] = Object.create(null)
 
-  // If it doesn't exist, then just mark the lack of results
-  if (!exists)
-    return cb()
+/***/ }),
+/* 86 */,
+/* 87 */,
+/* 88 */,
+/* 89 */,
+/* 90 */,
+/* 91 */,
+/* 92 */,
+/* 93 */,
+/* 94 */,
+/* 95 */,
+/* 96 */,
+/* 97 */,
+/* 98 */,
+/* 99 */,
+/* 100 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (prefix && isAbsolute(prefix) && !this.nomount) {
-    var trail = /[\/\\]$/.test(prefix)
-    if (prefix.charAt(0) === '/') {
-      prefix = path.join(this.root, prefix)
-    } else {
-      prefix = path.resolve(this.root, prefix)
-      if (trail)
-        prefix += '/'
-    }
-  }
+// getting tag from 19.1.3.6 Object.prototype.toString()
+var cof = __webpack_require__(47);
+var TAG = __webpack_require__(13)('toStringTag');
+// ES3 wrong here
+var ARG = cof(function () { return arguments; }()) == 'Arguments';
 
-  if (process.platform === 'win32')
-    prefix = prefix.replace(/\\/g, '/')
+// fallback for IE11 Script Access Denied error
+var tryGet = function (it, key) {
+  try {
+    return it[key];
+  } catch (e) { /* empty */ }
+};
 
-  // Mark this as a match
-  this._emitMatch(index, prefix)
-  cb()
-}
+module.exports = function (it) {
+  var O, T, B;
+  return it === undefined ? 'Undefined' : it === null ? 'Null'
+    // @@toStringTag case
+    : typeof (T = tryGet(O = Object(it), TAG)) == 'string' ? T
+    // builtinTag case
+    : ARG ? cof(O)
+    // ES3 arguments fallback
+    : (B = cof(O)) == 'Object' && typeof O.callee == 'function' ? 'Arguments' : B;
+};
 
-// Returns either 'DIR', 'FILE', or false
-Glob.prototype._stat = function (f, cb) {
-  var abs = this._makeAbs(f)
-  var needDir = f.slice(-1) === '/'
 
-  if (f.length > this.maxLength)
-    return cb()
+/***/ }),
+/* 101 */
+/***/ (function(module, exports) {
 
-  if (!this.stat && ownProp(this.cache, abs)) {
-    var c = this.cache[abs]
+// IE 8- don't enum bug keys
+module.exports = (
+  'constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf'
+).split(',');
 
-    if (Array.isArray(c))
-      c = 'DIR'
 
-    // It exists, but maybe not how we need it
-    if (!needDir || c === 'DIR')
-      return cb(null, c)
+/***/ }),
+/* 102 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    if (needDir && c === 'FILE')
-      return cb()
+var document = __webpack_require__(11).document;
+module.exports = document && document.documentElement;
 
-    // otherwise we have to stat, because maybe c=true
-    // if we know it exists, but not what it is.
-  }
 
-  var exists
-  var stat = this.statCache[abs]
-  if (stat !== undefined) {
-    if (stat === false)
-      return cb(null, stat)
-    else {
-      var type = stat.isDirectory() ? 'DIR' : 'FILE'
-      if (needDir && type === 'FILE')
-        return cb()
-      else
-        return cb(null, type, stat)
-    }
-  }
+/***/ }),
+/* 103 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  var self = this
-  var statcb = inflight('stat\0' + abs, lstatcb_)
-  if (statcb)
-    fs.lstat(abs, statcb)
+"use strict";
 
-  function lstatcb_ (er, lstat) {
-    if (lstat && lstat.isSymbolicLink()) {
-      // If it's a symlink, then treat it as the target, unless
-      // the target does not exist, then treat it as a file.
-      return fs.stat(abs, function (er, stat) {
-        if (er)
-          self._stat2(f, abs, null, lstat, cb)
-        else
-          self._stat2(f, abs, er, stat, cb)
-      })
-    } else {
-      self._stat2(f, abs, er, lstat, cb)
+var LIBRARY = __webpack_require__(69);
+var $export = __webpack_require__(41);
+var redefine = __webpack_require__(197);
+var hide = __webpack_require__(31);
+var Iterators = __webpack_require__(35);
+var $iterCreate = __webpack_require__(188);
+var setToStringTag = __webpack_require__(71);
+var getPrototypeOf = __webpack_require__(194);
+var ITERATOR = __webpack_require__(13)('iterator');
+var BUGGY = !([].keys && 'next' in [].keys()); // Safari has buggy iterators w/o `next`
+var FF_ITERATOR = '@@iterator';
+var KEYS = 'keys';
+var VALUES = 'values';
+
+var returnThis = function () { return this; };
+
+module.exports = function (Base, NAME, Constructor, next, DEFAULT, IS_SET, FORCED) {
+  $iterCreate(Constructor, NAME, next);
+  var getMethod = function (kind) {
+    if (!BUGGY && kind in proto) return proto[kind];
+    switch (kind) {
+      case KEYS: return function keys() { return new Constructor(this, kind); };
+      case VALUES: return function values() { return new Constructor(this, kind); };
+    } return function entries() { return new Constructor(this, kind); };
+  };
+  var TAG = NAME + ' Iterator';
+  var DEF_VALUES = DEFAULT == VALUES;
+  var VALUES_BUG = false;
+  var proto = Base.prototype;
+  var $native = proto[ITERATOR] || proto[FF_ITERATOR] || DEFAULT && proto[DEFAULT];
+  var $default = $native || getMethod(DEFAULT);
+  var $entries = DEFAULT ? !DEF_VALUES ? $default : getMethod('entries') : undefined;
+  var $anyNative = NAME == 'Array' ? proto.entries || $native : $native;
+  var methods, key, IteratorPrototype;
+  // Fix native
+  if ($anyNative) {
+    IteratorPrototype = getPrototypeOf($anyNative.call(new Base()));
+    if (IteratorPrototype !== Object.prototype && IteratorPrototype.next) {
+      // Set @@toStringTag to native iterators
+      setToStringTag(IteratorPrototype, TAG, true);
+      // fix for some old engines
+      if (!LIBRARY && typeof IteratorPrototype[ITERATOR] != 'function') hide(IteratorPrototype, ITERATOR, returnThis);
     }
   }
-}
-
-Glob.prototype._stat2 = function (f, abs, er, stat, cb) {
-  if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) {
-    this.statCache[abs] = false
-    return cb()
+  // fix Array#{values, @@iterator}.name in V8 / FF
+  if (DEF_VALUES && $native && $native.name !== VALUES) {
+    VALUES_BUG = true;
+    $default = function values() { return $native.call(this); };
   }
+  // Define iterator
+  if ((!LIBRARY || FORCED) && (BUGGY || VALUES_BUG || !proto[ITERATOR])) {
+    hide(proto, ITERATOR, $default);
+  }
+  // Plug for library
+  Iterators[NAME] = $default;
+  Iterators[TAG] = returnThis;
+  if (DEFAULT) {
+    methods = {
+      values: DEF_VALUES ? $default : getMethod(VALUES),
+      keys: IS_SET ? $default : getMethod(KEYS),
+      entries: $entries
+    };
+    if (FORCED) for (key in methods) {
+      if (!(key in proto)) redefine(proto, key, methods[key]);
+    } else $export($export.P + $export.F * (BUGGY || VALUES_BUG), NAME, methods);
+  }
+  return methods;
+};
 
-  var needDir = f.slice(-1) === '/'
-  this.statCache[abs] = stat
-
-  if (abs.slice(-1) === '/' && stat && !stat.isDirectory())
-    return cb(null, false, stat)
-
-  var c = true
-  if (stat)
-    c = stat.isDirectory() ? 'DIR' : 'FILE'
-  this.cache[abs] = this.cache[abs] || c
 
-  if (needDir && c === 'FILE')
-    return cb()
+/***/ }),
+/* 104 */
+/***/ (function(module, exports) {
 
-  return cb(null, c, stat)
-}
+module.exports = function (exec) {
+  try {
+    return { e: false, v: exec() };
+  } catch (e) {
+    return { e: true, v: e };
+  }
+};
 
 
 /***/ }),
-/* 76 */
+/* 105 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-
-function posix(path) {
-	return path.charAt(0) === '/';
-}
-
-function win32(path) {
-	// https://github.com/nodejs/node/blob/b3fcc245fb25539909ef1d5eaa01dbf92e168633/lib/path.js#L56
-	var splitDeviceRe = /^([a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/]+[^\\\/]+)?([\\\/])?([\s\S]*?)$/;
-	var result = splitDeviceRe.exec(path);
-	var device = result[1] || '';
-	var isUnc = Boolean(device && device.charAt(1) !== ':');
-
-	// UNC paths are always absolute
-	return Boolean(result[2] || isUnc);
-}
+var anObject = __webpack_require__(27);
+var isObject = __webpack_require__(34);
+var newPromiseCapability = __webpack_require__(70);
 
-module.exports = process.platform === 'win32' ? win32 : posix;
-module.exports.posix = posix;
-module.exports.win32 = win32;
+module.exports = function (C, x) {
+  anObject(C);
+  if (isObject(x) && x.constructor === C) return x;
+  var promiseCapability = newPromiseCapability.f(C);
+  var resolve = promiseCapability.resolve;
+  resolve(x);
+  return promiseCapability.promise;
+};
 
 
 /***/ }),
-/* 77 */,
-/* 78 */,
-/* 79 */
+/* 106 */
 /***/ (function(module, exports) {
 
-module.exports = __webpack_require__(121);
+module.exports = function (bitmap, value) {
+  return {
+    enumerable: !(bitmap & 1),
+    configurable: !(bitmap & 2),
+    writable: !(bitmap & 4),
+    value: value
+  };
+};
+
 
 /***/ }),
-/* 80 */,
-/* 81 */
+/* 107 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
+var core = __webpack_require__(23);
+var global = __webpack_require__(11);
+var SHARED = '__core-js_shared__';
+var store = global[SHARED] || (global[SHARED] = {});
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
+(module.exports = function (key, value) {
+  return store[key] || (store[key] = value !== undefined ? value : {});
+})('versions', []).push({
+  version: core.version,
+  mode: __webpack_require__(69) ? 'pure' : 'global',
+  copyright: '© 2018 Denis Pushkarev (zloirock.ru)'
 });
 
-exports.default = function (str, fileLoc = 'lockfile') {
-  str = (0, (_stripBom || _load_stripBom()).default)(str);
-  return hasMergeConflicts(str) ? parseWithConflict(str, fileLoc) : { type: 'success', object: parse(str, fileLoc) };
+
+/***/ }),
+/* 108 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// 7.3.20 SpeciesConstructor(O, defaultConstructor)
+var anObject = __webpack_require__(27);
+var aFunction = __webpack_require__(46);
+var SPECIES = __webpack_require__(13)('species');
+module.exports = function (O, D) {
+  var C = anObject(O).constructor;
+  var S;
+  return C === undefined || (S = anObject(C)[SPECIES]) == undefined ? D : aFunction(S);
 };
 
-var _util;
 
-function _load_util() {
-  return _util = _interopRequireDefault(__webpack_require__(2));
+/***/ }),
+/* 109 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var ctx = __webpack_require__(48);
+var invoke = __webpack_require__(185);
+var html = __webpack_require__(102);
+var cel = __webpack_require__(68);
+var global = __webpack_require__(11);
+var process = global.process;
+var setTask = global.setImmediate;
+var clearTask = global.clearImmediate;
+var MessageChannel = global.MessageChannel;
+var Dispatch = global.Dispatch;
+var counter = 0;
+var queue = {};
+var ONREADYSTATECHANGE = 'onreadystatechange';
+var defer, channel, port;
+var run = function () {
+  var id = +this;
+  // eslint-disable-next-line no-prototype-builtins
+  if (queue.hasOwnProperty(id)) {
+    var fn = queue[id];
+    delete queue[id];
+    fn();
+  }
+};
+var listener = function (event) {
+  run.call(event.data);
+};
+// Node.js 0.9+ & IE10+ has setImmediate, otherwise:
+if (!setTask || !clearTask) {
+  setTask = function setImmediate(fn) {
+    var args = [];
+    var i = 1;
+    while (arguments.length > i) args.push(arguments[i++]);
+    queue[++counter] = function () {
+      // eslint-disable-next-line no-new-func
+      invoke(typeof fn == 'function' ? fn : Function(fn), args);
+    };
+    defer(counter);
+    return counter;
+  };
+  clearTask = function clearImmediate(id) {
+    delete queue[id];
+  };
+  // Node.js 0.8-
+  if (__webpack_require__(47)(process) == 'process') {
+    defer = function (id) {
+      process.nextTick(ctx(run, id, 1));
+    };
+  // Sphere (JS game engine) Dispatch API
+  } else if (Dispatch && Dispatch.now) {
+    defer = function (id) {
+      Dispatch.now(ctx(run, id, 1));
+    };
+  // Browsers with MessageChannel, includes WebWorkers
+  } else if (MessageChannel) {
+    channel = new MessageChannel();
+    port = channel.port2;
+    channel.port1.onmessage = listener;
+    defer = ctx(port.postMessage, port, 1);
+  // Browsers with postMessage, skip WebWorkers
+  // IE8 has postMessage, but it's sync & typeof its postMessage is 'object'
+  } else if (global.addEventListener && typeof postMessage == 'function' && !global.importScripts) {
+    defer = function (id) {
+      global.postMessage(id + '', '*');
+    };
+    global.addEventListener('message', listener, false);
+  // IE8-
+  } else if (ONREADYSTATECHANGE in cel('script')) {
+    defer = function (id) {
+      html.appendChild(cel('script'))[ONREADYSTATECHANGE] = function () {
+        html.removeChild(this);
+        run.call(id);
+      };
+    };
+  // Rest old browsers
+  } else {
+    defer = function (id) {
+      setTimeout(ctx(run, id, 1), 0);
+    };
+  }
 }
+module.exports = {
+  set: setTask,
+  clear: clearTask
+};
 
-var _invariant;
 
-function _load_invariant() {
-  return _invariant = _interopRequireDefault(__webpack_require__(7));
-}
+/***/ }),
+/* 110 */
+/***/ (function(module, exports, __webpack_require__) {
 
-var _stripBom;
+// 7.1.15 ToLength
+var toInteger = __webpack_require__(73);
+var min = Math.min;
+module.exports = function (it) {
+  return it > 0 ? min(toInteger(it), 0x1fffffffffffff) : 0; // pow(2, 53) - 1 == 9007199254740991
+};
 
-function _load_stripBom() {
-  return _stripBom = _interopRequireDefault(__webpack_require__(122));
-}
 
-var _constants;
+/***/ }),
+/* 111 */
+/***/ (function(module, exports) {
 
-function _load_constants() {
-  return _constants = __webpack_require__(6);
-}
+var id = 0;
+var px = Math.random();
+module.exports = function (key) {
+  return 'Symbol('.concat(key === undefined ? '' : key, ')_', (++id + px).toString(36));
+};
 
-var _errors;
 
-function _load_errors() {
-  return _errors = __webpack_require__(4);
-}
+/***/ }),
+/* 112 */
+/***/ (function(module, exports, __webpack_require__) {
 
-var _map;
 
-function _load_map() {
-  return _map = _interopRequireDefault(__webpack_require__(20));
-}
+/**
+ * This is the common logic for both the Node.js and web browser
+ * implementations of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+exports = module.exports = createDebug.debug = createDebug['default'] = createDebug;
+exports.coerce = coerce;
+exports.disable = disable;
+exports.enable = enable;
+exports.enabled = enabled;
+exports.humanize = __webpack_require__(229);
 
-/* eslint quotes: 0 */
+/**
+ * Active `debug` instances.
+ */
+exports.instances = [];
 
-const VERSION_REGEX = /^yarn lockfile v(\d+)$/;
+/**
+ * The currently active debug mode names, and names to skip.
+ */
 
-const TOKEN_TYPES = {
-  boolean: 'BOOLEAN',
-  string: 'STRING',
-  identifier: 'IDENTIFIER',
-  eof: 'EOF',
-  colon: 'COLON',
-  newline: 'NEWLINE',
-  comment: 'COMMENT',
-  indent: 'INDENT',
-  invalid: 'INVALID',
-  number: 'NUMBER',
-  comma: 'COMMA'
-};
+exports.names = [];
+exports.skips = [];
 
-const VALID_PROP_VALUE_TOKENS = [TOKEN_TYPES.boolean, TOKEN_TYPES.string, TOKEN_TYPES.number];
+/**
+ * Map of special "%n" handling functions, for the debug "format" argument.
+ *
+ * Valid key names are a single, lower or upper-case letter, i.e. "n" and "N".
+ */
 
-function isValidPropValueToken(token) {
-  return VALID_PROP_VALUE_TOKENS.indexOf(token.type) >= 0;
-}
+exports.formatters = {};
 
-function* tokenise(input) {
-  let lastNewline = false;
-  let line = 1;
-  let col = 0;
+/**
+ * Select a color.
+ * @param {String} namespace
+ * @return {Number}
+ * @api private
+ */
 
-  function buildToken(type, value) {
-    return { line, col, type, value };
+function selectColor(namespace) {
+  var hash = 0, i;
+
+  for (i in namespace) {
+    hash  = ((hash << 5) - hash) + namespace.charCodeAt(i);
+    hash |= 0; // Convert to 32bit integer
   }
 
-  while (input.length) {
-    let chop = 0;
+  return exports.colors[Math.abs(hash) % exports.colors.length];
+}
 
-    if (input[0] === '\n' || input[0] === '\r') {
-      chop++;
-      // If this is a \r\n line, ignore both chars but only add one new line
-      if (input[1] === '\n') {
-        chop++;
-      }
-      line++;
-      col = 0;
-      yield buildToken(TOKEN_TYPES.newline);
-    } else if (input[0] === '#') {
-      chop++;
+/**
+ * Create a debugger with the given `namespace`.
+ *
+ * @param {String} namespace
+ * @return {Function}
+ * @api public
+ */
 
-      let val = '';
-      while (input[chop] !== '\n') {
-        val += input[chop];
-        chop++;
-      }
-      yield buildToken(TOKEN_TYPES.comment, val);
-    } else if (input[0] === ' ') {
-      if (lastNewline) {
-        let indent = '';
-        for (let i = 0; input[i] === ' '; i++) {
-          indent += input[i];
-        }
+function createDebug(namespace) {
 
-        if (indent.length % 2) {
-          throw new TypeError('Invalid number of spaces');
-        } else {
-          chop = indent.length;
-          yield buildToken(TOKEN_TYPES.indent, indent.length / 2);
-        }
-      } else {
-        chop++;
-      }
-    } else if (input[0] === '"') {
-      let val = '';
+  var prevTime;
 
-      for (let i = 0;; i++) {
-        const currentChar = input[i];
-        val += currentChar;
+  function debug() {
+    // disabled?
+    if (!debug.enabled) return;
 
-        if (i > 0 && currentChar === '"') {
-          const isEscaped = input[i - 1] === '\\' && input[i - 2] !== '\\';
-          if (!isEscaped) {
-            break;
-          }
-        }
-      }
+    var self = debug;
 
-      chop = val.length;
+    // set `diff` timestamp
+    var curr = +new Date();
+    var ms = curr - (prevTime || curr);
+    self.diff = ms;
+    self.prev = prevTime;
+    self.curr = curr;
+    prevTime = curr;
 
-      try {
-        yield buildToken(TOKEN_TYPES.string, JSON.parse(val));
-      } catch (err) {
-        if (err instanceof SyntaxError) {
-          yield buildToken(TOKEN_TYPES.invalid);
-        } else {
-          throw err;
-        }
-      }
-    } else if (/^[0-9]/.test(input)) {
-      let val = '';
-      for (let i = 0; /^[0-9]$/.test(input[i]); i++) {
-        val += input[i];
-      }
-      chop = val.length;
+    // turn the `arguments` into a proper Array
+    var args = new Array(arguments.length);
+    for (var i = 0; i < args.length; i++) {
+      args[i] = arguments[i];
+    }
 
-      yield buildToken(TOKEN_TYPES.number, +val);
-    } else if (/^true/.test(input)) {
-      yield buildToken(TOKEN_TYPES.boolean, true);
-      chop = 4;
-    } else if (/^false/.test(input)) {
-      yield buildToken(TOKEN_TYPES.boolean, false);
-      chop = 5;
-    } else if (input[0] === ':') {
-      yield buildToken(TOKEN_TYPES.colon);
-      chop++;
-    } else if (input[0] === ',') {
-      yield buildToken(TOKEN_TYPES.comma);
-      chop++;
-    } else if (/^[a-zA-Z\/-]/g.test(input)) {
-      let name = '';
-      for (let i = 0; i < input.length; i++) {
-        const char = input[i];
-        if (char === ':' || char === ' ' || char === '\n' || char === '\r' || char === ',') {
-          break;
-        } else {
-          name += char;
-        }
-      }
-      chop = name.length;
+    args[0] = exports.coerce(args[0]);
 
-      yield buildToken(TOKEN_TYPES.string, name);
-    } else {
-      yield buildToken(TOKEN_TYPES.invalid);
+    if ('string' !== typeof args[0]) {
+      // anything else let's inspect with %O
+      args.unshift('%O');
     }
 
-    if (!chop) {
-      // will trigger infinite recursion
-      yield buildToken(TOKEN_TYPES.invalid);
-    }
+    // apply any `formatters` transformations
+    var index = 0;
+    args[0] = args[0].replace(/%([a-zA-Z%])/g, function(match, format) {
+      // if we encounter an escaped % then don't increase the array index
+      if (match === '%%') return match;
+      index++;
+      var formatter = exports.formatters[format];
+      if ('function' === typeof formatter) {
+        var val = args[index];
+        match = formatter.call(self, val);
 
-    col += chop;
-    lastNewline = input[0] === '\n' || input[0] === '\r' && input[1] === '\n';
-    input = input.slice(chop);
-  }
+        // now we need to remove `args[index]` since it's inlined in the `format`
+        args.splice(index, 1);
+        index--;
+      }
+      return match;
+    });
 
-  yield buildToken(TOKEN_TYPES.eof);
-}
+    // apply env-specific formatting (colors, etc.)
+    exports.formatArgs.call(self, args);
 
-class Parser {
-  constructor(input, fileLoc = 'lockfile') {
-    this.comments = [];
-    this.tokens = tokenise(input);
-    this.fileLoc = fileLoc;
+    var logFn = debug.log || exports.log || console.log.bind(console);
+    logFn.apply(self, args);
   }
 
-  onComment(token) {
-    const value = token.value;
-    (0, (_invariant || _load_invariant()).default)(typeof value === 'string', 'expected token value to be a string');
+  debug.namespace = namespace;
+  debug.enabled = exports.enabled(namespace);
+  debug.useColors = exports.useColors();
+  debug.color = selectColor(namespace);
+  debug.destroy = destroy;
 
-    const comment = value.trim();
+  // env-specific initialization logic for debug instances
+  if ('function' === typeof exports.init) {
+    exports.init(debug);
+  }
 
-    const versionMatch = comment.match(VERSION_REGEX);
-    if (versionMatch) {
-      const version = +versionMatch[1];
-      if (version > (_constants || _load_constants()).LOCKFILE_VERSION) {
-        throw new (_errors || _load_errors()).MessageError(`Can't install from a lockfile of version ${version} as you're on an old yarn version that only supports ` + `versions up to ${(_constants || _load_constants()).LOCKFILE_VERSION}. Run \`$ yarn self-update\` to upgrade to the latest version.`);
-      }
-    }
+  exports.instances.push(debug);
 
-    this.comments.push(comment);
+  return debug;
+}
+
+function destroy () {
+  var index = exports.instances.indexOf(this);
+  if (index !== -1) {
+    exports.instances.splice(index, 1);
+    return true;
+  } else {
+    return false;
   }
+}
 
-  next() {
-    const item = this.tokens.next();
-    (0, (_invariant || _load_invariant()).default)(item, 'expected a token');
+/**
+ * Enables a debug mode by namespaces. This can include modes
+ * separated by a colon and wildcards.
+ *
+ * @param {String} namespaces
+ * @api public
+ */
 
-    const done = item.done,
-          value = item.value;
+function enable(namespaces) {
+  exports.save(namespaces);
 
-    if (done || !value) {
-      throw new Error('No more tokens');
-    } else if (value.type === TOKEN_TYPES.comment) {
-      this.onComment(value);
-      return this.next();
+  exports.names = [];
+  exports.skips = [];
+
+  var i;
+  var split = (typeof namespaces === 'string' ? namespaces : '').split(/[\s,]+/);
+  var len = split.length;
+
+  for (i = 0; i < len; i++) {
+    if (!split[i]) continue; // ignore empty strings
+    namespaces = split[i].replace(/\*/g, '.*?');
+    if (namespaces[0] === '-') {
+      exports.skips.push(new RegExp('^' + namespaces.substr(1) + '$'));
     } else {
-      return this.token = value;
+      exports.names.push(new RegExp('^' + namespaces + '$'));
     }
   }
 
-  unexpected(msg = 'Unexpected token') {
-    throw new SyntaxError(`${msg} ${this.token.line}:${this.token.col} in ${this.fileLoc}`);
+  for (i = 0; i < exports.instances.length; i++) {
+    var instance = exports.instances[i];
+    instance.enabled = exports.enabled(instance.namespace);
   }
+}
 
-  expect(tokType) {
-    if (this.token.type === tokType) {
-      this.next();
-    } else {
-      this.unexpected();
+/**
+ * Disable debug output.
+ *
+ * @api public
+ */
+
+function disable() {
+  exports.enable('');
+}
+
+/**
+ * Returns true if the given mode name is enabled, false otherwise.
+ *
+ * @param {String} name
+ * @return {Boolean}
+ * @api public
+ */
+
+function enabled(name) {
+  if (name[name.length - 1] === '*') {
+    return true;
+  }
+  var i, len;
+  for (i = 0, len = exports.skips.length; i < len; i++) {
+    if (exports.skips[i].test(name)) {
+      return false;
     }
   }
-
-  eat(tokType) {
-    if (this.token.type === tokType) {
-      this.next();
+  for (i = 0, len = exports.names.length; i < len; i++) {
+    if (exports.names[i].test(name)) {
       return true;
-    } else {
-      return false;
     }
   }
+  return false;
+}
 
-  parse(indent = 0) {
-    const obj = (0, (_map || _load_map()).default)();
+/**
+ * Coerce `val`.
+ *
+ * @param {Mixed} val
+ * @return {Mixed}
+ * @api private
+ */
 
-    while (true) {
-      const propToken = this.token;
+function coerce(val) {
+  if (val instanceof Error) return val.stack || val.message;
+  return val;
+}
 
-      if (propToken.type === TOKEN_TYPES.newline) {
-        const nextToken = this.next();
-        if (!indent) {
-          // if we have 0 indentation then the next token doesn't matter
-          continue;
-        }
 
-        if (nextToken.type !== TOKEN_TYPES.indent) {
-          // if we have no indentation after a newline then we've gone down a level
-          break;
-        }
+/***/ }),
+/* 113 */,
+/* 114 */
+/***/ (function(module, exports, __webpack_require__) {
 
-        if (nextToken.value === indent) {
-          // all is good, the indent is on our level
-          this.next();
-        } else {
-          // the indentation is less than our level
-          break;
-        }
-      } else if (propToken.type === TOKEN_TYPES.indent) {
-        if (propToken.value === indent) {
-          this.next();
-        } else {
-          break;
-        }
-      } else if (propToken.type === TOKEN_TYPES.eof) {
-        break;
-      } else if (propToken.type === TOKEN_TYPES.string) {
-        // property key
-        const key = propToken.value;
-        (0, (_invariant || _load_invariant()).default)(key, 'Expected a key');
+module.exports = realpath
+realpath.realpath = realpath
+realpath.sync = realpathSync
+realpath.realpathSync = realpathSync
+realpath.monkeypatch = monkeypatch
+realpath.unmonkeypatch = unmonkeypatch
 
-        const keys = [key];
-        this.next();
+var fs = __webpack_require__(3)
+var origRealpath = fs.realpath
+var origRealpathSync = fs.realpathSync
 
-        // support multiple keys
-        while (this.token.type === TOKEN_TYPES.comma) {
-          this.next(); // skip comma
+var version = process.version
+var ok = /^v[0-5]\./.test(version)
+var old = __webpack_require__(217)
 
-          const keyToken = this.token;
-          if (keyToken.type !== TOKEN_TYPES.string) {
-            this.unexpected('Expected string');
-          }
+function newError (er) {
+  return er && er.syscall === 'realpath' && (
+    er.code === 'ELOOP' ||
+    er.code === 'ENOMEM' ||
+    er.code === 'ENAMETOOLONG'
+  )
+}
 
-          const key = keyToken.value;
-          (0, (_invariant || _load_invariant()).default)(key, 'Expected a key');
-          keys.push(key);
-          this.next();
-        }
+function realpath (p, cache, cb) {
+  if (ok) {
+    return origRealpath(p, cache, cb)
+  }
 
-        const valToken = this.token;
+  if (typeof cache === 'function') {
+    cb = cache
+    cache = null
+  }
+  origRealpath(p, cache, function (er, result) {
+    if (newError(er)) {
+      old.realpath(p, cache, cb)
+    } else {
+      cb(er, result)
+    }
+  })
+}
 
-        if (valToken.type === TOKEN_TYPES.colon) {
-          // object
-          this.next();
+function realpathSync (p, cache) {
+  if (ok) {
+    return origRealpathSync(p, cache)
+  }
 
-          // parse object
-          const val = this.parse(indent + 1);
+  try {
+    return origRealpathSync(p, cache)
+  } catch (er) {
+    if (newError(er)) {
+      return old.realpathSync(p, cache)
+    } else {
+      throw er
+    }
+  }
+}
 
-          for (var _iterator = keys, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-            var _ref;
+function monkeypatch () {
+  fs.realpath = realpath
+  fs.realpathSync = realpathSync
+}
 
-            if (_isArray) {
-              if (_i >= _iterator.length) break;
-              _ref = _iterator[_i++];
-            } else {
-              _i = _iterator.next();
-              if (_i.done) break;
-              _ref = _i.value;
-            }
+function unmonkeypatch () {
+  fs.realpath = origRealpath
+  fs.realpathSync = origRealpathSync
+}
 
-            const key = _ref;
 
-            obj[key] = val;
-          }
+/***/ }),
+/* 115 */
+/***/ (function(module, exports, __webpack_require__) {
 
-          if (indent && this.token.type !== TOKEN_TYPES.indent) {
-            break;
-          }
-        } else if (isValidPropValueToken(valToken)) {
-          // plain value
-          for (var _iterator2 = keys, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-            var _ref2;
+exports.alphasort = alphasort
+exports.alphasorti = alphasorti
+exports.setopts = setopts
+exports.ownProp = ownProp
+exports.makeAbs = makeAbs
+exports.finish = finish
+exports.mark = mark
+exports.isIgnored = isIgnored
+exports.childrenIgnored = childrenIgnored
 
-            if (_isArray2) {
-              if (_i2 >= _iterator2.length) break;
-              _ref2 = _iterator2[_i2++];
-            } else {
-              _i2 = _iterator2.next();
-              if (_i2.done) break;
-              _ref2 = _i2.value;
-            }
+function ownProp (obj, field) {
+  return Object.prototype.hasOwnProperty.call(obj, field)
+}
 
-            const key = _ref2;
+var path = __webpack_require__(0)
+var minimatch = __webpack_require__(60)
+var isAbsolute = __webpack_require__(76)
+var Minimatch = minimatch.Minimatch
 
-            obj[key] = valToken.value;
-          }
+function alphasorti (a, b) {
+  return a.toLowerCase().localeCompare(b.toLowerCase())
+}
 
-          this.next();
-        } else {
-          this.unexpected('Invalid value type');
-        }
-      } else {
-        this.unexpected(`Unknown token: ${(_util || _load_util()).default.inspect(propToken)}`);
-      }
-    }
+function alphasort (a, b) {
+  return a.localeCompare(b)
+}
 
-    return obj;
+function setupIgnores (self, options) {
+  self.ignore = options.ignore || []
+
+  if (!Array.isArray(self.ignore))
+    self.ignore = [self.ignore]
+
+  if (self.ignore.length) {
+    self.ignore = self.ignore.map(ignoreMap)
   }
 }
 
-const MERGE_CONFLICT_ANCESTOR = '|||||||';
-const MERGE_CONFLICT_END = '>>>>>>>';
-const MERGE_CONFLICT_SEP = '=======';
-const MERGE_CONFLICT_START = '<<<<<<<';
+// ignore patterns are always in dot:true mode.
+function ignoreMap (pattern) {
+  var gmatcher = null
+  if (pattern.slice(-3) === '/**') {
+    var gpattern = pattern.replace(/(\/\*\*)+$/, '')
+    gmatcher = new Minimatch(gpattern, { dot: true })
+  }
 
-/**
- * Extract the two versions of the lockfile from a merge conflict.
- */
-function extractConflictVariants(str) {
-  const variants = [[], []];
-  const lines = str.split(/\r?\n/g);
-  let skip = false;
+  return {
+    matcher: new Minimatch(pattern, { dot: true }),
+    gmatcher: gmatcher
+  }
+}
 
-  while (lines.length) {
-    const line = lines.shift();
-    if (line.startsWith(MERGE_CONFLICT_START)) {
-      // get the first variant
-      while (lines.length) {
-        const conflictLine = lines.shift();
-        if (conflictLine === MERGE_CONFLICT_SEP) {
-          skip = false;
-          break;
-        } else if (skip || conflictLine.startsWith(MERGE_CONFLICT_ANCESTOR)) {
-          skip = true;
-          continue;
-        } else {
-          variants[0].push(conflictLine);
-        }
-      }
+function setopts (self, pattern, options) {
+  if (!options)
+    options = {}
 
-      // get the second variant
-      while (lines.length) {
-        const conflictLine = lines.shift();
-        if (conflictLine.startsWith(MERGE_CONFLICT_END)) {
-          break;
-        } else {
-          variants[1].push(conflictLine);
-        }
-      }
-    } else {
-      variants[0].push(line);
-      variants[1].push(line);
+  // base-matching: just use globstar for that.
+  if (options.matchBase && -1 === pattern.indexOf("/")) {
+    if (options.noglobstar) {
+      throw new Error("base matching requires globstar")
     }
+    pattern = "**/" + pattern
   }
 
-  return [variants[0].join('\n'), variants[1].join('\n')];
-}
+  self.silent = !!options.silent
+  self.pattern = pattern
+  self.strict = options.strict !== false
+  self.realpath = !!options.realpath
+  self.realpathCache = options.realpathCache || Object.create(null)
+  self.follow = !!options.follow
+  self.dot = !!options.dot
+  self.mark = !!options.mark
+  self.nodir = !!options.nodir
+  if (self.nodir)
+    self.mark = true
+  self.sync = !!options.sync
+  self.nounique = !!options.nounique
+  self.nonull = !!options.nonull
+  self.nosort = !!options.nosort
+  self.nocase = !!options.nocase
+  self.stat = !!options.stat
+  self.noprocess = !!options.noprocess
+  self.absolute = !!options.absolute
 
-/**
- * Check if a lockfile has merge conflicts.
- */
-function hasMergeConflicts(str) {
-  return str.includes(MERGE_CONFLICT_START) && str.includes(MERGE_CONFLICT_SEP) && str.includes(MERGE_CONFLICT_END);
-}
+  self.maxLength = options.maxLength || Infinity
+  self.cache = options.cache || Object.create(null)
+  self.statCache = options.statCache || Object.create(null)
+  self.symlinks = options.symlinks || Object.create(null)
 
-/**
- * Parse the lockfile.
- */
-function parse(str, fileLoc) {
-  const parser = new Parser(str, fileLoc);
-  parser.next();
-  return parser.parse();
-}
+  setupIgnores(self, options)
 
-/**
- * Parse and merge the two variants in a conflicted lockfile.
- */
-function parseWithConflict(str, fileLoc) {
-  const variants = extractConflictVariants(str);
-  try {
-    return { type: 'merge', object: Object.assign({}, parse(variants[0], fileLoc), parse(variants[1], fileLoc)) };
-  } catch (err) {
-    if (err instanceof SyntaxError) {
-      return { type: 'conflict', object: {} };
-    } else {
-      throw err;
-    }
+  self.changedCwd = false
+  var cwd = process.cwd()
+  if (!ownProp(options, "cwd"))
+    self.cwd = cwd
+  else {
+    self.cwd = path.resolve(options.cwd)
+    self.changedCwd = self.cwd !== cwd
   }
-}
-
-/***/ }),
-/* 82 */,
-/* 83 */,
-/* 84 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
 
+  self.root = options.root || path.resolve(self.cwd, "/")
+  self.root = path.resolve(self.root)
+  if (process.platform === "win32")
+    self.root = self.root.replace(/\\/g, "/")
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+  // TODO: is an absolute `cwd` supposed to be resolved against `root`?
+  // e.g. { cwd: '/test', root: __dirname } === path.join(__dirname, '/test')
+  self.cwdAbs = isAbsolute(self.cwd) ? self.cwd : makeAbs(self, self.cwd)
+  if (process.platform === "win32")
+    self.cwdAbs = self.cwdAbs.replace(/\\/g, "/")
+  self.nomount = !!options.nomount
 
-var _map;
+  // disable comments and negation in Minimatch.
+  // Note that they are not supported in Glob itself anyway.
+  options.nonegate = true
+  options.nocomment = true
 
-function _load_map() {
-  return _map = _interopRequireDefault(__webpack_require__(20));
+  self.minimatch = new Minimatch(pattern, options)
+  self.options = self.minimatch.options
 }
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function finish (self) {
+  var nou = self.nounique
+  var all = nou ? [] : Object.create(null)
 
-const debug = __webpack_require__(212)('yarn');
+  for (var i = 0, l = self.matches.length; i < l; i ++) {
+    var matches = self.matches[i]
+    if (!matches || Object.keys(matches).length === 0) {
+      if (self.nonull) {
+        // do like the shell, and spit out the literal glob
+        var literal = self.minimatch.globSet[i]
+        if (nou)
+          all.push(literal)
+        else
+          all[literal] = true
+      }
+    } else {
+      // had matches
+      var m = Object.keys(matches)
+      if (nou)
+        all.push.apply(all, m)
+      else
+        m.forEach(function (m) {
+          all[m] = true
+        })
+    }
+  }
 
-class BlockingQueue {
-  constructor(alias, maxConcurrency = Infinity) {
-    this.concurrencyQueue = [];
-    this.maxConcurrency = maxConcurrency;
-    this.runningCount = 0;
-    this.warnedStuck = false;
-    this.alias = alias;
-    this.first = true;
+  if (!nou)
+    all = Object.keys(all)
 
-    this.running = (0, (_map || _load_map()).default)();
-    this.queue = (0, (_map || _load_map()).default)();
+  if (!self.nosort)
+    all = all.sort(self.nocase ? alphasorti : alphasort)
 
-    this.stuckTick = this.stuckTick.bind(this);
+  // at *some* point we statted all of these
+  if (self.mark) {
+    for (var i = 0; i < all.length; i++) {
+      all[i] = self._mark(all[i])
+    }
+    if (self.nodir) {
+      all = all.filter(function (e) {
+        var notDir = !(/\/$/.test(e))
+        var c = self.cache[e] || self.cache[makeAbs(self, e)]
+        if (notDir && c)
+          notDir = c !== 'DIR' && !Array.isArray(c)
+        return notDir
+      })
+    }
   }
 
-  stillActive() {
-    if (this.stuckTimer) {
-      clearTimeout(this.stuckTimer);
-    }
+  if (self.ignore.length)
+    all = all.filter(function(m) {
+      return !isIgnored(self, m)
+    })
 
-    this.stuckTimer = setTimeout(this.stuckTick, 5000);
+  self.found = all
+}
 
-    // We need to check the existence of unref because of https://github.com/facebook/jest/issues/4559
-    // $FlowFixMe: Node's setInterval returns a Timeout, not a Number
-    this.stuckTimer.unref && this.stuckTimer.unref();
-  }
+function mark (self, p) {
+  var abs = makeAbs(self, p)
+  var c = self.cache[abs]
+  var m = p
+  if (c) {
+    var isDir = c === 'DIR' || Array.isArray(c)
+    var slash = p.slice(-1) === '/'
 
-  stuckTick() {
-    if (this.runningCount === 1) {
-      this.warnedStuck = true;
-      debug(`The ${JSON.stringify(this.alias)} blocking queue may be stuck. 5 seconds ` + `without any activity with 1 worker: ${Object.keys(this.running)[0]}`);
-    }
-  }
+    if (isDir && !slash)
+      m += '/'
+    else if (!isDir && slash)
+      m = m.slice(0, -1)
 
-  push(key, factory) {
-    if (this.first) {
-      this.first = false;
-    } else {
-      this.stillActive();
+    if (m !== p) {
+      var mabs = makeAbs(self, m)
+      self.statCache[mabs] = self.statCache[abs]
+      self.cache[mabs] = self.cache[abs]
     }
+  }
 
-    return new Promise((resolve, reject) => {
-      // we're already running so push ourselves to the queue
-      const queue = this.queue[key] = this.queue[key] || [];
-      queue.push({ factory, resolve, reject });
+  return m
+}
 
-      if (!this.running[key]) {
-        this.shift(key);
-      }
-    });
+// lotta situps...
+function makeAbs (self, f) {
+  var abs = f
+  if (f.charAt(0) === '/') {
+    abs = path.join(self.root, f)
+  } else if (isAbsolute(f) || f === '') {
+    abs = f
+  } else if (self.changedCwd) {
+    abs = path.resolve(self.cwd, f)
+  } else {
+    abs = path.resolve(f)
   }
 
-  shift(key) {
-    if (this.running[key]) {
-      delete this.running[key];
-      this.runningCount--;
+  if (process.platform === 'win32')
+    abs = abs.replace(/\\/g, '/')
 
-      if (this.stuckTimer) {
-        clearTimeout(this.stuckTimer);
-        this.stuckTimer = null;
-      }
+  return abs
+}
 
-      if (this.warnedStuck) {
-        this.warnedStuck = false;
-        debug(`${JSON.stringify(this.alias)} blocking queue finally resolved. Nothing to worry about.`);
-      }
-    }
 
-    const queue = this.queue[key];
-    if (!queue) {
-      return;
-    }
+// Return true, if pattern ends with globstar '**', for the accompanying parent directory.
+// Ex:- If node_modules/** is the pattern, add 'node_modules' to ignore list along with it's contents
+function isIgnored (self, path) {
+  if (!self.ignore.length)
+    return false
 
-    var _queue$shift = queue.shift();
+  return self.ignore.some(function(item) {
+    return item.matcher.match(path) || !!(item.gmatcher && item.gmatcher.match(path))
+  })
+}
 
-    const resolve = _queue$shift.resolve,
-          reject = _queue$shift.reject,
-          factory = _queue$shift.factory;
+function childrenIgnored (self, path) {
+  if (!self.ignore.length)
+    return false
 
-    if (!queue.length) {
-      delete this.queue[key];
-    }
+  return self.ignore.some(function(item) {
+    return !!(item.gmatcher && item.gmatcher.match(path))
+  })
+}
 
-    const next = () => {
-      this.shift(key);
-      this.shiftConcurrencyQueue();
-    };
 
-    const run = () => {
-      this.running[key] = true;
-      this.runningCount++;
+/***/ }),
+/* 116 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      factory().then(function (val) {
-        resolve(val);
-        next();
-        return null;
-      }).catch(function (err) {
-        reject(err);
-        next();
-      });
-    };
+var path = __webpack_require__(0);
+var fs = __webpack_require__(3);
+var _0777 = parseInt('0777', 8);
 
-    this.maybePushConcurrencyQueue(run);
-  }
+module.exports = mkdirP.mkdirp = mkdirP.mkdirP = mkdirP;
 
-  maybePushConcurrencyQueue(run) {
-    if (this.runningCount < this.maxConcurrency) {
-      run();
-    } else {
-      this.concurrencyQueue.push(run);
+function mkdirP (p, opts, f, made) {
+    if (typeof opts === 'function') {
+        f = opts;
+        opts = {};
     }
-  }
-
-  shiftConcurrencyQueue() {
-    if (this.runningCount < this.maxConcurrency) {
-      const fn = this.concurrencyQueue.shift();
-      if (fn) {
-        fn();
-      }
+    else if (!opts || typeof opts !== 'object') {
+        opts = { mode: opts };
     }
-  }
+    
+    var mode = opts.mode;
+    var xfs = opts.fs || fs;
+    
+    if (mode === undefined) {
+        mode = _0777 & (~process.umask());
+    }
+    if (!made) made = null;
+    
+    var cb = f || function () {};
+    p = path.resolve(p);
+    
+    xfs.mkdir(p, mode, function (er) {
+        if (!er) {
+            made = made || p;
+            return cb(null, made);
+        }
+        switch (er.code) {
+            case 'ENOENT':
+                mkdirP(path.dirname(p), opts, function (er, made) {
+                    if (er) cb(er, made);
+                    else mkdirP(p, opts, cb, made);
+                });
+                break;
+
+            // In the case of any other error, just see if there's a dir
+            // there already.  If so, then hooray!  If not, then something
+            // is borked.
+            default:
+                xfs.stat(p, function (er2, stat) {
+                    // if the stat fails, then that's super weird.
+                    // let the original error be the failure reason.
+                    if (er2 || !stat.isDirectory()) cb(er, made)
+                    else cb(null, made);
+                });
+                break;
+        }
+    });
 }
-exports.default = BlockingQueue;
 
-/***/ }),
-/* 85 */
-/***/ (function(module, exports) {
+mkdirP.sync = function sync (p, opts, made) {
+    if (!opts || typeof opts !== 'object') {
+        opts = { mode: opts };
+    }
+    
+    var mode = opts.mode;
+    var xfs = opts.fs || fs;
+    
+    if (mode === undefined) {
+        mode = _0777 & (~process.umask());
+    }
+    if (!made) made = null;
 
-module.exports = function (exec) {
-  try {
-    return !!exec();
-  } catch (e) {
-    return true;
-  }
+    p = path.resolve(p);
+
+    try {
+        xfs.mkdirSync(p, mode);
+        made = made || p;
+    }
+    catch (err0) {
+        switch (err0.code) {
+            case 'ENOENT' :
+                made = sync(path.dirname(p), opts, made);
+                sync(p, opts, made);
+                break;
+
+            // In the case of any other error, just see if there's a dir
+            // there already.  If so, then hooray!  If not, then something
+            // is borked.
+            default:
+                var stat;
+                try {
+                    stat = xfs.statSync(p);
+                }
+                catch (err1) {
+                    throw err0;
+                }
+                if (!stat.isDirectory()) throw err0;
+                break;
+        }
+    }
+
+    return made;
 };
 
 
 /***/ }),
-/* 86 */,
-/* 87 */,
-/* 88 */,
-/* 89 */,
-/* 90 */,
-/* 91 */,
-/* 92 */,
-/* 93 */,
-/* 94 */,
-/* 95 */,
-/* 96 */,
-/* 97 */,
-/* 98 */,
-/* 99 */,
-/* 100 */
+/* 117 */,
+/* 118 */,
+/* 119 */,
+/* 120 */,
+/* 121 */,
+/* 122 */
 /***/ (function(module, exports, __webpack_require__) {
 
-// getting tag from 19.1.3.6 Object.prototype.toString()
-var cof = __webpack_require__(47);
-var TAG = __webpack_require__(13)('toStringTag');
-// ES3 wrong here
-var ARG = cof(function () { return arguments; }()) == 'Arguments';
+"use strict";
 
-// fallback for IE11 Script Access Denied error
-var tryGet = function (it, key) {
-  try {
-    return it[key];
-  } catch (e) { /* empty */ }
-};
+module.exports = x => {
+	if (typeof x !== 'string') {
+		throw new TypeError('Expected a string, got ' + typeof x);
+	}
 
-module.exports = function (it) {
-  var O, T, B;
-  return it === undefined ? 'Undefined' : it === null ? 'Null'
-    // @@toStringTag case
-    : typeof (T = tryGet(O = Object(it), TAG)) == 'string' ? T
-    // builtinTag case
-    : ARG ? cof(O)
-    // ES3 arguments fallback
-    : (B = cof(O)) == 'Object' && typeof O.callee == 'function' ? 'Arguments' : B;
+	// Catches EFBBBF (UTF-8 BOM) because the buffer-to-string
+	// conversion translates it to FEFF (UTF-16 BOM)
+	if (x.charCodeAt(0) === 0xFEFF) {
+		return x.slice(1);
+	}
+
+	return x;
 };
 
 
 /***/ }),
-/* 101 */
+/* 123 */
 /***/ (function(module, exports) {
 
-// IE 8- don't enum bug keys
-module.exports = (
-  'constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf'
-).split(',');
-
-
-/***/ }),
-/* 102 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var document = __webpack_require__(11).document;
-module.exports = document && document.documentElement;
+// Returns a wrapper function that returns a wrapped callback
+// The wrapper function should do some stuff, and return a
+// presumably different callback function.
+// This makes sure that own properties are retained, so that
+// decorations and such are not lost along the way.
+module.exports = wrappy
+function wrappy (fn, cb) {
+  if (fn && cb) return wrappy(fn)(cb)
 
+  if (typeof fn !== 'function')
+    throw new TypeError('need wrapper function')
 
-/***/ }),
-/* 103 */
-/***/ (function(module, exports, __webpack_require__) {
+  Object.keys(fn).forEach(function (k) {
+    wrapper[k] = fn[k]
+  })
 
-"use strict";
+  return wrapper
 
-var LIBRARY = __webpack_require__(69);
-var $export = __webpack_require__(41);
-var redefine = __webpack_require__(197);
-var hide = __webpack_require__(31);
-var Iterators = __webpack_require__(35);
-var $iterCreate = __webpack_require__(188);
-var setToStringTag = __webpack_require__(71);
-var getPrototypeOf = __webpack_require__(194);
-var ITERATOR = __webpack_require__(13)('iterator');
-var BUGGY = !([].keys && 'next' in [].keys()); // Safari has buggy iterators w/o `next`
-var FF_ITERATOR = '@@iterator';
-var KEYS = 'keys';
-var VALUES = 'values';
-
-var returnThis = function () { return this; };
-
-module.exports = function (Base, NAME, Constructor, next, DEFAULT, IS_SET, FORCED) {
-  $iterCreate(Constructor, NAME, next);
-  var getMethod = function (kind) {
-    if (!BUGGY && kind in proto) return proto[kind];
-    switch (kind) {
-      case KEYS: return function keys() { return new Constructor(this, kind); };
-      case VALUES: return function values() { return new Constructor(this, kind); };
-    } return function entries() { return new Constructor(this, kind); };
-  };
-  var TAG = NAME + ' Iterator';
-  var DEF_VALUES = DEFAULT == VALUES;
-  var VALUES_BUG = false;
-  var proto = Base.prototype;
-  var $native = proto[ITERATOR] || proto[FF_ITERATOR] || DEFAULT && proto[DEFAULT];
-  var $default = $native || getMethod(DEFAULT);
-  var $entries = DEFAULT ? !DEF_VALUES ? $default : getMethod('entries') : undefined;
-  var $anyNative = NAME == 'Array' ? proto.entries || $native : $native;
-  var methods, key, IteratorPrototype;
-  // Fix native
-  if ($anyNative) {
-    IteratorPrototype = getPrototypeOf($anyNative.call(new Base()));
-    if (IteratorPrototype !== Object.prototype && IteratorPrototype.next) {
-      // Set @@toStringTag to native iterators
-      setToStringTag(IteratorPrototype, TAG, true);
-      // fix for some old engines
-      if (!LIBRARY && typeof IteratorPrototype[ITERATOR] != 'function') hide(IteratorPrototype, ITERATOR, returnThis);
+  function wrapper() {
+    var args = new Array(arguments.length)
+    for (var i = 0; i < args.length; i++) {
+      args[i] = arguments[i]
     }
+    var ret = fn.apply(this, args)
+    var cb = args[args.length-1]
+    if (typeof ret === 'function' && ret !== cb) {
+      Object.keys(cb).forEach(function (k) {
+        ret[k] = cb[k]
+      })
+    }
+    return ret
   }
-  // fix Array#{values, @@iterator}.name in V8 / FF
-  if (DEF_VALUES && $native && $native.name !== VALUES) {
-    VALUES_BUG = true;
-    $default = function values() { return $native.call(this); };
-  }
-  // Define iterator
-  if ((!LIBRARY || FORCED) && (BUGGY || VALUES_BUG || !proto[ITERATOR])) {
-    hide(proto, ITERATOR, $default);
-  }
-  // Plug for library
-  Iterators[NAME] = $default;
-  Iterators[TAG] = returnThis;
-  if (DEFAULT) {
-    methods = {
-      values: DEF_VALUES ? $default : getMethod(VALUES),
-      keys: IS_SET ? $default : getMethod(KEYS),
-      entries: $entries
-    };
-    if (FORCED) for (key in methods) {
-      if (!(key in proto)) redefine(proto, key, methods[key]);
-    } else $export($export.P + $export.F * (BUGGY || VALUES_BUG), NAME, methods);
-  }
-  return methods;
-};
-
-
-/***/ }),
-/* 104 */
-/***/ (function(module, exports) {
-
-module.exports = function (exec) {
-  try {
-    return { e: false, v: exec() };
-  } catch (e) {
-    return { e: true, v: e };
-  }
-};
+}
 
 
 /***/ }),
-/* 105 */
+/* 124 */,
+/* 125 */,
+/* 126 */,
+/* 127 */,
+/* 128 */,
+/* 129 */,
+/* 130 */,
+/* 131 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var anObject = __webpack_require__(27);
-var isObject = __webpack_require__(34);
-var newPromiseCapability = __webpack_require__(70);
-
-module.exports = function (C, x) {
-  anObject(C);
-  if (isObject(x) && x.constructor === C) return x;
-  var promiseCapability = newPromiseCapability.f(C);
-  var resolve = promiseCapability.resolve;
-  resolve(x);
-  return promiseCapability.promise;
-};
-
-
-/***/ }),
-/* 106 */
-/***/ (function(module, exports) {
-
-module.exports = function (bitmap, value) {
-  return {
-    enumerable: !(bitmap & 1),
-    configurable: !(bitmap & 2),
-    writable: !(bitmap & 4),
-    value: value
-  };
+// fallback for non-array-like ES3 and non-enumerable old V8 strings
+var cof = __webpack_require__(47);
+// eslint-disable-next-line no-prototype-builtins
+module.exports = Object('z').propertyIsEnumerable(0) ? Object : function (it) {
+  return cof(it) == 'String' ? it.split('') : Object(it);
 };
 
 
 /***/ }),
-/* 107 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var core = __webpack_require__(23);
-var global = __webpack_require__(11);
-var SHARED = '__core-js_shared__';
-var store = global[SHARED] || (global[SHARED] = {});
-
-(module.exports = function (key, value) {
-  return store[key] || (store[key] = value !== undefined ? value : {});
-})('versions', []).push({
-  version: core.version,
-  mode: __webpack_require__(69) ? 'pure' : 'global',
-  copyright: '© 2018 Denis Pushkarev (zloirock.ru)'
-});
-
-
-/***/ }),
-/* 108 */
+/* 132 */
 /***/ (function(module, exports, __webpack_require__) {
 
-// 7.3.20 SpeciesConstructor(O, defaultConstructor)
-var anObject = __webpack_require__(27);
-var aFunction = __webpack_require__(46);
-var SPECIES = __webpack_require__(13)('species');
-module.exports = function (O, D) {
-  var C = anObject(O).constructor;
-  var S;
-  return C === undefined || (S = anObject(C)[SPECIES]) == undefined ? D : aFunction(S);
-};
-
-
-/***/ }),
-/* 109 */
-/***/ (function(module, exports, __webpack_require__) {
+// 19.1.2.14 / 15.2.3.14 Object.keys(O)
+var $keys = __webpack_require__(195);
+var enumBugKeys = __webpack_require__(101);
 
-var ctx = __webpack_require__(48);
-var invoke = __webpack_require__(185);
-var html = __webpack_require__(102);
-var cel = __webpack_require__(68);
-var global = __webpack_require__(11);
-var process = global.process;
-var setTask = global.setImmediate;
-var clearTask = global.clearImmediate;
-var MessageChannel = global.MessageChannel;
-var Dispatch = global.Dispatch;
-var counter = 0;
-var queue = {};
-var ONREADYSTATECHANGE = 'onreadystatechange';
-var defer, channel, port;
-var run = function () {
-  var id = +this;
-  // eslint-disable-next-line no-prototype-builtins
-  if (queue.hasOwnProperty(id)) {
-    var fn = queue[id];
-    delete queue[id];
-    fn();
-  }
-};
-var listener = function (event) {
-  run.call(event.data);
-};
-// Node.js 0.9+ & IE10+ has setImmediate, otherwise:
-if (!setTask || !clearTask) {
-  setTask = function setImmediate(fn) {
-    var args = [];
-    var i = 1;
-    while (arguments.length > i) args.push(arguments[i++]);
-    queue[++counter] = function () {
-      // eslint-disable-next-line no-new-func
-      invoke(typeof fn == 'function' ? fn : Function(fn), args);
-    };
-    defer(counter);
-    return counter;
-  };
-  clearTask = function clearImmediate(id) {
-    delete queue[id];
-  };
-  // Node.js 0.8-
-  if (__webpack_require__(47)(process) == 'process') {
-    defer = function (id) {
-      process.nextTick(ctx(run, id, 1));
-    };
-  // Sphere (JS game engine) Dispatch API
-  } else if (Dispatch && Dispatch.now) {
-    defer = function (id) {
-      Dispatch.now(ctx(run, id, 1));
-    };
-  // Browsers with MessageChannel, includes WebWorkers
-  } else if (MessageChannel) {
-    channel = new MessageChannel();
-    port = channel.port2;
-    channel.port1.onmessage = listener;
-    defer = ctx(port.postMessage, port, 1);
-  // Browsers with postMessage, skip WebWorkers
-  // IE8 has postMessage, but it's sync & typeof its postMessage is 'object'
-  } else if (global.addEventListener && typeof postMessage == 'function' && !global.importScripts) {
-    defer = function (id) {
-      global.postMessage(id + '', '*');
-    };
-    global.addEventListener('message', listener, false);
-  // IE8-
-  } else if (ONREADYSTATECHANGE in cel('script')) {
-    defer = function (id) {
-      html.appendChild(cel('script'))[ONREADYSTATECHANGE] = function () {
-        html.removeChild(this);
-        run.call(id);
-      };
-    };
-  // Rest old browsers
-  } else {
-    defer = function (id) {
-      setTimeout(ctx(run, id, 1), 0);
-    };
-  }
-}
-module.exports = {
-  set: setTask,
-  clear: clearTask
+module.exports = Object.keys || function keys(O) {
+  return $keys(O, enumBugKeys);
 };
 
 
 /***/ }),
-/* 110 */
+/* 133 */
 /***/ (function(module, exports, __webpack_require__) {
 
-// 7.1.15 ToLength
-var toInteger = __webpack_require__(73);
-var min = Math.min;
+// 7.1.13 ToObject(argument)
+var defined = __webpack_require__(67);
 module.exports = function (it) {
-  return it > 0 ? min(toInteger(it), 0x1fffffffffffff) : 0; // pow(2, 53) - 1 == 9007199254740991
+  return Object(defined(it));
 };
 
 
 /***/ }),
-/* 111 */
+/* 134 */,
+/* 135 */,
+/* 136 */,
+/* 137 */,
+/* 138 */,
+/* 139 */,
+/* 140 */,
+/* 141 */,
+/* 142 */,
+/* 143 */,
+/* 144 */,
+/* 145 */
 /***/ (function(module, exports) {
 
-var id = 0;
-var px = Math.random();
-module.exports = function (key) {
-  return 'Symbol('.concat(key === undefined ? '' : key, ')_', (++id + px).toString(36));
-};
-
+module.exports = {"name":"yarn","installationMethod":"unknown","version":"1.10.0-0","license":"BSD-2-Clause","preferGlobal":true,"description":"📦🐈 Fast, reliable, and secure dependency management.","dependencies":{"@zkochan/cmd-shim":"^2.2.4","babel-runtime":"^6.26.0","bytes":"^3.0.0","camelcase":"^4.0.0","chalk":"^2.1.0","commander":"^2.9.0","death":"^1.0.0","debug":"^3.0.0","deep-equal":"^1.0.1","detect-indent":"^5.0.0","dnscache":"^1.0.1","glob":"^7.1.1","gunzip-maybe":"^1.4.0","hash-for-dep":"^1.2.3","imports-loader":"^0.8.0","ini":"^1.3.4","inquirer":"^3.0.1","invariant":"^2.2.0","is-builtin-module":"^2.0.0","is-ci":"^1.0.10","is-webpack-bundle":"^1.0.0","leven":"^2.0.0","loud-rejection":"^1.2.0","micromatch":"^2.3.11","mkdirp":"^0.5.1","node-emoji":"^1.6.1","normalize-url":"^2.0.0","npm-logical-tree":"^1.2.1","object-path":"^0.11.2","proper-lockfile":"^2.0.0","puka":"^1.0.0","read":"^1.0.7","request":"^2.87.0","request-capture-har":"^1.2.2","rimraf":"^2.5.0","semver":"^5.1.0","ssri":"^5.3.0","strip-ansi":"^4.0.0","strip-bom":"^3.0.0","tar-fs":"^1.16.0","tar-stream":"^1.6.1","uuid":"^3.0.1","v8-compile-cache":"^2.0.0","validate-npm-package-license":"^3.0.3","yn":"^2.0.0"},"devDependencies":{"babel-core":"^6.26.0","babel-eslint":"^7.2.3","babel-loader":"^6.2.5","babel-plugin-array-includes":"^2.0.3","babel-plugin-transform-builtin-extend":"^1.1.2","babel-plugin-transform-inline-imports-commonjs":"^1.0.0","babel-plugin-transform-runtime":"^6.4.3","babel-preset-env":"^1.6.0","babel-preset-flow":"^6.23.0","babel-preset-stage-0":"^6.0.0","babylon":"^6.5.0","commitizen":"^2.9.6","cz-conventional-changelog":"^2.0.0","eslint":"^4.3.0","eslint-config-fb-strict":"^22.0.0","eslint-plugin-babel":"^5.0.0","eslint-plugin-flowtype":"^2.35.0","eslint-plugin-jasmine":"^2.6.2","eslint-plugin-jest":"^21.0.0","eslint-plugin-jsx-a11y":"^6.0.2","eslint-plugin-prefer-object-spread":"^1.2.1","eslint-plugin-prettier":"^2.1.2","eslint-plugin-react":"^7.1.0","eslint-plugin-relay":"^0.0.24","eslint-plugin-yarn-internal":"file:scripts/eslint-rules","execa":"^0.10.0","flow-bin":"^0.66.0","git-release-notes":"^3.0.0","gulp":"^3.9.0","gulp-babel":"^7.0.0","gulp-if":"^2.0.1","gulp-newer":"^1.0.0","gulp-plumber":"^1.0.1","gulp-sourcemaps":"^2.2.0","gulp-util":"^3.0.7","gulp-watch":"^5.0.0","jest":"^22.4.4","jsinspect":"^0.12.6","minimatch":"^3.0.4","mock-stdin":"^0.3.0","prettier":"^1.5.2","temp":"^0.8.3","webpack":"^2.1.0-beta.25","yargs":"^6.3.0"},"resolutions":{"sshpk":"^1.14.2"},"engines":{"node":">=4.0.0"},"repository":"yarnpkg/yarn","bin":{"yarn":"./bin/yarn.js","yarnpkg":"./bin/yarn.js"},"scripts":{"build":"gulp build","build-bundle":"node ./scripts/build-webpack.js","build-chocolatey":"powershell ./scripts/build-chocolatey.ps1","build-deb":"./scripts/build-deb.sh","build-dist":"bash ./scripts/build-dist.sh","build-win-installer":"scripts\\build-windows-installer.bat","changelog":"git-release-notes $(git describe --tags --abbrev=0 $(git describe --tags --abbrev=0)^)..$(git describe --tags --abbrev=0) scripts/changelog.md","dupe-check":"yarn jsinspect ./src","lint":"eslint . && flow check","pkg-tests":"yarn --cwd packages/pkg-tests jest yarn.test.js","prettier":"eslint src __tests__ --fix","release-branch":"./scripts/release-branch.sh","test":"yarn lint && yarn test-only","test-only":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --verbose","test-only-debug":"node --inspect-brk --max_old_space_size=4096 node_modules/jest/bin/jest.js --runInBand --verbose","test-coverage":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --coverage --verbose","watch":"gulp watch","commit":"git-cz"},"jest":{"collectCoverageFrom":["src/**/*.js"],"testEnvironment":"node","modulePathIgnorePatterns":["__tests__/fixtures/","packages/pkg-tests/pkg-tests-fixtures","dist/"],"testPathIgnorePatterns":["__tests__/(fixtures|__mocks__)/","updates/","_(temp|mock|install|init|helpers).js$","packages/pkg-tests"]},"config":{"commitizen":{"path":"./node_modules/cz-conventional-changelog"}}}
 
 /***/ }),
-/* 112 */
+/* 146 */,
+/* 147 */,
+/* 148 */,
+/* 149 */,
+/* 150 */
 /***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
-/**
- * This is the common logic for both the Node.js and web browser
- * implementations of `debug()`.
- *
- * Expose `debug()` as the module.
- */
 
-exports = module.exports = createDebug.debug = createDebug['default'] = createDebug;
-exports.coerce = coerce;
-exports.disable = disable;
-exports.enable = enable;
-exports.enabled = enabled;
-exports.humanize = __webpack_require__(229);
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = stringify;
 
-/**
- * Active `debug` instances.
- */
-exports.instances = [];
+var _misc;
 
-/**
- * The currently active debug mode names, and names to skip.
- */
+function _load_misc() {
+  return _misc = __webpack_require__(12);
+}
 
-exports.names = [];
-exports.skips = [];
+var _constants;
 
-/**
- * Map of special "%n" handling functions, for the debug "format" argument.
- *
- * Valid key names are a single, lower or upper-case letter, i.e. "n" and "N".
- */
+function _load_constants() {
+  return _constants = __webpack_require__(6);
+}
 
-exports.formatters = {};
+var _package;
 
-/**
- * Select a color.
- * @param {String} namespace
- * @return {Number}
- * @api private
- */
+function _load_package() {
+  return _package = __webpack_require__(145);
+}
 
-function selectColor(namespace) {
-  var hash = 0, i;
+const NODE_VERSION = process.version;
 
-  for (i in namespace) {
-    hash  = ((hash << 5) - hash) + namespace.charCodeAt(i);
-    hash |= 0; // Convert to 32bit integer
-  }
+function shouldWrapKey(str) {
+  return str.indexOf('true') === 0 || str.indexOf('false') === 0 || /[:\s\n\\",\[\]]/g.test(str) || /^[0-9]/g.test(str) || !/^[a-zA-Z]/g.test(str);
+}
 
-  return exports.colors[Math.abs(hash) % exports.colors.length];
+function maybeWrap(str) {
+  if (typeof str === 'boolean' || typeof str === 'number' || shouldWrapKey(str)) {
+    return JSON.stringify(str);
+  } else {
+    return str;
+  }
 }
 
-/**
- * Create a debugger with the given `namespace`.
- *
- * @param {String} namespace
- * @return {Function}
- * @api public
- */
+const priorities = {
+  name: 1,
+  version: 2,
+  uid: 3,
+  resolved: 4,
+  integrity: 5,
+  registry: 6,
+  dependencies: 7
+};
 
-function createDebug(namespace) {
+function priorityThenAlphaSort(a, b) {
+  if (priorities[a] || priorities[b]) {
+    return (priorities[a] || 100) > (priorities[b] || 100) ? 1 : -1;
+  } else {
+    return (0, (_misc || _load_misc()).sortAlpha)(a, b);
+  }
+}
 
-  var prevTime;
+function _stringify(obj, options) {
+  if (typeof obj !== 'object') {
+    throw new TypeError();
+  }
 
-  function debug() {
-    // disabled?
-    if (!debug.enabled) return;
+  const indent = options.indent;
+  const lines = [];
 
-    var self = debug;
+  // Sorting order needs to be consistent between runs, we run native sort by name because there are no
+  // problems with it being unstable because there are no to keys the same
+  // However priorities can be duplicated and native sort can shuffle things from run to run
+  const keys = Object.keys(obj).sort(priorityThenAlphaSort);
 
-    // set `diff` timestamp
-    var curr = +new Date();
-    var ms = curr - (prevTime || curr);
-    self.diff = ms;
-    self.prev = prevTime;
-    self.curr = curr;
-    prevTime = curr;
+  let addedKeys = [];
 
-    // turn the `arguments` into a proper Array
-    var args = new Array(arguments.length);
-    for (var i = 0; i < args.length; i++) {
-      args[i] = arguments[i];
+  for (let i = 0; i < keys.length; i++) {
+    const key = keys[i];
+    const val = obj[key];
+    if (val == null || addedKeys.indexOf(key) >= 0) {
+      continue;
     }
 
-    args[0] = exports.coerce(args[0]);
+    const valKeys = [key];
 
-    if ('string' !== typeof args[0]) {
-      // anything else let's inspect with %O
-      args.unshift('%O');
+    // get all keys that have the same value equality, we only want this for objects
+    if (typeof val === 'object') {
+      for (let j = i + 1; j < keys.length; j++) {
+        const key = keys[j];
+        if (val === obj[key]) {
+          valKeys.push(key);
+        }
+      }
     }
 
-    // apply any `formatters` transformations
-    var index = 0;
-    args[0] = args[0].replace(/%([a-zA-Z%])/g, function(match, format) {
-      // if we encounter an escaped % then don't increase the array index
-      if (match === '%%') return match;
-      index++;
-      var formatter = exports.formatters[format];
-      if ('function' === typeof formatter) {
-        var val = args[index];
-        match = formatter.call(self, val);
-
-        // now we need to remove `args[index]` since it's inlined in the `format`
-        args.splice(index, 1);
-        index--;
-      }
-      return match;
-    });
+    const keyLine = valKeys.sort((_misc || _load_misc()).sortAlpha).map(maybeWrap).join(', ');
 
-    // apply env-specific formatting (colors, etc.)
-    exports.formatArgs.call(self, args);
+    if (typeof val === 'string' || typeof val === 'boolean' || typeof val === 'number') {
+      lines.push(`${keyLine} ${maybeWrap(val)}`);
+    } else if (typeof val === 'object') {
+      lines.push(`${keyLine}:\n${_stringify(val, { indent: indent + '  ' })}` + (options.topLevel ? '\n' : ''));
+    } else {
+      throw new TypeError();
+    }
 
-    var logFn = debug.log || exports.log || console.log.bind(console);
-    logFn.apply(self, args);
+    addedKeys = addedKeys.concat(valKeys);
   }
 
-  debug.namespace = namespace;
-  debug.enabled = exports.enabled(namespace);
-  debug.useColors = exports.useColors();
-  debug.color = selectColor(namespace);
-  debug.destroy = destroy;
+  return indent + lines.join(`\n${indent}`);
+}
 
-  // env-specific initialization logic for debug instances
-  if ('function' === typeof exports.init) {
-    exports.init(debug);
+function stringify(obj, noHeader, enableVersions) {
+  const val = _stringify(obj, {
+    indent: '',
+    topLevel: true
+  });
+  if (noHeader) {
+    return val;
   }
 
-  exports.instances.push(debug);
+  const lines = [];
+  lines.push('# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.');
+  lines.push(`# yarn lockfile v${(_constants || _load_constants()).LOCKFILE_VERSION}`);
+  if (enableVersions) {
+    lines.push(`# yarn v${(_package || _load_package()).version}`);
+    lines.push(`# node ${NODE_VERSION}`);
+  }
+  lines.push('\n');
+  lines.push(val);
 
-  return debug;
+  return lines.join('\n');
 }
 
-function destroy () {
-  var index = exports.instances.indexOf(this);
-  if (index !== -1) {
-    exports.instances.splice(index, 1);
-    return true;
-  } else {
-    return false;
-  }
-}
+/***/ }),
+/* 151 */,
+/* 152 */,
+/* 153 */,
+/* 154 */,
+/* 155 */,
+/* 156 */,
+/* 157 */,
+/* 158 */,
+/* 159 */,
+/* 160 */,
+/* 161 */,
+/* 162 */,
+/* 163 */,
+/* 164 */
+/***/ (function(module, exports, __webpack_require__) {
 
-/**
- * Enables a debug mode by namespaces. This can include modes
- * separated by a colon and wildcards.
- *
- * @param {String} namespaces
- * @api public
- */
+"use strict";
 
-function enable(namespaces) {
-  exports.save(namespaces);
 
-  exports.names = [];
-  exports.skips = [];
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.fileDatesEqual = exports.copyFile = exports.unlink = undefined;
 
-  var i;
-  var split = (typeof namespaces === 'string' ? namespaces : '').split(/[\s,]+/);
-  var len = split.length;
+var _asyncToGenerator2;
 
-  for (i = 0; i < len; i++) {
-    if (!split[i]) continue; // ignore empty strings
-    namespaces = split[i].replace(/\*/g, '.*?');
-    if (namespaces[0] === '-') {
-      exports.skips.push(new RegExp('^' + namespaces.substr(1) + '$'));
-    } else {
-      exports.names.push(new RegExp('^' + namespaces + '$'));
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(1));
+}
+
+// We want to preserve file timestamps when copying a file, since yarn uses them to decide if a file has
+// changed compared to the cache.
+// There are some OS specific cases here:
+// * On linux, fs.copyFile does not preserve timestamps, but does on OSX and Win.
+// * On windows, you must open a file with write permissions to call `fs.futimes`.
+// * On OSX you can open with read permissions and still call `fs.futimes`.
+let fixTimes = (() => {
+  var _ref3 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (fd, dest, data) {
+    const doOpen = fd === undefined;
+    let openfd = fd ? fd : -1;
+
+    if (disableTimestampCorrection === undefined) {
+      // if timestamps match already, no correction is needed.
+      // the need to correct timestamps varies based on OS and node versions.
+      const destStat = yield lstat(dest);
+      disableTimestampCorrection = fileDatesEqual(destStat.mtime, data.mtime);
     }
-  }
 
-  for (i = 0; i < exports.instances.length; i++) {
-    var instance = exports.instances[i];
-    instance.enabled = exports.enabled(instance.namespace);
-  }
+    if (disableTimestampCorrection) {
+      return;
+    }
+
+    if (doOpen) {
+      try {
+        openfd = yield open(dest, 'a', data.mode);
+      } catch (er) {
+        // file is likely read-only
+        try {
+          openfd = yield open(dest, 'r', data.mode);
+        } catch (err) {
+          // We can't even open this file for reading.
+          return;
+        }
+      }
+    }
+
+    try {
+      if (openfd) {
+        yield futimes(openfd, data.atime, data.mtime);
+      }
+    } catch (er) {
+      // If `futimes` throws an exception, we probably have a case of a read-only file on Windows.
+      // In this case we can just return. The incorrect timestamp will just cause that file to be recopied
+      // on subsequent installs, which will effect yarn performance but not break anything.
+    } finally {
+      if (doOpen && openfd) {
+        yield close(openfd);
+      }
+    }
+  });
+
+  return function fixTimes(_x7, _x8, _x9) {
+    return _ref3.apply(this, arguments);
+  };
+})();
+
+// Compare file timestamps.
+// Some versions of Node on windows zero the milliseconds when utime is used.
+
+
+var _fs;
+
+function _load_fs() {
+  return _fs = _interopRequireDefault(__webpack_require__(3));
 }
 
-/**
- * Disable debug output.
- *
- * @api public
- */
+var _promise;
 
-function disable() {
-  exports.enable('');
+function _load_promise() {
+  return _promise = __webpack_require__(40);
 }
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// This module serves as a wrapper for file operations that are inconsistant across node and OS versions.
+
+let disableTimestampCorrection = undefined; // OS dependent. will be detected on first file copy.
+
+const readFileBuffer = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.readFile);
+const close = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.close);
+const lstat = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.lstat);
+const open = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.open);
+const futimes = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.futimes);
+
+const write = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.write);
+
+const unlink = exports.unlink = (0, (_promise || _load_promise()).promisify)(__webpack_require__(233));
+
 /**
- * Returns true if the given mode name is enabled, false otherwise.
- *
- * @param {String} name
- * @return {Boolean}
- * @api public
+ * Unlinks the destination to force a recreation. This is needed on case-insensitive file systems
+ * to force the correct naming when the filename has changed only in character-casing. (Jest -> jest).
  */
+const copyFile = exports.copyFile = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data, cleanup) {
+    try {
+      yield unlink(data.dest);
+      yield copyFilePoly(data.src, data.dest, 0, data);
+    } finally {
+      if (cleanup) {
+        cleanup();
+      }
+    }
+  });
 
-function enabled(name) {
-  if (name[name.length - 1] === '*') {
-    return true;
+  return function copyFile(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+// Node 8.5.0 introduced `fs.copyFile` which is much faster, so use that when available.
+// Otherwise we fall back to reading and writing files as buffers.
+const copyFilePoly = (src, dest, flags, data) => {
+  if ((_fs || _load_fs()).default.copyFile) {
+    return new Promise((resolve, reject) => (_fs || _load_fs()).default.copyFile(src, dest, flags, err => {
+      if (err) {
+        reject(err);
+      } else {
+        fixTimes(undefined, dest, data).then(() => resolve()).catch(ex => reject(ex));
+      }
+    }));
+  } else {
+    return copyWithBuffer(src, dest, flags, data);
   }
-  var i, len;
-  for (i = 0, len = exports.skips.length; i < len; i++) {
-    if (exports.skips[i].test(name)) {
-      return false;
+};
+
+const copyWithBuffer = (() => {
+  var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (src, dest, flags, data) {
+    // Use open -> write -> futimes -> close sequence to avoid opening the file twice:
+    // one with writeFile and one with utimes
+    const fd = yield open(dest, 'w', data.mode);
+    try {
+      const buffer = yield readFileBuffer(src);
+      yield write(fd, buffer, 0, buffer.length);
+      yield fixTimes(fd, dest, data);
+    } finally {
+      yield close(fd);
     }
+  });
+
+  return function copyWithBuffer(_x3, _x4, _x5, _x6) {
+    return _ref2.apply(this, arguments);
+  };
+})();const fileDatesEqual = exports.fileDatesEqual = (a, b) => {
+  const aTime = a.getTime();
+  const bTime = b.getTime();
+
+  if (process.platform !== 'win32') {
+    return aTime === bTime;
   }
-  for (i = 0, len = exports.names.length; i < len; i++) {
-    if (exports.names[i].test(name)) {
-      return true;
-    }
+
+  // See https://github.com/nodejs/node/pull/12607
+  // Submillisecond times from stat and utimes are truncated on Windows,
+  // causing a file with mtime 8.0079998 and 8.0081144 to become 8.007 and 8.008
+  // and making it impossible to update these files to their correct timestamps.
+  if (Math.abs(aTime - bTime) <= 1) {
+    return true;
   }
-  return false;
-}
 
-/**
- * Coerce `val`.
- *
- * @param {Mixed} val
- * @return {Mixed}
- * @api private
- */
+  const aTimeSec = Math.floor(aTime / 1000);
+  const bTimeSec = Math.floor(bTime / 1000);
 
-function coerce(val) {
-  if (val instanceof Error) return val.stack || val.message;
-  return val;
-}
+  // See https://github.com/nodejs/node/issues/2069
+  // Some versions of Node on windows zero the milliseconds when utime is used
+  // So if any of the time has a milliseconds part of zero we suspect that the
+  // bug is present and compare only seconds.
+  if (aTime - aTimeSec * 1000 === 0 || bTime - bTimeSec * 1000 === 0) {
+    return aTimeSec === bTimeSec;
+  }
 
+  return aTime === bTime;
+};
 
 /***/ }),
-/* 113 */,
-/* 114 */
+/* 165 */,
+/* 166 */,
+/* 167 */,
+/* 168 */,
+/* 169 */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = realpath
-realpath.realpath = realpath
-realpath.sync = realpathSync
-realpath.realpathSync = realpathSync
-realpath.monkeypatch = monkeypatch
-realpath.unmonkeypatch = unmonkeypatch
+"use strict";
 
-var fs = __webpack_require__(3)
-var origRealpath = fs.realpath
-var origRealpathSync = fs.realpathSync
 
-var version = process.version
-var ok = /^v[0-5]\./.test(version)
-var old = __webpack_require__(217)
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isFakeRoot = isFakeRoot;
+exports.isRootUser = isRootUser;
+function getUid() {
+  if (process.platform !== 'win32' && process.getuid) {
+    return process.getuid();
+  }
+  return null;
+}
 
-function newError (er) {
-  return er && er.syscall === 'realpath' && (
-    er.code === 'ELOOP' ||
-    er.code === 'ENOMEM' ||
-    er.code === 'ENAMETOOLONG'
-  )
+exports.default = isRootUser(getUid()) && !isFakeRoot();
+function isFakeRoot() {
+  return Boolean(process.env.FAKEROOTKEY);
 }
 
-function realpath (p, cache, cb) {
-  if (ok) {
-    return origRealpath(p, cache, cb)
-  }
+function isRootUser(uid) {
+  return uid === 0;
+}
 
-  if (typeof cache === 'function') {
-    cb = cache
-    cache = null
+/***/ }),
+/* 170 */,
+/* 171 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDataDir = getDataDir;
+exports.getCacheDir = getCacheDir;
+exports.getConfigDir = getConfigDir;
+const path = __webpack_require__(0);
+const userHome = __webpack_require__(45).default;
+
+const FALLBACK_CONFIG_DIR = path.join(userHome, '.config', 'yarn');
+const FALLBACK_CACHE_DIR = path.join(userHome, '.cache', 'yarn');
+
+function getDataDir() {
+  if (process.platform === 'win32') {
+    const WIN32_APPDATA_DIR = getLocalAppDataDir();
+    return WIN32_APPDATA_DIR == null ? FALLBACK_CONFIG_DIR : path.join(WIN32_APPDATA_DIR, 'Data');
+  } else if (process.env.XDG_DATA_HOME) {
+    return path.join(process.env.XDG_DATA_HOME, 'yarn');
+  } else {
+    // This could arguably be ~/Library/Application Support/Yarn on Macs,
+    // but that feels unintuitive for a cli tool
+
+    // Instead, use our prior fallback. Some day this could be
+    // path.join(userHome, '.local', 'share', 'yarn')
+    // or return path.join(WIN32_APPDATA_DIR, 'Data') on win32
+    return FALLBACK_CONFIG_DIR;
   }
-  origRealpath(p, cache, function (er, result) {
-    if (newError(er)) {
-      old.realpath(p, cache, cb)
-    } else {
-      cb(er, result)
-    }
-  })
 }
 
-function realpathSync (p, cache) {
-  if (ok) {
-    return origRealpathSync(p, cache)
+function getCacheDir() {
+  if (process.platform === 'win32') {
+    // process.env.TEMP also exists, but most apps put caches here
+    return path.join(getLocalAppDataDir() || path.join(userHome, 'AppData', 'Local', 'Yarn'), 'Cache');
+  } else if (process.env.XDG_CACHE_HOME) {
+    return path.join(process.env.XDG_CACHE_HOME, 'yarn');
+  } else if (process.platform === 'darwin') {
+    return path.join(userHome, 'Library', 'Caches', 'Yarn');
+  } else {
+    return FALLBACK_CACHE_DIR;
   }
+}
 
-  try {
-    return origRealpathSync(p, cache)
-  } catch (er) {
-    if (newError(er)) {
-      return old.realpathSync(p, cache)
-    } else {
-      throw er
-    }
+function getConfigDir() {
+  if (process.platform === 'win32') {
+    // Use our prior fallback. Some day this could be
+    // return path.join(WIN32_APPDATA_DIR, 'Config')
+    const WIN32_APPDATA_DIR = getLocalAppDataDir();
+    return WIN32_APPDATA_DIR == null ? FALLBACK_CONFIG_DIR : path.join(WIN32_APPDATA_DIR, 'Config');
+  } else if (process.env.XDG_CONFIG_HOME) {
+    return path.join(process.env.XDG_CONFIG_HOME, 'yarn');
+  } else {
+    return FALLBACK_CONFIG_DIR;
   }
 }
 
-function monkeypatch () {
-  fs.realpath = realpath
-  fs.realpathSync = realpathSync
+function getLocalAppDataDir() {
+  return process.env.LOCALAPPDATA ? path.join(process.env.LOCALAPPDATA, 'Yarn') : null;
 }
 
-function unmonkeypatch () {
-  fs.realpath = origRealpath
-  fs.realpathSync = origRealpathSync
-}
+/***/ }),
+/* 172 */,
+/* 173 */
+/***/ (function(module, exports, __webpack_require__) {
 
+module.exports = { "default": __webpack_require__(179), __esModule: true };
 
 /***/ }),
-/* 115 */
+/* 174 */
 /***/ (function(module, exports, __webpack_require__) {
 
-exports.alphasort = alphasort
-exports.alphasorti = alphasorti
-exports.setopts = setopts
-exports.ownProp = ownProp
-exports.makeAbs = makeAbs
-exports.finish = finish
-exports.mark = mark
-exports.isIgnored = isIgnored
-exports.childrenIgnored = childrenIgnored
+"use strict";
 
-function ownProp (obj, field) {
-  return Object.prototype.hasOwnProperty.call(obj, field)
-}
+module.exports = balanced;
+function balanced(a, b, str) {
+  if (a instanceof RegExp) a = maybeMatch(a, str);
+  if (b instanceof RegExp) b = maybeMatch(b, str);
 
-var path = __webpack_require__(0)
-var minimatch = __webpack_require__(60)
-var isAbsolute = __webpack_require__(76)
-var Minimatch = minimatch.Minimatch
+  var r = range(a, b, str);
 
-function alphasorti (a, b) {
-  return a.toLowerCase().localeCompare(b.toLowerCase())
+  return r && {
+    start: r[0],
+    end: r[1],
+    pre: str.slice(0, r[0]),
+    body: str.slice(r[0] + a.length, r[1]),
+    post: str.slice(r[1] + b.length)
+  };
 }
 
-function alphasort (a, b) {
-  return a.localeCompare(b)
+function maybeMatch(reg, str) {
+  var m = str.match(reg);
+  return m ? m[0] : null;
 }
 
-function setupIgnores (self, options) {
-  self.ignore = options.ignore || []
-
-  if (!Array.isArray(self.ignore))
-    self.ignore = [self.ignore]
+balanced.range = range;
+function range(a, b, str) {
+  var begs, beg, left, right, result;
+  var ai = str.indexOf(a);
+  var bi = str.indexOf(b, ai + 1);
+  var i = ai;
 
-  if (self.ignore.length) {
-    self.ignore = self.ignore.map(ignoreMap)
-  }
-}
+  if (ai >= 0 && bi > 0) {
+    begs = [];
+    left = str.length;
 
-// ignore patterns are always in dot:true mode.
-function ignoreMap (pattern) {
-  var gmatcher = null
-  if (pattern.slice(-3) === '/**') {
-    var gpattern = pattern.replace(/(\/\*\*)+$/, '')
-    gmatcher = new Minimatch(gpattern, { dot: true })
-  }
+    while (i >= 0 && !result) {
+      if (i == ai) {
+        begs.push(i);
+        ai = str.indexOf(a, i + 1);
+      } else if (begs.length == 1) {
+        result = [ begs.pop(), bi ];
+      } else {
+        beg = begs.pop();
+        if (beg < left) {
+          left = beg;
+          right = bi;
+        }
 
-  return {
-    matcher: new Minimatch(pattern, { dot: true }),
-    gmatcher: gmatcher
-  }
-}
+        bi = str.indexOf(b, i + 1);
+      }
 
-function setopts (self, pattern, options) {
-  if (!options)
-    options = {}
+      i = ai < bi && ai >= 0 ? ai : bi;
+    }
 
-  // base-matching: just use globstar for that.
-  if (options.matchBase && -1 === pattern.indexOf("/")) {
-    if (options.noglobstar) {
-      throw new Error("base matching requires globstar")
+    if (begs.length) {
+      result = [ left, right ];
     }
-    pattern = "**/" + pattern
   }
 
-  self.silent = !!options.silent
-  self.pattern = pattern
-  self.strict = options.strict !== false
-  self.realpath = !!options.realpath
-  self.realpathCache = options.realpathCache || Object.create(null)
-  self.follow = !!options.follow
-  self.dot = !!options.dot
-  self.mark = !!options.mark
-  self.nodir = !!options.nodir
-  if (self.nodir)
-    self.mark = true
-  self.sync = !!options.sync
-  self.nounique = !!options.nounique
-  self.nonull = !!options.nonull
-  self.nosort = !!options.nosort
-  self.nocase = !!options.nocase
-  self.stat = !!options.stat
-  self.noprocess = !!options.noprocess
-  self.absolute = !!options.absolute
-
-  self.maxLength = options.maxLength || Infinity
-  self.cache = options.cache || Object.create(null)
-  self.statCache = options.statCache || Object.create(null)
-  self.symlinks = options.symlinks || Object.create(null)
+  return result;
+}
 
-  setupIgnores(self, options)
 
-  self.changedCwd = false
-  var cwd = process.cwd()
-  if (!ownProp(options, "cwd"))
-    self.cwd = cwd
-  else {
-    self.cwd = path.resolve(options.cwd)
-    self.changedCwd = self.cwd !== cwd
-  }
+/***/ }),
+/* 175 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  self.root = options.root || path.resolve(self.cwd, "/")
-  self.root = path.resolve(self.root)
-  if (process.platform === "win32")
-    self.root = self.root.replace(/\\/g, "/")
+var concatMap = __webpack_require__(178);
+var balanced = __webpack_require__(174);
 
-  // TODO: is an absolute `cwd` supposed to be resolved against `root`?
-  // e.g. { cwd: '/test', root: __dirname } === path.join(__dirname, '/test')
-  self.cwdAbs = isAbsolute(self.cwd) ? self.cwd : makeAbs(self, self.cwd)
-  if (process.platform === "win32")
-    self.cwdAbs = self.cwdAbs.replace(/\\/g, "/")
-  self.nomount = !!options.nomount
+module.exports = expandTop;
 
-  // disable comments and negation in Minimatch.
-  // Note that they are not supported in Glob itself anyway.
-  options.nonegate = true
-  options.nocomment = true
+var escSlash = '\0SLASH'+Math.random()+'\0';
+var escOpen = '\0OPEN'+Math.random()+'\0';
+var escClose = '\0CLOSE'+Math.random()+'\0';
+var escComma = '\0COMMA'+Math.random()+'\0';
+var escPeriod = '\0PERIOD'+Math.random()+'\0';
 
-  self.minimatch = new Minimatch(pattern, options)
-  self.options = self.minimatch.options
+function numeric(str) {
+  return parseInt(str, 10) == str
+    ? parseInt(str, 10)
+    : str.charCodeAt(0);
 }
 
-function finish (self) {
-  var nou = self.nounique
-  var all = nou ? [] : Object.create(null)
-
-  for (var i = 0, l = self.matches.length; i < l; i ++) {
-    var matches = self.matches[i]
-    if (!matches || Object.keys(matches).length === 0) {
-      if (self.nonull) {
-        // do like the shell, and spit out the literal glob
-        var literal = self.minimatch.globSet[i]
-        if (nou)
-          all.push(literal)
-        else
-          all[literal] = true
-      }
-    } else {
-      // had matches
-      var m = Object.keys(matches)
-      if (nou)
-        all.push.apply(all, m)
-      else
-        m.forEach(function (m) {
-          all[m] = true
-        })
-    }
-  }
-
-  if (!nou)
-    all = Object.keys(all)
-
-  if (!self.nosort)
-    all = all.sort(self.nocase ? alphasorti : alphasort)
-
-  // at *some* point we statted all of these
-  if (self.mark) {
-    for (var i = 0; i < all.length; i++) {
-      all[i] = self._mark(all[i])
-    }
-    if (self.nodir) {
-      all = all.filter(function (e) {
-        var notDir = !(/\/$/.test(e))
-        var c = self.cache[e] || self.cache[makeAbs(self, e)]
-        if (notDir && c)
-          notDir = c !== 'DIR' && !Array.isArray(c)
-        return notDir
-      })
-    }
-  }
-
-  if (self.ignore.length)
-    all = all.filter(function(m) {
-      return !isIgnored(self, m)
-    })
+function escapeBraces(str) {
+  return str.split('\\\\').join(escSlash)
+            .split('\\{').join(escOpen)
+            .split('\\}').join(escClose)
+            .split('\\,').join(escComma)
+            .split('\\.').join(escPeriod);
+}
 
-  self.found = all
+function unescapeBraces(str) {
+  return str.split(escSlash).join('\\')
+            .split(escOpen).join('{')
+            .split(escClose).join('}')
+            .split(escComma).join(',')
+            .split(escPeriod).join('.');
 }
 
-function mark (self, p) {
-  var abs = makeAbs(self, p)
-  var c = self.cache[abs]
-  var m = p
-  if (c) {
-    var isDir = c === 'DIR' || Array.isArray(c)
-    var slash = p.slice(-1) === '/'
 
-    if (isDir && !slash)
-      m += '/'
-    else if (!isDir && slash)
-      m = m.slice(0, -1)
+// Basically just str.split(","), but handling cases
+// where we have nested braced sections, which should be
+// treated as individual members, like {a,{b,c},d}
+function parseCommaParts(str) {
+  if (!str)
+    return [''];
 
-    if (m !== p) {
-      var mabs = makeAbs(self, m)
-      self.statCache[mabs] = self.statCache[abs]
-      self.cache[mabs] = self.cache[abs]
-    }
-  }
+  var parts = [];
+  var m = balanced('{', '}', str);
 
-  return m
-}
+  if (!m)
+    return str.split(',');
 
-// lotta situps...
-function makeAbs (self, f) {
-  var abs = f
-  if (f.charAt(0) === '/') {
-    abs = path.join(self.root, f)
-  } else if (isAbsolute(f) || f === '') {
-    abs = f
-  } else if (self.changedCwd) {
-    abs = path.resolve(self.cwd, f)
-  } else {
-    abs = path.resolve(f)
+  var pre = m.pre;
+  var body = m.body;
+  var post = m.post;
+  var p = pre.split(',');
+
+  p[p.length-1] += '{' + body + '}';
+  var postParts = parseCommaParts(post);
+  if (post.length) {
+    p[p.length-1] += postParts.shift();
+    p.push.apply(p, postParts);
   }
 
-  if (process.platform === 'win32')
-    abs = abs.replace(/\\/g, '/')
+  parts.push.apply(parts, p);
 
-  return abs
+  return parts;
 }
 
+function expandTop(str) {
+  if (!str)
+    return [];
 
-// Return true, if pattern ends with globstar '**', for the accompanying parent directory.
-// Ex:- If node_modules/** is the pattern, add 'node_modules' to ignore list along with it's contents
-function isIgnored (self, path) {
-  if (!self.ignore.length)
-    return false
+  // I don't know why Bash 4.3 does this, but it does.
+  // Anything starting with {} will have the first two bytes preserved
+  // but *only* at the top level, so {},a}b will not expand to anything,
+  // but a{},b}c will be expanded to [a}c,abc].
+  // One could argue that this is a bug in Bash, but since the goal of
+  // this module is to match Bash's rules, we escape a leading {}
+  if (str.substr(0, 2) === '{}') {
+    str = '\\{\\}' + str.substr(2);
+  }
 
-  return self.ignore.some(function(item) {
-    return item.matcher.match(path) || !!(item.gmatcher && item.gmatcher.match(path))
-  })
+  return expand(escapeBraces(str), true).map(unescapeBraces);
 }
 
-function childrenIgnored (self, path) {
-  if (!self.ignore.length)
-    return false
-
-  return self.ignore.some(function(item) {
-    return !!(item.gmatcher && item.gmatcher.match(path))
-  })
+function identity(e) {
+  return e;
 }
 
+function embrace(str) {
+  return '{' + str + '}';
+}
+function isPadded(el) {
+  return /^-?0\d/.test(el);
+}
 
-/***/ }),
-/* 116 */
-/***/ (function(module, exports, __webpack_require__) {
+function lte(i, y) {
+  return i <= y;
+}
+function gte(i, y) {
+  return i >= y;
+}
 
-var path = __webpack_require__(0);
-var fs = __webpack_require__(3);
-var _0777 = parseInt('0777', 8);
+function expand(str, isTop) {
+  var expansions = [];
 
-module.exports = mkdirP.mkdirp = mkdirP.mkdirP = mkdirP;
+  var m = balanced('{', '}', str);
+  if (!m || /\$$/.test(m.pre)) return [str];
 
-function mkdirP (p, opts, f, made) {
-    if (typeof opts === 'function') {
-        f = opts;
-        opts = {};
-    }
-    else if (!opts || typeof opts !== 'object') {
-        opts = { mode: opts };
+  var isNumericSequence = /^-?\d+\.\.-?\d+(?:\.\.-?\d+)?$/.test(m.body);
+  var isAlphaSequence = /^[a-zA-Z]\.\.[a-zA-Z](?:\.\.-?\d+)?$/.test(m.body);
+  var isSequence = isNumericSequence || isAlphaSequence;
+  var isOptions = m.body.indexOf(',') >= 0;
+  if (!isSequence && !isOptions) {
+    // {a},b}
+    if (m.post.match(/,.*\}/)) {
+      str = m.pre + '{' + m.body + escClose + m.post;
+      return expand(str);
     }
-    
-    var mode = opts.mode;
-    var xfs = opts.fs || fs;
-    
-    if (mode === undefined) {
-        mode = _0777 & (~process.umask());
+    return [str];
+  }
+
+  var n;
+  if (isSequence) {
+    n = m.body.split(/\.\./);
+  } else {
+    n = parseCommaParts(m.body);
+    if (n.length === 1) {
+      // x{{a,b}}y ==> x{a}y x{b}y
+      n = expand(n[0], false).map(embrace);
+      if (n.length === 1) {
+        var post = m.post.length
+          ? expand(m.post, false)
+          : [''];
+        return post.map(function(p) {
+          return m.pre + n[0] + p;
+        });
+      }
     }
-    if (!made) made = null;
-    
-    var cb = f || function () {};
-    p = path.resolve(p);
-    
-    xfs.mkdir(p, mode, function (er) {
-        if (!er) {
-            made = made || p;
-            return cb(null, made);
-        }
-        switch (er.code) {
-            case 'ENOENT':
-                mkdirP(path.dirname(p), opts, function (er, made) {
-                    if (er) cb(er, made);
-                    else mkdirP(p, opts, cb, made);
-                });
-                break;
+  }
 
-            // In the case of any other error, just see if there's a dir
-            // there already.  If so, then hooray!  If not, then something
-            // is borked.
-            default:
-                xfs.stat(p, function (er2, stat) {
-                    // if the stat fails, then that's super weird.
-                    // let the original error be the failure reason.
-                    if (er2 || !stat.isDirectory()) cb(er, made)
-                    else cb(null, made);
-                });
-                break;
-        }
-    });
-}
+  // at this point, n is the parts, and we know it's not a comma set
+  // with a single entry.
 
-mkdirP.sync = function sync (p, opts, made) {
-    if (!opts || typeof opts !== 'object') {
-        opts = { mode: opts };
-    }
-    
-    var mode = opts.mode;
-    var xfs = opts.fs || fs;
-    
-    if (mode === undefined) {
-        mode = _0777 & (~process.umask());
-    }
-    if (!made) made = null;
+  // no need to expand pre, since it is guaranteed to be free of brace-sets
+  var pre = m.pre;
+  var post = m.post.length
+    ? expand(m.post, false)
+    : [''];
 
-    p = path.resolve(p);
+  var N;
 
-    try {
-        xfs.mkdirSync(p, mode);
-        made = made || p;
+  if (isSequence) {
+    var x = numeric(n[0]);
+    var y = numeric(n[1]);
+    var width = Math.max(n[0].length, n[1].length)
+    var incr = n.length == 3
+      ? Math.abs(numeric(n[2]))
+      : 1;
+    var test = lte;
+    var reverse = y < x;
+    if (reverse) {
+      incr *= -1;
+      test = gte;
     }
-    catch (err0) {
-        switch (err0.code) {
-            case 'ENOENT' :
-                made = sync(path.dirname(p), opts, made);
-                sync(p, opts, made);
-                break;
+    var pad = n.some(isPadded);
 
-            // In the case of any other error, just see if there's a dir
-            // there already.  If so, then hooray!  If not, then something
-            // is borked.
-            default:
-                var stat;
-                try {
-                    stat = xfs.statSync(p);
-                }
-                catch (err1) {
-                    throw err0;
-                }
-                if (!stat.isDirectory()) throw err0;
-                break;
+    N = [];
+
+    for (var i = x; test(i, y); i += incr) {
+      var c;
+      if (isAlphaSequence) {
+        c = String.fromCharCode(i);
+        if (c === '\\')
+          c = '';
+      } else {
+        c = String(i);
+        if (pad) {
+          var need = width - c.length;
+          if (need > 0) {
+            var z = new Array(need + 1).join('0');
+            if (i < 0)
+              c = '-' + z + c.slice(1);
+            else
+              c = z + c;
+          }
         }
+      }
+      N.push(c);
     }
+  } else {
+    N = concatMap(n, function(el) { return expand(el, false) });
+  }
+
+  for (var j = 0; j < N.length; j++) {
+    for (var k = 0; k < post.length; k++) {
+      var expansion = pre + N[j] + post[k];
+      if (!isTop || isSequence || expansion)
+        expansions.push(expansion);
+    }
+  }
+
+  return expansions;
+}
 
-    return made;
-};
 
 
 /***/ }),
-/* 117 */,
-/* 118 */,
-/* 119 */,
-/* 120 */,
-/* 121 */,
-/* 122 */
+/* 176 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-module.exports = x => {
-	if (typeof x !== 'string') {
-		throw new TypeError('Expected a string, got ' + typeof x);
-	}
-
-	// Catches EFBBBF (UTF-8 BOM) because the buffer-to-string
-	// conversion translates it to FEFF (UTF-16 BOM)
-	if (x.charCodeAt(0) === 0xFEFF) {
-		return x.slice(1);
-	}
 
-	return x;
-};
+function preserveCamelCase(str) {
+	let isLastCharLower = false;
+	let isLastCharUpper = false;
+	let isLastLastCharUpper = false;
 
+	for (let i = 0; i < str.length; i++) {
+		const c = str[i];
 
-/***/ }),
-/* 123 */
-/***/ (function(module, exports) {
+		if (isLastCharLower && /[a-zA-Z]/.test(c) && c.toUpperCase() === c) {
+			str = str.substr(0, i) + '-' + str.substr(i);
+			isLastCharLower = false;
+			isLastLastCharUpper = isLastCharUpper;
+			isLastCharUpper = true;
+			i++;
+		} else if (isLastCharUpper && isLastLastCharUpper && /[a-zA-Z]/.test(c) && c.toLowerCase() === c) {
+			str = str.substr(0, i - 1) + '-' + str.substr(i - 1);
+			isLastLastCharUpper = isLastCharUpper;
+			isLastCharUpper = false;
+			isLastCharLower = true;
+		} else {
+			isLastCharLower = c.toLowerCase() === c;
+			isLastLastCharUpper = isLastCharUpper;
+			isLastCharUpper = c.toUpperCase() === c;
+		}
+	}
 
-// Returns a wrapper function that returns a wrapped callback
-// The wrapper function should do some stuff, and return a
-// presumably different callback function.
-// This makes sure that own properties are retained, so that
-// decorations and such are not lost along the way.
-module.exports = wrappy
-function wrappy (fn, cb) {
-  if (fn && cb) return wrappy(fn)(cb)
+	return str;
+}
 
-  if (typeof fn !== 'function')
-    throw new TypeError('need wrapper function')
+module.exports = function (str) {
+	if (arguments.length > 1) {
+		str = Array.from(arguments)
+			.map(x => x.trim())
+			.filter(x => x.length)
+			.join('-');
+	} else {
+		str = str.trim();
+	}
 
-  Object.keys(fn).forEach(function (k) {
-    wrapper[k] = fn[k]
-  })
+	if (str.length === 0) {
+		return '';
+	}
 
-  return wrapper
+	if (str.length === 1) {
+		return str.toLowerCase();
+	}
 
-  function wrapper() {
-    var args = new Array(arguments.length)
-    for (var i = 0; i < args.length; i++) {
-      args[i] = arguments[i]
-    }
-    var ret = fn.apply(this, args)
-    var cb = args[args.length-1]
-    if (typeof ret === 'function' && ret !== cb) {
-      Object.keys(cb).forEach(function (k) {
-        ret[k] = cb[k]
-      })
-    }
-    return ret
-  }
-}
+	if (/^[a-z0-9]+$/.test(str)) {
+		return str;
+	}
 
+	const hasUpperCase = str !== str.toLowerCase();
 
-/***/ }),
-/* 124 */,
-/* 125 */,
-/* 126 */,
-/* 127 */,
-/* 128 */,
-/* 129 */,
-/* 130 */,
-/* 131 */
-/***/ (function(module, exports, __webpack_require__) {
+	if (hasUpperCase) {
+		str = preserveCamelCase(str);
+	}
 
-// fallback for non-array-like ES3 and non-enumerable old V8 strings
-var cof = __webpack_require__(47);
-// eslint-disable-next-line no-prototype-builtins
-module.exports = Object('z').propertyIsEnumerable(0) ? Object : function (it) {
-  return cof(it) == 'String' ? it.split('') : Object(it);
+	return str
+		.replace(/^[_.\- ]+/, '')
+		.toLowerCase()
+		.replace(/[_.\- ]+(\w|$)/g, (m, p1) => p1.toUpperCase());
 };
 
 
 /***/ }),
-/* 132 */
-/***/ (function(module, exports, __webpack_require__) {
+/* 177 */,
+/* 178 */
+/***/ (function(module, exports) {
 
-// 19.1.2.14 / 15.2.3.14 Object.keys(O)
-var $keys = __webpack_require__(195);
-var enumBugKeys = __webpack_require__(101);
+module.exports = function (xs, fn) {
+    var res = [];
+    for (var i = 0; i < xs.length; i++) {
+        var x = fn(xs[i], i);
+        if (isArray(x)) res.push.apply(res, x);
+        else res.push(x);
+    }
+    return res;
+};
 
-module.exports = Object.keys || function keys(O) {
-  return $keys(O, enumBugKeys);
+var isArray = Array.isArray || function (xs) {
+    return Object.prototype.toString.call(xs) === '[object Array]';
 };
 
 
 /***/ }),
-/* 133 */
+/* 179 */
 /***/ (function(module, exports, __webpack_require__) {
 
-// 7.1.13 ToObject(argument)
-var defined = __webpack_require__(67);
-module.exports = function (it) {
-  return Object(defined(it));
-};
+__webpack_require__(205);
+__webpack_require__(207);
+__webpack_require__(210);
+__webpack_require__(206);
+__webpack_require__(208);
+__webpack_require__(209);
+module.exports = __webpack_require__(23).Promise;
 
 
 /***/ }),
-/* 134 */,
-/* 135 */,
-/* 136 */,
-/* 137 */,
-/* 138 */,
-/* 139 */,
-/* 140 */,
-/* 141 */,
-/* 142 */,
-/* 143 */,
-/* 144 */,
-/* 145 */
+/* 180 */
 /***/ (function(module, exports) {
 
-module.exports = {"name":"yarn","installationMethod":"unknown","version":"1.10.0-0","license":"BSD-2-Clause","preferGlobal":true,"description":"📦🐈 Fast, reliable, and secure dependency management.","dependencies":{"@zkochan/cmd-shim":"^2.2.4","babel-runtime":"^6.26.0","bytes":"^3.0.0","camelcase":"^4.0.0","chalk":"^2.1.0","commander":"^2.9.0","death":"^1.0.0","debug":"^3.0.0","deep-equal":"^1.0.1","detect-indent":"^5.0.0","dnscache":"^1.0.1","glob":"^7.1.1","gunzip-maybe":"^1.4.0","hash-for-dep":"^1.2.3","imports-loader":"^0.8.0","ini":"^1.3.4","inquirer":"^3.0.1","invariant":"^2.2.0","is-builtin-module":"^2.0.0","is-ci":"^1.0.10","is-webpack-bundle":"^1.0.0","leven":"^2.0.0","loud-rejection":"^1.2.0","micromatch":"^2.3.11","mkdirp":"^0.5.1","node-emoji":"^1.6.1","normalize-url":"^2.0.0","npm-logical-tree":"^1.2.1","object-path":"^0.11.2","proper-lockfile":"^2.0.0","puka":"^1.0.0","read":"^1.0.7","request":"^2.87.0","request-capture-har":"^1.2.2","rimraf":"^2.5.0","semver":"^5.1.0","ssri":"^5.3.0","strip-ansi":"^4.0.0","strip-bom":"^3.0.0","tar-fs":"^1.16.0","tar-stream":"^1.6.1","uuid":"^3.0.1","v8-compile-cache":"^2.0.0","validate-npm-package-license":"^3.0.3","yn":"^2.0.0"},"devDependencies":{"babel-core":"^6.26.0","babel-eslint":"^7.2.3","babel-loader":"^6.2.5","babel-plugin-array-includes":"^2.0.3","babel-plugin-transform-builtin-extend":"^1.1.2","babel-plugin-transform-inline-imports-commonjs":"^1.0.0","babel-plugin-transform-runtime":"^6.4.3","babel-preset-env":"^1.6.0","babel-preset-flow":"^6.23.0","babel-preset-stage-0":"^6.0.0","babylon":"^6.5.0","commitizen":"^2.9.6","cz-conventional-changelog":"^2.0.0","eslint":"^4.3.0","eslint-config-fb-strict":"^22.0.0","eslint-plugin-babel":"^5.0.0","eslint-plugin-flowtype":"^2.35.0","eslint-plugin-jasmine":"^2.6.2","eslint-plugin-jest":"^21.0.0","eslint-plugin-jsx-a11y":"^6.0.2","eslint-plugin-prefer-object-spread":"^1.2.1","eslint-plugin-prettier":"^2.1.2","eslint-plugin-react":"^7.1.0","eslint-plugin-relay":"^0.0.24","eslint-plugin-yarn-internal":"file:scripts/eslint-rules","execa":"^0.10.0","flow-bin":"^0.66.0","git-release-notes":"^3.0.0","gulp":"^3.9.0","gulp-babel":"^7.0.0","gulp-if":"^2.0.1","gulp-newer":"^1.0.0","gulp-plumber":"^1.0.1","gulp-sourcemaps":"^2.2.0","gulp-util":"^3.0.7","gulp-watch":"^5.0.0","jest":"^22.4.4","jsinspect":"^0.12.6","minimatch":"^3.0.4","mock-stdin":"^0.3.0","prettier":"^1.5.2","temp":"^0.8.3","webpack":"^2.1.0-beta.25","yargs":"^6.3.0"},"resolutions":{"sshpk":"^1.14.2"},"engines":{"node":">=4.0.0"},"repository":"yarnpkg/yarn","bin":{"yarn":"./bin/yarn.js","yarnpkg":"./bin/yarn.js"},"scripts":{"build":"gulp build","build-bundle":"node ./scripts/build-webpack.js","build-chocolatey":"powershell ./scripts/build-chocolatey.ps1","build-deb":"./scripts/build-deb.sh","build-dist":"bash ./scripts/build-dist.sh","build-win-installer":"scripts\\build-windows-installer.bat","changelog":"git-release-notes $(git describe --tags --abbrev=0 $(git describe --tags --abbrev=0)^)..$(git describe --tags --abbrev=0) scripts/changelog.md","dupe-check":"yarn jsinspect ./src","lint":"eslint . && flow check","pkg-tests":"yarn --cwd packages/pkg-tests jest yarn.test.js","prettier":"eslint src __tests__ --fix","release-branch":"./scripts/release-branch.sh","test":"yarn lint && yarn test-only","test-only":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --verbose","test-only-debug":"node --inspect-brk --max_old_space_size=4096 node_modules/jest/bin/jest.js --runInBand --verbose","test-coverage":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --coverage --verbose","watch":"gulp watch","commit":"git-cz"},"jest":{"collectCoverageFrom":["src/**/*.js"],"testEnvironment":"node","modulePathIgnorePatterns":["__tests__/fixtures/","packages/pkg-tests/pkg-tests-fixtures","dist/"],"testPathIgnorePatterns":["__tests__/(fixtures|__mocks__)/","updates/","_(temp|mock|install|init|helpers).js$","packages/pkg-tests"]},"config":{"commitizen":{"path":"./node_modules/cz-conventional-changelog"}}}
+module.exports = function () { /* empty */ };
+
 
 /***/ }),
-/* 146 */,
-/* 147 */,
-/* 148 */,
-/* 149 */,
-/* 150 */
-/***/ (function(module, exports, __webpack_require__) {
+/* 181 */
+/***/ (function(module, exports) {
 
-"use strict";
+module.exports = function (it, Constructor, name, forbiddenField) {
+  if (!(it instanceof Constructor) || (forbiddenField !== undefined && forbiddenField in it)) {
+    throw TypeError(name + ': incorrect invocation!');
+  } return it;
+};
 
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = stringify;
+/***/ }),
+/* 182 */
+/***/ (function(module, exports, __webpack_require__) {
 
-var _misc;
+// false -> Array#indexOf
+// true  -> Array#includes
+var toIObject = __webpack_require__(74);
+var toLength = __webpack_require__(110);
+var toAbsoluteIndex = __webpack_require__(200);
+module.exports = function (IS_INCLUDES) {
+  return function ($this, el, fromIndex) {
+    var O = toIObject($this);
+    var length = toLength(O.length);
+    var index = toAbsoluteIndex(fromIndex, length);
+    var value;
+    // Array#includes uses SameValueZero equality algorithm
+    // eslint-disable-next-line no-self-compare
+    if (IS_INCLUDES && el != el) while (length > index) {
+      value = O[index++];
+      // eslint-disable-next-line no-self-compare
+      if (value != value) return true;
+    // Array#indexOf ignores holes, Array#includes - not
+    } else for (;length > index; index++) if (IS_INCLUDES || index in O) {
+      if (O[index] === el) return IS_INCLUDES || index || 0;
+    } return !IS_INCLUDES && -1;
+  };
+};
 
-function _load_misc() {
-  return _misc = __webpack_require__(12);
-}
 
-var _constants;
+/***/ }),
+/* 183 */
+/***/ (function(module, exports, __webpack_require__) {
 
-function _load_constants() {
-  return _constants = __webpack_require__(6);
-}
+var ctx = __webpack_require__(48);
+var call = __webpack_require__(187);
+var isArrayIter = __webpack_require__(186);
+var anObject = __webpack_require__(27);
+var toLength = __webpack_require__(110);
+var getIterFn = __webpack_require__(203);
+var BREAK = {};
+var RETURN = {};
+var exports = module.exports = function (iterable, entries, fn, that, ITERATOR) {
+  var iterFn = ITERATOR ? function () { return iterable; } : getIterFn(iterable);
+  var f = ctx(fn, that, entries ? 2 : 1);
+  var index = 0;
+  var length, step, iterator, result;
+  if (typeof iterFn != 'function') throw TypeError(iterable + ' is not iterable!');
+  // fast case for arrays with default iterator
+  if (isArrayIter(iterFn)) for (length = toLength(iterable.length); length > index; index++) {
+    result = entries ? f(anObject(step = iterable[index])[0], step[1]) : f(iterable[index]);
+    if (result === BREAK || result === RETURN) return result;
+  } else for (iterator = iterFn.call(iterable); !(step = iterator.next()).done;) {
+    result = call(iterator, f, step.value, entries);
+    if (result === BREAK || result === RETURN) return result;
+  }
+};
+exports.BREAK = BREAK;
+exports.RETURN = RETURN;
 
-var _package;
 
-function _load_package() {
-  return _package = __webpack_require__(145);
-}
+/***/ }),
+/* 184 */
+/***/ (function(module, exports, __webpack_require__) {
 
-const NODE_VERSION = process.version;
+module.exports = !__webpack_require__(33) && !__webpack_require__(85)(function () {
+  return Object.defineProperty(__webpack_require__(68)('div'), 'a', { get: function () { return 7; } }).a != 7;
+});
 
-function shouldWrapKey(str) {
-  return str.indexOf('true') === 0 || str.indexOf('false') === 0 || /[:\s\n\\",\[\]]/g.test(str) || /^[0-9]/g.test(str) || !/^[a-zA-Z]/g.test(str);
-}
 
-function maybeWrap(str) {
-  if (typeof str === 'boolean' || typeof str === 'number' || shouldWrapKey(str)) {
-    return JSON.stringify(str);
-  } else {
-    return str;
-  }
-}
+/***/ }),
+/* 185 */
+/***/ (function(module, exports) {
 
-const priorities = {
-  name: 1,
-  version: 2,
-  uid: 3,
-  resolved: 4,
-  integrity: 5,
-  registry: 6,
-  dependencies: 7
+// fast apply, http://jsperf.lnkit.com/fast-apply/5
+module.exports = function (fn, args, that) {
+  var un = that === undefined;
+  switch (args.length) {
+    case 0: return un ? fn()
+                      : fn.call(that);
+    case 1: return un ? fn(args[0])
+                      : fn.call(that, args[0]);
+    case 2: return un ? fn(args[0], args[1])
+                      : fn.call(that, args[0], args[1]);
+    case 3: return un ? fn(args[0], args[1], args[2])
+                      : fn.call(that, args[0], args[1], args[2]);
+    case 4: return un ? fn(args[0], args[1], args[2], args[3])
+                      : fn.call(that, args[0], args[1], args[2], args[3]);
+  } return fn.apply(that, args);
 };
 
-function priorityThenAlphaSort(a, b) {
-  if (priorities[a] || priorities[b]) {
-    return (priorities[a] || 100) > (priorities[b] || 100) ? 1 : -1;
-  } else {
-    return (0, (_misc || _load_misc()).sortAlpha)(a, b);
-  }
-}
-
-function _stringify(obj, options) {
-  if (typeof obj !== 'object') {
-    throw new TypeError();
-  }
 
-  const indent = options.indent;
-  const lines = [];
+/***/ }),
+/* 186 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  // Sorting order needs to be consistent between runs, we run native sort by name because there are no
-  // problems with it being unstable because there are no to keys the same
-  // However priorities can be duplicated and native sort can shuffle things from run to run
-  const keys = Object.keys(obj).sort(priorityThenAlphaSort);
+// check on default Array iterator
+var Iterators = __webpack_require__(35);
+var ITERATOR = __webpack_require__(13)('iterator');
+var ArrayProto = Array.prototype;
 
-  let addedKeys = [];
+module.exports = function (it) {
+  return it !== undefined && (Iterators.Array === it || ArrayProto[ITERATOR] === it);
+};
 
-  for (let i = 0; i < keys.length; i++) {
-    const key = keys[i];
-    const val = obj[key];
-    if (val == null || addedKeys.indexOf(key) >= 0) {
-      continue;
-    }
 
-    const valKeys = [key];
+/***/ }),
+/* 187 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    // get all keys that have the same value equality, we only want this for objects
-    if (typeof val === 'object') {
-      for (let j = i + 1; j < keys.length; j++) {
-        const key = keys[j];
-        if (val === obj[key]) {
-          valKeys.push(key);
-        }
-      }
-    }
+// call something on iterator step with safe closing on error
+var anObject = __webpack_require__(27);
+module.exports = function (iterator, fn, value, entries) {
+  try {
+    return entries ? fn(anObject(value)[0], value[1]) : fn(value);
+  // 7.4.6 IteratorClose(iterator, completion)
+  } catch (e) {
+    var ret = iterator['return'];
+    if (ret !== undefined) anObject(ret.call(iterator));
+    throw e;
+  }
+};
 
-    const keyLine = valKeys.sort((_misc || _load_misc()).sortAlpha).map(maybeWrap).join(', ');
 
-    if (typeof val === 'string' || typeof val === 'boolean' || typeof val === 'number') {
-      lines.push(`${keyLine} ${maybeWrap(val)}`);
-    } else if (typeof val === 'object') {
-      lines.push(`${keyLine}:\n${_stringify(val, { indent: indent + '  ' })}` + (options.topLevel ? '\n' : ''));
-    } else {
-      throw new TypeError();
-    }
+/***/ }),
+/* 188 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    addedKeys = addedKeys.concat(valKeys);
-  }
+"use strict";
 
-  return indent + lines.join(`\n${indent}`);
-}
+var create = __webpack_require__(192);
+var descriptor = __webpack_require__(106);
+var setToStringTag = __webpack_require__(71);
+var IteratorPrototype = {};
 
-function stringify(obj, noHeader, enableVersions) {
-  const val = _stringify(obj, {
-    indent: '',
-    topLevel: true
-  });
-  if (noHeader) {
-    return val;
-  }
+// 25.1.2.1.1 %IteratorPrototype%[@@iterator]()
+__webpack_require__(31)(IteratorPrototype, __webpack_require__(13)('iterator'), function () { return this; });
 
-  const lines = [];
-  lines.push('# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.');
-  lines.push(`# yarn lockfile v${(_constants || _load_constants()).LOCKFILE_VERSION}`);
-  if (enableVersions) {
-    lines.push(`# yarn v${(_package || _load_package()).version}`);
-    lines.push(`# node ${NODE_VERSION}`);
-  }
-  lines.push('\n');
-  lines.push(val);
+module.exports = function (Constructor, NAME, next) {
+  Constructor.prototype = create(IteratorPrototype, { next: descriptor(1, next) });
+  setToStringTag(Constructor, NAME + ' Iterator');
+};
 
-  return lines.join('\n');
-}
 
 /***/ }),
-/* 151 */,
-/* 152 */,
-/* 153 */,
-/* 154 */,
-/* 155 */,
-/* 156 */,
-/* 157 */,
-/* 158 */,
-/* 159 */,
-/* 160 */,
-/* 161 */,
-/* 162 */,
-/* 163 */,
-/* 164 */
+/* 189 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+var ITERATOR = __webpack_require__(13)('iterator');
+var SAFE_CLOSING = false;
 
+try {
+  var riter = [7][ITERATOR]();
+  riter['return'] = function () { SAFE_CLOSING = true; };
+  // eslint-disable-next-line no-throw-literal
+  Array.from(riter, function () { throw 2; });
+} catch (e) { /* empty */ }
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.fileDatesEqual = exports.copyFile = exports.unlink = undefined;
+module.exports = function (exec, skipClosing) {
+  if (!skipClosing && !SAFE_CLOSING) return false;
+  var safe = false;
+  try {
+    var arr = [7];
+    var iter = arr[ITERATOR]();
+    iter.next = function () { return { done: safe = true }; };
+    arr[ITERATOR] = function () { return iter; };
+    exec(arr);
+  } catch (e) { /* empty */ }
+  return safe;
+};
 
-var _asyncToGenerator2;
 
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(1));
-}
+/***/ }),
+/* 190 */
+/***/ (function(module, exports) {
 
-// We want to preserve file timestamps when copying a file, since yarn uses them to decide if a file has
-// changed compared to the cache.
-// There are some OS specific cases here:
-// * On linux, fs.copyFile does not preserve timestamps, but does on OSX and Win.
-// * On windows, you must open a file with write permissions to call `fs.futimes`.
-// * On OSX you can open with read permissions and still call `fs.futimes`.
-let fixTimes = (() => {
-  var _ref3 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (fd, dest, data) {
-    const doOpen = fd === undefined;
-    let openfd = fd ? fd : -1;
+module.exports = function (done, value) {
+  return { value: value, done: !!done };
+};
 
-    if (disableTimestampCorrection === undefined) {
-      // if timestamps match already, no correction is needed.
-      // the need to correct timestamps varies based on OS and node versions.
-      const destStat = yield lstat(dest);
-      disableTimestampCorrection = fileDatesEqual(destStat.mtime, data.mtime);
-    }
 
-    if (disableTimestampCorrection) {
-      return;
-    }
+/***/ }),
+/* 191 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    if (doOpen) {
+var global = __webpack_require__(11);
+var macrotask = __webpack_require__(109).set;
+var Observer = global.MutationObserver || global.WebKitMutationObserver;
+var process = global.process;
+var Promise = global.Promise;
+var isNode = __webpack_require__(47)(process) == 'process';
+
+module.exports = function () {
+  var head, last, notify;
+
+  var flush = function () {
+    var parent, fn;
+    if (isNode && (parent = process.domain)) parent.exit();
+    while (head) {
+      fn = head.fn;
+      head = head.next;
       try {
-        openfd = yield open(dest, 'a', data.mode);
-      } catch (er) {
-        // file is likely read-only
-        try {
-          openfd = yield open(dest, 'r', data.mode);
-        } catch (err) {
-          // We can't even open this file for reading.
-          return;
-        }
+        fn();
+      } catch (e) {
+        if (head) notify();
+        else last = undefined;
+        throw e;
       }
-    }
+    } last = undefined;
+    if (parent) parent.enter();
+  };
 
-    try {
-      if (openfd) {
-        yield futimes(openfd, data.atime, data.mtime);
-      }
-    } catch (er) {
-      // If `futimes` throws an exception, we probably have a case of a read-only file on Windows.
-      // In this case we can just return. The incorrect timestamp will just cause that file to be recopied
-      // on subsequent installs, which will effect yarn performance but not break anything.
-    } finally {
-      if (doOpen && openfd) {
-        yield close(openfd);
-      }
-    }
-  });
+  // Node.js
+  if (isNode) {
+    notify = function () {
+      process.nextTick(flush);
+    };
+  // browsers with MutationObserver, except iOS Safari - https://github.com/zloirock/core-js/issues/339
+  } else if (Observer && !(global.navigator && global.navigator.standalone)) {
+    var toggle = true;
+    var node = document.createTextNode('');
+    new Observer(flush).observe(node, { characterData: true }); // eslint-disable-line no-new
+    notify = function () {
+      node.data = toggle = !toggle;
+    };
+  // environments with maybe non-completely correct, but existent Promise
+  } else if (Promise && Promise.resolve) {
+    // Promise.resolve without an argument throws an error in LG WebOS 2
+    var promise = Promise.resolve(undefined);
+    notify = function () {
+      promise.then(flush);
+    };
+  // for other environments - macrotask based on:
+  // - setImmediate
+  // - MessageChannel
+  // - window.postMessag
+  // - onreadystatechange
+  // - setTimeout
+  } else {
+    notify = function () {
+      // strange IE + webpack dev server bug - use .call(global)
+      macrotask.call(global, flush);
+    };
+  }
 
-  return function fixTimes(_x7, _x8, _x9) {
-    return _ref3.apply(this, arguments);
+  return function (fn) {
+    var task = { fn: fn, next: undefined };
+    if (last) last.next = task;
+    if (!head) {
+      head = task;
+      notify();
+    } last = task;
   };
-})();
+};
 
-// Compare file timestamps.
-// Some versions of Node on windows zero the milliseconds when utime is used.
 
+/***/ }),
+/* 192 */
+/***/ (function(module, exports, __webpack_require__) {
 
-var _fs;
+// 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties])
+var anObject = __webpack_require__(27);
+var dPs = __webpack_require__(193);
+var enumBugKeys = __webpack_require__(101);
+var IE_PROTO = __webpack_require__(72)('IE_PROTO');
+var Empty = function () { /* empty */ };
+var PROTOTYPE = 'prototype';
 
-function _load_fs() {
-  return _fs = _interopRequireDefault(__webpack_require__(3));
-}
+// Create object with fake `null` prototype: use iframe Object with cleared prototype
+var createDict = function () {
+  // Thrash, waste and sodomy: IE GC bug
+  var iframe = __webpack_require__(68)('iframe');
+  var i = enumBugKeys.length;
+  var lt = '<';
+  var gt = '>';
+  var iframeDocument;
+  iframe.style.display = 'none';
+  __webpack_require__(102).appendChild(iframe);
+  iframe.src = 'javascript:'; // eslint-disable-line no-script-url
+  // createDict = iframe.contentWindow.Object;
+  // html.removeChild(iframe);
+  iframeDocument = iframe.contentWindow.document;
+  iframeDocument.open();
+  iframeDocument.write(lt + 'script' + gt + 'document.F=Object' + lt + '/script' + gt);
+  iframeDocument.close();
+  createDict = iframeDocument.F;
+  while (i--) delete createDict[PROTOTYPE][enumBugKeys[i]];
+  return createDict();
+};
 
-var _promise;
+module.exports = Object.create || function create(O, Properties) {
+  var result;
+  if (O !== null) {
+    Empty[PROTOTYPE] = anObject(O);
+    result = new Empty();
+    Empty[PROTOTYPE] = null;
+    // add "__proto__" for Object.getPrototypeOf polyfill
+    result[IE_PROTO] = O;
+  } else result = createDict();
+  return Properties === undefined ? result : dPs(result, Properties);
+};
 
-function _load_promise() {
-  return _promise = __webpack_require__(40);
-}
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/***/ }),
+/* 193 */
+/***/ (function(module, exports, __webpack_require__) {
 
-// This module serves as a wrapper for file operations that are inconsistant across node and OS versions.
+var dP = __webpack_require__(50);
+var anObject = __webpack_require__(27);
+var getKeys = __webpack_require__(132);
 
-let disableTimestampCorrection = undefined; // OS dependent. will be detected on first file copy.
+module.exports = __webpack_require__(33) ? Object.defineProperties : function defineProperties(O, Properties) {
+  anObject(O);
+  var keys = getKeys(Properties);
+  var length = keys.length;
+  var i = 0;
+  var P;
+  while (length > i) dP.f(O, P = keys[i++], Properties[P]);
+  return O;
+};
 
-const readFileBuffer = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.readFile);
-const close = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.close);
-const lstat = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.lstat);
-const open = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.open);
-const futimes = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.futimes);
 
-const write = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.write);
+/***/ }),
+/* 194 */
+/***/ (function(module, exports, __webpack_require__) {
 
-const unlink = exports.unlink = (0, (_promise || _load_promise()).promisify)(__webpack_require__(233));
+// 19.1.2.9 / 15.2.3.2 Object.getPrototypeOf(O)
+var has = __webpack_require__(49);
+var toObject = __webpack_require__(133);
+var IE_PROTO = __webpack_require__(72)('IE_PROTO');
+var ObjectProto = Object.prototype;
 
-/**
- * Unlinks the destination to force a recreation. This is needed on case-insensitive file systems
- * to force the correct naming when the filename has changed only in character-casing. (Jest -> jest).
- */
-const copyFile = exports.copyFile = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data, cleanup) {
-    try {
-      yield unlink(data.dest);
-      yield copyFilePoly(data.src, data.dest, 0, data);
-    } finally {
-      if (cleanup) {
-        cleanup();
-      }
-    }
-  });
+module.exports = Object.getPrototypeOf || function (O) {
+  O = toObject(O);
+  if (has(O, IE_PROTO)) return O[IE_PROTO];
+  if (typeof O.constructor == 'function' && O instanceof O.constructor) {
+    return O.constructor.prototype;
+  } return O instanceof Object ? ObjectProto : null;
+};
 
-  return function copyFile(_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-// Node 8.5.0 introduced `fs.copyFile` which is much faster, so use that when available.
-// Otherwise we fall back to reading and writing files as buffers.
-const copyFilePoly = (src, dest, flags, data) => {
-  if ((_fs || _load_fs()).default.copyFile) {
-    return new Promise((resolve, reject) => (_fs || _load_fs()).default.copyFile(src, dest, flags, err => {
-      if (err) {
-        reject(err);
-      } else {
-        fixTimes(undefined, dest, data).then(() => resolve()).catch(ex => reject(ex));
-      }
-    }));
-  } else {
-    return copyWithBuffer(src, dest, flags, data);
-  }
-};
-
-const copyWithBuffer = (() => {
-  var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (src, dest, flags, data) {
-    // Use open -> write -> futimes -> close sequence to avoid opening the file twice:
-    // one with writeFile and one with utimes
-    const fd = yield open(dest, 'w', data.mode);
-    try {
-      const buffer = yield readFileBuffer(src);
-      yield write(fd, buffer, 0, buffer.length);
-      yield fixTimes(fd, dest, data);
-    } finally {
-      yield close(fd);
-    }
-  });
-
-  return function copyWithBuffer(_x3, _x4, _x5, _x6) {
-    return _ref2.apply(this, arguments);
-  };
-})();const fileDatesEqual = exports.fileDatesEqual = (a, b) => {
-  const aTime = a.getTime();
-  const bTime = b.getTime();
-
-  if (process.platform !== 'win32') {
-    return aTime === bTime;
-  }
-
-  // See https://github.com/nodejs/node/pull/12607
-  // Submillisecond times from stat and utimes are truncated on Windows,
-  // causing a file with mtime 8.0079998 and 8.0081144 to become 8.007 and 8.008
-  // and making it impossible to update these files to their correct timestamps.
-  if (Math.abs(aTime - bTime) <= 1) {
-    return true;
-  }
-
-  const aTimeSec = Math.floor(aTime / 1000);
-  const bTimeSec = Math.floor(bTime / 1000);
-
-  // See https://github.com/nodejs/node/issues/2069
-  // Some versions of Node on windows zero the milliseconds when utime is used
-  // So if any of the time has a milliseconds part of zero we suspect that the
-  // bug is present and compare only seconds.
-  if (aTime - aTimeSec * 1000 === 0 || bTime - bTimeSec * 1000 === 0) {
-    return aTimeSec === bTimeSec;
-  }
-
-  return aTime === bTime;
-};
 
 /***/ }),
-/* 165 */,
-/* 166 */,
-/* 167 */,
-/* 168 */,
-/* 169 */
+/* 195 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
+var has = __webpack_require__(49);
+var toIObject = __webpack_require__(74);
+var arrayIndexOf = __webpack_require__(182)(false);
+var IE_PROTO = __webpack_require__(72)('IE_PROTO');
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.isFakeRoot = isFakeRoot;
-exports.isRootUser = isRootUser;
-function getUid() {
-  if (process.platform !== 'win32' && process.getuid) {
-    return process.getuid();
+module.exports = function (object, names) {
+  var O = toIObject(object);
+  var i = 0;
+  var result = [];
+  var key;
+  for (key in O) if (key != IE_PROTO) has(O, key) && result.push(key);
+  // Don't enum bug & hidden keys
+  while (names.length > i) if (has(O, key = names[i++])) {
+    ~arrayIndexOf(result, key) || result.push(key);
   }
-  return null;
-}
-
-exports.default = isRootUser(getUid()) && !isFakeRoot();
-function isFakeRoot() {
-  return Boolean(process.env.FAKEROOTKEY);
-}
+  return result;
+};
 
-function isRootUser(uid) {
-  return uid === 0;
-}
 
 /***/ }),
-/* 170 */,
-/* 171 */
+/* 196 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getDataDir = getDataDir;
-exports.getCacheDir = getCacheDir;
-exports.getConfigDir = getConfigDir;
-const path = __webpack_require__(0);
-const userHome = __webpack_require__(45).default;
-
-const FALLBACK_CONFIG_DIR = path.join(userHome, '.config', 'yarn');
-const FALLBACK_CACHE_DIR = path.join(userHome, '.cache', 'yarn');
-
-function getDataDir() {
-  if (process.platform === 'win32') {
-    const WIN32_APPDATA_DIR = getLocalAppDataDir();
-    return WIN32_APPDATA_DIR == null ? FALLBACK_CONFIG_DIR : path.join(WIN32_APPDATA_DIR, 'Data');
-  } else if (process.env.XDG_DATA_HOME) {
-    return path.join(process.env.XDG_DATA_HOME, 'yarn');
-  } else {
-    // This could arguably be ~/Library/Application Support/Yarn on Macs,
-    // but that feels unintuitive for a cli tool
-
-    // Instead, use our prior fallback. Some day this could be
-    // path.join(userHome, '.local', 'share', 'yarn')
-    // or return path.join(WIN32_APPDATA_DIR, 'Data') on win32
-    return FALLBACK_CONFIG_DIR;
-  }
-}
-
-function getCacheDir() {
-  if (process.platform === 'win32') {
-    // process.env.TEMP also exists, but most apps put caches here
-    return path.join(getLocalAppDataDir() || path.join(userHome, 'AppData', 'Local', 'Yarn'), 'Cache');
-  } else if (process.env.XDG_CACHE_HOME) {
-    return path.join(process.env.XDG_CACHE_HOME, 'yarn');
-  } else if (process.platform === 'darwin') {
-    return path.join(userHome, 'Library', 'Caches', 'Yarn');
-  } else {
-    return FALLBACK_CACHE_DIR;
-  }
-}
-
-function getConfigDir() {
-  if (process.platform === 'win32') {
-    // Use our prior fallback. Some day this could be
-    // return path.join(WIN32_APPDATA_DIR, 'Config')
-    const WIN32_APPDATA_DIR = getLocalAppDataDir();
-    return WIN32_APPDATA_DIR == null ? FALLBACK_CONFIG_DIR : path.join(WIN32_APPDATA_DIR, 'Config');
-  } else if (process.env.XDG_CONFIG_HOME) {
-    return path.join(process.env.XDG_CONFIG_HOME, 'yarn');
-  } else {
-    return FALLBACK_CONFIG_DIR;
-  }
-}
+var hide = __webpack_require__(31);
+module.exports = function (target, src, safe) {
+  for (var key in src) {
+    if (safe && target[key]) target[key] = src[key];
+    else hide(target, key, src[key]);
+  } return target;
+};
 
-function getLocalAppDataDir() {
-  return process.env.LOCALAPPDATA ? path.join(process.env.LOCALAPPDATA, 'Yarn') : null;
-}
 
 /***/ }),
-/* 172 */,
-/* 173 */
+/* 197 */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = { "default": __webpack_require__(179), __esModule: true };
+module.exports = __webpack_require__(31);
+
 
 /***/ }),
-/* 174 */
+/* 198 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-module.exports = balanced;
-function balanced(a, b, str) {
-  if (a instanceof RegExp) a = maybeMatch(a, str);
-  if (b instanceof RegExp) b = maybeMatch(b, str);
-
-  var r = range(a, b, str);
-
-  return r && {
-    start: r[0],
-    end: r[1],
-    pre: str.slice(0, r[0]),
-    body: str.slice(r[0] + a.length, r[1]),
-    post: str.slice(r[1] + b.length)
-  };
-}
-
-function maybeMatch(reg, str) {
-  var m = str.match(reg);
-  return m ? m[0] : null;
-}
-
-balanced.range = range;
-function range(a, b, str) {
-  var begs, beg, left, right, result;
-  var ai = str.indexOf(a);
-  var bi = str.indexOf(b, ai + 1);
-  var i = ai;
-
-  if (ai >= 0 && bi > 0) {
-    begs = [];
-    left = str.length;
-
-    while (i >= 0 && !result) {
-      if (i == ai) {
-        begs.push(i);
-        ai = str.indexOf(a, i + 1);
-      } else if (begs.length == 1) {
-        result = [ begs.pop(), bi ];
-      } else {
-        beg = begs.pop();
-        if (beg < left) {
-          left = beg;
-          right = bi;
-        }
+var global = __webpack_require__(11);
+var core = __webpack_require__(23);
+var dP = __webpack_require__(50);
+var DESCRIPTORS = __webpack_require__(33);
+var SPECIES = __webpack_require__(13)('species');
 
-        bi = str.indexOf(b, i + 1);
-      }
+module.exports = function (KEY) {
+  var C = typeof core[KEY] == 'function' ? core[KEY] : global[KEY];
+  if (DESCRIPTORS && C && !C[SPECIES]) dP.f(C, SPECIES, {
+    configurable: true,
+    get: function () { return this; }
+  });
+};
 
-      i = ai < bi && ai >= 0 ? ai : bi;
-    }
 
-    if (begs.length) {
-      result = [ left, right ];
-    }
-  }
+/***/ }),
+/* 199 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  return result;
-}
+var toInteger = __webpack_require__(73);
+var defined = __webpack_require__(67);
+// true  -> String#at
+// false -> String#codePointAt
+module.exports = function (TO_STRING) {
+  return function (that, pos) {
+    var s = String(defined(that));
+    var i = toInteger(pos);
+    var l = s.length;
+    var a, b;
+    if (i < 0 || i >= l) return TO_STRING ? '' : undefined;
+    a = s.charCodeAt(i);
+    return a < 0xd800 || a > 0xdbff || i + 1 === l || (b = s.charCodeAt(i + 1)) < 0xdc00 || b > 0xdfff
+      ? TO_STRING ? s.charAt(i) : a
+      : TO_STRING ? s.slice(i, i + 2) : (a - 0xd800 << 10) + (b - 0xdc00) + 0x10000;
+  };
+};
 
 
 /***/ }),
-/* 175 */
+/* 200 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var concatMap = __webpack_require__(178);
-var balanced = __webpack_require__(174);
+var toInteger = __webpack_require__(73);
+var max = Math.max;
+var min = Math.min;
+module.exports = function (index, length) {
+  index = toInteger(index);
+  return index < 0 ? max(index + length, 0) : min(index, length);
+};
 
-module.exports = expandTop;
 
-var escSlash = '\0SLASH'+Math.random()+'\0';
-var escOpen = '\0OPEN'+Math.random()+'\0';
-var escClose = '\0CLOSE'+Math.random()+'\0';
-var escComma = '\0COMMA'+Math.random()+'\0';
-var escPeriod = '\0PERIOD'+Math.random()+'\0';
+/***/ }),
+/* 201 */
+/***/ (function(module, exports, __webpack_require__) {
 
-function numeric(str) {
-  return parseInt(str, 10) == str
-    ? parseInt(str, 10)
-    : str.charCodeAt(0);
-}
+// 7.1.1 ToPrimitive(input [, PreferredType])
+var isObject = __webpack_require__(34);
+// instead of the ES6 spec version, we didn't implement @@toPrimitive case
+// and the second argument - flag - preferred type is a string
+module.exports = function (it, S) {
+  if (!isObject(it)) return it;
+  var fn, val;
+  if (S && typeof (fn = it.toString) == 'function' && !isObject(val = fn.call(it))) return val;
+  if (typeof (fn = it.valueOf) == 'function' && !isObject(val = fn.call(it))) return val;
+  if (!S && typeof (fn = it.toString) == 'function' && !isObject(val = fn.call(it))) return val;
+  throw TypeError("Can't convert object to primitive value");
+};
 
-function escapeBraces(str) {
-  return str.split('\\\\').join(escSlash)
-            .split('\\{').join(escOpen)
-            .split('\\}').join(escClose)
-            .split('\\,').join(escComma)
-            .split('\\.').join(escPeriod);
-}
 
-function unescapeBraces(str) {
-  return str.split(escSlash).join('\\')
-            .split(escOpen).join('{')
-            .split(escClose).join('}')
-            .split(escComma).join(',')
-            .split(escPeriod).join('.');
-}
+/***/ }),
+/* 202 */
+/***/ (function(module, exports, __webpack_require__) {
 
+var global = __webpack_require__(11);
+var navigator = global.navigator;
 
-// Basically just str.split(","), but handling cases
-// where we have nested braced sections, which should be
-// treated as individual members, like {a,{b,c},d}
-function parseCommaParts(str) {
-  if (!str)
-    return [''];
+module.exports = navigator && navigator.userAgent || '';
 
-  var parts = [];
-  var m = balanced('{', '}', str);
 
-  if (!m)
-    return str.split(',');
+/***/ }),
+/* 203 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  var pre = m.pre;
-  var body = m.body;
-  var post = m.post;
-  var p = pre.split(',');
+var classof = __webpack_require__(100);
+var ITERATOR = __webpack_require__(13)('iterator');
+var Iterators = __webpack_require__(35);
+module.exports = __webpack_require__(23).getIteratorMethod = function (it) {
+  if (it != undefined) return it[ITERATOR]
+    || it['@@iterator']
+    || Iterators[classof(it)];
+};
 
-  p[p.length-1] += '{' + body + '}';
-  var postParts = parseCommaParts(post);
-  if (post.length) {
-    p[p.length-1] += postParts.shift();
-    p.push.apply(p, postParts);
-  }
 
-  parts.push.apply(parts, p);
+/***/ }),
+/* 204 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  return parts;
-}
+"use strict";
 
-function expandTop(str) {
-  if (!str)
-    return [];
+var addToUnscopables = __webpack_require__(180);
+var step = __webpack_require__(190);
+var Iterators = __webpack_require__(35);
+var toIObject = __webpack_require__(74);
 
-  // I don't know why Bash 4.3 does this, but it does.
-  // Anything starting with {} will have the first two bytes preserved
-  // but *only* at the top level, so {},a}b will not expand to anything,
-  // but a{},b}c will be expanded to [a}c,abc].
-  // One could argue that this is a bug in Bash, but since the goal of
-  // this module is to match Bash's rules, we escape a leading {}
-  if (str.substr(0, 2) === '{}') {
-    str = '\\{\\}' + str.substr(2);
+// 22.1.3.4 Array.prototype.entries()
+// 22.1.3.13 Array.prototype.keys()
+// 22.1.3.29 Array.prototype.values()
+// 22.1.3.30 Array.prototype[@@iterator]()
+module.exports = __webpack_require__(103)(Array, 'Array', function (iterated, kind) {
+  this._t = toIObject(iterated); // target
+  this._i = 0;                   // next index
+  this._k = kind;                // kind
+// 22.1.5.2.1 %ArrayIteratorPrototype%.next()
+}, function () {
+  var O = this._t;
+  var kind = this._k;
+  var index = this._i++;
+  if (!O || index >= O.length) {
+    this._t = undefined;
+    return step(1);
   }
+  if (kind == 'keys') return step(0, index);
+  if (kind == 'values') return step(0, O[index]);
+  return step(0, [index, O[index]]);
+}, 'values');
 
-  return expand(escapeBraces(str), true).map(unescapeBraces);
-}
-
-function identity(e) {
-  return e;
-}
+// argumentsList[@@iterator] is %ArrayProto_values% (9.4.4.6, 9.4.4.7)
+Iterators.Arguments = Iterators.Array;
 
-function embrace(str) {
-  return '{' + str + '}';
-}
-function isPadded(el) {
-  return /^-?0\d/.test(el);
-}
+addToUnscopables('keys');
+addToUnscopables('values');
+addToUnscopables('entries');
 
-function lte(i, y) {
-  return i <= y;
-}
-function gte(i, y) {
-  return i >= y;
-}
 
-function expand(str, isTop) {
-  var expansions = [];
+/***/ }),
+/* 205 */
+/***/ (function(module, exports) {
 
-  var m = balanced('{', '}', str);
-  if (!m || /\$$/.test(m.pre)) return [str];
 
-  var isNumericSequence = /^-?\d+\.\.-?\d+(?:\.\.-?\d+)?$/.test(m.body);
-  var isAlphaSequence = /^[a-zA-Z]\.\.[a-zA-Z](?:\.\.-?\d+)?$/.test(m.body);
-  var isSequence = isNumericSequence || isAlphaSequence;
-  var isOptions = m.body.indexOf(',') >= 0;
-  if (!isSequence && !isOptions) {
-    // {a},b}
-    if (m.post.match(/,.*\}/)) {
-      str = m.pre + '{' + m.body + escClose + m.post;
-      return expand(str);
-    }
-    return [str];
-  }
 
-  var n;
-  if (isSequence) {
-    n = m.body.split(/\.\./);
-  } else {
-    n = parseCommaParts(m.body);
-    if (n.length === 1) {
-      // x{{a,b}}y ==> x{a}y x{b}y
-      n = expand(n[0], false).map(embrace);
-      if (n.length === 1) {
-        var post = m.post.length
-          ? expand(m.post, false)
-          : [''];
-        return post.map(function(p) {
-          return m.pre + n[0] + p;
-        });
-      }
-    }
-  }
+/***/ }),
+/* 206 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  // at this point, n is the parts, and we know it's not a comma set
-  // with a single entry.
+"use strict";
 
-  // no need to expand pre, since it is guaranteed to be free of brace-sets
-  var pre = m.pre;
-  var post = m.post.length
-    ? expand(m.post, false)
-    : [''];
+var LIBRARY = __webpack_require__(69);
+var global = __webpack_require__(11);
+var ctx = __webpack_require__(48);
+var classof = __webpack_require__(100);
+var $export = __webpack_require__(41);
+var isObject = __webpack_require__(34);
+var aFunction = __webpack_require__(46);
+var anInstance = __webpack_require__(181);
+var forOf = __webpack_require__(183);
+var speciesConstructor = __webpack_require__(108);
+var task = __webpack_require__(109).set;
+var microtask = __webpack_require__(191)();
+var newPromiseCapabilityModule = __webpack_require__(70);
+var perform = __webpack_require__(104);
+var userAgent = __webpack_require__(202);
+var promiseResolve = __webpack_require__(105);
+var PROMISE = 'Promise';
+var TypeError = global.TypeError;
+var process = global.process;
+var versions = process && process.versions;
+var v8 = versions && versions.v8 || '';
+var $Promise = global[PROMISE];
+var isNode = classof(process) == 'process';
+var empty = function () { /* empty */ };
+var Internal, newGenericPromiseCapability, OwnPromiseCapability, Wrapper;
+var newPromiseCapability = newGenericPromiseCapability = newPromiseCapabilityModule.f;
 
-  var N;
+var USE_NATIVE = !!function () {
+  try {
+    // correct subclassing with @@species support
+    var promise = $Promise.resolve(1);
+    var FakePromise = (promise.constructor = {})[__webpack_require__(13)('species')] = function (exec) {
+      exec(empty, empty);
+    };
+    // unhandled rejections tracking support, NodeJS Promise without it fails @@species test
+    return (isNode || typeof PromiseRejectionEvent == 'function')
+      && promise.then(empty) instanceof FakePromise
+      // v8 6.6 (Node 10 and Chrome 66) have a bug with resolving custom thenables
+      // https://bugs.chromium.org/p/chromium/issues/detail?id=830565
+      // we can't detect it synchronously, so just check versions
+      && v8.indexOf('6.6') !== 0
+      && userAgent.indexOf('Chrome/66') === -1;
+  } catch (e) { /* empty */ }
+}();
 
-  if (isSequence) {
-    var x = numeric(n[0]);
-    var y = numeric(n[1]);
-    var width = Math.max(n[0].length, n[1].length)
-    var incr = n.length == 3
-      ? Math.abs(numeric(n[2]))
-      : 1;
-    var test = lte;
-    var reverse = y < x;
-    if (reverse) {
-      incr *= -1;
-      test = gte;
-    }
-    var pad = n.some(isPadded);
-
-    N = [];
-
-    for (var i = x; test(i, y); i += incr) {
-      var c;
-      if (isAlphaSequence) {
-        c = String.fromCharCode(i);
-        if (c === '\\')
-          c = '';
-      } else {
-        c = String(i);
-        if (pad) {
-          var need = width - c.length;
-          if (need > 0) {
-            var z = new Array(need + 1).join('0');
-            if (i < 0)
-              c = '-' + z + c.slice(1);
-            else
-              c = z + c;
+// helpers
+var isThenable = function (it) {
+  var then;
+  return isObject(it) && typeof (then = it.then) == 'function' ? then : false;
+};
+var notify = function (promise, isReject) {
+  if (promise._n) return;
+  promise._n = true;
+  var chain = promise._c;
+  microtask(function () {
+    var value = promise._v;
+    var ok = promise._s == 1;
+    var i = 0;
+    var run = function (reaction) {
+      var handler = ok ? reaction.ok : reaction.fail;
+      var resolve = reaction.resolve;
+      var reject = reaction.reject;
+      var domain = reaction.domain;
+      var result, then, exited;
+      try {
+        if (handler) {
+          if (!ok) {
+            if (promise._h == 2) onHandleUnhandled(promise);
+            promise._h = 1;
           }
-        }
+          if (handler === true) result = value;
+          else {
+            if (domain) domain.enter();
+            result = handler(value); // may throw
+            if (domain) {
+              domain.exit();
+              exited = true;
+            }
+          }
+          if (result === reaction.promise) {
+            reject(TypeError('Promise-chain cycle'));
+          } else if (then = isThenable(result)) {
+            then.call(result, resolve, reject);
+          } else resolve(result);
+        } else reject(value);
+      } catch (e) {
+        if (domain && !exited) domain.exit();
+        reject(e);
       }
-      N.push(c);
+    };
+    while (chain.length > i) run(chain[i++]); // variable length - can't use forEach
+    promise._c = [];
+    promise._n = false;
+    if (isReject && !promise._h) onUnhandled(promise);
+  });
+};
+var onUnhandled = function (promise) {
+  task.call(global, function () {
+    var value = promise._v;
+    var unhandled = isUnhandled(promise);
+    var result, handler, console;
+    if (unhandled) {
+      result = perform(function () {
+        if (isNode) {
+          process.emit('unhandledRejection', value, promise);
+        } else if (handler = global.onunhandledrejection) {
+          handler({ promise: promise, reason: value });
+        } else if ((console = global.console) && console.error) {
+          console.error('Unhandled promise rejection', value);
+        }
+      });
+      // Browsers should not trigger `rejectionHandled` event if it was handled here, NodeJS - should
+      promise._h = isNode || isUnhandled(promise) ? 2 : 1;
+    } promise._a = undefined;
+    if (unhandled && result.e) throw result.v;
+  });
+};
+var isUnhandled = function (promise) {
+  return promise._h !== 1 && (promise._a || promise._c).length === 0;
+};
+var onHandleUnhandled = function (promise) {
+  task.call(global, function () {
+    var handler;
+    if (isNode) {
+      process.emit('rejectionHandled', promise);
+    } else if (handler = global.onrejectionhandled) {
+      handler({ promise: promise, reason: promise._v });
     }
-  } else {
-    N = concatMap(n, function(el) { return expand(el, false) });
-  }
-
-  for (var j = 0; j < N.length; j++) {
-    for (var k = 0; k < post.length; k++) {
-      var expansion = pre + N[j] + post[k];
-      if (!isTop || isSequence || expansion)
-        expansions.push(expansion);
+  });
+};
+var $reject = function (value) {
+  var promise = this;
+  if (promise._d) return;
+  promise._d = true;
+  promise = promise._w || promise; // unwrap
+  promise._v = value;
+  promise._s = 2;
+  if (!promise._a) promise._a = promise._c.slice();
+  notify(promise, true);
+};
+var $resolve = function (value) {
+  var promise = this;
+  var then;
+  if (promise._d) return;
+  promise._d = true;
+  promise = promise._w || promise; // unwrap
+  try {
+    if (promise === value) throw TypeError("Promise can't be resolved itself");
+    if (then = isThenable(value)) {
+      microtask(function () {
+        var wrapper = { _w: promise, _d: false }; // wrap
+        try {
+          then.call(value, ctx($resolve, wrapper, 1), ctx($reject, wrapper, 1));
+        } catch (e) {
+          $reject.call(wrapper, e);
+        }
+      });
+    } else {
+      promise._v = value;
+      promise._s = 1;
+      notify(promise, false);
     }
+  } catch (e) {
+    $reject.call({ _w: promise, _d: false }, e); // wrap
   }
+};
 
-  return expansions;
+// constructor polyfill
+if (!USE_NATIVE) {
+  // 25.4.3.1 Promise(executor)
+  $Promise = function Promise(executor) {
+    anInstance(this, $Promise, PROMISE, '_h');
+    aFunction(executor);
+    Internal.call(this);
+    try {
+      executor(ctx($resolve, this, 1), ctx($reject, this, 1));
+    } catch (err) {
+      $reject.call(this, err);
+    }
+  };
+  // eslint-disable-next-line no-unused-vars
+  Internal = function Promise(executor) {
+    this._c = [];             // <- awaiting reactions
+    this._a = undefined;      // <- checked in isUnhandled reactions
+    this._s = 0;              // <- state
+    this._d = false;          // <- done
+    this._v = undefined;      // <- value
+    this._h = 0;              // <- rejection state, 0 - default, 1 - handled, 2 - unhandled
+    this._n = false;          // <- notify
+  };
+  Internal.prototype = __webpack_require__(196)($Promise.prototype, {
+    // 25.4.5.3 Promise.prototype.then(onFulfilled, onRejected)
+    then: function then(onFulfilled, onRejected) {
+      var reaction = newPromiseCapability(speciesConstructor(this, $Promise));
+      reaction.ok = typeof onFulfilled == 'function' ? onFulfilled : true;
+      reaction.fail = typeof onRejected == 'function' && onRejected;
+      reaction.domain = isNode ? process.domain : undefined;
+      this._c.push(reaction);
+      if (this._a) this._a.push(reaction);
+      if (this._s) notify(this, false);
+      return reaction.promise;
+    },
+    // 25.4.5.1 Promise.prototype.catch(onRejected)
+    'catch': function (onRejected) {
+      return this.then(undefined, onRejected);
+    }
+  });
+  OwnPromiseCapability = function () {
+    var promise = new Internal();
+    this.promise = promise;
+    this.resolve = ctx($resolve, promise, 1);
+    this.reject = ctx($reject, promise, 1);
+  };
+  newPromiseCapabilityModule.f = newPromiseCapability = function (C) {
+    return C === $Promise || C === Wrapper
+      ? new OwnPromiseCapability(C)
+      : newGenericPromiseCapability(C);
+  };
 }
 
+$export($export.G + $export.W + $export.F * !USE_NATIVE, { Promise: $Promise });
+__webpack_require__(71)($Promise, PROMISE);
+__webpack_require__(198)(PROMISE);
+Wrapper = __webpack_require__(23)[PROMISE];
+
+// statics
+$export($export.S + $export.F * !USE_NATIVE, PROMISE, {
+  // 25.4.4.5 Promise.reject(r)
+  reject: function reject(r) {
+    var capability = newPromiseCapability(this);
+    var $$reject = capability.reject;
+    $$reject(r);
+    return capability.promise;
+  }
+});
+$export($export.S + $export.F * (LIBRARY || !USE_NATIVE), PROMISE, {
+  // 25.4.4.6 Promise.resolve(x)
+  resolve: function resolve(x) {
+    return promiseResolve(LIBRARY && this === Wrapper ? $Promise : this, x);
+  }
+});
+$export($export.S + $export.F * !(USE_NATIVE && __webpack_require__(189)(function (iter) {
+  $Promise.all(iter)['catch'](empty);
+})), PROMISE, {
+  // 25.4.4.1 Promise.all(iterable)
+  all: function all(iterable) {
+    var C = this;
+    var capability = newPromiseCapability(C);
+    var resolve = capability.resolve;
+    var reject = capability.reject;
+    var result = perform(function () {
+      var values = [];
+      var index = 0;
+      var remaining = 1;
+      forOf(iterable, false, function (promise) {
+        var $index = index++;
+        var alreadyCalled = false;
+        values.push(undefined);
+        remaining++;
+        C.resolve(promise).then(function (value) {
+          if (alreadyCalled) return;
+          alreadyCalled = true;
+          values[$index] = value;
+          --remaining || resolve(values);
+        }, reject);
+      });
+      --remaining || resolve(values);
+    });
+    if (result.e) reject(result.v);
+    return capability.promise;
+  },
+  // 25.4.4.4 Promise.race(iterable)
+  race: function race(iterable) {
+    var C = this;
+    var capability = newPromiseCapability(C);
+    var reject = capability.reject;
+    var result = perform(function () {
+      forOf(iterable, false, function (promise) {
+        C.resolve(promise).then(capability.resolve, reject);
+      });
+    });
+    if (result.e) reject(result.v);
+    return capability.promise;
+  }
+});
 
 
 /***/ }),
-/* 176 */
+/* 207 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+var $at = __webpack_require__(199)(true);
 
-function preserveCamelCase(str) {
-	let isLastCharLower = false;
-	let isLastCharUpper = false;
-	let isLastLastCharUpper = false;
+// 21.1.3.27 String.prototype[@@iterator]()
+__webpack_require__(103)(String, 'String', function (iterated) {
+  this._t = String(iterated); // target
+  this._i = 0;                // next index
+// 21.1.5.2.1 %StringIteratorPrototype%.next()
+}, function () {
+  var O = this._t;
+  var index = this._i;
+  var point;
+  if (index >= O.length) return { value: undefined, done: true };
+  point = $at(O, index);
+  this._i += point.length;
+  return { value: point, done: false };
+});
 
-	for (let i = 0; i < str.length; i++) {
-		const c = str[i];
 
-		if (isLastCharLower && /[a-zA-Z]/.test(c) && c.toUpperCase() === c) {
-			str = str.substr(0, i) + '-' + str.substr(i);
-			isLastCharLower = false;
-			isLastLastCharUpper = isLastCharUpper;
-			isLastCharUpper = true;
-			i++;
-		} else if (isLastCharUpper && isLastLastCharUpper && /[a-zA-Z]/.test(c) && c.toLowerCase() === c) {
-			str = str.substr(0, i - 1) + '-' + str.substr(i - 1);
-			isLastLastCharUpper = isLastCharUpper;
-			isLastCharUpper = false;
-			isLastCharLower = true;
-		} else {
-			isLastCharLower = c.toLowerCase() === c;
-			isLastLastCharUpper = isLastCharUpper;
-			isLastCharUpper = c.toUpperCase() === c;
-		}
-	}
+/***/ }),
+/* 208 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	return str;
-}
+"use strict";
+// https://github.com/tc39/proposal-promise-finally
 
-module.exports = function (str) {
-	if (arguments.length > 1) {
-		str = Array.from(arguments)
-			.map(x => x.trim())
-			.filter(x => x.length)
-			.join('-');
-	} else {
-		str = str.trim();
-	}
+var $export = __webpack_require__(41);
+var core = __webpack_require__(23);
+var global = __webpack_require__(11);
+var speciesConstructor = __webpack_require__(108);
+var promiseResolve = __webpack_require__(105);
 
-	if (str.length === 0) {
-		return '';
-	}
+$export($export.P + $export.R, 'Promise', { 'finally': function (onFinally) {
+  var C = speciesConstructor(this, core.Promise || global.Promise);
+  var isFunction = typeof onFinally == 'function';
+  return this.then(
+    isFunction ? function (x) {
+      return promiseResolve(C, onFinally()).then(function () { return x; });
+    } : onFinally,
+    isFunction ? function (e) {
+      return promiseResolve(C, onFinally()).then(function () { throw e; });
+    } : onFinally
+  );
+} });
 
-	if (str.length === 1) {
-		return str.toLowerCase();
-	}
 
-	if (/^[a-z0-9]+$/.test(str)) {
-		return str;
-	}
+/***/ }),
+/* 209 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	const hasUpperCase = str !== str.toLowerCase();
+"use strict";
 
-	if (hasUpperCase) {
-		str = preserveCamelCase(str);
-	}
+// https://github.com/tc39/proposal-promise-try
+var $export = __webpack_require__(41);
+var newPromiseCapability = __webpack_require__(70);
+var perform = __webpack_require__(104);
 
-	return str
-		.replace(/^[_.\- ]+/, '')
-		.toLowerCase()
-		.replace(/[_.\- ]+(\w|$)/g, (m, p1) => p1.toUpperCase());
-};
+$export($export.S, 'Promise', { 'try': function (callbackfn) {
+  var promiseCapability = newPromiseCapability.f(this);
+  var result = perform(callbackfn);
+  (result.e ? promiseCapability.reject : promiseCapability.resolve)(result.v);
+  return promiseCapability.promise;
+} });
 
 
 /***/ }),
-/* 177 */,
-/* 178 */
-/***/ (function(module, exports) {
+/* 210 */
+/***/ (function(module, exports, __webpack_require__) {
 
-module.exports = function (xs, fn) {
-    var res = [];
-    for (var i = 0; i < xs.length; i++) {
-        var x = fn(xs[i], i);
-        if (isArray(x)) res.push.apply(res, x);
-        else res.push(x);
-    }
-    return res;
-};
+__webpack_require__(204);
+var global = __webpack_require__(11);
+var hide = __webpack_require__(31);
+var Iterators = __webpack_require__(35);
+var TO_STRING_TAG = __webpack_require__(13)('toStringTag');
 
-var isArray = Array.isArray || function (xs) {
-    return Object.prototype.toString.call(xs) === '[object Array]';
-};
+var DOMIterables = ('CSSRuleList,CSSStyleDeclaration,CSSValueList,ClientRectList,DOMRectList,DOMStringList,' +
+  'DOMTokenList,DataTransferItemList,FileList,HTMLAllCollection,HTMLCollection,HTMLFormElement,HTMLSelectElement,' +
+  'MediaList,MimeTypeArray,NamedNodeMap,NodeList,PaintRequestList,Plugin,PluginArray,SVGLengthList,SVGNumberList,' +
+  'SVGPathSegList,SVGPointList,SVGStringList,SVGTransformList,SourceBufferList,StyleSheetList,TextTrackCueList,' +
+  'TextTrackList,TouchList').split(',');
+
+for (var i = 0; i < DOMIterables.length; i++) {
+  var NAME = DOMIterables[i];
+  var Collection = global[NAME];
+  var proto = Collection && Collection.prototype;
+  if (proto && !proto[TO_STRING_TAG]) hide(proto, TO_STRING_TAG, NAME);
+  Iterators[NAME] = Iterators.Array;
+}
 
 
 /***/ }),
-/* 179 */
+/* 211 */
 /***/ (function(module, exports, __webpack_require__) {
 
-__webpack_require__(205);
-__webpack_require__(207);
-__webpack_require__(210);
-__webpack_require__(206);
-__webpack_require__(208);
-__webpack_require__(209);
-module.exports = __webpack_require__(23).Promise;
+/**
+ * This is the web browser implementation of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
 
+exports = module.exports = __webpack_require__(112);
+exports.log = log;
+exports.formatArgs = formatArgs;
+exports.save = save;
+exports.load = load;
+exports.useColors = useColors;
+exports.storage = 'undefined' != typeof chrome
+               && 'undefined' != typeof chrome.storage
+                  ? chrome.storage.local
+                  : localstorage();
 
-/***/ }),
-/* 180 */
-/***/ (function(module, exports) {
+/**
+ * Colors.
+ */
 
-module.exports = function () { /* empty */ };
+exports.colors = [
+  '#0000CC', '#0000FF', '#0033CC', '#0033FF', '#0066CC', '#0066FF', '#0099CC',
+  '#0099FF', '#00CC00', '#00CC33', '#00CC66', '#00CC99', '#00CCCC', '#00CCFF',
+  '#3300CC', '#3300FF', '#3333CC', '#3333FF', '#3366CC', '#3366FF', '#3399CC',
+  '#3399FF', '#33CC00', '#33CC33', '#33CC66', '#33CC99', '#33CCCC', '#33CCFF',
+  '#6600CC', '#6600FF', '#6633CC', '#6633FF', '#66CC00', '#66CC33', '#9900CC',
+  '#9900FF', '#9933CC', '#9933FF', '#99CC00', '#99CC33', '#CC0000', '#CC0033',
+  '#CC0066', '#CC0099', '#CC00CC', '#CC00FF', '#CC3300', '#CC3333', '#CC3366',
+  '#CC3399', '#CC33CC', '#CC33FF', '#CC6600', '#CC6633', '#CC9900', '#CC9933',
+  '#CCCC00', '#CCCC33', '#FF0000', '#FF0033', '#FF0066', '#FF0099', '#FF00CC',
+  '#FF00FF', '#FF3300', '#FF3333', '#FF3366', '#FF3399', '#FF33CC', '#FF33FF',
+  '#FF6600', '#FF6633', '#FF9900', '#FF9933', '#FFCC00', '#FFCC33'
+];
 
+/**
+ * Currently only WebKit-based Web Inspectors, Firefox >= v31,
+ * and the Firebug extension (any Firefox version) are known
+ * to support "%c" CSS customizations.
+ *
+ * TODO: add a `localStorage` variable to explicitly enable/disable colors
+ */
 
-/***/ }),
-/* 181 */
-/***/ (function(module, exports) {
+function useColors() {
+  // NB: In an Electron preload script, document will be defined but not fully
+  // initialized. Since we know we're in Chrome, we'll just detect this case
+  // explicitly
+  if (typeof window !== 'undefined' && window.process && window.process.type === 'renderer') {
+    return true;
+  }
 
-module.exports = function (it, Constructor, name, forbiddenField) {
-  if (!(it instanceof Constructor) || (forbiddenField !== undefined && forbiddenField in it)) {
-    throw TypeError(name + ': incorrect invocation!');
-  } return it;
+  // Internet Explorer and Edge do not support colors.
+  if (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/(edge|trident)\/(\d+)/)) {
+    return false;
+  }
+
+  // is webkit? http://stackoverflow.com/a/16459606/376773
+  // document is undefined in react-native: https://github.com/facebook/react-native/pull/1632
+  return (typeof document !== 'undefined' && document.documentElement && document.documentElement.style && document.documentElement.style.WebkitAppearance) ||
+    // is firebug? http://stackoverflow.com/a/398120/376773
+    (typeof window !== 'undefined' && window.console && (window.console.firebug || (window.console.exception && window.console.table))) ||
+    // is firefox >= v31?
+    // https://developer.mozilla.org/en-US/docs/Tools/Web_Console#Styling_messages
+    (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/) && parseInt(RegExp.$1, 10) >= 31) ||
+    // double check webkit in userAgent just in case we are in a worker
+    (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/));
+}
+
+/**
+ * Map %j to `JSON.stringify()`, since no Web Inspectors do that by default.
+ */
+
+exports.formatters.j = function(v) {
+  try {
+    return JSON.stringify(v);
+  } catch (err) {
+    return '[UnexpectedJSONParseError]: ' + err.message;
+  }
 };
 
 
-/***/ }),
-/* 182 */
-/***/ (function(module, exports, __webpack_require__) {
+/**
+ * Colorize log arguments if enabled.
+ *
+ * @api public
+ */
 
-// false -> Array#indexOf
-// true  -> Array#includes
-var toIObject = __webpack_require__(74);
-var toLength = __webpack_require__(110);
-var toAbsoluteIndex = __webpack_require__(200);
-module.exports = function (IS_INCLUDES) {
-  return function ($this, el, fromIndex) {
-    var O = toIObject($this);
-    var length = toLength(O.length);
-    var index = toAbsoluteIndex(fromIndex, length);
-    var value;
-    // Array#includes uses SameValueZero equality algorithm
-    // eslint-disable-next-line no-self-compare
-    if (IS_INCLUDES && el != el) while (length > index) {
-      value = O[index++];
-      // eslint-disable-next-line no-self-compare
-      if (value != value) return true;
-    // Array#indexOf ignores holes, Array#includes - not
-    } else for (;length > index; index++) if (IS_INCLUDES || index in O) {
-      if (O[index] === el) return IS_INCLUDES || index || 0;
-    } return !IS_INCLUDES && -1;
-  };
-};
+function formatArgs(args) {
+  var useColors = this.useColors;
 
+  args[0] = (useColors ? '%c' : '')
+    + this.namespace
+    + (useColors ? ' %c' : ' ')
+    + args[0]
+    + (useColors ? '%c ' : ' ')
+    + '+' + exports.humanize(this.diff);
 
-/***/ }),
-/* 183 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (!useColors) return;
 
-var ctx = __webpack_require__(48);
-var call = __webpack_require__(187);
-var isArrayIter = __webpack_require__(186);
-var anObject = __webpack_require__(27);
-var toLength = __webpack_require__(110);
-var getIterFn = __webpack_require__(203);
-var BREAK = {};
-var RETURN = {};
-var exports = module.exports = function (iterable, entries, fn, that, ITERATOR) {
-  var iterFn = ITERATOR ? function () { return iterable; } : getIterFn(iterable);
-  var f = ctx(fn, that, entries ? 2 : 1);
+  var c = 'color: ' + this.color;
+  args.splice(1, 0, c, 'color: inherit')
+
+  // the final "%c" is somewhat tricky, because there could be other
+  // arguments passed either before or after the %c, so we need to
+  // figure out the correct index to insert the CSS into
   var index = 0;
-  var length, step, iterator, result;
-  if (typeof iterFn != 'function') throw TypeError(iterable + ' is not iterable!');
-  // fast case for arrays with default iterator
-  if (isArrayIter(iterFn)) for (length = toLength(iterable.length); length > index; index++) {
-    result = entries ? f(anObject(step = iterable[index])[0], step[1]) : f(iterable[index]);
-    if (result === BREAK || result === RETURN) return result;
-  } else for (iterator = iterFn.call(iterable); !(step = iterator.next()).done;) {
-    result = call(iterator, f, step.value, entries);
-    if (result === BREAK || result === RETURN) return result;
-  }
-};
-exports.BREAK = BREAK;
-exports.RETURN = RETURN;
+  var lastC = 0;
+  args[0].replace(/%[a-zA-Z%]/g, function(match) {
+    if ('%%' === match) return;
+    index++;
+    if ('%c' === match) {
+      // we only are interested in the *last* %c
+      // (the user may have provided their own)
+      lastC = index;
+    }
+  });
 
+  args.splice(lastC, 0, c);
+}
 
-/***/ }),
-/* 184 */
-/***/ (function(module, exports, __webpack_require__) {
+/**
+ * Invokes `console.log()` when available.
+ * No-op when `console.log` is not a "function".
+ *
+ * @api public
+ */
 
-module.exports = !__webpack_require__(33) && !__webpack_require__(85)(function () {
-  return Object.defineProperty(__webpack_require__(68)('div'), 'a', { get: function () { return 7; } }).a != 7;
-});
+function log() {
+  // this hackery is required for IE8/9, where
+  // the `console.log` function doesn't have 'apply'
+  return 'object' === typeof console
+    && console.log
+    && Function.prototype.apply.call(console.log, console, arguments);
+}
 
+/**
+ * Save `namespaces`.
+ *
+ * @param {String} namespaces
+ * @api private
+ */
 
-/***/ }),
-/* 185 */
-/***/ (function(module, exports) {
+function save(namespaces) {
+  try {
+    if (null == namespaces) {
+      exports.storage.removeItem('debug');
+    } else {
+      exports.storage.debug = namespaces;
+    }
+  } catch(e) {}
+}
 
-// fast apply, http://jsperf.lnkit.com/fast-apply/5
-module.exports = function (fn, args, that) {
-  var un = that === undefined;
-  switch (args.length) {
-    case 0: return un ? fn()
-                      : fn.call(that);
-    case 1: return un ? fn(args[0])
-                      : fn.call(that, args[0]);
-    case 2: return un ? fn(args[0], args[1])
-                      : fn.call(that, args[0], args[1]);
-    case 3: return un ? fn(args[0], args[1], args[2])
-                      : fn.call(that, args[0], args[1], args[2]);
-    case 4: return un ? fn(args[0], args[1], args[2], args[3])
-                      : fn.call(that, args[0], args[1], args[2], args[3]);
-  } return fn.apply(that, args);
-};
+/**
+ * Load `namespaces`.
+ *
+ * @return {String} returns the previously persisted debug modes
+ * @api private
+ */
 
+function load() {
+  var r;
+  try {
+    r = exports.storage.debug;
+  } catch(e) {}
 
-/***/ }),
-/* 186 */
-/***/ (function(module, exports, __webpack_require__) {
+  // If debug isn't set in LS, and we're in Electron, try to load $DEBUG
+  if (!r && typeof process !== 'undefined' && 'env' in process) {
+    r = process.env.DEBUG;
+  }
 
-// check on default Array iterator
-var Iterators = __webpack_require__(35);
-var ITERATOR = __webpack_require__(13)('iterator');
-var ArrayProto = Array.prototype;
+  return r;
+}
 
-module.exports = function (it) {
-  return it !== undefined && (Iterators.Array === it || ArrayProto[ITERATOR] === it);
-};
+/**
+ * Enable namespaces listed in `localStorage.debug` initially.
+ */
 
+exports.enable(load());
 
-/***/ }),
-/* 187 */
-/***/ (function(module, exports, __webpack_require__) {
+/**
+ * Localstorage attempts to return the localstorage.
+ *
+ * This is necessary because safari throws
+ * when a user disables cookies/localstorage
+ * and you attempt to access it.
+ *
+ * @return {LocalStorage}
+ * @api private
+ */
 
-// call something on iterator step with safe closing on error
-var anObject = __webpack_require__(27);
-module.exports = function (iterator, fn, value, entries) {
+function localstorage() {
   try {
-    return entries ? fn(anObject(value)[0], value[1]) : fn(value);
-  // 7.4.6 IteratorClose(iterator, completion)
-  } catch (e) {
-    var ret = iterator['return'];
-    if (ret !== undefined) anObject(ret.call(iterator));
-    throw e;
-  }
-};
+    return window.localStorage;
+  } catch (e) {}
+}
 
 
 /***/ }),
-/* 188 */
+/* 212 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-var create = __webpack_require__(192);
-var descriptor = __webpack_require__(106);
-var setToStringTag = __webpack_require__(71);
-var IteratorPrototype = {};
-
-// 25.1.2.1.1 %IteratorPrototype%[@@iterator]()
-__webpack_require__(31)(IteratorPrototype, __webpack_require__(13)('iterator'), function () { return this; });
+/**
+ * Detect Electron renderer process, which is node, but we should
+ * treat as a browser.
+ */
 
-module.exports = function (Constructor, NAME, next) {
-  Constructor.prototype = create(IteratorPrototype, { next: descriptor(1, next) });
-  setToStringTag(Constructor, NAME + ' Iterator');
-};
+if (typeof process === 'undefined' || process.type === 'renderer') {
+  module.exports = __webpack_require__(211);
+} else {
+  module.exports = __webpack_require__(213);
+}
 
 
 /***/ }),
-/* 189 */
+/* 213 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var ITERATOR = __webpack_require__(13)('iterator');
-var SAFE_CLOSING = false;
+/**
+ * Module dependencies.
+ */
 
-try {
-  var riter = [7][ITERATOR]();
-  riter['return'] = function () { SAFE_CLOSING = true; };
-  // eslint-disable-next-line no-throw-literal
-  Array.from(riter, function () { throw 2; });
-} catch (e) { /* empty */ }
+var tty = __webpack_require__(79);
+var util = __webpack_require__(2);
 
-module.exports = function (exec, skipClosing) {
-  if (!skipClosing && !SAFE_CLOSING) return false;
-  var safe = false;
-  try {
-    var arr = [7];
-    var iter = arr[ITERATOR]();
-    iter.next = function () { return { done: safe = true }; };
-    arr[ITERATOR] = function () { return iter; };
-    exec(arr);
-  } catch (e) { /* empty */ }
-  return safe;
-};
+/**
+ * This is the Node.js implementation of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
 
+exports = module.exports = __webpack_require__(112);
+exports.init = init;
+exports.log = log;
+exports.formatArgs = formatArgs;
+exports.save = save;
+exports.load = load;
+exports.useColors = useColors;
 
-/***/ }),
-/* 190 */
-/***/ (function(module, exports) {
+/**
+ * Colors.
+ */
 
-module.exports = function (done, value) {
-  return { value: value, done: !!done };
-};
+exports.colors = [ 6, 2, 3, 4, 5, 1 ];
 
+try {
+  var supportsColor = __webpack_require__(239);
+  if (supportsColor && supportsColor.level >= 2) {
+    exports.colors = [
+      20, 21, 26, 27, 32, 33, 38, 39, 40, 41, 42, 43, 44, 45, 56, 57, 62, 63, 68,
+      69, 74, 75, 76, 77, 78, 79, 80, 81, 92, 93, 98, 99, 112, 113, 128, 129, 134,
+      135, 148, 149, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171,
+      172, 173, 178, 179, 184, 185, 196, 197, 198, 199, 200, 201, 202, 203, 204,
+      205, 206, 207, 208, 209, 214, 215, 220, 221
+    ];
+  }
+} catch (err) {
+  // swallow - we only care if `supports-color` is available; it doesn't have to be.
+}
 
-/***/ }),
-/* 191 */
-/***/ (function(module, exports, __webpack_require__) {
+/**
+ * Build up the default `inspectOpts` object from the environment variables.
+ *
+ *   $ DEBUG_COLORS=no DEBUG_DEPTH=10 DEBUG_SHOW_HIDDEN=enabled node script.js
+ */
 
-var global = __webpack_require__(11);
-var macrotask = __webpack_require__(109).set;
-var Observer = global.MutationObserver || global.WebKitMutationObserver;
-var process = global.process;
-var Promise = global.Promise;
-var isNode = __webpack_require__(47)(process) == 'process';
+exports.inspectOpts = Object.keys(process.env).filter(function (key) {
+  return /^debug_/i.test(key);
+}).reduce(function (obj, key) {
+  // camel-case
+  var prop = key
+    .substring(6)
+    .toLowerCase()
+    .replace(/_([a-z])/g, function (_, k) { return k.toUpperCase() });
 
-module.exports = function () {
-  var head, last, notify;
+  // coerce string value into JS value
+  var val = process.env[key];
+  if (/^(yes|on|true|enabled)$/i.test(val)) val = true;
+  else if (/^(no|off|false|disabled)$/i.test(val)) val = false;
+  else if (val === 'null') val = null;
+  else val = Number(val);
 
-  var flush = function () {
-    var parent, fn;
-    if (isNode && (parent = process.domain)) parent.exit();
-    while (head) {
-      fn = head.fn;
-      head = head.next;
-      try {
-        fn();
-      } catch (e) {
-        if (head) notify();
-        else last = undefined;
-        throw e;
-      }
-    } last = undefined;
-    if (parent) parent.enter();
-  };
+  obj[prop] = val;
+  return obj;
+}, {});
 
-  // Node.js
-  if (isNode) {
-    notify = function () {
-      process.nextTick(flush);
-    };
-  // browsers with MutationObserver, except iOS Safari - https://github.com/zloirock/core-js/issues/339
-  } else if (Observer && !(global.navigator && global.navigator.standalone)) {
-    var toggle = true;
-    var node = document.createTextNode('');
-    new Observer(flush).observe(node, { characterData: true }); // eslint-disable-line no-new
-    notify = function () {
-      node.data = toggle = !toggle;
-    };
-  // environments with maybe non-completely correct, but existent Promise
-  } else if (Promise && Promise.resolve) {
-    // Promise.resolve without an argument throws an error in LG WebOS 2
-    var promise = Promise.resolve(undefined);
-    notify = function () {
-      promise.then(flush);
-    };
-  // for other environments - macrotask based on:
-  // - setImmediate
-  // - MessageChannel
-  // - window.postMessag
-  // - onreadystatechange
-  // - setTimeout
-  } else {
-    notify = function () {
-      // strange IE + webpack dev server bug - use .call(global)
-      macrotask.call(global, flush);
-    };
-  }
+/**
+ * Is stdout a TTY? Colored output is enabled when `true`.
+ */
 
-  return function (fn) {
-    var task = { fn: fn, next: undefined };
-    if (last) last.next = task;
-    if (!head) {
-      head = task;
-      notify();
-    } last = task;
-  };
-};
+function useColors() {
+  return 'colors' in exports.inspectOpts
+    ? Boolean(exports.inspectOpts.colors)
+    : tty.isatty(process.stderr.fd);
+}
 
+/**
+ * Map %o to `util.inspect()`, all on a single line.
+ */
 
-/***/ }),
-/* 192 */
-/***/ (function(module, exports, __webpack_require__) {
+exports.formatters.o = function(v) {
+  this.inspectOpts.colors = this.useColors;
+  return util.inspect(v, this.inspectOpts)
+    .split('\n').map(function(str) {
+      return str.trim()
+    }).join(' ');
+};
 
-// 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties])
-var anObject = __webpack_require__(27);
-var dPs = __webpack_require__(193);
-var enumBugKeys = __webpack_require__(101);
-var IE_PROTO = __webpack_require__(72)('IE_PROTO');
-var Empty = function () { /* empty */ };
-var PROTOTYPE = 'prototype';
+/**
+ * Map %o to `util.inspect()`, allowing multiple lines if needed.
+ */
 
-// Create object with fake `null` prototype: use iframe Object with cleared prototype
-var createDict = function () {
-  // Thrash, waste and sodomy: IE GC bug
-  var iframe = __webpack_require__(68)('iframe');
-  var i = enumBugKeys.length;
-  var lt = '<';
-  var gt = '>';
-  var iframeDocument;
-  iframe.style.display = 'none';
-  __webpack_require__(102).appendChild(iframe);
-  iframe.src = 'javascript:'; // eslint-disable-line no-script-url
-  // createDict = iframe.contentWindow.Object;
-  // html.removeChild(iframe);
-  iframeDocument = iframe.contentWindow.document;
-  iframeDocument.open();
-  iframeDocument.write(lt + 'script' + gt + 'document.F=Object' + lt + '/script' + gt);
-  iframeDocument.close();
-  createDict = iframeDocument.F;
-  while (i--) delete createDict[PROTOTYPE][enumBugKeys[i]];
-  return createDict();
+exports.formatters.O = function(v) {
+  this.inspectOpts.colors = this.useColors;
+  return util.inspect(v, this.inspectOpts);
 };
 
-module.exports = Object.create || function create(O, Properties) {
-  var result;
-  if (O !== null) {
-    Empty[PROTOTYPE] = anObject(O);
-    result = new Empty();
-    Empty[PROTOTYPE] = null;
-    // add "__proto__" for Object.getPrototypeOf polyfill
-    result[IE_PROTO] = O;
-  } else result = createDict();
-  return Properties === undefined ? result : dPs(result, Properties);
-};
+/**
+ * Adds ANSI color escape codes if enabled.
+ *
+ * @api public
+ */
 
+function formatArgs(args) {
+  var name = this.namespace;
+  var useColors = this.useColors;
 
-/***/ }),
-/* 193 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (useColors) {
+    var c = this.color;
+    var colorCode = '\u001b[3' + (c < 8 ? c : '8;5;' + c);
+    var prefix = '  ' + colorCode + ';1m' + name + ' ' + '\u001b[0m';
 
-var dP = __webpack_require__(50);
-var anObject = __webpack_require__(27);
-var getKeys = __webpack_require__(132);
+    args[0] = prefix + args[0].split('\n').join('\n' + prefix);
+    args.push(colorCode + 'm+' + exports.humanize(this.diff) + '\u001b[0m');
+  } else {
+    args[0] = getDate() + name + ' ' + args[0];
+  }
+}
 
-module.exports = __webpack_require__(33) ? Object.defineProperties : function defineProperties(O, Properties) {
-  anObject(O);
-  var keys = getKeys(Properties);
-  var length = keys.length;
-  var i = 0;
-  var P;
-  while (length > i) dP.f(O, P = keys[i++], Properties[P]);
-  return O;
-};
+function getDate() {
+  if (exports.inspectOpts.hideDate) {
+    return '';
+  } else {
+    return new Date().toISOString() + ' ';
+  }
+}
 
+/**
+ * Invokes `util.format()` with the specified arguments and writes to stderr.
+ */
 
-/***/ }),
-/* 194 */
-/***/ (function(module, exports, __webpack_require__) {
+function log() {
+  return process.stderr.write(util.format.apply(util, arguments) + '\n');
+}
 
-// 19.1.2.9 / 15.2.3.2 Object.getPrototypeOf(O)
-var has = __webpack_require__(49);
-var toObject = __webpack_require__(133);
-var IE_PROTO = __webpack_require__(72)('IE_PROTO');
-var ObjectProto = Object.prototype;
+/**
+ * Save `namespaces`.
+ *
+ * @param {String} namespaces
+ * @api private
+ */
 
-module.exports = Object.getPrototypeOf || function (O) {
-  O = toObject(O);
-  if (has(O, IE_PROTO)) return O[IE_PROTO];
-  if (typeof O.constructor == 'function' && O instanceof O.constructor) {
-    return O.constructor.prototype;
-  } return O instanceof Object ? ObjectProto : null;
-};
+function save(namespaces) {
+  if (null == namespaces) {
+    // If you set a process.env field to null or undefined, it gets cast to the
+    // string 'null' or 'undefined'. Just delete instead.
+    delete process.env.DEBUG;
+  } else {
+    process.env.DEBUG = namespaces;
+  }
+}
 
+/**
+ * Load `namespaces`.
+ *
+ * @return {String} returns the previously persisted debug modes
+ * @api private
+ */
 
-/***/ }),
-/* 195 */
-/***/ (function(module, exports, __webpack_require__) {
+function load() {
+  return process.env.DEBUG;
+}
 
-var has = __webpack_require__(49);
-var toIObject = __webpack_require__(74);
-var arrayIndexOf = __webpack_require__(182)(false);
-var IE_PROTO = __webpack_require__(72)('IE_PROTO');
+/**
+ * Init logic for `debug` instances.
+ *
+ * Create a new `inspectOpts` object in case `useColors` is set
+ * differently for a particular `debug` instance.
+ */
 
-module.exports = function (object, names) {
-  var O = toIObject(object);
-  var i = 0;
-  var result = [];
-  var key;
-  for (key in O) if (key != IE_PROTO) has(O, key) && result.push(key);
-  // Don't enum bug & hidden keys
-  while (names.length > i) if (has(O, key = names[i++])) {
-    ~arrayIndexOf(result, key) || result.push(key);
+function init (debug) {
+  debug.inspectOpts = {};
+
+  var keys = Object.keys(exports.inspectOpts);
+  for (var i = 0; i < keys.length; i++) {
+    debug.inspectOpts[keys[i]] = exports.inspectOpts[keys[i]];
   }
-  return result;
-};
+}
+
+/**
+ * Enable namespaces listed in `process.env.DEBUG` initially.
+ */
+
+exports.enable(load());
 
 
 /***/ }),
-/* 196 */
+/* 214 */,
+/* 215 */,
+/* 216 */,
+/* 217 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var hide = __webpack_require__(31);
-module.exports = function (target, src, safe) {
-  for (var key in src) {
-    if (safe && target[key]) target[key] = src[key];
-    else hide(target, key, src[key]);
-  } return target;
-};
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+var pathModule = __webpack_require__(0);
+var isWindows = process.platform === 'win32';
+var fs = __webpack_require__(3);
 
-/***/ }),
-/* 197 */
-/***/ (function(module, exports, __webpack_require__) {
+// JavaScript implementation of realpath, ported from node pre-v6
 
-module.exports = __webpack_require__(31);
+var DEBUG = process.env.NODE_DEBUG && /fs/.test(process.env.NODE_DEBUG);
 
+function rethrow() {
+  // Only enable in debug mode. A backtrace uses ~1000 bytes of heap space and
+  // is fairly slow to generate.
+  var callback;
+  if (DEBUG) {
+    var backtrace = new Error;
+    callback = debugCallback;
+  } else
+    callback = missingCallback;
 
-/***/ }),
-/* 198 */
-/***/ (function(module, exports, __webpack_require__) {
+  return callback;
 
-"use strict";
+  function debugCallback(err) {
+    if (err) {
+      backtrace.message = err.message;
+      err = backtrace;
+      missingCallback(err);
+    }
+  }
 
-var global = __webpack_require__(11);
-var core = __webpack_require__(23);
-var dP = __webpack_require__(50);
-var DESCRIPTORS = __webpack_require__(33);
-var SPECIES = __webpack_require__(13)('species');
+  function missingCallback(err) {
+    if (err) {
+      if (process.throwDeprecation)
+        throw err;  // Forgot a callback but don't know where? Use NODE_DEBUG=fs
+      else if (!process.noDeprecation) {
+        var msg = 'fs: missing callback ' + (err.stack || err.message);
+        if (process.traceDeprecation)
+          console.trace(msg);
+        else
+          console.error(msg);
+      }
+    }
+  }
+}
 
-module.exports = function (KEY) {
-  var C = typeof core[KEY] == 'function' ? core[KEY] : global[KEY];
-  if (DESCRIPTORS && C && !C[SPECIES]) dP.f(C, SPECIES, {
-    configurable: true,
-    get: function () { return this; }
-  });
-};
+function maybeCallback(cb) {
+  return typeof cb === 'function' ? cb : rethrow();
+}
 
+var normalize = pathModule.normalize;
 
-/***/ }),
-/* 199 */
-/***/ (function(module, exports, __webpack_require__) {
+// Regexp that finds the next partion of a (partial) path
+// result is [base_with_slash, base], e.g. ['somedir/', 'somedir']
+if (isWindows) {
+  var nextPartRe = /(.*?)(?:[\/\\]+|$)/g;
+} else {
+  var nextPartRe = /(.*?)(?:[\/]+|$)/g;
+}
 
-var toInteger = __webpack_require__(73);
-var defined = __webpack_require__(67);
-// true  -> String#at
-// false -> String#codePointAt
-module.exports = function (TO_STRING) {
-  return function (that, pos) {
-    var s = String(defined(that));
-    var i = toInteger(pos);
-    var l = s.length;
-    var a, b;
-    if (i < 0 || i >= l) return TO_STRING ? '' : undefined;
-    a = s.charCodeAt(i);
-    return a < 0xd800 || a > 0xdbff || i + 1 === l || (b = s.charCodeAt(i + 1)) < 0xdc00 || b > 0xdfff
-      ? TO_STRING ? s.charAt(i) : a
-      : TO_STRING ? s.slice(i, i + 2) : (a - 0xd800 << 10) + (b - 0xdc00) + 0x10000;
-  };
-};
+// Regex to find the device root, including trailing slash. E.g. 'c:\\'.
+if (isWindows) {
+  var splitRootRe = /^(?:[a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/][^\\\/]+)?[\\\/]*/;
+} else {
+  var splitRootRe = /^[\/]*/;
+}
 
+exports.realpathSync = function realpathSync(p, cache) {
+  // make p is absolute
+  p = pathModule.resolve(p);
 
-/***/ }),
-/* 200 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (cache && Object.prototype.hasOwnProperty.call(cache, p)) {
+    return cache[p];
+  }
 
-var toInteger = __webpack_require__(73);
-var max = Math.max;
-var min = Math.min;
-module.exports = function (index, length) {
-  index = toInteger(index);
-  return index < 0 ? max(index + length, 0) : min(index, length);
-};
+  var original = p,
+      seenLinks = {},
+      knownHard = {};
 
+  // current character position in p
+  var pos;
+  // the partial path so far, including a trailing slash if any
+  var current;
+  // the partial path without a trailing slash (except when pointing at a root)
+  var base;
+  // the partial path scanned in the previous round, with slash
+  var previous;
 
-/***/ }),
-/* 201 */
-/***/ (function(module, exports, __webpack_require__) {
+  start();
 
-// 7.1.1 ToPrimitive(input [, PreferredType])
-var isObject = __webpack_require__(34);
-// instead of the ES6 spec version, we didn't implement @@toPrimitive case
-// and the second argument - flag - preferred type is a string
-module.exports = function (it, S) {
-  if (!isObject(it)) return it;
-  var fn, val;
-  if (S && typeof (fn = it.toString) == 'function' && !isObject(val = fn.call(it))) return val;
-  if (typeof (fn = it.valueOf) == 'function' && !isObject(val = fn.call(it))) return val;
-  if (!S && typeof (fn = it.toString) == 'function' && !isObject(val = fn.call(it))) return val;
-  throw TypeError("Can't convert object to primitive value");
-};
+  function start() {
+    // Skip over roots
+    var m = splitRootRe.exec(p);
+    pos = m[0].length;
+    current = m[0];
+    base = m[0];
+    previous = '';
 
+    // On windows, check that the root exists. On unix there is no need.
+    if (isWindows && !knownHard[base]) {
+      fs.lstatSync(base);
+      knownHard[base] = true;
+    }
+  }
 
-/***/ }),
-/* 202 */
-/***/ (function(module, exports, __webpack_require__) {
+  // walk down the path, swapping out linked pathparts for their real
+  // values
+  // NB: p.length changes.
+  while (pos < p.length) {
+    // find the next part
+    nextPartRe.lastIndex = pos;
+    var result = nextPartRe.exec(p);
+    previous = current;
+    current += result[0];
+    base = previous + result[1];
+    pos = nextPartRe.lastIndex;
 
-var global = __webpack_require__(11);
-var navigator = global.navigator;
+    // continue if not a symlink
+    if (knownHard[base] || (cache && cache[base] === base)) {
+      continue;
+    }
 
-module.exports = navigator && navigator.userAgent || '';
+    var resolvedLink;
+    if (cache && Object.prototype.hasOwnProperty.call(cache, base)) {
+      // some known symbolic link.  no need to stat again.
+      resolvedLink = cache[base];
+    } else {
+      var stat = fs.lstatSync(base);
+      if (!stat.isSymbolicLink()) {
+        knownHard[base] = true;
+        if (cache) cache[base] = base;
+        continue;
+      }
+
+      // read the link if it wasn't read before
+      // dev/ino always return 0 on windows, so skip the check.
+      var linkTarget = null;
+      if (!isWindows) {
+        var id = stat.dev.toString(32) + ':' + stat.ino.toString(32);
+        if (seenLinks.hasOwnProperty(id)) {
+          linkTarget = seenLinks[id];
+        }
+      }
+      if (linkTarget === null) {
+        fs.statSync(base);
+        linkTarget = fs.readlinkSync(base);
+      }
+      resolvedLink = pathModule.resolve(previous, linkTarget);
+      // track this, if given a cache.
+      if (cache) cache[base] = resolvedLink;
+      if (!isWindows) seenLinks[id] = linkTarget;
+    }
 
+    // resolve the link, then start over
+    p = pathModule.resolve(resolvedLink, p.slice(pos));
+    start();
+  }
 
-/***/ }),
-/* 203 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (cache) cache[original] = p;
 
-var classof = __webpack_require__(100);
-var ITERATOR = __webpack_require__(13)('iterator');
-var Iterators = __webpack_require__(35);
-module.exports = __webpack_require__(23).getIteratorMethod = function (it) {
-  if (it != undefined) return it[ITERATOR]
-    || it['@@iterator']
-    || Iterators[classof(it)];
+  return p;
 };
 
 
-/***/ }),
-/* 204 */
-/***/ (function(module, exports, __webpack_require__) {
+exports.realpath = function realpath(p, cache, cb) {
+  if (typeof cb !== 'function') {
+    cb = maybeCallback(cache);
+    cache = null;
+  }
 
-"use strict";
+  // make p is absolute
+  p = pathModule.resolve(p);
 
-var addToUnscopables = __webpack_require__(180);
-var step = __webpack_require__(190);
-var Iterators = __webpack_require__(35);
-var toIObject = __webpack_require__(74);
+  if (cache && Object.prototype.hasOwnProperty.call(cache, p)) {
+    return process.nextTick(cb.bind(null, null, cache[p]));
+  }
 
-// 22.1.3.4 Array.prototype.entries()
-// 22.1.3.13 Array.prototype.keys()
-// 22.1.3.29 Array.prototype.values()
-// 22.1.3.30 Array.prototype[@@iterator]()
-module.exports = __webpack_require__(103)(Array, 'Array', function (iterated, kind) {
-  this._t = toIObject(iterated); // target
-  this._i = 0;                   // next index
-  this._k = kind;                // kind
-// 22.1.5.2.1 %ArrayIteratorPrototype%.next()
-}, function () {
-  var O = this._t;
-  var kind = this._k;
-  var index = this._i++;
-  if (!O || index >= O.length) {
-    this._t = undefined;
-    return step(1);
+  var original = p,
+      seenLinks = {},
+      knownHard = {};
+
+  // current character position in p
+  var pos;
+  // the partial path so far, including a trailing slash if any
+  var current;
+  // the partial path without a trailing slash (except when pointing at a root)
+  var base;
+  // the partial path scanned in the previous round, with slash
+  var previous;
+
+  start();
+
+  function start() {
+    // Skip over roots
+    var m = splitRootRe.exec(p);
+    pos = m[0].length;
+    current = m[0];
+    base = m[0];
+    previous = '';
+
+    // On windows, check that the root exists. On unix there is no need.
+    if (isWindows && !knownHard[base]) {
+      fs.lstat(base, function(err) {
+        if (err) return cb(err);
+        knownHard[base] = true;
+        LOOP();
+      });
+    } else {
+      process.nextTick(LOOP);
+    }
   }
-  if (kind == 'keys') return step(0, index);
-  if (kind == 'values') return step(0, O[index]);
-  return step(0, [index, O[index]]);
-}, 'values');
 
-// argumentsList[@@iterator] is %ArrayProto_values% (9.4.4.6, 9.4.4.7)
-Iterators.Arguments = Iterators.Array;
+  // walk down the path, swapping out linked pathparts for their real
+  // values
+  function LOOP() {
+    // stop if scanned past end of path
+    if (pos >= p.length) {
+      if (cache) cache[original] = p;
+      return cb(null, p);
+    }
 
-addToUnscopables('keys');
-addToUnscopables('values');
-addToUnscopables('entries');
+    // find the next part
+    nextPartRe.lastIndex = pos;
+    var result = nextPartRe.exec(p);
+    previous = current;
+    current += result[0];
+    base = previous + result[1];
+    pos = nextPartRe.lastIndex;
 
+    // continue if not a symlink
+    if (knownHard[base] || (cache && cache[base] === base)) {
+      return process.nextTick(LOOP);
+    }
 
-/***/ }),
-/* 205 */
-/***/ (function(module, exports) {
+    if (cache && Object.prototype.hasOwnProperty.call(cache, base)) {
+      // known symbolic link.  no need to stat again.
+      return gotResolvedLink(cache[base]);
+    }
+
+    return fs.lstat(base, gotStat);
+  }
+
+  function gotStat(err, stat) {
+    if (err) return cb(err);
+
+    // if not a symlink, skip to the next path part
+    if (!stat.isSymbolicLink()) {
+      knownHard[base] = true;
+      if (cache) cache[base] = base;
+      return process.nextTick(LOOP);
+    }
+
+    // stat & read the link if not read before
+    // call gotTarget as soon as the link target is known
+    // dev/ino always return 0 on windows, so skip the check.
+    if (!isWindows) {
+      var id = stat.dev.toString(32) + ':' + stat.ino.toString(32);
+      if (seenLinks.hasOwnProperty(id)) {
+        return gotTarget(null, seenLinks[id], base);
+      }
+    }
+    fs.stat(base, function(err) {
+      if (err) return cb(err);
+
+      fs.readlink(base, function(err, target) {
+        if (!isWindows) seenLinks[id] = target;
+        gotTarget(err, target);
+      });
+    });
+  }
+
+  function gotTarget(err, target, base) {
+    if (err) return cb(err);
 
+    var resolvedLink = pathModule.resolve(previous, target);
+    if (cache) cache[base] = resolvedLink;
+    gotResolvedLink(resolvedLink);
+  }
+
+  function gotResolvedLink(resolvedLink) {
+    // resolve the link, then start over
+    p = pathModule.resolve(resolvedLink, p.slice(pos));
+    start();
+  }
+};
 
 
 /***/ }),
-/* 206 */
+/* 218 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+module.exports = globSync
+globSync.GlobSync = GlobSync
 
-var LIBRARY = __webpack_require__(69);
-var global = __webpack_require__(11);
-var ctx = __webpack_require__(48);
-var classof = __webpack_require__(100);
-var $export = __webpack_require__(41);
-var isObject = __webpack_require__(34);
-var aFunction = __webpack_require__(46);
-var anInstance = __webpack_require__(181);
-var forOf = __webpack_require__(183);
-var speciesConstructor = __webpack_require__(108);
-var task = __webpack_require__(109).set;
-var microtask = __webpack_require__(191)();
-var newPromiseCapabilityModule = __webpack_require__(70);
-var perform = __webpack_require__(104);
-var userAgent = __webpack_require__(202);
-var promiseResolve = __webpack_require__(105);
-var PROMISE = 'Promise';
-var TypeError = global.TypeError;
-var process = global.process;
-var versions = process && process.versions;
-var v8 = versions && versions.v8 || '';
-var $Promise = global[PROMISE];
-var isNode = classof(process) == 'process';
-var empty = function () { /* empty */ };
-var Internal, newGenericPromiseCapability, OwnPromiseCapability, Wrapper;
-var newPromiseCapability = newGenericPromiseCapability = newPromiseCapabilityModule.f;
+var fs = __webpack_require__(3)
+var rp = __webpack_require__(114)
+var minimatch = __webpack_require__(60)
+var Minimatch = minimatch.Minimatch
+var Glob = __webpack_require__(75).Glob
+var util = __webpack_require__(2)
+var path = __webpack_require__(0)
+var assert = __webpack_require__(22)
+var isAbsolute = __webpack_require__(76)
+var common = __webpack_require__(115)
+var alphasort = common.alphasort
+var alphasorti = common.alphasorti
+var setopts = common.setopts
+var ownProp = common.ownProp
+var childrenIgnored = common.childrenIgnored
+var isIgnored = common.isIgnored
 
-var USE_NATIVE = !!function () {
-  try {
-    // correct subclassing with @@species support
-    var promise = $Promise.resolve(1);
-    var FakePromise = (promise.constructor = {})[__webpack_require__(13)('species')] = function (exec) {
-      exec(empty, empty);
-    };
-    // unhandled rejections tracking support, NodeJS Promise without it fails @@species test
-    return (isNode || typeof PromiseRejectionEvent == 'function')
-      && promise.then(empty) instanceof FakePromise
-      // v8 6.6 (Node 10 and Chrome 66) have a bug with resolving custom thenables
-      // https://bugs.chromium.org/p/chromium/issues/detail?id=830565
-      // we can't detect it synchronously, so just check versions
-      && v8.indexOf('6.6') !== 0
-      && userAgent.indexOf('Chrome/66') === -1;
-  } catch (e) { /* empty */ }
-}();
+function globSync (pattern, options) {
+  if (typeof options === 'function' || arguments.length === 3)
+    throw new TypeError('callback provided to sync glob\n'+
+                        'See: https://github.com/isaacs/node-glob/issues/167')
 
-// helpers
-var isThenable = function (it) {
-  var then;
-  return isObject(it) && typeof (then = it.then) == 'function' ? then : false;
-};
-var notify = function (promise, isReject) {
-  if (promise._n) return;
-  promise._n = true;
-  var chain = promise._c;
-  microtask(function () {
-    var value = promise._v;
-    var ok = promise._s == 1;
-    var i = 0;
-    var run = function (reaction) {
-      var handler = ok ? reaction.ok : reaction.fail;
-      var resolve = reaction.resolve;
-      var reject = reaction.reject;
-      var domain = reaction.domain;
-      var result, then, exited;
-      try {
-        if (handler) {
-          if (!ok) {
-            if (promise._h == 2) onHandleUnhandled(promise);
-            promise._h = 1;
-          }
-          if (handler === true) result = value;
-          else {
-            if (domain) domain.enter();
-            result = handler(value); // may throw
-            if (domain) {
-              domain.exit();
-              exited = true;
-            }
-          }
-          if (result === reaction.promise) {
-            reject(TypeError('Promise-chain cycle'));
-          } else if (then = isThenable(result)) {
-            then.call(result, resolve, reject);
-          } else resolve(result);
-        } else reject(value);
-      } catch (e) {
-        if (domain && !exited) domain.exit();
-        reject(e);
-      }
-    };
-    while (chain.length > i) run(chain[i++]); // variable length - can't use forEach
-    promise._c = [];
-    promise._n = false;
-    if (isReject && !promise._h) onUnhandled(promise);
-  });
-};
-var onUnhandled = function (promise) {
-  task.call(global, function () {
-    var value = promise._v;
-    var unhandled = isUnhandled(promise);
-    var result, handler, console;
-    if (unhandled) {
-      result = perform(function () {
-        if (isNode) {
-          process.emit('unhandledRejection', value, promise);
-        } else if (handler = global.onunhandledrejection) {
-          handler({ promise: promise, reason: value });
-        } else if ((console = global.console) && console.error) {
-          console.error('Unhandled promise rejection', value);
-        }
-      });
-      // Browsers should not trigger `rejectionHandled` event if it was handled here, NodeJS - should
-      promise._h = isNode || isUnhandled(promise) ? 2 : 1;
-    } promise._a = undefined;
-    if (unhandled && result.e) throw result.v;
-  });
-};
-var isUnhandled = function (promise) {
-  return promise._h !== 1 && (promise._a || promise._c).length === 0;
-};
-var onHandleUnhandled = function (promise) {
-  task.call(global, function () {
-    var handler;
-    if (isNode) {
-      process.emit('rejectionHandled', promise);
-    } else if (handler = global.onrejectionhandled) {
-      handler({ promise: promise, reason: promise._v });
-    }
-  });
-};
-var $reject = function (value) {
-  var promise = this;
-  if (promise._d) return;
-  promise._d = true;
-  promise = promise._w || promise; // unwrap
-  promise._v = value;
-  promise._s = 2;
-  if (!promise._a) promise._a = promise._c.slice();
-  notify(promise, true);
-};
-var $resolve = function (value) {
-  var promise = this;
-  var then;
-  if (promise._d) return;
-  promise._d = true;
-  promise = promise._w || promise; // unwrap
-  try {
-    if (promise === value) throw TypeError("Promise can't be resolved itself");
-    if (then = isThenable(value)) {
-      microtask(function () {
-        var wrapper = { _w: promise, _d: false }; // wrap
+  return new GlobSync(pattern, options).found
+}
+
+function GlobSync (pattern, options) {
+  if (!pattern)
+    throw new Error('must provide pattern')
+
+  if (typeof options === 'function' || arguments.length === 3)
+    throw new TypeError('callback provided to sync glob\n'+
+                        'See: https://github.com/isaacs/node-glob/issues/167')
+
+  if (!(this instanceof GlobSync))
+    return new GlobSync(pattern, options)
+
+  setopts(this, pattern, options)
+
+  if (this.noprocess)
+    return this
+
+  var n = this.minimatch.set.length
+  this.matches = new Array(n)
+  for (var i = 0; i < n; i ++) {
+    this._process(this.minimatch.set[i], i, false)
+  }
+  this._finish()
+}
+
+GlobSync.prototype._finish = function () {
+  assert(this instanceof GlobSync)
+  if (this.realpath) {
+    var self = this
+    this.matches.forEach(function (matchset, index) {
+      var set = self.matches[index] = Object.create(null)
+      for (var p in matchset) {
         try {
-          then.call(value, ctx($resolve, wrapper, 1), ctx($reject, wrapper, 1));
-        } catch (e) {
-          $reject.call(wrapper, e);
+          p = self._makeAbs(p)
+          var real = rp.realpathSync(p, self.realpathCache)
+          set[real] = true
+        } catch (er) {
+          if (er.syscall === 'stat')
+            set[self._makeAbs(p)] = true
+          else
+            throw er
         }
-      });
-    } else {
-      promise._v = value;
-      promise._s = 1;
-      notify(promise, false);
-    }
-  } catch (e) {
-    $reject.call({ _w: promise, _d: false }, e); // wrap
+      }
+    })
   }
-};
-
-// constructor polyfill
-if (!USE_NATIVE) {
-  // 25.4.3.1 Promise(executor)
-  $Promise = function Promise(executor) {
-    anInstance(this, $Promise, PROMISE, '_h');
-    aFunction(executor);
-    Internal.call(this);
-    try {
-      executor(ctx($resolve, this, 1), ctx($reject, this, 1));
-    } catch (err) {
-      $reject.call(this, err);
-    }
-  };
-  // eslint-disable-next-line no-unused-vars
-  Internal = function Promise(executor) {
-    this._c = [];             // <- awaiting reactions
-    this._a = undefined;      // <- checked in isUnhandled reactions
-    this._s = 0;              // <- state
-    this._d = false;          // <- done
-    this._v = undefined;      // <- value
-    this._h = 0;              // <- rejection state, 0 - default, 1 - handled, 2 - unhandled
-    this._n = false;          // <- notify
-  };
-  Internal.prototype = __webpack_require__(196)($Promise.prototype, {
-    // 25.4.5.3 Promise.prototype.then(onFulfilled, onRejected)
-    then: function then(onFulfilled, onRejected) {
-      var reaction = newPromiseCapability(speciesConstructor(this, $Promise));
-      reaction.ok = typeof onFulfilled == 'function' ? onFulfilled : true;
-      reaction.fail = typeof onRejected == 'function' && onRejected;
-      reaction.domain = isNode ? process.domain : undefined;
-      this._c.push(reaction);
-      if (this._a) this._a.push(reaction);
-      if (this._s) notify(this, false);
-      return reaction.promise;
-    },
-    // 25.4.5.1 Promise.prototype.catch(onRejected)
-    'catch': function (onRejected) {
-      return this.then(undefined, onRejected);
-    }
-  });
-  OwnPromiseCapability = function () {
-    var promise = new Internal();
-    this.promise = promise;
-    this.resolve = ctx($resolve, promise, 1);
-    this.reject = ctx($reject, promise, 1);
-  };
-  newPromiseCapabilityModule.f = newPromiseCapability = function (C) {
-    return C === $Promise || C === Wrapper
-      ? new OwnPromiseCapability(C)
-      : newGenericPromiseCapability(C);
-  };
+  common.finish(this)
 }
 
-$export($export.G + $export.W + $export.F * !USE_NATIVE, { Promise: $Promise });
-__webpack_require__(71)($Promise, PROMISE);
-__webpack_require__(198)(PROMISE);
-Wrapper = __webpack_require__(23)[PROMISE];
 
-// statics
-$export($export.S + $export.F * !USE_NATIVE, PROMISE, {
-  // 25.4.4.5 Promise.reject(r)
-  reject: function reject(r) {
-    var capability = newPromiseCapability(this);
-    var $$reject = capability.reject;
-    $$reject(r);
-    return capability.promise;
-  }
-});
-$export($export.S + $export.F * (LIBRARY || !USE_NATIVE), PROMISE, {
-  // 25.4.4.6 Promise.resolve(x)
-  resolve: function resolve(x) {
-    return promiseResolve(LIBRARY && this === Wrapper ? $Promise : this, x);
+GlobSync.prototype._process = function (pattern, index, inGlobStar) {
+  assert(this instanceof GlobSync)
+
+  // Get the first [n] parts of pattern that are all strings.
+  var n = 0
+  while (typeof pattern[n] === 'string') {
+    n ++
   }
-});
-$export($export.S + $export.F * !(USE_NATIVE && __webpack_require__(189)(function (iter) {
-  $Promise.all(iter)['catch'](empty);
-})), PROMISE, {
-  // 25.4.4.1 Promise.all(iterable)
-  all: function all(iterable) {
-    var C = this;
-    var capability = newPromiseCapability(C);
-    var resolve = capability.resolve;
-    var reject = capability.reject;
-    var result = perform(function () {
-      var values = [];
-      var index = 0;
-      var remaining = 1;
-      forOf(iterable, false, function (promise) {
-        var $index = index++;
-        var alreadyCalled = false;
-        values.push(undefined);
-        remaining++;
-        C.resolve(promise).then(function (value) {
-          if (alreadyCalled) return;
-          alreadyCalled = true;
-          values[$index] = value;
-          --remaining || resolve(values);
-        }, reject);
-      });
-      --remaining || resolve(values);
-    });
-    if (result.e) reject(result.v);
-    return capability.promise;
-  },
-  // 25.4.4.4 Promise.race(iterable)
-  race: function race(iterable) {
-    var C = this;
-    var capability = newPromiseCapability(C);
-    var reject = capability.reject;
-    var result = perform(function () {
-      forOf(iterable, false, function (promise) {
-        C.resolve(promise).then(capability.resolve, reject);
-      });
-    });
-    if (result.e) reject(result.v);
-    return capability.promise;
+  // now n is the index of the first one that is *not* a string.
+
+  // See if there's anything else
+  var prefix
+  switch (n) {
+    // if not, then this is rather simple
+    case pattern.length:
+      this._processSimple(pattern.join('/'), index)
+      return
+
+    case 0:
+      // pattern *starts* with some non-trivial item.
+      // going to readdir(cwd), but not include the prefix in matches.
+      prefix = null
+      break
+
+    default:
+      // pattern has some string bits in the front.
+      // whatever it starts with, whether that's 'absolute' like /foo/bar,
+      // or 'relative' like '../baz'
+      prefix = pattern.slice(0, n).join('/')
+      break
   }
-});
 
+  var remain = pattern.slice(n)
 
-/***/ }),
-/* 207 */
-/***/ (function(module, exports, __webpack_require__) {
+  // get the list of entries.
+  var read
+  if (prefix === null)
+    read = '.'
+  else if (isAbsolute(prefix) || isAbsolute(pattern.join('/'))) {
+    if (!prefix || !isAbsolute(prefix))
+      prefix = '/' + prefix
+    read = prefix
+  } else
+    read = prefix
 
-"use strict";
+  var abs = this._makeAbs(read)
 
-var $at = __webpack_require__(199)(true);
+  //if ignored, skip processing
+  if (childrenIgnored(this, read))
+    return
 
-// 21.1.3.27 String.prototype[@@iterator]()
-__webpack_require__(103)(String, 'String', function (iterated) {
-  this._t = String(iterated); // target
-  this._i = 0;                // next index
-// 21.1.5.2.1 %StringIteratorPrototype%.next()
-}, function () {
-  var O = this._t;
-  var index = this._i;
-  var point;
-  if (index >= O.length) return { value: undefined, done: true };
-  point = $at(O, index);
-  this._i += point.length;
-  return { value: point, done: false };
-});
+  var isGlobStar = remain[0] === minimatch.GLOBSTAR
+  if (isGlobStar)
+    this._processGlobStar(prefix, read, abs, remain, index, inGlobStar)
+  else
+    this._processReaddir(prefix, read, abs, remain, index, inGlobStar)
+}
 
 
-/***/ }),
-/* 208 */
-/***/ (function(module, exports, __webpack_require__) {
+GlobSync.prototype._processReaddir = function (prefix, read, abs, remain, index, inGlobStar) {
+  var entries = this._readdir(abs, inGlobStar)
 
-"use strict";
-// https://github.com/tc39/proposal-promise-finally
+  // if the abs isn't a dir, then nothing can match!
+  if (!entries)
+    return
 
-var $export = __webpack_require__(41);
-var core = __webpack_require__(23);
-var global = __webpack_require__(11);
-var speciesConstructor = __webpack_require__(108);
-var promiseResolve = __webpack_require__(105);
+  // It will only match dot entries if it starts with a dot, or if
+  // dot is set.  Stuff like @(.foo|.bar) isn't allowed.
+  var pn = remain[0]
+  var negate = !!this.minimatch.negate
+  var rawGlob = pn._glob
+  var dotOk = this.dot || rawGlob.charAt(0) === '.'
 
-$export($export.P + $export.R, 'Promise', { 'finally': function (onFinally) {
-  var C = speciesConstructor(this, core.Promise || global.Promise);
-  var isFunction = typeof onFinally == 'function';
-  return this.then(
-    isFunction ? function (x) {
-      return promiseResolve(C, onFinally()).then(function () { return x; });
-    } : onFinally,
-    isFunction ? function (e) {
-      return promiseResolve(C, onFinally()).then(function () { throw e; });
-    } : onFinally
-  );
-} });
+  var matchedEntries = []
+  for (var i = 0; i < entries.length; i++) {
+    var e = entries[i]
+    if (e.charAt(0) !== '.' || dotOk) {
+      var m
+      if (negate && !prefix) {
+        m = !e.match(pn)
+      } else {
+        m = e.match(pn)
+      }
+      if (m)
+        matchedEntries.push(e)
+    }
+  }
 
+  var len = matchedEntries.length
+  // If there are no matched entries, then nothing matches.
+  if (len === 0)
+    return
 
-/***/ }),
-/* 209 */
-/***/ (function(module, exports, __webpack_require__) {
+  // if this is the last remaining pattern bit, then no need for
+  // an additional stat *unless* the user has specified mark or
+  // stat explicitly.  We know they exist, since readdir returned
+  // them.
 
-"use strict";
+  if (remain.length === 1 && !this.mark && !this.stat) {
+    if (!this.matches[index])
+      this.matches[index] = Object.create(null)
 
-// https://github.com/tc39/proposal-promise-try
-var $export = __webpack_require__(41);
-var newPromiseCapability = __webpack_require__(70);
-var perform = __webpack_require__(104);
+    for (var i = 0; i < len; i ++) {
+      var e = matchedEntries[i]
+      if (prefix) {
+        if (prefix.slice(-1) !== '/')
+          e = prefix + '/' + e
+        else
+          e = prefix + e
+      }
 
-$export($export.S, 'Promise', { 'try': function (callbackfn) {
-  var promiseCapability = newPromiseCapability.f(this);
-  var result = perform(callbackfn);
-  (result.e ? promiseCapability.reject : promiseCapability.resolve)(result.v);
-  return promiseCapability.promise;
-} });
+      if (e.charAt(0) === '/' && !this.nomount) {
+        e = path.join(this.root, e)
+      }
+      this._emitMatch(index, e)
+    }
+    // This was the last one, and no stats were needed
+    return
+  }
 
+  // now test all matched entries as stand-ins for that part
+  // of the pattern.
+  remain.shift()
+  for (var i = 0; i < len; i ++) {
+    var e = matchedEntries[i]
+    var newPattern
+    if (prefix)
+      newPattern = [prefix, e]
+    else
+      newPattern = [e]
+    this._process(newPattern.concat(remain), index, inGlobStar)
+  }
+}
 
-/***/ }),
-/* 210 */
-/***/ (function(module, exports, __webpack_require__) {
 
-__webpack_require__(204);
-var global = __webpack_require__(11);
-var hide = __webpack_require__(31);
-var Iterators = __webpack_require__(35);
-var TO_STRING_TAG = __webpack_require__(13)('toStringTag');
+GlobSync.prototype._emitMatch = function (index, e) {
+  if (isIgnored(this, e))
+    return
 
-var DOMIterables = ('CSSRuleList,CSSStyleDeclaration,CSSValueList,ClientRectList,DOMRectList,DOMStringList,' +
-  'DOMTokenList,DataTransferItemList,FileList,HTMLAllCollection,HTMLCollection,HTMLFormElement,HTMLSelectElement,' +
-  'MediaList,MimeTypeArray,NamedNodeMap,NodeList,PaintRequestList,Plugin,PluginArray,SVGLengthList,SVGNumberList,' +
-  'SVGPathSegList,SVGPointList,SVGStringList,SVGTransformList,SourceBufferList,StyleSheetList,TextTrackCueList,' +
-  'TextTrackList,TouchList').split(',');
+  var abs = this._makeAbs(e)
 
-for (var i = 0; i < DOMIterables.length; i++) {
-  var NAME = DOMIterables[i];
-  var Collection = global[NAME];
-  var proto = Collection && Collection.prototype;
-  if (proto && !proto[TO_STRING_TAG]) hide(proto, TO_STRING_TAG, NAME);
-  Iterators[NAME] = Iterators.Array;
-}
+  if (this.mark)
+    e = this._mark(e)
 
+  if (this.absolute) {
+    e = abs
+  }
 
-/***/ }),
-/* 211 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (this.matches[index][e])
+    return
 
-/**
- * This is the web browser implementation of `debug()`.
- *
- * Expose `debug()` as the module.
- */
+  if (this.nodir) {
+    var c = this.cache[abs]
+    if (c === 'DIR' || Array.isArray(c))
+      return
+  }
 
-exports = module.exports = __webpack_require__(112);
-exports.log = log;
-exports.formatArgs = formatArgs;
-exports.save = save;
-exports.load = load;
-exports.useColors = useColors;
-exports.storage = 'undefined' != typeof chrome
-               && 'undefined' != typeof chrome.storage
-                  ? chrome.storage.local
-                  : localstorage();
+  this.matches[index][e] = true
 
-/**
- * Colors.
- */
+  if (this.stat)
+    this._stat(e)
+}
 
-exports.colors = [
-  '#0000CC', '#0000FF', '#0033CC', '#0033FF', '#0066CC', '#0066FF', '#0099CC',
-  '#0099FF', '#00CC00', '#00CC33', '#00CC66', '#00CC99', '#00CCCC', '#00CCFF',
-  '#3300CC', '#3300FF', '#3333CC', '#3333FF', '#3366CC', '#3366FF', '#3399CC',
-  '#3399FF', '#33CC00', '#33CC33', '#33CC66', '#33CC99', '#33CCCC', '#33CCFF',
-  '#6600CC', '#6600FF', '#6633CC', '#6633FF', '#66CC00', '#66CC33', '#9900CC',
-  '#9900FF', '#9933CC', '#9933FF', '#99CC00', '#99CC33', '#CC0000', '#CC0033',
-  '#CC0066', '#CC0099', '#CC00CC', '#CC00FF', '#CC3300', '#CC3333', '#CC3366',
-  '#CC3399', '#CC33CC', '#CC33FF', '#CC6600', '#CC6633', '#CC9900', '#CC9933',
-  '#CCCC00', '#CCCC33', '#FF0000', '#FF0033', '#FF0066', '#FF0099', '#FF00CC',
-  '#FF00FF', '#FF3300', '#FF3333', '#FF3366', '#FF3399', '#FF33CC', '#FF33FF',
-  '#FF6600', '#FF6633', '#FF9900', '#FF9933', '#FFCC00', '#FFCC33'
-];
 
-/**
- * Currently only WebKit-based Web Inspectors, Firefox >= v31,
- * and the Firebug extension (any Firefox version) are known
- * to support "%c" CSS customizations.
- *
- * TODO: add a `localStorage` variable to explicitly enable/disable colors
- */
-
-function useColors() {
-  // NB: In an Electron preload script, document will be defined but not fully
-  // initialized. Since we know we're in Chrome, we'll just detect this case
-  // explicitly
-  if (typeof window !== 'undefined' && window.process && window.process.type === 'renderer') {
-    return true;
-  }
-
-  // Internet Explorer and Edge do not support colors.
-  if (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/(edge|trident)\/(\d+)/)) {
-    return false;
-  }
-
-  // is webkit? http://stackoverflow.com/a/16459606/376773
-  // document is undefined in react-native: https://github.com/facebook/react-native/pull/1632
-  return (typeof document !== 'undefined' && document.documentElement && document.documentElement.style && document.documentElement.style.WebkitAppearance) ||
-    // is firebug? http://stackoverflow.com/a/398120/376773
-    (typeof window !== 'undefined' && window.console && (window.console.firebug || (window.console.exception && window.console.table))) ||
-    // is firefox >= v31?
-    // https://developer.mozilla.org/en-US/docs/Tools/Web_Console#Styling_messages
-    (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/) && parseInt(RegExp.$1, 10) >= 31) ||
-    // double check webkit in userAgent just in case we are in a worker
-    (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/));
-}
-
-/**
- * Map %j to `JSON.stringify()`, since no Web Inspectors do that by default.
- */
+GlobSync.prototype._readdirInGlobStar = function (abs) {
+  // follow all symlinked directories forever
+  // just proceed as if this is a non-globstar situation
+  if (this.follow)
+    return this._readdir(abs, false)
 
-exports.formatters.j = function(v) {
+  var entries
+  var lstat
+  var stat
   try {
-    return JSON.stringify(v);
-  } catch (err) {
-    return '[UnexpectedJSONParseError]: ' + err.message;
+    lstat = fs.lstatSync(abs)
+  } catch (er) {
+    if (er.code === 'ENOENT') {
+      // lstat failed, doesn't exist
+      return null
+    }
   }
-};
-
-
-/**
- * Colorize log arguments if enabled.
- *
- * @api public
- */
-
-function formatArgs(args) {
-  var useColors = this.useColors;
-
-  args[0] = (useColors ? '%c' : '')
-    + this.namespace
-    + (useColors ? ' %c' : ' ')
-    + args[0]
-    + (useColors ? '%c ' : ' ')
-    + '+' + exports.humanize(this.diff);
 
-  if (!useColors) return;
-
-  var c = 'color: ' + this.color;
-  args.splice(1, 0, c, 'color: inherit')
+  var isSym = lstat && lstat.isSymbolicLink()
+  this.symlinks[abs] = isSym
 
-  // the final "%c" is somewhat tricky, because there could be other
-  // arguments passed either before or after the %c, so we need to
-  // figure out the correct index to insert the CSS into
-  var index = 0;
-  var lastC = 0;
-  args[0].replace(/%[a-zA-Z%]/g, function(match) {
-    if ('%%' === match) return;
-    index++;
-    if ('%c' === match) {
-      // we only are interested in the *last* %c
-      // (the user may have provided their own)
-      lastC = index;
-    }
-  });
+  // If it's not a symlink or a dir, then it's definitely a regular file.
+  // don't bother doing a readdir in that case.
+  if (!isSym && lstat && !lstat.isDirectory())
+    this.cache[abs] = 'FILE'
+  else
+    entries = this._readdir(abs, false)
 
-  args.splice(lastC, 0, c);
+  return entries
 }
 
-/**
- * Invokes `console.log()` when available.
- * No-op when `console.log` is not a "function".
- *
- * @api public
- */
-
-function log() {
-  // this hackery is required for IE8/9, where
-  // the `console.log` function doesn't have 'apply'
-  return 'object' === typeof console
-    && console.log
-    && Function.prototype.apply.call(console.log, console, arguments);
-}
+GlobSync.prototype._readdir = function (abs, inGlobStar) {
+  var entries
 
-/**
- * Save `namespaces`.
- *
- * @param {String} namespaces
- * @api private
- */
+  if (inGlobStar && !ownProp(this.symlinks, abs))
+    return this._readdirInGlobStar(abs)
 
-function save(namespaces) {
-  try {
-    if (null == namespaces) {
-      exports.storage.removeItem('debug');
-    } else {
-      exports.storage.debug = namespaces;
-    }
-  } catch(e) {}
-}
+  if (ownProp(this.cache, abs)) {
+    var c = this.cache[abs]
+    if (!c || c === 'FILE')
+      return null
 
-/**
- * Load `namespaces`.
- *
- * @return {String} returns the previously persisted debug modes
- * @api private
- */
+    if (Array.isArray(c))
+      return c
+  }
 
-function load() {
-  var r;
   try {
-    r = exports.storage.debug;
-  } catch(e) {}
-
-  // If debug isn't set in LS, and we're in Electron, try to load $DEBUG
-  if (!r && typeof process !== 'undefined' && 'env' in process) {
-    r = process.env.DEBUG;
+    return this._readdirEntries(abs, fs.readdirSync(abs))
+  } catch (er) {
+    this._readdirError(abs, er)
+    return null
   }
-
-  return r;
 }
 
-/**
- * Enable namespaces listed in `localStorage.debug` initially.
- */
-
-exports.enable(load());
+GlobSync.prototype._readdirEntries = function (abs, entries) {
+  // if we haven't asked to stat everything, then just
+  // assume that everything in there exists, so we can avoid
+  // having to stat it a second time.
+  if (!this.mark && !this.stat) {
+    for (var i = 0; i < entries.length; i ++) {
+      var e = entries[i]
+      if (abs === '/')
+        e = abs + e
+      else
+        e = abs + '/' + e
+      this.cache[e] = true
+    }
+  }
 
-/**
- * Localstorage attempts to return the localstorage.
- *
- * This is necessary because safari throws
- * when a user disables cookies/localstorage
- * and you attempt to access it.
- *
- * @return {LocalStorage}
- * @api private
- */
+  this.cache[abs] = entries
 
-function localstorage() {
-  try {
-    return window.localStorage;
-  } catch (e) {}
+  // mark and cache dir-ness
+  return entries
 }
 
+GlobSync.prototype._readdirError = function (f, er) {
+  // handle errors, and cache the information
+  switch (er.code) {
+    case 'ENOTSUP': // https://github.com/isaacs/node-glob/issues/205
+    case 'ENOTDIR': // totally normal. means it *does* exist.
+      var abs = this._makeAbs(f)
+      this.cache[abs] = 'FILE'
+      if (abs === this.cwdAbs) {
+        var error = new Error(er.code + ' invalid cwd ' + this.cwd)
+        error.path = this.cwd
+        error.code = er.code
+        throw error
+      }
+      break
 
-/***/ }),
-/* 212 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/**
- * Detect Electron renderer process, which is node, but we should
- * treat as a browser.
- */
+    case 'ENOENT': // not terribly unusual
+    case 'ELOOP':
+    case 'ENAMETOOLONG':
+    case 'UNKNOWN':
+      this.cache[this._makeAbs(f)] = false
+      break
 
-if (typeof process === 'undefined' || process.type === 'renderer') {
-  module.exports = __webpack_require__(211);
-} else {
-  module.exports = __webpack_require__(213);
+    default: // some unusual error.  Treat as failure.
+      this.cache[this._makeAbs(f)] = false
+      if (this.strict)
+        throw er
+      if (!this.silent)
+        console.error('glob error', er)
+      break
+  }
 }
 
+GlobSync.prototype._processGlobStar = function (prefix, read, abs, remain, index, inGlobStar) {
 
-/***/ }),
-/* 213 */
-/***/ (function(module, exports, __webpack_require__) {
+  var entries = this._readdir(abs, inGlobStar)
 
-/**
- * Module dependencies.
- */
+  // no entries means not a dir, so it can never have matches
+  // foo.txt/** doesn't match foo.txt
+  if (!entries)
+    return
 
-var tty = __webpack_require__(79);
-var util = __webpack_require__(2);
+  // test without the globstar, and with every child both below
+  // and replacing the globstar.
+  var remainWithoutGlobStar = remain.slice(1)
+  var gspref = prefix ? [ prefix ] : []
+  var noGlobStar = gspref.concat(remainWithoutGlobStar)
 
-/**
- * This is the Node.js implementation of `debug()`.
- *
- * Expose `debug()` as the module.
- */
+  // the noGlobStar pattern exits the inGlobStar state
+  this._process(noGlobStar, index, false)
 
-exports = module.exports = __webpack_require__(112);
-exports.init = init;
-exports.log = log;
-exports.formatArgs = formatArgs;
-exports.save = save;
-exports.load = load;
-exports.useColors = useColors;
+  var len = entries.length
+  var isSym = this.symlinks[abs]
 
-/**
- * Colors.
- */
+  // If it's a symlink, and we're in a globstar, then stop
+  if (isSym && inGlobStar)
+    return
 
-exports.colors = [ 6, 2, 3, 4, 5, 1 ];
+  for (var i = 0; i < len; i++) {
+    var e = entries[i]
+    if (e.charAt(0) === '.' && !this.dot)
+      continue
 
-try {
-  var supportsColor = __webpack_require__(239);
-  if (supportsColor && supportsColor.level >= 2) {
-    exports.colors = [
-      20, 21, 26, 27, 32, 33, 38, 39, 40, 41, 42, 43, 44, 45, 56, 57, 62, 63, 68,
-      69, 74, 75, 76, 77, 78, 79, 80, 81, 92, 93, 98, 99, 112, 113, 128, 129, 134,
-      135, 148, 149, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171,
-      172, 173, 178, 179, 184, 185, 196, 197, 198, 199, 200, 201, 202, 203, 204,
-      205, 206, 207, 208, 209, 214, 215, 220, 221
-    ];
+    // these two cases enter the inGlobStar state
+    var instead = gspref.concat(entries[i], remainWithoutGlobStar)
+    this._process(instead, index, true)
+
+    var below = gspref.concat(entries[i], remain)
+    this._process(below, index, true)
   }
-} catch (err) {
-  // swallow - we only care if `supports-color` is available; it doesn't have to be.
 }
 
-/**
- * Build up the default `inspectOpts` object from the environment variables.
- *
- *   $ DEBUG_COLORS=no DEBUG_DEPTH=10 DEBUG_SHOW_HIDDEN=enabled node script.js
- */
+GlobSync.prototype._processSimple = function (prefix, index) {
+  // XXX review this.  Shouldn't it be doing the mounting etc
+  // before doing stat?  kinda weird?
+  var exists = this._stat(prefix)
 
-exports.inspectOpts = Object.keys(process.env).filter(function (key) {
-  return /^debug_/i.test(key);
-}).reduce(function (obj, key) {
-  // camel-case
-  var prop = key
-    .substring(6)
-    .toLowerCase()
-    .replace(/_([a-z])/g, function (_, k) { return k.toUpperCase() });
+  if (!this.matches[index])
+    this.matches[index] = Object.create(null)
 
-  // coerce string value into JS value
-  var val = process.env[key];
-  if (/^(yes|on|true|enabled)$/i.test(val)) val = true;
-  else if (/^(no|off|false|disabled)$/i.test(val)) val = false;
-  else if (val === 'null') val = null;
-  else val = Number(val);
+  // If it doesn't exist, then just mark the lack of results
+  if (!exists)
+    return
 
-  obj[prop] = val;
-  return obj;
-}, {});
+  if (prefix && isAbsolute(prefix) && !this.nomount) {
+    var trail = /[\/\\]$/.test(prefix)
+    if (prefix.charAt(0) === '/') {
+      prefix = path.join(this.root, prefix)
+    } else {
+      prefix = path.resolve(this.root, prefix)
+      if (trail)
+        prefix += '/'
+    }
+  }
 
-/**
- * Is stdout a TTY? Colored output is enabled when `true`.
- */
+  if (process.platform === 'win32')
+    prefix = prefix.replace(/\\/g, '/')
 
-function useColors() {
-  return 'colors' in exports.inspectOpts
-    ? Boolean(exports.inspectOpts.colors)
-    : tty.isatty(process.stderr.fd);
+  // Mark this as a match
+  this._emitMatch(index, prefix)
 }
 
-/**
- * Map %o to `util.inspect()`, all on a single line.
- */
-
-exports.formatters.o = function(v) {
-  this.inspectOpts.colors = this.useColors;
-  return util.inspect(v, this.inspectOpts)
-    .split('\n').map(function(str) {
-      return str.trim()
-    }).join(' ');
-};
+// Returns either 'DIR', 'FILE', or false
+GlobSync.prototype._stat = function (f) {
+  var abs = this._makeAbs(f)
+  var needDir = f.slice(-1) === '/'
 
-/**
- * Map %o to `util.inspect()`, allowing multiple lines if needed.
- */
+  if (f.length > this.maxLength)
+    return false
 
-exports.formatters.O = function(v) {
-  this.inspectOpts.colors = this.useColors;
-  return util.inspect(v, this.inspectOpts);
-};
+  if (!this.stat && ownProp(this.cache, abs)) {
+    var c = this.cache[abs]
 
-/**
- * Adds ANSI color escape codes if enabled.
- *
- * @api public
- */
+    if (Array.isArray(c))
+      c = 'DIR'
 
-function formatArgs(args) {
-  var name = this.namespace;
-  var useColors = this.useColors;
+    // It exists, but maybe not how we need it
+    if (!needDir || c === 'DIR')
+      return c
 
-  if (useColors) {
-    var c = this.color;
-    var colorCode = '\u001b[3' + (c < 8 ? c : '8;5;' + c);
-    var prefix = '  ' + colorCode + ';1m' + name + ' ' + '\u001b[0m';
+    if (needDir && c === 'FILE')
+      return false
 
-    args[0] = prefix + args[0].split('\n').join('\n' + prefix);
-    args.push(colorCode + 'm+' + exports.humanize(this.diff) + '\u001b[0m');
-  } else {
-    args[0] = getDate() + name + ' ' + args[0];
+    // otherwise we have to stat, because maybe c=true
+    // if we know it exists, but not what it is.
   }
-}
 
-function getDate() {
-  if (exports.inspectOpts.hideDate) {
-    return '';
-  } else {
-    return new Date().toISOString() + ' ';
+  var exists
+  var stat = this.statCache[abs]
+  if (!stat) {
+    var lstat
+    try {
+      lstat = fs.lstatSync(abs)
+    } catch (er) {
+      if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) {
+        this.statCache[abs] = false
+        return false
+      }
+    }
+
+    if (lstat && lstat.isSymbolicLink()) {
+      try {
+        stat = fs.statSync(abs)
+      } catch (er) {
+        stat = lstat
+      }
+    } else {
+      stat = lstat
+    }
   }
-}
 
-/**
- * Invokes `util.format()` with the specified arguments and writes to stderr.
- */
+  this.statCache[abs] = stat
 
-function log() {
-  return process.stderr.write(util.format.apply(util, arguments) + '\n');
-}
+  var c = true
+  if (stat)
+    c = stat.isDirectory() ? 'DIR' : 'FILE'
 
-/**
- * Save `namespaces`.
- *
- * @param {String} namespaces
- * @api private
- */
+  this.cache[abs] = this.cache[abs] || c
 
-function save(namespaces) {
-  if (null == namespaces) {
-    // If you set a process.env field to null or undefined, it gets cast to the
-    // string 'null' or 'undefined'. Just delete instead.
-    delete process.env.DEBUG;
-  } else {
-    process.env.DEBUG = namespaces;
-  }
+  if (needDir && c === 'FILE')
+    return false
+
+  return c
 }
 
-/**
- * Load `namespaces`.
- *
- * @return {String} returns the previously persisted debug modes
- * @api private
- */
+GlobSync.prototype._mark = function (p) {
+  return common.mark(this, p)
+}
 
-function load() {
-  return process.env.DEBUG;
+GlobSync.prototype._makeAbs = function (f) {
+  return common.makeAbs(this, f)
 }
 
-/**
- * Init logic for `debug` instances.
- *
- * Create a new `inspectOpts` object in case `useColors` is set
- * differently for a particular `debug` instance.
- */
 
-function init (debug) {
-  debug.inspectOpts = {};
+/***/ }),
+/* 219 */,
+/* 220 */,
+/* 221 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  var keys = Object.keys(exports.inspectOpts);
-  for (var i = 0; i < keys.length; i++) {
-    debug.inspectOpts[keys[i]] = exports.inspectOpts[keys[i]];
-  }
-}
+"use strict";
 
-/**
- * Enable namespaces listed in `process.env.DEBUG` initially.
- */
+module.exports = function (flag, argv) {
+	argv = argv || process.argv;
 
-exports.enable(load());
+	var terminatorPos = argv.indexOf('--');
+	var prefix = /^--/.test(flag) ? '' : '--';
+	var pos = argv.indexOf(prefix + flag);
+
+	return pos !== -1 && (terminatorPos !== -1 ? pos < terminatorPos : true);
+};
 
 
 /***/ }),
-/* 214 */,
-/* 215 */,
-/* 216 */,
-/* 217 */
+/* 222 */,
+/* 223 */
 /***/ (function(module, exports, __webpack_require__) {
 
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-var pathModule = __webpack_require__(0);
-var isWindows = process.platform === 'win32';
-var fs = __webpack_require__(3);
-
-// JavaScript implementation of realpath, ported from node pre-v6
-
-var DEBUG = process.env.NODE_DEBUG && /fs/.test(process.env.NODE_DEBUG);
-
-function rethrow() {
-  // Only enable in debug mode. A backtrace uses ~1000 bytes of heap space and
-  // is fairly slow to generate.
-  var callback;
-  if (DEBUG) {
-    var backtrace = new Error;
-    callback = debugCallback;
-  } else
-    callback = missingCallback;
+var wrappy = __webpack_require__(123)
+var reqs = Object.create(null)
+var once = __webpack_require__(61)
 
-  return callback;
+module.exports = wrappy(inflight)
 
-  function debugCallback(err) {
-    if (err) {
-      backtrace.message = err.message;
-      err = backtrace;
-      missingCallback(err);
-    }
+function inflight (key, cb) {
+  if (reqs[key]) {
+    reqs[key].push(cb)
+    return null
+  } else {
+    reqs[key] = [cb]
+    return makeres(key)
   }
+}
 
-  function missingCallback(err) {
-    if (err) {
-      if (process.throwDeprecation)
-        throw err;  // Forgot a callback but don't know where? Use NODE_DEBUG=fs
-      else if (!process.noDeprecation) {
-        var msg = 'fs: missing callback ' + (err.stack || err.message);
-        if (process.traceDeprecation)
-          console.trace(msg);
-        else
-          console.error(msg);
+function makeres (key) {
+  return once(function RES () {
+    var cbs = reqs[key]
+    var len = cbs.length
+    var args = slice(arguments)
+
+    // XXX It's somewhat ambiguous whether a new callback added in this
+    // pass should be queued for later execution if something in the
+    // list of callbacks throws, or if it should just be discarded.
+    // However, it's such an edge case that it hardly matters, and either
+    // choice is likely as surprising as the other.
+    // As it happens, we do go ahead and schedule it for later execution.
+    try {
+      for (var i = 0; i < len; i++) {
+        cbs[i].apply(null, args)
+      }
+    } finally {
+      if (cbs.length > len) {
+        // added more in the interim.
+        // de-zalgo, just in case, but don't call again.
+        cbs.splice(0, len)
+        process.nextTick(function () {
+          RES.apply(null, args)
+        })
+      } else {
+        delete reqs[key]
       }
     }
-  }
+  })
 }
 
-function maybeCallback(cb) {
-  return typeof cb === 'function' ? cb : rethrow();
+function slice (args) {
+  var length = args.length
+  var array = []
+
+  for (var i = 0; i < length; i++) array[i] = args[i]
+  return array
 }
 
-var normalize = pathModule.normalize;
 
-// Regexp that finds the next partion of a (partial) path
-// result is [base_with_slash, base], e.g. ['somedir/', 'somedir']
-if (isWindows) {
-  var nextPartRe = /(.*?)(?:[\/\\]+|$)/g;
-} else {
-  var nextPartRe = /(.*?)(?:[\/]+|$)/g;
-}
+/***/ }),
+/* 224 */
+/***/ (function(module, exports) {
 
-// Regex to find the device root, including trailing slash. E.g. 'c:\\'.
-if (isWindows) {
-  var splitRootRe = /^(?:[a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/][^\\\/]+)?[\\\/]*/;
+if (typeof Object.create === 'function') {
+  // implementation from standard node.js 'util' module
+  module.exports = function inherits(ctor, superCtor) {
+    ctor.super_ = superCtor
+    ctor.prototype = Object.create(superCtor.prototype, {
+      constructor: {
+        value: ctor,
+        enumerable: false,
+        writable: true,
+        configurable: true
+      }
+    });
+  };
 } else {
-  var splitRootRe = /^[\/]*/;
+  // old school shim for old browsers
+  module.exports = function inherits(ctor, superCtor) {
+    ctor.super_ = superCtor
+    var TempCtor = function () {}
+    TempCtor.prototype = superCtor.prototype
+    ctor.prototype = new TempCtor()
+    ctor.prototype.constructor = ctor
+  }
 }
 
-exports.realpathSync = function realpathSync(p, cache) {
-  // make p is absolute
-  p = pathModule.resolve(p);
-
-  if (cache && Object.prototype.hasOwnProperty.call(cache, p)) {
-    return cache[p];
-  }
 
-  var original = p,
-      seenLinks = {},
-      knownHard = {};
+/***/ }),
+/* 225 */,
+/* 226 */,
+/* 227 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  // current character position in p
-  var pos;
-  // the partial path so far, including a trailing slash if any
-  var current;
-  // the partial path without a trailing slash (except when pointing at a root)
-  var base;
-  // the partial path scanned in the previous round, with slash
-  var previous;
+// @flow
 
-  start();
+/*::
+declare var __webpack_require__: mixed;
+*/
 
-  function start() {
-    // Skip over roots
-    var m = splitRootRe.exec(p);
-    pos = m[0].length;
-    current = m[0];
-    base = m[0];
-    previous = '';
+module.exports = typeof __webpack_require__ !== "undefined";
 
-    // On windows, check that the root exists. On unix there is no need.
-    if (isWindows && !knownHard[base]) {
-      fs.lstatSync(base);
-      knownHard[base] = true;
-    }
-  }
 
-  // walk down the path, swapping out linked pathparts for their real
-  // values
-  // NB: p.length changes.
-  while (pos < p.length) {
-    // find the next part
-    nextPartRe.lastIndex = pos;
-    var result = nextPartRe.exec(p);
-    previous = current;
-    current += result[0];
-    base = previous + result[1];
-    pos = nextPartRe.lastIndex;
+/***/ }),
+/* 228 */,
+/* 229 */
+/***/ (function(module, exports) {
 
-    // continue if not a symlink
-    if (knownHard[base] || (cache && cache[base] === base)) {
-      continue;
-    }
+/**
+ * Helpers.
+ */
 
-    var resolvedLink;
-    if (cache && Object.prototype.hasOwnProperty.call(cache, base)) {
-      // some known symbolic link.  no need to stat again.
-      resolvedLink = cache[base];
-    } else {
-      var stat = fs.lstatSync(base);
-      if (!stat.isSymbolicLink()) {
-        knownHard[base] = true;
-        if (cache) cache[base] = base;
-        continue;
-      }
+var s = 1000;
+var m = s * 60;
+var h = m * 60;
+var d = h * 24;
+var y = d * 365.25;
 
-      // read the link if it wasn't read before
-      // dev/ino always return 0 on windows, so skip the check.
-      var linkTarget = null;
-      if (!isWindows) {
-        var id = stat.dev.toString(32) + ':' + stat.ino.toString(32);
-        if (seenLinks.hasOwnProperty(id)) {
-          linkTarget = seenLinks[id];
-        }
-      }
-      if (linkTarget === null) {
-        fs.statSync(base);
-        linkTarget = fs.readlinkSync(base);
-      }
-      resolvedLink = pathModule.resolve(previous, linkTarget);
-      // track this, if given a cache.
-      if (cache) cache[base] = resolvedLink;
-      if (!isWindows) seenLinks[id] = linkTarget;
-    }
+/**
+ * Parse or format the given `val`.
+ *
+ * Options:
+ *
+ *  - `long` verbose formatting [false]
+ *
+ * @param {String|Number} val
+ * @param {Object} [options]
+ * @throws {Error} throw an error if val is not a non-empty string or a number
+ * @return {String|Number}
+ * @api public
+ */
 
-    // resolve the link, then start over
-    p = pathModule.resolve(resolvedLink, p.slice(pos));
-    start();
+module.exports = function(val, options) {
+  options = options || {};
+  var type = typeof val;
+  if (type === 'string' && val.length > 0) {
+    return parse(val);
+  } else if (type === 'number' && isNaN(val) === false) {
+    return options.long ? fmtLong(val) : fmtShort(val);
   }
-
-  if (cache) cache[original] = p;
-
-  return p;
+  throw new Error(
+    'val is not a non-empty string or a valid number. val=' +
+      JSON.stringify(val)
+  );
 };
 
+/**
+ * Parse the given `str` and return milliseconds.
+ *
+ * @param {String} str
+ * @return {Number}
+ * @api private
+ */
 
-exports.realpath = function realpath(p, cache, cb) {
-  if (typeof cb !== 'function') {
-    cb = maybeCallback(cache);
-    cache = null;
+function parse(str) {
+  str = String(str);
+  if (str.length > 100) {
+    return;
+  }
+  var match = /^((?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|years?|yrs?|y)?$/i.exec(
+    str
+  );
+  if (!match) {
+    return;
+  }
+  var n = parseFloat(match[1]);
+  var type = (match[2] || 'ms').toLowerCase();
+  switch (type) {
+    case 'years':
+    case 'year':
+    case 'yrs':
+    case 'yr':
+    case 'y':
+      return n * y;
+    case 'days':
+    case 'day':
+    case 'd':
+      return n * d;
+    case 'hours':
+    case 'hour':
+    case 'hrs':
+    case 'hr':
+    case 'h':
+      return n * h;
+    case 'minutes':
+    case 'minute':
+    case 'mins':
+    case 'min':
+    case 'm':
+      return n * m;
+    case 'seconds':
+    case 'second':
+    case 'secs':
+    case 'sec':
+    case 's':
+      return n * s;
+    case 'milliseconds':
+    case 'millisecond':
+    case 'msecs':
+    case 'msec':
+    case 'ms':
+      return n;
+    default:
+      return undefined;
   }
+}
 
-  // make p is absolute
-  p = pathModule.resolve(p);
+/**
+ * Short format for `ms`.
+ *
+ * @param {Number} ms
+ * @return {String}
+ * @api private
+ */
 
-  if (cache && Object.prototype.hasOwnProperty.call(cache, p)) {
-    return process.nextTick(cb.bind(null, null, cache[p]));
+function fmtShort(ms) {
+  if (ms >= d) {
+    return Math.round(ms / d) + 'd';
   }
+  if (ms >= h) {
+    return Math.round(ms / h) + 'h';
+  }
+  if (ms >= m) {
+    return Math.round(ms / m) + 'm';
+  }
+  if (ms >= s) {
+    return Math.round(ms / s) + 's';
+  }
+  return ms + 'ms';
+}
 
-  var original = p,
-      seenLinks = {},
-      knownHard = {};
-
-  // current character position in p
-  var pos;
-  // the partial path so far, including a trailing slash if any
-  var current;
-  // the partial path without a trailing slash (except when pointing at a root)
-  var base;
-  // the partial path scanned in the previous round, with slash
-  var previous;
+/**
+ * Long format for `ms`.
+ *
+ * @param {Number} ms
+ * @return {String}
+ * @api private
+ */
 
-  start();
+function fmtLong(ms) {
+  return plural(ms, d, 'day') ||
+    plural(ms, h, 'hour') ||
+    plural(ms, m, 'minute') ||
+    plural(ms, s, 'second') ||
+    ms + ' ms';
+}
 
-  function start() {
-    // Skip over roots
-    var m = splitRootRe.exec(p);
-    pos = m[0].length;
-    current = m[0];
-    base = m[0];
-    previous = '';
+/**
+ * Pluralization helper.
+ */
 
-    // On windows, check that the root exists. On unix there is no need.
-    if (isWindows && !knownHard[base]) {
-      fs.lstat(base, function(err) {
-        if (err) return cb(err);
-        knownHard[base] = true;
-        LOOP();
-      });
-    } else {
-      process.nextTick(LOOP);
-    }
+function plural(ms, n, name) {
+  if (ms < n) {
+    return;
   }
+  if (ms < n * 1.5) {
+    return Math.floor(ms / n) + ' ' + name;
+  }
+  return Math.ceil(ms / n) + ' ' + name + 's';
+}
 
-  // walk down the path, swapping out linked pathparts for their real
-  // values
-  function LOOP() {
-    // stop if scanned past end of path
-    if (pos >= p.length) {
-      if (cache) cache[original] = p;
-      return cb(null, p);
-    }
 
-    // find the next part
-    nextPartRe.lastIndex = pos;
-    var result = nextPartRe.exec(p);
-    previous = current;
-    current += result[0];
-    base = previous + result[1];
-    pos = nextPartRe.lastIndex;
+/***/ }),
+/* 230 */,
+/* 231 */,
+/* 232 */,
+/* 233 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    // continue if not a symlink
-    if (knownHard[base] || (cache && cache[base] === base)) {
-      return process.nextTick(LOOP);
-    }
+module.exports = rimraf
+rimraf.sync = rimrafSync
 
-    if (cache && Object.prototype.hasOwnProperty.call(cache, base)) {
-      // known symbolic link.  no need to stat again.
-      return gotResolvedLink(cache[base]);
-    }
+var assert = __webpack_require__(22)
+var path = __webpack_require__(0)
+var fs = __webpack_require__(3)
+var glob = __webpack_require__(75)
+var _0666 = parseInt('666', 8)
 
-    return fs.lstat(base, gotStat);
-  }
+var defaultGlobOpts = {
+  nosort: true,
+  silent: true
+}
 
-  function gotStat(err, stat) {
-    if (err) return cb(err);
+// for EMFILE handling
+var timeout = 0
 
-    // if not a symlink, skip to the next path part
-    if (!stat.isSymbolicLink()) {
-      knownHard[base] = true;
-      if (cache) cache[base] = base;
-      return process.nextTick(LOOP);
-    }
+var isWindows = (process.platform === "win32")
 
-    // stat & read the link if not read before
-    // call gotTarget as soon as the link target is known
-    // dev/ino always return 0 on windows, so skip the check.
-    if (!isWindows) {
-      var id = stat.dev.toString(32) + ':' + stat.ino.toString(32);
-      if (seenLinks.hasOwnProperty(id)) {
-        return gotTarget(null, seenLinks[id], base);
-      }
-    }
-    fs.stat(base, function(err) {
-      if (err) return cb(err);
+function defaults (options) {
+  var methods = [
+    'unlink',
+    'chmod',
+    'stat',
+    'lstat',
+    'rmdir',
+    'readdir'
+  ]
+  methods.forEach(function(m) {
+    options[m] = options[m] || fs[m]
+    m = m + 'Sync'
+    options[m] = options[m] || fs[m]
+  })
 
-      fs.readlink(base, function(err, target) {
-        if (!isWindows) seenLinks[id] = target;
-        gotTarget(err, target);
-      });
-    });
+  options.maxBusyTries = options.maxBusyTries || 3
+  options.emfileWait = options.emfileWait || 1000
+  if (options.glob === false) {
+    options.disableGlob = true
   }
+  options.disableGlob = options.disableGlob || false
+  options.glob = options.glob || defaultGlobOpts
+}
 
-  function gotTarget(err, target, base) {
-    if (err) return cb(err);
-
-    var resolvedLink = pathModule.resolve(previous, target);
-    if (cache) cache[base] = resolvedLink;
-    gotResolvedLink(resolvedLink);
+function rimraf (p, options, cb) {
+  if (typeof options === 'function') {
+    cb = options
+    options = {}
   }
 
-  function gotResolvedLink(resolvedLink) {
-    // resolve the link, then start over
-    p = pathModule.resolve(resolvedLink, p.slice(pos));
-    start();
-  }
-};
+  assert(p, 'rimraf: missing path')
+  assert.equal(typeof p, 'string', 'rimraf: path should be a string')
+  assert.equal(typeof cb, 'function', 'rimraf: callback function required')
+  assert(options, 'rimraf: invalid options argument provided')
+  assert.equal(typeof options, 'object', 'rimraf: options should be object')
 
+  defaults(options)
 
-/***/ }),
-/* 218 */
-/***/ (function(module, exports, __webpack_require__) {
+  var busyTries = 0
+  var errState = null
+  var n = 0
 
-module.exports = globSync
-globSync.GlobSync = GlobSync
+  if (options.disableGlob || !glob.hasMagic(p))
+    return afterGlob(null, [p])
 
-var fs = __webpack_require__(3)
-var rp = __webpack_require__(114)
-var minimatch = __webpack_require__(60)
-var Minimatch = minimatch.Minimatch
-var Glob = __webpack_require__(75).Glob
-var util = __webpack_require__(2)
-var path = __webpack_require__(0)
-var assert = __webpack_require__(22)
-var isAbsolute = __webpack_require__(76)
-var common = __webpack_require__(115)
-var alphasort = common.alphasort
-var alphasorti = common.alphasorti
-var setopts = common.setopts
-var ownProp = common.ownProp
-var childrenIgnored = common.childrenIgnored
-var isIgnored = common.isIgnored
+  options.lstat(p, function (er, stat) {
+    if (!er)
+      return afterGlob(null, [p])
 
-function globSync (pattern, options) {
-  if (typeof options === 'function' || arguments.length === 3)
-    throw new TypeError('callback provided to sync glob\n'+
-                        'See: https://github.com/isaacs/node-glob/issues/167')
+    glob(p, options.glob, afterGlob)
+  })
 
-  return new GlobSync(pattern, options).found
-}
+  function next (er) {
+    errState = errState || er
+    if (--n === 0)
+      cb(errState)
+  }
 
-function GlobSync (pattern, options) {
-  if (!pattern)
-    throw new Error('must provide pattern')
+  function afterGlob (er, results) {
+    if (er)
+      return cb(er)
 
-  if (typeof options === 'function' || arguments.length === 3)
-    throw new TypeError('callback provided to sync glob\n'+
-                        'See: https://github.com/isaacs/node-glob/issues/167')
+    n = results.length
+    if (n === 0)
+      return cb()
 
-  if (!(this instanceof GlobSync))
-    return new GlobSync(pattern, options)
+    results.forEach(function (p) {
+      rimraf_(p, options, function CB (er) {
+        if (er) {
+          if ((er.code === "EBUSY" || er.code === "ENOTEMPTY" || er.code === "EPERM") &&
+              busyTries < options.maxBusyTries) {
+            busyTries ++
+            var time = busyTries * 100
+            // try again, with the same exact callback as this one.
+            return setTimeout(function () {
+              rimraf_(p, options, CB)
+            }, time)
+          }
 
-  setopts(this, pattern, options)
+          // this one won't happen if graceful-fs is used.
+          if (er.code === "EMFILE" && timeout < options.emfileWait) {
+            return setTimeout(function () {
+              rimraf_(p, options, CB)
+            }, timeout ++)
+          }
 
-  if (this.noprocess)
-    return this
+          // already gone
+          if (er.code === "ENOENT") er = null
+        }
 
-  var n = this.minimatch.set.length
-  this.matches = new Array(n)
-  for (var i = 0; i < n; i ++) {
-    this._process(this.minimatch.set[i], i, false)
+        timeout = 0
+        next(er)
+      })
+    })
   }
-  this._finish()
 }
 
-GlobSync.prototype._finish = function () {
-  assert(this instanceof GlobSync)
-  if (this.realpath) {
-    var self = this
-    this.matches.forEach(function (matchset, index) {
-      var set = self.matches[index] = Object.create(null)
-      for (var p in matchset) {
-        try {
-          p = self._makeAbs(p)
-          var real = rp.realpathSync(p, self.realpathCache)
-          set[real] = true
-        } catch (er) {
-          if (er.syscall === 'stat')
-            set[self._makeAbs(p)] = true
-          else
-            throw er
-        }
+// Two possible strategies.
+// 1. Assume it's a file.  unlink it, then do the dir stuff on EPERM or EISDIR
+// 2. Assume it's a directory.  readdir, then do the file stuff on ENOTDIR
+//
+// Both result in an extra syscall when you guess wrong.  However, there
+// are likely far more normal files in the world than directories.  This
+// is based on the assumption that a the average number of files per
+// directory is >= 1.
+//
+// If anyone ever complains about this, then I guess the strategy could
+// be made configurable somehow.  But until then, YAGNI.
+function rimraf_ (p, options, cb) {
+  assert(p)
+  assert(options)
+  assert(typeof cb === 'function')
+
+  // sunos lets the root user unlink directories, which is... weird.
+  // so we have to lstat here and make sure it's not a dir.
+  options.lstat(p, function (er, st) {
+    if (er && er.code === "ENOENT")
+      return cb(null)
+
+    // Windows can EPERM on stat.  Life is suffering.
+    if (er && er.code === "EPERM" && isWindows)
+      fixWinEPERM(p, options, er, cb)
+
+    if (st && st.isDirectory())
+      return rmdir(p, options, er, cb)
+
+    options.unlink(p, function (er) {
+      if (er) {
+        if (er.code === "ENOENT")
+          return cb(null)
+        if (er.code === "EPERM")
+          return (isWindows)
+            ? fixWinEPERM(p, options, er, cb)
+            : rmdir(p, options, er, cb)
+        if (er.code === "EISDIR")
+          return rmdir(p, options, er, cb)
       }
+      return cb(er)
     })
-  }
-  common.finish(this)
+  })
 }
 
+function fixWinEPERM (p, options, er, cb) {
+  assert(p)
+  assert(options)
+  assert(typeof cb === 'function')
+  if (er)
+    assert(er instanceof Error)
 
-GlobSync.prototype._process = function (pattern, index, inGlobStar) {
-  assert(this instanceof GlobSync)
+  options.chmod(p, _0666, function (er2) {
+    if (er2)
+      cb(er2.code === "ENOENT" ? null : er)
+    else
+      options.stat(p, function(er3, stats) {
+        if (er3)
+          cb(er3.code === "ENOENT" ? null : er)
+        else if (stats.isDirectory())
+          rmdir(p, options, er, cb)
+        else
+          options.unlink(p, cb)
+      })
+  })
+}
 
-  // Get the first [n] parts of pattern that are all strings.
-  var n = 0
-  while (typeof pattern[n] === 'string') {
-    n ++
-  }
-  // now n is the index of the first one that is *not* a string.
+function fixWinEPERMSync (p, options, er) {
+  assert(p)
+  assert(options)
+  if (er)
+    assert(er instanceof Error)
 
-  // See if there's anything else
-  var prefix
-  switch (n) {
-    // if not, then this is rather simple
-    case pattern.length:
-      this._processSimple(pattern.join('/'), index)
+  try {
+    options.chmodSync(p, _0666)
+  } catch (er2) {
+    if (er2.code === "ENOENT")
       return
+    else
+      throw er
+  }
 
-    case 0:
-      // pattern *starts* with some non-trivial item.
-      // going to readdir(cwd), but not include the prefix in matches.
-      prefix = null
-      break
-
-    default:
-      // pattern has some string bits in the front.
-      // whatever it starts with, whether that's 'absolute' like /foo/bar,
-      // or 'relative' like '../baz'
-      prefix = pattern.slice(0, n).join('/')
-      break
+  try {
+    var stats = options.statSync(p)
+  } catch (er3) {
+    if (er3.code === "ENOENT")
+      return
+    else
+      throw er
   }
 
-  var remain = pattern.slice(n)
+  if (stats.isDirectory())
+    rmdirSync(p, options, er)
+  else
+    options.unlinkSync(p)
+}
 
-  // get the list of entries.
-  var read
-  if (prefix === null)
-    read = '.'
-  else if (isAbsolute(prefix) || isAbsolute(pattern.join('/'))) {
-    if (!prefix || !isAbsolute(prefix))
-      prefix = '/' + prefix
-    read = prefix
-  } else
-    read = prefix
+function rmdir (p, options, originalEr, cb) {
+  assert(p)
+  assert(options)
+  if (originalEr)
+    assert(originalEr instanceof Error)
+  assert(typeof cb === 'function')
 
-  var abs = this._makeAbs(read)
+  // try to rmdir first, and only readdir on ENOTEMPTY or EEXIST (SunOS)
+  // if we guessed wrong, and it's not a directory, then
+  // raise the original error.
+  options.rmdir(p, function (er) {
+    if (er && (er.code === "ENOTEMPTY" || er.code === "EEXIST" || er.code === "EPERM"))
+      rmkids(p, options, cb)
+    else if (er && er.code === "ENOTDIR")
+      cb(originalEr)
+    else
+      cb(er)
+  })
+}
 
-  //if ignored, skip processing
-  if (childrenIgnored(this, read))
-    return
+function rmkids(p, options, cb) {
+  assert(p)
+  assert(options)
+  assert(typeof cb === 'function')
 
-  var isGlobStar = remain[0] === minimatch.GLOBSTAR
-  if (isGlobStar)
-    this._processGlobStar(prefix, read, abs, remain, index, inGlobStar)
-  else
-    this._processReaddir(prefix, read, abs, remain, index, inGlobStar)
+  options.readdir(p, function (er, files) {
+    if (er)
+      return cb(er)
+    var n = files.length
+    if (n === 0)
+      return options.rmdir(p, cb)
+    var errState
+    files.forEach(function (f) {
+      rimraf(path.join(p, f), options, function (er) {
+        if (errState)
+          return
+        if (er)
+          return cb(errState = er)
+        if (--n === 0)
+          options.rmdir(p, cb)
+      })
+    })
+  })
 }
 
+// this looks simpler, and is strictly *faster*, but will
+// tie up the JavaScript thread and fail on excessively
+// deep directory trees.
+function rimrafSync (p, options) {
+  options = options || {}
+  defaults(options)
 
-GlobSync.prototype._processReaddir = function (prefix, read, abs, remain, index, inGlobStar) {
-  var entries = this._readdir(abs, inGlobStar)
-
-  // if the abs isn't a dir, then nothing can match!
-  if (!entries)
-    return
+  assert(p, 'rimraf: missing path')
+  assert.equal(typeof p, 'string', 'rimraf: path should be a string')
+  assert(options, 'rimraf: missing options')
+  assert.equal(typeof options, 'object', 'rimraf: options should be object')
 
-  // It will only match dot entries if it starts with a dot, or if
-  // dot is set.  Stuff like @(.foo|.bar) isn't allowed.
-  var pn = remain[0]
-  var negate = !!this.minimatch.negate
-  var rawGlob = pn._glob
-  var dotOk = this.dot || rawGlob.charAt(0) === '.'
+  var results
 
-  var matchedEntries = []
-  for (var i = 0; i < entries.length; i++) {
-    var e = entries[i]
-    if (e.charAt(0) !== '.' || dotOk) {
-      var m
-      if (negate && !prefix) {
-        m = !e.match(pn)
-      } else {
-        m = e.match(pn)
-      }
-      if (m)
-        matchedEntries.push(e)
+  if (options.disableGlob || !glob.hasMagic(p)) {
+    results = [p]
+  } else {
+    try {
+      options.lstatSync(p)
+      results = [p]
+    } catch (er) {
+      results = glob.sync(p, options.glob)
     }
   }
 
-  var len = matchedEntries.length
-  // If there are no matched entries, then nothing matches.
-  if (len === 0)
+  if (!results.length)
     return
 
-  // if this is the last remaining pattern bit, then no need for
-  // an additional stat *unless* the user has specified mark or
-  // stat explicitly.  We know they exist, since readdir returned
-  // them.
-
-  if (remain.length === 1 && !this.mark && !this.stat) {
-    if (!this.matches[index])
-      this.matches[index] = Object.create(null)
+  for (var i = 0; i < results.length; i++) {
+    var p = results[i]
 
-    for (var i = 0; i < len; i ++) {
-      var e = matchedEntries[i]
-      if (prefix) {
-        if (prefix.slice(-1) !== '/')
-          e = prefix + '/' + e
-        else
-          e = prefix + e
-      }
+    try {
+      var st = options.lstatSync(p)
+    } catch (er) {
+      if (er.code === "ENOENT")
+        return
 
-      if (e.charAt(0) === '/' && !this.nomount) {
-        e = path.join(this.root, e)
-      }
-      this._emitMatch(index, e)
+      // Windows can EPERM on stat.  Life is suffering.
+      if (er.code === "EPERM" && isWindows)
+        fixWinEPERMSync(p, options, er)
     }
-    // This was the last one, and no stats were needed
-    return
-  }
-
-  // now test all matched entries as stand-ins for that part
-  // of the pattern.
-  remain.shift()
-  for (var i = 0; i < len; i ++) {
-    var e = matchedEntries[i]
-    var newPattern
-    if (prefix)
-      newPattern = [prefix, e]
-    else
-      newPattern = [e]
-    this._process(newPattern.concat(remain), index, inGlobStar)
-  }
-}
-
-
-GlobSync.prototype._emitMatch = function (index, e) {
-  if (isIgnored(this, e))
-    return
-
-  var abs = this._makeAbs(e)
 
-  if (this.mark)
-    e = this._mark(e)
+    try {
+      // sunos lets the root user unlink directories, which is... weird.
+      if (st && st.isDirectory())
+        rmdirSync(p, options, null)
+      else
+        options.unlinkSync(p)
+    } catch (er) {
+      if (er.code === "ENOENT")
+        return
+      if (er.code === "EPERM")
+        return isWindows ? fixWinEPERMSync(p, options, er) : rmdirSync(p, options, er)
+      if (er.code !== "EISDIR")
+        throw er
 
-  if (this.absolute) {
-    e = abs
+      rmdirSync(p, options, er)
+    }
   }
+}
 
-  if (this.matches[index][e])
-    return
+function rmdirSync (p, options, originalEr) {
+  assert(p)
+  assert(options)
+  if (originalEr)
+    assert(originalEr instanceof Error)
 
-  if (this.nodir) {
-    var c = this.cache[abs]
-    if (c === 'DIR' || Array.isArray(c))
+  try {
+    options.rmdirSync(p)
+  } catch (er) {
+    if (er.code === "ENOENT")
       return
+    if (er.code === "ENOTDIR")
+      throw originalEr
+    if (er.code === "ENOTEMPTY" || er.code === "EEXIST" || er.code === "EPERM")
+      rmkidsSync(p, options)
   }
-
-  this.matches[index][e] = true
-
-  if (this.stat)
-    this._stat(e)
 }
 
+function rmkidsSync (p, options) {
+  assert(p)
+  assert(options)
+  options.readdirSync(p).forEach(function (f) {
+    rimrafSync(path.join(p, f), options)
+  })
 
-GlobSync.prototype._readdirInGlobStar = function (abs) {
-  // follow all symlinked directories forever
-  // just proceed as if this is a non-globstar situation
-  if (this.follow)
-    return this._readdir(abs, false)
-
-  var entries
-  var lstat
-  var stat
-  try {
-    lstat = fs.lstatSync(abs)
-  } catch (er) {
-    if (er.code === 'ENOENT') {
-      // lstat failed, doesn't exist
-      return null
+  // We only end up here once we got ENOTEMPTY at least once, and
+  // at this point, we are guaranteed to have removed all the kids.
+  // So, we know that it won't be ENOENT or ENOTDIR or anything else.
+  // try really hard to delete stuff on windows, because it has a
+  // PROFOUNDLY annoying habit of not closing handles promptly when
+  // files are deleted, resulting in spurious ENOTEMPTY errors.
+  var retries = isWindows ? 100 : 1
+  var i = 0
+  do {
+    var threw = true
+    try {
+      var ret = options.rmdirSync(p, options)
+      threw = false
+      return ret
+    } finally {
+      if (++i < retries && threw)
+        continue
     }
-  }
+  } while (true)
+}
 
-  var isSym = lstat && lstat.isSymbolicLink()
-  this.symlinks[abs] = isSym
 
-  // If it's not a symlink or a dir, then it's definitely a regular file.
-  // don't bother doing a readdir in that case.
-  if (!isSym && lstat && !lstat.isDirectory())
-    this.cache[abs] = 'FILE'
-  else
-    entries = this._readdir(abs, false)
+/***/ }),
+/* 234 */,
+/* 235 */,
+/* 236 */,
+/* 237 */,
+/* 238 */,
+/* 239 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  return entries
-}
+"use strict";
 
-GlobSync.prototype._readdir = function (abs, inGlobStar) {
-  var entries
+var hasFlag = __webpack_require__(221);
 
-  if (inGlobStar && !ownProp(this.symlinks, abs))
-    return this._readdirInGlobStar(abs)
+var support = function (level) {
+	if (level === 0) {
+		return false;
+	}
 
-  if (ownProp(this.cache, abs)) {
-    var c = this.cache[abs]
-    if (!c || c === 'FILE')
-      return null
+	return {
+		level: level,
+		hasBasic: true,
+		has256: level >= 2,
+		has16m: level >= 3
+	};
+};
 
-    if (Array.isArray(c))
-      return c
-  }
+var supportLevel = (function () {
+	if (hasFlag('no-color') ||
+		hasFlag('no-colors') ||
+		hasFlag('color=false')) {
+		return 0;
+	}
 
-  try {
-    return this._readdirEntries(abs, fs.readdirSync(abs))
-  } catch (er) {
-    this._readdirError(abs, er)
-    return null
-  }
-}
+	if (hasFlag('color=16m') ||
+		hasFlag('color=full') ||
+		hasFlag('color=truecolor')) {
+		return 3;
+	}
 
-GlobSync.prototype._readdirEntries = function (abs, entries) {
-  // if we haven't asked to stat everything, then just
-  // assume that everything in there exists, so we can avoid
-  // having to stat it a second time.
-  if (!this.mark && !this.stat) {
-    for (var i = 0; i < entries.length; i ++) {
-      var e = entries[i]
-      if (abs === '/')
-        e = abs + e
-      else
-        e = abs + '/' + e
-      this.cache[e] = true
-    }
-  }
+	if (hasFlag('color=256')) {
+		return 2;
+	}
 
-  this.cache[abs] = entries
+	if (hasFlag('color') ||
+		hasFlag('colors') ||
+		hasFlag('color=true') ||
+		hasFlag('color=always')) {
+		return 1;
+	}
 
-  // mark and cache dir-ness
-  return entries
-}
+	if (process.stdout && !process.stdout.isTTY) {
+		return 0;
+	}
 
-GlobSync.prototype._readdirError = function (f, er) {
-  // handle errors, and cache the information
-  switch (er.code) {
-    case 'ENOTSUP': // https://github.com/isaacs/node-glob/issues/205
-    case 'ENOTDIR': // totally normal. means it *does* exist.
-      var abs = this._makeAbs(f)
-      this.cache[abs] = 'FILE'
-      if (abs === this.cwdAbs) {
-        var error = new Error(er.code + ' invalid cwd ' + this.cwd)
-        error.path = this.cwd
-        error.code = er.code
-        throw error
-      }
-      break
+	if (process.platform === 'win32') {
+		return 1;
+	}
 
-    case 'ENOENT': // not terribly unusual
-    case 'ELOOP':
-    case 'ENAMETOOLONG':
-    case 'UNKNOWN':
-      this.cache[this._makeAbs(f)] = false
-      break
+	if ('CI' in process.env) {
+		if ('TRAVIS' in process.env || process.env.CI === 'Travis') {
+			return 1;
+		}
 
-    default: // some unusual error.  Treat as failure.
-      this.cache[this._makeAbs(f)] = false
-      if (this.strict)
-        throw er
-      if (!this.silent)
-        console.error('glob error', er)
-      break
-  }
-}
+		return 0;
+	}
 
-GlobSync.prototype._processGlobStar = function (prefix, read, abs, remain, index, inGlobStar) {
+	if ('TEAMCITY_VERSION' in process.env) {
+		return process.env.TEAMCITY_VERSION.match(/^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/) === null ? 0 : 1;
+	}
 
-  var entries = this._readdir(abs, inGlobStar)
+	if (/^(screen|xterm)-256(?:color)?/.test(process.env.TERM)) {
+		return 2;
+	}
 
-  // no entries means not a dir, so it can never have matches
-  // foo.txt/** doesn't match foo.txt
-  if (!entries)
-    return
+	if (/^screen|^xterm|^vt100|color|ansi|cygwin|linux/i.test(process.env.TERM)) {
+		return 1;
+	}
 
-  // test without the globstar, and with every child both below
-  // and replacing the globstar.
-  var remainWithoutGlobStar = remain.slice(1)
-  var gspref = prefix ? [ prefix ] : []
-  var noGlobStar = gspref.concat(remainWithoutGlobStar)
+	if ('COLORTERM' in process.env) {
+		return 1;
+	}
 
-  // the noGlobStar pattern exits the inGlobStar state
-  this._process(noGlobStar, index, false)
+	if (process.env.TERM === 'dumb') {
+		return 0;
+	}
 
-  var len = entries.length
-  var isSym = this.symlinks[abs]
+	return 0;
+})();
 
-  // If it's a symlink, and we're in a globstar, then stop
-  if (isSym && inGlobStar)
-    return
+if (supportLevel === 0 && 'FORCE_COLOR' in process.env) {
+	supportLevel = 1;
+}
 
-  for (var i = 0; i < len; i++) {
-    var e = entries[i]
-    if (e.charAt(0) === '.' && !this.dot)
-      continue
+module.exports = process && support(supportLevel);
 
-    // these two cases enter the inGlobStar state
-    var instead = gspref.concat(entries[i], remainWithoutGlobStar)
-    this._process(instead, index, true)
 
-    var below = gspref.concat(entries[i], remain)
-    this._process(below, index, true)
-  }
-}
+/***/ })
+/******/ ]);
 
-GlobSync.prototype._processSimple = function (prefix, index) {
-  // XXX review this.  Shouldn't it be doing the mounting etc
-  // before doing stat?  kinda weird?
-  var exists = this._stat(prefix)
+/***/ }),
+/* 285 */
+/***/ (function(module, exports) {
 
-  if (!this.matches[index])
-    this.matches[index] = Object.create(null)
+module.exports = require("buffer");
 
-  // If it doesn't exist, then just mark the lack of results
-  if (!exists)
-    return
+/***/ }),
+/* 286 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  if (prefix && isAbsolute(prefix) && !this.nomount) {
-    var trail = /[\/\\]$/.test(prefix)
-    if (prefix.charAt(0) === '/') {
-      prefix = path.join(this.root, prefix)
-    } else {
-      prefix = path.resolve(this.root, prefix)
-      if (trail)
-        prefix += '/'
-    }
-  }
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "BootstrapCacheFile", function() { return BootstrapCacheFile; });
+/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(133);
+/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-  if (process.platform === 'win32')
-    prefix = prefix.replace(/\\/g, '/')
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
-  // Mark this as a match
-  this._emitMatch(index, prefix)
-}
 
-// Returns either 'DIR', 'FILE', or false
-GlobSync.prototype._stat = function (f) {
-  var abs = this._makeAbs(f)
-  var needDir = f.slice(-1) === '/'
+class BootstrapCacheFile {
+  constructor(kbn, project, checksums) {
+    _defineProperty(this, "path", void 0);
 
-  if (f.length > this.maxLength)
-    return false
+    _defineProperty(this, "expectedValue", void 0);
 
-  if (!this.stat && ownProp(this.cache, abs)) {
-    var c = this.cache[abs]
+    this.path = path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(project.targetLocation, '.bootstrap-cache');
 
-    if (Array.isArray(c))
-      c = 'DIR'
+    if (!checksums) {
+      return;
+    }
 
-    // It exists, but maybe not how we need it
-    if (!needDir || c === 'DIR')
-      return c
+    const projectAndDepCacheKeys = Array.from(kbn.getProjectAndDeps(project.name).values()) // sort deps by name so that the key is stable
+    .sort((a, b) => a.name.localeCompare(b.name)) // get the cacheKey for each project, return undefined if the cache key couldn't be determined
+    .map(p => {
+      const cacheKey = checksums.get(p.name);
 
-    if (needDir && c === 'FILE')
-      return false
+      if (cacheKey) {
+        return `${p.name}:${cacheKey}`;
+      }
+    }); // if any of the relevant cache keys are undefined then the projectCacheKey must be too
 
-    // otherwise we have to stat, because maybe c=true
-    // if we know it exists, but not what it is.
+    this.expectedValue = projectAndDepCacheKeys.some(k => !k) ? undefined : [`# this is only human readable for debugging, please don't try to parse this`, ...projectAndDepCacheKeys].join('\n');
   }
 
-  var exists
-  var stat = this.statCache[abs]
-  if (!stat) {
-    var lstat
+  isValid() {
+    if (!this.expectedValue) {
+      return false;
+    }
+
     try {
-      lstat = fs.lstatSync(abs)
-    } catch (er) {
-      if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) {
-        this.statCache[abs] = false
-        return false
+      return fs__WEBPACK_IMPORTED_MODULE_0___default.a.readFileSync(this.path, 'utf8') === this.expectedValue;
+    } catch (error) {
+      if (error.code === 'ENOENT') {
+        return false;
       }
+
+      throw error;
     }
+  }
 
-    if (lstat && lstat.isSymbolicLink()) {
-      try {
-        stat = fs.statSync(abs)
-      } catch (er) {
-        stat = lstat
+  delete() {
+    try {
+      fs__WEBPACK_IMPORTED_MODULE_0___default.a.unlinkSync(this.path);
+    } catch (error) {
+      if (error.code !== 'ENOENT') {
+        throw error;
       }
-    } else {
-      stat = lstat
     }
   }
 
-  this.statCache[abs] = stat
-
-  var c = true
-  if (stat)
-    c = stat.isDirectory() ? 'DIR' : 'FILE'
-
-  this.cache[abs] = this.cache[abs] || c
-
-  if (needDir && c === 'FILE')
-    return false
-
-  return c
-}
+  write() {
+    if (!this.expectedValue) {
+      return;
+    }
 
-GlobSync.prototype._mark = function (p) {
-  return common.mark(this, p)
-}
+    fs__WEBPACK_IMPORTED_MODULE_0___default.a.mkdirSync(path__WEBPACK_IMPORTED_MODULE_1___default.a.dirname(this.path), {
+      recursive: true
+    });
+    fs__WEBPACK_IMPORTED_MODULE_0___default.a.writeFileSync(this.path, this.expectedValue);
+  }
 
-GlobSync.prototype._makeAbs = function (f) {
-  return common.makeAbs(this, f)
 }
 
-
 /***/ }),
-/* 219 */,
-/* 220 */,
-/* 221 */
-/***/ (function(module, exports, __webpack_require__) {
+/* 287 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CleanCommand", function() { return CleanCommand; });
+/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(288);
+/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(del__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(375);
+/* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(ora__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(130);
+/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(143);
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
-module.exports = function (flag, argv) {
-	argv = argv || process.argv;
 
-	var terminatorPos = argv.indexOf('--');
-	var prefix = /^--/.test(flag) ? '' : '--';
-	var pos = argv.indexOf(prefix + flag);
 
-	return pos !== -1 && (terminatorPos !== -1 ? pos < terminatorPos : true);
-};
 
 
-/***/ }),
-/* 222 */,
-/* 223 */
-/***/ (function(module, exports, __webpack_require__) {
+const CleanCommand = {
+  description: 'Remove the node_modules and target directories from all projects.',
+  name: 'clean',
 
-var wrappy = __webpack_require__(123)
-var reqs = Object.create(null)
-var once = __webpack_require__(61)
+  async run(projects) {
+    const toDelete = [];
 
-module.exports = wrappy(inflight)
+    for (const project of projects.values()) {
+      if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_3__["isDirectory"])(project.nodeModulesLocation)) {
+        toDelete.push({
+          cwd: project.path,
+          pattern: Object(path__WEBPACK_IMPORTED_MODULE_2__["relative"])(project.path, project.nodeModulesLocation)
+        });
+      }
 
-function inflight (key, cb) {
-  if (reqs[key]) {
-    reqs[key].push(cb)
-    return null
-  } else {
-    reqs[key] = [cb]
-    return makeres(key)
-  }
-}
+      if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_3__["isDirectory"])(project.targetLocation)) {
+        toDelete.push({
+          cwd: project.path,
+          pattern: Object(path__WEBPACK_IMPORTED_MODULE_2__["relative"])(project.path, project.targetLocation)
+        });
+      }
 
-function makeres (key) {
-  return once(function RES () {
-    var cbs = reqs[key]
-    var len = cbs.length
-    var args = slice(arguments)
+      const {
+        extraPatterns
+      } = project.getCleanConfig();
 
-    // XXX It's somewhat ambiguous whether a new callback added in this
-    // pass should be queued for later execution if something in the
-    // list of callbacks throws, or if it should just be discarded.
-    // However, it's such an edge case that it hardly matters, and either
-    // choice is likely as surprising as the other.
-    // As it happens, we do go ahead and schedule it for later execution.
-    try {
-      for (var i = 0; i < len; i++) {
-        cbs[i].apply(null, args)
-      }
-    } finally {
-      if (cbs.length > len) {
-        // added more in the interim.
-        // de-zalgo, just in case, but don't call again.
-        cbs.splice(0, len)
-        process.nextTick(function () {
-          RES.apply(null, args)
-        })
-      } else {
-        delete reqs[key]
+      if (extraPatterns) {
+        toDelete.push({
+          cwd: project.path,
+          pattern: extraPatterns
+        });
       }
     }
-  })
-}
-
-function slice (args) {
-  var length = args.length
-  var array = []
 
-  for (var i = 0; i < length; i++) array[i] = args[i]
-  return array
-}
+    if (toDelete.length === 0) {
+      _utils_log__WEBPACK_IMPORTED_MODULE_4__["log"].success('Nothing to delete');
+    } else {
+      /**
+       * In order to avoid patterns like `/build` in packages from accidentally
+       * impacting files outside the package we use `process.chdir()` to change
+       * the cwd to the package and execute `del()` without the `force` option
+       * so it will check that each file being deleted is within the package.
+       *
+       * `del()` does support a `cwd` option, but it's only for resolving the
+       * patterns and does not impact the cwd check.
+       */
+      const originalCwd = process.cwd();
 
+      try {
+        for (const {
+          pattern,
+          cwd
+        } of toDelete) {
+          process.chdir(cwd);
+          const promise = del__WEBPACK_IMPORTED_MODULE_0___default()(pattern);
 
-/***/ }),
-/* 224 */
-/***/ (function(module, exports) {
+          if (_utils_log__WEBPACK_IMPORTED_MODULE_4__["log"].wouldLogLevel('info')) {
+            ora__WEBPACK_IMPORTED_MODULE_1___default.a.promise(promise, Object(path__WEBPACK_IMPORTED_MODULE_2__["relative"])(originalCwd, Object(path__WEBPACK_IMPORTED_MODULE_2__["join"])(cwd, String(pattern))));
+          }
 
-if (typeof Object.create === 'function') {
-  // implementation from standard node.js 'util' module
-  module.exports = function inherits(ctor, superCtor) {
-    ctor.super_ = superCtor
-    ctor.prototype = Object.create(superCtor.prototype, {
-      constructor: {
-        value: ctor,
-        enumerable: false,
-        writable: true,
-        configurable: true
+          await promise;
+        }
+      } finally {
+        process.chdir(originalCwd);
       }
-    });
-  };
-} else {
-  // old school shim for old browsers
-  module.exports = function inherits(ctor, superCtor) {
-    ctor.super_ = superCtor
-    var TempCtor = function () {}
-    TempCtor.prototype = superCtor.prototype
-    ctor.prototype = new TempCtor()
-    ctor.prototype.constructor = ctor
+    }
   }
-}
 
+};
 
 /***/ }),
-/* 225 */,
-/* 226 */,
-/* 227 */
+/* 288 */
 /***/ (function(module, exports, __webpack_require__) {
 
-// @flow
+"use strict";
 
-/*::
-declare var __webpack_require__: mixed;
-*/
+const {promisify} = __webpack_require__(111);
+const path = __webpack_require__(4);
+const globby = __webpack_require__(289);
+const isGlob = __webpack_require__(367);
+const slash = __webpack_require__(365);
+const gracefulFs = __webpack_require__(132);
+const isPathCwd = __webpack_require__(368);
+const isPathInside = __webpack_require__(369);
+const rimraf = __webpack_require__(370);
+const pMap = __webpack_require__(371);
 
-module.exports = typeof __webpack_require__ !== "undefined";
+const rimrafP = promisify(rimraf);
 
+const rimrafOptions = {
+	glob: false,
+	unlink: gracefulFs.unlink,
+	unlinkSync: gracefulFs.unlinkSync,
+	chmod: gracefulFs.chmod,
+	chmodSync: gracefulFs.chmodSync,
+	stat: gracefulFs.stat,
+	statSync: gracefulFs.statSync,
+	lstat: gracefulFs.lstat,
+	lstatSync: gracefulFs.lstatSync,
+	rmdir: gracefulFs.rmdir,
+	rmdirSync: gracefulFs.rmdirSync,
+	readdir: gracefulFs.readdir,
+	readdirSync: gracefulFs.readdirSync
+};
 
-/***/ }),
-/* 228 */,
-/* 229 */
-/***/ (function(module, exports) {
+function safeCheck(file, cwd) {
+	if (isPathCwd(file)) {
+		throw new Error('Cannot delete the current working directory. Can be overridden with the `force` option.');
+	}
 
-/**
- * Helpers.
- */
+	if (!isPathInside(file, cwd)) {
+		throw new Error('Cannot delete files/directories outside the current working directory. Can be overridden with the `force` option.');
+	}
+}
 
-var s = 1000;
-var m = s * 60;
-var h = m * 60;
-var d = h * 24;
-var y = d * 365.25;
-
-/**
- * Parse or format the given `val`.
- *
- * Options:
- *
- *  - `long` verbose formatting [false]
- *
- * @param {String|Number} val
- * @param {Object} [options]
- * @throws {Error} throw an error if val is not a non-empty string or a number
- * @return {String|Number}
- * @api public
- */
+function normalizePatterns(patterns) {
+	patterns = Array.isArray(patterns) ? patterns : [patterns];
 
-module.exports = function(val, options) {
-  options = options || {};
-  var type = typeof val;
-  if (type === 'string' && val.length > 0) {
-    return parse(val);
-  } else if (type === 'number' && isNaN(val) === false) {
-    return options.long ? fmtLong(val) : fmtShort(val);
-  }
-  throw new Error(
-    'val is not a non-empty string or a valid number. val=' +
-      JSON.stringify(val)
-  );
-};
+	patterns = patterns.map(pattern => {
+		if (process.platform === 'win32' && isGlob(pattern) === false) {
+			return slash(pattern);
+		}
 
-/**
- * Parse the given `str` and return milliseconds.
- *
- * @param {String} str
- * @return {Number}
- * @api private
- */
+		return pattern;
+	});
 
-function parse(str) {
-  str = String(str);
-  if (str.length > 100) {
-    return;
-  }
-  var match = /^((?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|years?|yrs?|y)?$/i.exec(
-    str
-  );
-  if (!match) {
-    return;
-  }
-  var n = parseFloat(match[1]);
-  var type = (match[2] || 'ms').toLowerCase();
-  switch (type) {
-    case 'years':
-    case 'year':
-    case 'yrs':
-    case 'yr':
-    case 'y':
-      return n * y;
-    case 'days':
-    case 'day':
-    case 'd':
-      return n * d;
-    case 'hours':
-    case 'hour':
-    case 'hrs':
-    case 'hr':
-    case 'h':
-      return n * h;
-    case 'minutes':
-    case 'minute':
-    case 'mins':
-    case 'min':
-    case 'm':
-      return n * m;
-    case 'seconds':
-    case 'second':
-    case 'secs':
-    case 'sec':
-    case 's':
-      return n * s;
-    case 'milliseconds':
-    case 'millisecond':
-    case 'msecs':
-    case 'msec':
-    case 'ms':
-      return n;
-    default:
-      return undefined;
-  }
+	return patterns;
 }
 
-/**
- * Short format for `ms`.
- *
- * @param {Number} ms
- * @return {String}
- * @api private
- */
-
-function fmtShort(ms) {
-  if (ms >= d) {
-    return Math.round(ms / d) + 'd';
-  }
-  if (ms >= h) {
-    return Math.round(ms / h) + 'h';
-  }
-  if (ms >= m) {
-    return Math.round(ms / m) + 'm';
-  }
-  if (ms >= s) {
-    return Math.round(ms / s) + 's';
-  }
-  return ms + 'ms';
-}
+module.exports = async (patterns, {force, dryRun, cwd = process.cwd(), ...options} = {}) => {
+	options = {
+		expandDirectories: false,
+		onlyFiles: false,
+		followSymbolicLinks: false,
+		cwd,
+		...options
+	};
 
-/**
- * Long format for `ms`.
- *
- * @param {Number} ms
- * @return {String}
- * @api private
- */
+	patterns = normalizePatterns(patterns);
 
-function fmtLong(ms) {
-  return plural(ms, d, 'day') ||
-    plural(ms, h, 'hour') ||
-    plural(ms, m, 'minute') ||
-    plural(ms, s, 'second') ||
-    ms + ' ms';
-}
+	const files = (await globby(patterns, options))
+		.sort((a, b) => b.localeCompare(a));
 
-/**
- * Pluralization helper.
- */
+	const mapper = async file => {
+		file = path.resolve(cwd, file);
 
-function plural(ms, n, name) {
-  if (ms < n) {
-    return;
-  }
-  if (ms < n * 1.5) {
-    return Math.floor(ms / n) + ' ' + name;
-  }
-  return Math.ceil(ms / n) + ' ' + name + 's';
-}
+		if (!force) {
+			safeCheck(file, cwd);
+		}
 
+		if (!dryRun) {
+			await rimrafP(file, rimrafOptions);
+		}
 
-/***/ }),
-/* 230 */,
-/* 231 */,
-/* 232 */,
-/* 233 */
-/***/ (function(module, exports, __webpack_require__) {
+		return file;
+	};
 
-module.exports = rimraf
-rimraf.sync = rimrafSync
+	const removedFiles = await pMap(files, mapper, options);
 
-var assert = __webpack_require__(22)
-var path = __webpack_require__(0)
-var fs = __webpack_require__(3)
-var glob = __webpack_require__(75)
-var _0666 = parseInt('666', 8)
+	removedFiles.sort((a, b) => a.localeCompare(b));
 
-var defaultGlobOpts = {
-  nosort: true,
-  silent: true
-}
+	return removedFiles;
+};
 
-// for EMFILE handling
-var timeout = 0
+module.exports.sync = (patterns, {force, dryRun, cwd = process.cwd(), ...options} = {}) => {
+	options = {
+		expandDirectories: false,
+		onlyFiles: false,
+		followSymbolicLinks: false,
+		cwd,
+		...options
+	};
 
-var isWindows = (process.platform === "win32")
+	patterns = normalizePatterns(patterns);
 
-function defaults (options) {
-  var methods = [
-    'unlink',
-    'chmod',
-    'stat',
-    'lstat',
-    'rmdir',
-    'readdir'
-  ]
-  methods.forEach(function(m) {
-    options[m] = options[m] || fs[m]
-    m = m + 'Sync'
-    options[m] = options[m] || fs[m]
-  })
+	const files = globby.sync(patterns, options)
+		.sort((a, b) => b.localeCompare(a));
 
-  options.maxBusyTries = options.maxBusyTries || 3
-  options.emfileWait = options.emfileWait || 1000
-  if (options.glob === false) {
-    options.disableGlob = true
-  }
-  options.disableGlob = options.disableGlob || false
-  options.glob = options.glob || defaultGlobOpts
-}
+	const removedFiles = files.map(file => {
+		file = path.resolve(cwd, file);
 
-function rimraf (p, options, cb) {
-  if (typeof options === 'function') {
-    cb = options
-    options = {}
-  }
+		if (!force) {
+			safeCheck(file, cwd);
+		}
 
-  assert(p, 'rimraf: missing path')
-  assert.equal(typeof p, 'string', 'rimraf: path should be a string')
-  assert.equal(typeof cb, 'function', 'rimraf: callback function required')
-  assert(options, 'rimraf: invalid options argument provided')
-  assert.equal(typeof options, 'object', 'rimraf: options should be object')
+		if (!dryRun) {
+			rimraf.sync(file, rimrafOptions);
+		}
 
-  defaults(options)
+		return file;
+	});
 
-  var busyTries = 0
-  var errState = null
-  var n = 0
+	removedFiles.sort((a, b) => a.localeCompare(b));
 
-  if (options.disableGlob || !glob.hasMagic(p))
-    return afterGlob(null, [p])
+	return removedFiles;
+};
 
-  options.lstat(p, function (er, stat) {
-    if (!er)
-      return afterGlob(null, [p])
 
-    glob(p, options.glob, afterGlob)
-  })
+/***/ }),
+/* 289 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  function next (er) {
-    errState = errState || er
-    if (--n === 0)
-      cb(errState)
-  }
+"use strict";
 
-  function afterGlob (er, results) {
-    if (er)
-      return cb(er)
+const fs = __webpack_require__(133);
+const arrayUnion = __webpack_require__(290);
+const merge2 = __webpack_require__(291);
+const glob = __webpack_require__(146);
+const fastGlob = __webpack_require__(292);
+const dirGlob = __webpack_require__(361);
+const gitignore = __webpack_require__(363);
+const {FilterStream, UniqueStream} = __webpack_require__(366);
 
-    n = results.length
-    if (n === 0)
-      return cb()
+const DEFAULT_FILTER = () => false;
 
-    results.forEach(function (p) {
-      rimraf_(p, options, function CB (er) {
-        if (er) {
-          if ((er.code === "EBUSY" || er.code === "ENOTEMPTY" || er.code === "EPERM") &&
-              busyTries < options.maxBusyTries) {
-            busyTries ++
-            var time = busyTries * 100
-            // try again, with the same exact callback as this one.
-            return setTimeout(function () {
-              rimraf_(p, options, CB)
-            }, time)
-          }
+const isNegative = pattern => pattern[0] === '!';
 
-          // this one won't happen if graceful-fs is used.
-          if (er.code === "EMFILE" && timeout < options.emfileWait) {
-            return setTimeout(function () {
-              rimraf_(p, options, CB)
-            }, timeout ++)
-          }
+const assertPatternsInput = patterns => {
+	if (!patterns.every(pattern => typeof pattern === 'string')) {
+		throw new TypeError('Patterns must be a string or an array of strings');
+	}
+};
 
-          // already gone
-          if (er.code === "ENOENT") er = null
-        }
+const checkCwdOption = (options = {}) => {
+	if (!options.cwd) {
+		return;
+	}
 
-        timeout = 0
-        next(er)
-      })
-    })
-  }
-}
+	let stat;
+	try {
+		stat = fs.statSync(options.cwd);
+	} catch (_) {
+		return;
+	}
 
-// Two possible strategies.
-// 1. Assume it's a file.  unlink it, then do the dir stuff on EPERM or EISDIR
-// 2. Assume it's a directory.  readdir, then do the file stuff on ENOTDIR
-//
-// Both result in an extra syscall when you guess wrong.  However, there
-// are likely far more normal files in the world than directories.  This
-// is based on the assumption that a the average number of files per
-// directory is >= 1.
-//
-// If anyone ever complains about this, then I guess the strategy could
-// be made configurable somehow.  But until then, YAGNI.
-function rimraf_ (p, options, cb) {
-  assert(p)
-  assert(options)
-  assert(typeof cb === 'function')
+	if (!stat.isDirectory()) {
+		throw new Error('The `cwd` option must be a path to a directory');
+	}
+};
 
-  // sunos lets the root user unlink directories, which is... weird.
-  // so we have to lstat here and make sure it's not a dir.
-  options.lstat(p, function (er, st) {
-    if (er && er.code === "ENOENT")
-      return cb(null)
+const getPathString = p => p.stats instanceof fs.Stats ? p.path : p;
 
-    // Windows can EPERM on stat.  Life is suffering.
-    if (er && er.code === "EPERM" && isWindows)
-      fixWinEPERM(p, options, er, cb)
+const generateGlobTasks = (patterns, taskOptions) => {
+	patterns = arrayUnion([].concat(patterns));
+	assertPatternsInput(patterns);
+	checkCwdOption(taskOptions);
 
-    if (st && st.isDirectory())
-      return rmdir(p, options, er, cb)
+	const globTasks = [];
 
-    options.unlink(p, function (er) {
-      if (er) {
-        if (er.code === "ENOENT")
-          return cb(null)
-        if (er.code === "EPERM")
-          return (isWindows)
-            ? fixWinEPERM(p, options, er, cb)
-            : rmdir(p, options, er, cb)
-        if (er.code === "EISDIR")
-          return rmdir(p, options, er, cb)
-      }
-      return cb(er)
-    })
-  })
-}
+	taskOptions = {
+		ignore: [],
+		expandDirectories: true,
+		...taskOptions
+	};
 
-function fixWinEPERM (p, options, er, cb) {
-  assert(p)
-  assert(options)
-  assert(typeof cb === 'function')
-  if (er)
-    assert(er instanceof Error)
+	for (const [index, pattern] of patterns.entries()) {
+		if (isNegative(pattern)) {
+			continue;
+		}
 
-  options.chmod(p, _0666, function (er2) {
-    if (er2)
-      cb(er2.code === "ENOENT" ? null : er)
-    else
-      options.stat(p, function(er3, stats) {
-        if (er3)
-          cb(er3.code === "ENOENT" ? null : er)
-        else if (stats.isDirectory())
-          rmdir(p, options, er, cb)
-        else
-          options.unlink(p, cb)
-      })
-  })
-}
+		const ignore = patterns
+			.slice(index)
+			.filter(isNegative)
+			.map(pattern => pattern.slice(1));
 
-function fixWinEPERMSync (p, options, er) {
-  assert(p)
-  assert(options)
-  if (er)
-    assert(er instanceof Error)
+		const options = {
+			...taskOptions,
+			ignore: taskOptions.ignore.concat(ignore)
+		};
 
-  try {
-    options.chmodSync(p, _0666)
-  } catch (er2) {
-    if (er2.code === "ENOENT")
-      return
-    else
-      throw er
-  }
+		globTasks.push({pattern, options});
+	}
 
-  try {
-    var stats = options.statSync(p)
-  } catch (er3) {
-    if (er3.code === "ENOENT")
-      return
-    else
-      throw er
-  }
+	return globTasks;
+};
 
-  if (stats.isDirectory())
-    rmdirSync(p, options, er)
-  else
-    options.unlinkSync(p)
-}
+const globDirs = (task, fn) => {
+	let options = {};
+	if (task.options.cwd) {
+		options.cwd = task.options.cwd;
+	}
 
-function rmdir (p, options, originalEr, cb) {
-  assert(p)
-  assert(options)
-  if (originalEr)
-    assert(originalEr instanceof Error)
-  assert(typeof cb === 'function')
+	if (Array.isArray(task.options.expandDirectories)) {
+		options = {
+			...options,
+			files: task.options.expandDirectories
+		};
+	} else if (typeof task.options.expandDirectories === 'object') {
+		options = {
+			...options,
+			...task.options.expandDirectories
+		};
+	}
 
-  // try to rmdir first, and only readdir on ENOTEMPTY or EEXIST (SunOS)
-  // if we guessed wrong, and it's not a directory, then
-  // raise the original error.
-  options.rmdir(p, function (er) {
-    if (er && (er.code === "ENOTEMPTY" || er.code === "EEXIST" || er.code === "EPERM"))
-      rmkids(p, options, cb)
-    else if (er && er.code === "ENOTDIR")
-      cb(originalEr)
-    else
-      cb(er)
-  })
-}
+	return fn(task.pattern, options);
+};
 
-function rmkids(p, options, cb) {
-  assert(p)
-  assert(options)
-  assert(typeof cb === 'function')
+const getPattern = (task, fn) => task.options.expandDirectories ? globDirs(task, fn) : [task.pattern];
 
-  options.readdir(p, function (er, files) {
-    if (er)
-      return cb(er)
-    var n = files.length
-    if (n === 0)
-      return options.rmdir(p, cb)
-    var errState
-    files.forEach(function (f) {
-      rimraf(path.join(p, f), options, function (er) {
-        if (errState)
-          return
-        if (er)
-          return cb(errState = er)
-        if (--n === 0)
-          options.rmdir(p, cb)
-      })
-    })
-  })
-}
+const getFilterSync = options => {
+	return options && options.gitignore ?
+		gitignore.sync({cwd: options.cwd, ignore: options.ignore}) :
+		DEFAULT_FILTER;
+};
 
-// this looks simpler, and is strictly *faster*, but will
-// tie up the JavaScript thread and fail on excessively
-// deep directory trees.
-function rimrafSync (p, options) {
-  options = options || {}
-  defaults(options)
-
-  assert(p, 'rimraf: missing path')
-  assert.equal(typeof p, 'string', 'rimraf: path should be a string')
-  assert(options, 'rimraf: missing options')
-  assert.equal(typeof options, 'object', 'rimraf: options should be object')
-
-  var results
-
-  if (options.disableGlob || !glob.hasMagic(p)) {
-    results = [p]
-  } else {
-    try {
-      options.lstatSync(p)
-      results = [p]
-    } catch (er) {
-      results = glob.sync(p, options.glob)
-    }
-  }
-
-  if (!results.length)
-    return
-
-  for (var i = 0; i < results.length; i++) {
-    var p = results[i]
-
-    try {
-      var st = options.lstatSync(p)
-    } catch (er) {
-      if (er.code === "ENOENT")
-        return
-
-      // Windows can EPERM on stat.  Life is suffering.
-      if (er.code === "EPERM" && isWindows)
-        fixWinEPERMSync(p, options, er)
-    }
-
-    try {
-      // sunos lets the root user unlink directories, which is... weird.
-      if (st && st.isDirectory())
-        rmdirSync(p, options, null)
-      else
-        options.unlinkSync(p)
-    } catch (er) {
-      if (er.code === "ENOENT")
-        return
-      if (er.code === "EPERM")
-        return isWindows ? fixWinEPERMSync(p, options, er) : rmdirSync(p, options, er)
-      if (er.code !== "EISDIR")
-        throw er
-
-      rmdirSync(p, options, er)
-    }
-  }
-}
-
-function rmdirSync (p, options, originalEr) {
-  assert(p)
-  assert(options)
-  if (originalEr)
-    assert(originalEr instanceof Error)
-
-  try {
-    options.rmdirSync(p)
-  } catch (er) {
-    if (er.code === "ENOENT")
-      return
-    if (er.code === "ENOTDIR")
-      throw originalEr
-    if (er.code === "ENOTEMPTY" || er.code === "EEXIST" || er.code === "EPERM")
-      rmkidsSync(p, options)
-  }
-}
-
-function rmkidsSync (p, options) {
-  assert(p)
-  assert(options)
-  options.readdirSync(p).forEach(function (f) {
-    rimrafSync(path.join(p, f), options)
-  })
-
-  // We only end up here once we got ENOTEMPTY at least once, and
-  // at this point, we are guaranteed to have removed all the kids.
-  // So, we know that it won't be ENOENT or ENOTDIR or anything else.
-  // try really hard to delete stuff on windows, because it has a
-  // PROFOUNDLY annoying habit of not closing handles promptly when
-  // files are deleted, resulting in spurious ENOTEMPTY errors.
-  var retries = isWindows ? 100 : 1
-  var i = 0
-  do {
-    var threw = true
-    try {
-      var ret = options.rmdirSync(p, options)
-      threw = false
-      return ret
-    } finally {
-      if (++i < retries && threw)
-        continue
-    }
-  } while (true)
-}
-
-
-/***/ }),
-/* 234 */,
-/* 235 */,
-/* 236 */,
-/* 237 */,
-/* 238 */,
-/* 239 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var hasFlag = __webpack_require__(221);
-
-var support = function (level) {
-	if (level === 0) {
-		return false;
-	}
+const globToTask = task => glob => {
+	const {options} = task;
+	if (options.ignore && Array.isArray(options.ignore) && options.expandDirectories) {
+		options.ignore = dirGlob.sync(options.ignore);
+	}
 
 	return {
-		level: level,
-		hasBasic: true,
-		has256: level >= 2,
-		has16m: level >= 3
+		pattern: glob,
+		options
 	};
 };
 
-var supportLevel = (function () {
-	if (hasFlag('no-color') ||
-		hasFlag('no-colors') ||
-		hasFlag('color=false')) {
-		return 0;
-	}
+module.exports = async (patterns, options) => {
+	const globTasks = generateGlobTasks(patterns, options);
 
-	if (hasFlag('color=16m') ||
-		hasFlag('color=full') ||
-		hasFlag('color=truecolor')) {
-		return 3;
-	}
+	const getFilter = async () => {
+		return options && options.gitignore ?
+			gitignore({cwd: options.cwd, ignore: options.ignore}) :
+			DEFAULT_FILTER;
+	};
 
-	if (hasFlag('color=256')) {
-		return 2;
-	}
+	const getTasks = async () => {
+		const tasks = await Promise.all(globTasks.map(async task => {
+			const globs = await getPattern(task, dirGlob);
+			return Promise.all(globs.map(globToTask(task)));
+		}));
 
-	if (hasFlag('color') ||
-		hasFlag('colors') ||
-		hasFlag('color=true') ||
-		hasFlag('color=always')) {
-		return 1;
-	}
+		return arrayUnion(...tasks);
+	};
 
-	if (process.stdout && !process.stdout.isTTY) {
-		return 0;
-	}
+	const [filter, tasks] = await Promise.all([getFilter(), getTasks()]);
+	const paths = await Promise.all(tasks.map(task => fastGlob(task.pattern, task.options)));
 
-	if (process.platform === 'win32') {
-		return 1;
-	}
+	return arrayUnion(...paths).filter(path_ => !filter(getPathString(path_)));
+};
 
-	if ('CI' in process.env) {
-		if ('TRAVIS' in process.env || process.env.CI === 'Travis') {
-			return 1;
-		}
+module.exports.sync = (patterns, options) => {
+	const globTasks = generateGlobTasks(patterns, options);
 
-		return 0;
-	}
+	const tasks = globTasks.reduce((tasks, task) => {
+		const newTask = getPattern(task, dirGlob.sync).map(globToTask(task));
+		return tasks.concat(newTask);
+	}, []);
 
-	if ('TEAMCITY_VERSION' in process.env) {
-		return process.env.TEAMCITY_VERSION.match(/^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/) === null ? 0 : 1;
-	}
+	const filter = getFilterSync(options);
 
-	if (/^(screen|xterm)-256(?:color)?/.test(process.env.TERM)) {
-		return 2;
-	}
+	return tasks.reduce(
+		(matches, task) => arrayUnion(matches, fastGlob.sync(task.pattern, task.options)),
+		[]
+	).filter(path_ => !filter(path_));
+};
 
-	if (/^screen|^xterm|^vt100|color|ansi|cygwin|linux/i.test(process.env.TERM)) {
-		return 1;
-	}
+module.exports.stream = (patterns, options) => {
+	const globTasks = generateGlobTasks(patterns, options);
 
-	if ('COLORTERM' in process.env) {
-		return 1;
-	}
+	const tasks = globTasks.reduce((tasks, task) => {
+		const newTask = getPattern(task, dirGlob.sync).map(globToTask(task));
+		return tasks.concat(newTask);
+	}, []);
 
-	if (process.env.TERM === 'dumb') {
-		return 0;
-	}
+	const filter = getFilterSync(options);
+	const filterStream = new FilterStream(p => !filter(p));
+	const uniqueStream = new UniqueStream();
 
-	return 0;
-})();
+	return merge2(tasks.map(task => fastGlob.stream(task.pattern, task.options)))
+		.pipe(filterStream)
+		.pipe(uniqueStream);
+};
 
-if (supportLevel === 0 && 'FORCE_COLOR' in process.env) {
-	supportLevel = 1;
-}
+module.exports.generateGlobTasks = generateGlobTasks;
 
-module.exports = process && support(supportLevel);
+module.exports.hasMagic = (patterns, options) => []
+	.concat(patterns)
+	.some(pattern => glob.hasMagic(pattern, options));
 
+module.exports.gitignore = gitignore;
 
-/***/ })
-/******/ ]);
 
 /***/ }),
-/* 293 */
-/***/ (function(module, exports) {
+/* 290 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+module.exports = (...arguments_) => {
+	return [...new Set([].concat(...arguments_))];
+};
 
-module.exports = require("buffer");
 
 /***/ }),
-/* 294 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 291 */
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "BootstrapCacheFile", function() { return BootstrapCacheFile; });
-/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(133);
-/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 /*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * merge2
+ * https://github.com/teambition/merge2
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Copyright (c) 2014-2020 Teambition
+ * Licensed under the MIT license.
  */
+const Stream = __webpack_require__(137)
+const PassThrough = Stream.PassThrough
+const slice = Array.prototype.slice
 
+module.exports = merge2
 
-class BootstrapCacheFile {
-  constructor(kbn, project, checksums) {
-    _defineProperty(this, "path", void 0);
+function merge2 () {
+  const streamsQueue = []
+  const args = slice.call(arguments)
+  let merging = false
+  let options = args[args.length - 1]
 
-    _defineProperty(this, "expectedValue", void 0);
+  if (options && !Array.isArray(options) && options.pipe == null) {
+    args.pop()
+  } else {
+    options = {}
+  }
 
-    this.path = path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(project.targetLocation, '.bootstrap-cache');
+  const doEnd = options.end !== false
+  const doPipeError = options.pipeError === true
+  if (options.objectMode == null) {
+    options.objectMode = true
+  }
+  if (options.highWaterMark == null) {
+    options.highWaterMark = 64 * 1024
+  }
+  const mergedStream = PassThrough(options)
 
-    if (!checksums) {
-      return;
+  function addStream () {
+    for (let i = 0, len = arguments.length; i < len; i++) {
+      streamsQueue.push(pauseStreams(arguments[i], options))
     }
+    mergeStream()
+    return this
+  }
 
-    const projectAndDepCacheKeys = Array.from(kbn.getProjectAndDeps(project.name).values()) // sort deps by name so that the key is stable
-    .sort((a, b) => a.name.localeCompare(b.name)) // get the cacheKey for each project, return undefined if the cache key couldn't be determined
-    .map(p => {
-      const cacheKey = checksums.get(p.name);
+  function mergeStream () {
+    if (merging) {
+      return
+    }
+    merging = true
 
-      if (cacheKey) {
-        return `${p.name}:${cacheKey}`;
-      }
-    }); // if any of the relevant cache keys are undefined then the projectCacheKey must be too
+    let streams = streamsQueue.shift()
+    if (!streams) {
+      process.nextTick(endStream)
+      return
+    }
+    if (!Array.isArray(streams)) {
+      streams = [streams]
+    }
 
-    this.expectedValue = projectAndDepCacheKeys.some(k => !k) ? undefined : [`# this is only human readable for debugging, please don't try to parse this`, ...projectAndDepCacheKeys].join('\n');
-  }
+    let pipesCount = streams.length + 1
 
-  isValid() {
-    if (!this.expectedValue) {
-      return false;
+    function next () {
+      if (--pipesCount > 0) {
+        return
+      }
+      merging = false
+      mergeStream()
     }
 
-    try {
-      return fs__WEBPACK_IMPORTED_MODULE_0___default.a.readFileSync(this.path, 'utf8') === this.expectedValue;
-    } catch (error) {
-      if (error.code === 'ENOENT') {
-        return false;
+    function pipe (stream) {
+      function onend () {
+        stream.removeListener('merge2UnpipeEnd', onend)
+        stream.removeListener('end', onend)
+        if (doPipeError) {
+          stream.removeListener('error', onerror)
+        }
+        next()
+      }
+      function onerror (err) {
+        mergedStream.emit('error', err)
+      }
+      // skip ended stream
+      if (stream._readableState.endEmitted) {
+        return next()
       }
 
-      throw error;
-    }
-  }
+      stream.on('merge2UnpipeEnd', onend)
+      stream.on('end', onend)
 
-  delete() {
-    try {
-      fs__WEBPACK_IMPORTED_MODULE_0___default.a.unlinkSync(this.path);
-    } catch (error) {
-      if (error.code !== 'ENOENT') {
-        throw error;
+      if (doPipeError) {
+        stream.on('error', onerror)
       }
+
+      stream.pipe(mergedStream, { end: false })
+      // compatible for old stream
+      stream.resume()
+    }
+
+    for (let i = 0; i < streams.length; i++) {
+      pipe(streams[i])
     }
+
+    next()
   }
 
-  write() {
-    if (!this.expectedValue) {
-      return;
+  function endStream () {
+    merging = false
+    // emit 'queueDrain' when all streams merged.
+    mergedStream.emit('queueDrain')
+    if (doEnd) {
+      mergedStream.end()
     }
+  }
 
-    fs__WEBPACK_IMPORTED_MODULE_0___default.a.mkdirSync(path__WEBPACK_IMPORTED_MODULE_1___default.a.dirname(this.path), {
-      recursive: true
-    });
-    fs__WEBPACK_IMPORTED_MODULE_0___default.a.writeFileSync(this.path, this.expectedValue);
+  mergedStream.setMaxListeners(0)
+  mergedStream.add = addStream
+  mergedStream.on('unpipe', function (stream) {
+    stream.emit('merge2UnpipeEnd')
+  })
+
+  if (args.length) {
+    addStream.apply(null, args)
   }
+  return mergedStream
+}
 
+// check and pause streams for pipe.
+function pauseStreams (streams, options) {
+  if (!Array.isArray(streams)) {
+    // Backwards-compat with old-style streams
+    if (!streams._readableState && streams.pipe) {
+      streams = streams.pipe(PassThrough(options))
+    }
+    if (!streams._readableState || !streams.pause || !streams.pipe) {
+      throw new Error('Only readable stream can be merged.')
+    }
+    streams.pause()
+  } else {
+    for (let i = 0, len = streams.length; i < len; i++) {
+      streams[i] = pauseStreams(streams[i], options)
+    }
+  }
+  return streams
 }
 
+
 /***/ }),
-/* 295 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 292 */
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CleanCommand", function() { return CleanCommand; });
-/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(296);
-/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(del__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(383);
-/* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(ora__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(130);
-/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(143);
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
+
+const taskManager = __webpack_require__(293);
+const async_1 = __webpack_require__(322);
+const stream_1 = __webpack_require__(357);
+const sync_1 = __webpack_require__(358);
+const settings_1 = __webpack_require__(360);
+const utils = __webpack_require__(294);
+async function FastGlob(source, options) {
+    assertPatternsInput(source);
+    const works = getWorks(source, async_1.default, options);
+    const result = await Promise.all(works);
+    return utils.array.flatten(result);
+}
+// https://github.com/typescript-eslint/typescript-eslint/issues/60
+// eslint-disable-next-line no-redeclare
+(function (FastGlob) {
+    function sync(source, options) {
+        assertPatternsInput(source);
+        const works = getWorks(source, sync_1.default, options);
+        return utils.array.flatten(works);
+    }
+    FastGlob.sync = sync;
+    function stream(source, options) {
+        assertPatternsInput(source);
+        const works = getWorks(source, stream_1.default, options);
+        /**
+         * The stream returned by the provider cannot work with an asynchronous iterator.
+         * To support asynchronous iterators, regardless of the number of tasks, we always multiplex streams.
+         * This affects performance (+25%). I don't see best solution right now.
+         */
+        return utils.stream.merge(works);
+    }
+    FastGlob.stream = stream;
+    function generateTasks(source, options) {
+        assertPatternsInput(source);
+        const patterns = [].concat(source);
+        const settings = new settings_1.default(options);
+        return taskManager.generate(patterns, settings);
+    }
+    FastGlob.generateTasks = generateTasks;
+    function isDynamicPattern(source, options) {
+        assertPatternsInput(source);
+        const settings = new settings_1.default(options);
+        return utils.pattern.isDynamicPattern(source, settings);
+    }
+    FastGlob.isDynamicPattern = isDynamicPattern;
+    function escapePath(source) {
+        assertPatternsInput(source);
+        return utils.path.escape(source);
+    }
+    FastGlob.escapePath = escapePath;
+})(FastGlob || (FastGlob = {}));
+function getWorks(source, _Provider, options) {
+    const patterns = [].concat(source);
+    const settings = new settings_1.default(options);
+    const tasks = taskManager.generate(patterns, settings);
+    const provider = new _Provider(settings);
+    return tasks.map(provider.read, provider);
+}
+function assertPatternsInput(input) {
+    const source = [].concat(input);
+    const isValidSource = source.every((item) => utils.string.isString(item) && !utils.string.isEmpty(item));
+    if (!isValidSource) {
+        throw new TypeError('Patterns must be a string (non empty) or an array of strings');
+    }
+}
+module.exports = FastGlob;
 
 
+/***/ }),
+/* 293 */
+/***/ (function(module, exports, __webpack_require__) {
 
-const CleanCommand = {
-  description: 'Remove the node_modules and target directories from all projects.',
-  name: 'clean',
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__(294);
+function generate(patterns, settings) {
+    const positivePatterns = getPositivePatterns(patterns);
+    const negativePatterns = getNegativePatternsAsPositive(patterns, settings.ignore);
+    const staticPatterns = positivePatterns.filter((pattern) => utils.pattern.isStaticPattern(pattern, settings));
+    const dynamicPatterns = positivePatterns.filter((pattern) => utils.pattern.isDynamicPattern(pattern, settings));
+    const staticTasks = convertPatternsToTasks(staticPatterns, negativePatterns, /* dynamic */ false);
+    const dynamicTasks = convertPatternsToTasks(dynamicPatterns, negativePatterns, /* dynamic */ true);
+    return staticTasks.concat(dynamicTasks);
+}
+exports.generate = generate;
+function convertPatternsToTasks(positive, negative, dynamic) {
+    const positivePatternsGroup = groupPatternsByBaseDirectory(positive);
+    // When we have a global group – there is no reason to divide the patterns into independent tasks.
+    // In this case, the global task covers the rest.
+    if ('.' in positivePatternsGroup) {
+        const task = convertPatternGroupToTask('.', positive, negative, dynamic);
+        return [task];
+    }
+    return convertPatternGroupsToTasks(positivePatternsGroup, negative, dynamic);
+}
+exports.convertPatternsToTasks = convertPatternsToTasks;
+function getPositivePatterns(patterns) {
+    return utils.pattern.getPositivePatterns(patterns);
+}
+exports.getPositivePatterns = getPositivePatterns;
+function getNegativePatternsAsPositive(patterns, ignore) {
+    const negative = utils.pattern.getNegativePatterns(patterns).concat(ignore);
+    const positive = negative.map(utils.pattern.convertToPositivePattern);
+    return positive;
+}
+exports.getNegativePatternsAsPositive = getNegativePatternsAsPositive;
+function groupPatternsByBaseDirectory(patterns) {
+    const group = {};
+    return patterns.reduce((collection, pattern) => {
+        const base = utils.pattern.getBaseDirectory(pattern);
+        if (base in collection) {
+            collection[base].push(pattern);
+        }
+        else {
+            collection[base] = [pattern];
+        }
+        return collection;
+    }, group);
+}
+exports.groupPatternsByBaseDirectory = groupPatternsByBaseDirectory;
+function convertPatternGroupsToTasks(positive, negative, dynamic) {
+    return Object.keys(positive).map((base) => {
+        return convertPatternGroupToTask(base, positive[base], negative, dynamic);
+    });
+}
+exports.convertPatternGroupsToTasks = convertPatternGroupsToTasks;
+function convertPatternGroupToTask(base, positive, negative, dynamic) {
+    return {
+        dynamic,
+        positive,
+        negative,
+        base,
+        patterns: [].concat(positive, negative.map(utils.pattern.convertToNegativePattern))
+    };
+}
+exports.convertPatternGroupToTask = convertPatternGroupToTask;
 
-  async run(projects) {
-    const toDelete = [];
 
-    for (const project of projects.values()) {
-      if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_3__["isDirectory"])(project.nodeModulesLocation)) {
-        toDelete.push({
-          cwd: project.path,
-          pattern: Object(path__WEBPACK_IMPORTED_MODULE_2__["relative"])(project.path, project.nodeModulesLocation)
-        });
-      }
+/***/ }),
+/* 294 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_3__["isDirectory"])(project.targetLocation)) {
-        toDelete.push({
-          cwd: project.path,
-          pattern: Object(path__WEBPACK_IMPORTED_MODULE_2__["relative"])(project.path, project.targetLocation)
-        });
-      }
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const array = __webpack_require__(295);
+exports.array = array;
+const errno = __webpack_require__(296);
+exports.errno = errno;
+const fs = __webpack_require__(297);
+exports.fs = fs;
+const path = __webpack_require__(298);
+exports.path = path;
+const pattern = __webpack_require__(299);
+exports.pattern = pattern;
+const stream = __webpack_require__(320);
+exports.stream = stream;
+const string = __webpack_require__(321);
+exports.string = string;
 
-      const {
-        extraPatterns
-      } = project.getCleanConfig();
 
-      if (extraPatterns) {
-        toDelete.push({
-          cwd: project.path,
-          pattern: extraPatterns
-        });
-      }
-    }
+/***/ }),
+/* 295 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    if (toDelete.length === 0) {
-      _utils_log__WEBPACK_IMPORTED_MODULE_4__["log"].success('Nothing to delete');
-    } else {
-      /**
-       * In order to avoid patterns like `/build` in packages from accidentally
-       * impacting files outside the package we use `process.chdir()` to change
-       * the cwd to the package and execute `del()` without the `force` option
-       * so it will check that each file being deleted is within the package.
-       *
-       * `del()` does support a `cwd` option, but it's only for resolving the
-       * patterns and does not impact the cwd check.
-       */
-      const originalCwd = process.cwd();
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+function flatten(items) {
+    return items.reduce((collection, item) => [].concat(collection, item), []);
+}
+exports.flatten = flatten;
+function splitWhen(items, predicate) {
+    const result = [[]];
+    let groupIndex = 0;
+    for (const item of items) {
+        if (predicate(item)) {
+            groupIndex++;
+            result[groupIndex] = [];
+        }
+        else {
+            result[groupIndex].push(item);
+        }
+    }
+    return result;
+}
+exports.splitWhen = splitWhen;
 
-      try {
-        for (const {
-          pattern,
-          cwd
-        } of toDelete) {
-          process.chdir(cwd);
-          const promise = del__WEBPACK_IMPORTED_MODULE_0___default()(pattern);
 
-          if (_utils_log__WEBPACK_IMPORTED_MODULE_4__["log"].wouldLogLevel('info')) {
-            ora__WEBPACK_IMPORTED_MODULE_1___default.a.promise(promise, Object(path__WEBPACK_IMPORTED_MODULE_2__["relative"])(originalCwd, Object(path__WEBPACK_IMPORTED_MODULE_2__["join"])(cwd, String(pattern))));
-          }
+/***/ }),
+/* 296 */
+/***/ (function(module, exports, __webpack_require__) {
 
-          await promise;
-        }
-      } finally {
-        process.chdir(originalCwd);
-      }
-    }
-  }
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+function isEnoentCodeError(error) {
+    return error.code === 'ENOENT';
+}
+exports.isEnoentCodeError = isEnoentCodeError;
 
-};
 
 /***/ }),
-/* 296 */
+/* 297 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+class DirentFromStats {
+    constructor(name, stats) {
+        this.name = name;
+        this.isBlockDevice = stats.isBlockDevice.bind(stats);
+        this.isCharacterDevice = stats.isCharacterDevice.bind(stats);
+        this.isDirectory = stats.isDirectory.bind(stats);
+        this.isFIFO = stats.isFIFO.bind(stats);
+        this.isFile = stats.isFile.bind(stats);
+        this.isSocket = stats.isSocket.bind(stats);
+        this.isSymbolicLink = stats.isSymbolicLink.bind(stats);
+    }
+}
+function createDirentFromStats(name, stats) {
+    return new DirentFromStats(name, stats);
+}
+exports.createDirentFromStats = createDirentFromStats;
 
-const {promisify} = __webpack_require__(111);
-const path = __webpack_require__(4);
-const globby = __webpack_require__(297);
-const isGlob = __webpack_require__(375);
-const slash = __webpack_require__(373);
-const gracefulFs = __webpack_require__(132);
-const isPathCwd = __webpack_require__(376);
-const isPathInside = __webpack_require__(377);
-const rimraf = __webpack_require__(378);
-const pMap = __webpack_require__(379);
-
-const rimrafP = promisify(rimraf);
 
-const rimrafOptions = {
-	glob: false,
-	unlink: gracefulFs.unlink,
-	unlinkSync: gracefulFs.unlinkSync,
-	chmod: gracefulFs.chmod,
-	chmodSync: gracefulFs.chmodSync,
-	stat: gracefulFs.stat,
-	statSync: gracefulFs.statSync,
-	lstat: gracefulFs.lstat,
-	lstatSync: gracefulFs.lstatSync,
-	rmdir: gracefulFs.rmdir,
-	rmdirSync: gracefulFs.rmdirSync,
-	readdir: gracefulFs.readdir,
-	readdirSync: gracefulFs.readdirSync
-};
+/***/ }),
+/* 298 */
+/***/ (function(module, exports, __webpack_require__) {
 
-function safeCheck(file, cwd) {
-	if (isPathCwd(file)) {
-		throw new Error('Cannot delete the current working directory. Can be overridden with the `force` option.');
-	}
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = __webpack_require__(4);
+const LEADING_DOT_SEGMENT_CHARACTERS_COUNT = 2; // ./ or .\\
+const UNESCAPED_GLOB_SYMBOLS_RE = /(\\?)([()*?[\]{|}]|^!|[!+@](?=\())/g;
+/**
+ * Designed to work only with simple paths: `dir\\file`.
+ */
+function unixify(filepath) {
+    return filepath.replace(/\\/g, '/');
+}
+exports.unixify = unixify;
+function makeAbsolute(cwd, filepath) {
+    return path.resolve(cwd, filepath);
+}
+exports.makeAbsolute = makeAbsolute;
+function escape(pattern) {
+    return pattern.replace(UNESCAPED_GLOB_SYMBOLS_RE, '\\$2');
+}
+exports.escape = escape;
+function removeLeadingDotSegment(entry) {
+    // We do not use `startsWith` because this is 10x slower than current implementation for some cases.
+    // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
+    if (entry.charAt(0) === '.') {
+        const secondCharactery = entry.charAt(1);
+        if (secondCharactery === '/' || secondCharactery === '\\') {
+            return entry.slice(LEADING_DOT_SEGMENT_CHARACTERS_COUNT);
+        }
+    }
+    return entry;
+}
+exports.removeLeadingDotSegment = removeLeadingDotSegment;
 
-	if (!isPathInside(file, cwd)) {
-		throw new Error('Cannot delete files/directories outside the current working directory. Can be overridden with the `force` option.');
-	}
-}
 
-function normalizePatterns(patterns) {
-	patterns = Array.isArray(patterns) ? patterns : [patterns];
+/***/ }),
+/* 299 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	patterns = patterns.map(pattern => {
-		if (process.platform === 'win32' && isGlob(pattern) === false) {
-			return slash(pattern);
-		}
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = __webpack_require__(4);
+const globParent = __webpack_require__(300);
+const micromatch = __webpack_require__(303);
+const picomatch = __webpack_require__(314);
+const GLOBSTAR = '**';
+const ESCAPE_SYMBOL = '\\';
+const COMMON_GLOB_SYMBOLS_RE = /[*?]|^!/;
+const REGEX_CHARACTER_CLASS_SYMBOLS_RE = /\[.*]/;
+const REGEX_GROUP_SYMBOLS_RE = /(?:^|[^!*+?@])\(.*\|.*\)/;
+const GLOB_EXTENSION_SYMBOLS_RE = /[!*+?@]\(.*\)/;
+const BRACE_EXPANSIONS_SYMBOLS_RE = /{.*(?:,|\.\.).*}/;
+function isStaticPattern(pattern, options = {}) {
+    return !isDynamicPattern(pattern, options);
+}
+exports.isStaticPattern = isStaticPattern;
+function isDynamicPattern(pattern, options = {}) {
+    /**
+     * When the `caseSensitiveMatch` option is disabled, all patterns must be marked as dynamic, because we cannot check
+     * filepath directly (without read directory).
+     */
+    if (options.caseSensitiveMatch === false || pattern.includes(ESCAPE_SYMBOL)) {
+        return true;
+    }
+    if (COMMON_GLOB_SYMBOLS_RE.test(pattern) || REGEX_CHARACTER_CLASS_SYMBOLS_RE.test(pattern) || REGEX_GROUP_SYMBOLS_RE.test(pattern)) {
+        return true;
+    }
+    if (options.extglob !== false && GLOB_EXTENSION_SYMBOLS_RE.test(pattern)) {
+        return true;
+    }
+    if (options.braceExpansion !== false && BRACE_EXPANSIONS_SYMBOLS_RE.test(pattern)) {
+        return true;
+    }
+    return false;
+}
+exports.isDynamicPattern = isDynamicPattern;
+function convertToPositivePattern(pattern) {
+    return isNegativePattern(pattern) ? pattern.slice(1) : pattern;
+}
+exports.convertToPositivePattern = convertToPositivePattern;
+function convertToNegativePattern(pattern) {
+    return '!' + pattern;
+}
+exports.convertToNegativePattern = convertToNegativePattern;
+function isNegativePattern(pattern) {
+    return pattern.startsWith('!') && pattern[1] !== '(';
+}
+exports.isNegativePattern = isNegativePattern;
+function isPositivePattern(pattern) {
+    return !isNegativePattern(pattern);
+}
+exports.isPositivePattern = isPositivePattern;
+function getNegativePatterns(patterns) {
+    return patterns.filter(isNegativePattern);
+}
+exports.getNegativePatterns = getNegativePatterns;
+function getPositivePatterns(patterns) {
+    return patterns.filter(isPositivePattern);
+}
+exports.getPositivePatterns = getPositivePatterns;
+function getBaseDirectory(pattern) {
+    return globParent(pattern, { flipBackslashes: false });
+}
+exports.getBaseDirectory = getBaseDirectory;
+function hasGlobStar(pattern) {
+    return pattern.includes(GLOBSTAR);
+}
+exports.hasGlobStar = hasGlobStar;
+function endsWithSlashGlobStar(pattern) {
+    return pattern.endsWith('/' + GLOBSTAR);
+}
+exports.endsWithSlashGlobStar = endsWithSlashGlobStar;
+function isAffectDepthOfReadingPattern(pattern) {
+    const basename = path.basename(pattern);
+    return endsWithSlashGlobStar(pattern) || isStaticPattern(basename);
+}
+exports.isAffectDepthOfReadingPattern = isAffectDepthOfReadingPattern;
+function expandPatternsWithBraceExpansion(patterns) {
+    return patterns.reduce((collection, pattern) => {
+        return collection.concat(expandBraceExpansion(pattern));
+    }, []);
+}
+exports.expandPatternsWithBraceExpansion = expandPatternsWithBraceExpansion;
+function expandBraceExpansion(pattern) {
+    return micromatch.braces(pattern, {
+        expand: true,
+        nodupes: true
+    });
+}
+exports.expandBraceExpansion = expandBraceExpansion;
+function getPatternParts(pattern, options) {
+    const info = picomatch.scan(pattern, Object.assign(Object.assign({}, options), { parts: true }));
+    // See micromatch/picomatch#58 for more details
+    if (info.parts.length === 0) {
+        return [pattern];
+    }
+    return info.parts;
+}
+exports.getPatternParts = getPatternParts;
+function makeRe(pattern, options) {
+    return micromatch.makeRe(pattern, options);
+}
+exports.makeRe = makeRe;
+function convertPatternsToRe(patterns, options) {
+    return patterns.map((pattern) => makeRe(pattern, options));
+}
+exports.convertPatternsToRe = convertPatternsToRe;
+function matchAny(entry, patternsRe) {
+    return patternsRe.some((patternRe) => patternRe.test(entry));
+}
+exports.matchAny = matchAny;
 
-		return pattern;
-	});
 
-	return patterns;
-}
+/***/ }),
+/* 300 */
+/***/ (function(module, exports, __webpack_require__) {
 
-module.exports = async (patterns, {force, dryRun, cwd = process.cwd(), ...options} = {}) => {
-	options = {
-		expandDirectories: false,
-		onlyFiles: false,
-		followSymbolicLinks: false,
-		cwd,
-		...options
-	};
+"use strict";
 
-	patterns = normalizePatterns(patterns);
 
-	const files = (await globby(patterns, options))
-		.sort((a, b) => b.localeCompare(a));
+var isGlob = __webpack_require__(301);
+var pathPosixDirname = __webpack_require__(4).posix.dirname;
+var isWin32 = __webpack_require__(120).platform() === 'win32';
 
-	const mapper = async file => {
-		file = path.resolve(cwd, file);
+var slash = '/';
+var backslash = /\\/g;
+var enclosure = /[\{\[].*[\/]*.*[\}\]]$/;
+var globby = /(^|[^\\])([\{\[]|\([^\)]+$)/;
+var escaped = /\\([\!\*\?\|\[\]\(\)\{\}])/g;
 
-		if (!force) {
-			safeCheck(file, cwd);
-		}
+/**
+ * @param {string} str
+ * @param {Object} opts
+ * @param {boolean} [opts.flipBackslashes=true]
+ */
+module.exports = function globParent(str, opts) {
+  var options = Object.assign({ flipBackslashes: true }, opts);
 
-		if (!dryRun) {
-			await rimrafP(file, rimrafOptions);
-		}
+  // flip windows path separators
+  if (options.flipBackslashes && isWin32 && str.indexOf(slash) < 0) {
+    str = str.replace(backslash, slash);
+  }
 
-		return file;
-	};
+  // special case for strings ending in enclosure containing path separator
+  if (enclosure.test(str)) {
+    str += slash;
+  }
 
-	const removedFiles = await pMap(files, mapper, options);
+  // preserves full path in case of trailing path separator
+  str += 'a';
 
-	removedFiles.sort((a, b) => a.localeCompare(b));
+  // remove path parts that are globby
+  do {
+    str = pathPosixDirname(str);
+  } while (isGlob(str) || globby.test(str));
 
-	return removedFiles;
+  // remove escape chars and return result
+  return str.replace(escaped, '$1');
 };
 
-module.exports.sync = (patterns, {force, dryRun, cwd = process.cwd(), ...options} = {}) => {
-	options = {
-		expandDirectories: false,
-		onlyFiles: false,
-		followSymbolicLinks: false,
-		cwd,
-		...options
-	};
 
-	patterns = normalizePatterns(patterns);
+/***/ }),
+/* 301 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	const files = globby.sync(patterns, options)
-		.sort((a, b) => b.localeCompare(a));
+/*!
+ * is-glob <https://github.com/jonschlinkert/is-glob>
+ *
+ * Copyright (c) 2014-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-	const removedFiles = files.map(file => {
-		file = path.resolve(cwd, file);
+var isExtglob = __webpack_require__(302);
+var chars = { '{': '}', '(': ')', '[': ']'};
+var strictRegex = /\\(.)|(^!|\*|[\].+)]\?|\[[^\\\]]+\]|\{[^\\}]+\}|\(\?[:!=][^\\)]+\)|\([^|]+\|[^\\)]+\))/;
+var relaxedRegex = /\\(.)|(^!|[*?{}()[\]]|\(\?)/;
 
-		if (!force) {
-			safeCheck(file, cwd);
-		}
+module.exports = function isGlob(str, options) {
+  if (typeof str !== 'string' || str === '') {
+    return false;
+  }
 
-		if (!dryRun) {
-			rimraf.sync(file, rimrafOptions);
-		}
+  if (isExtglob(str)) {
+    return true;
+  }
 
-		return file;
-	});
+  var regex = strictRegex;
+  var match;
 
-	removedFiles.sort((a, b) => a.localeCompare(b));
+  // optionally relax regex
+  if (options && options.strict === false) {
+    regex = relaxedRegex;
+  }
 
-	return removedFiles;
+  while ((match = regex.exec(str))) {
+    if (match[2]) return true;
+    var idx = match.index + match[0].length;
+
+    // if an open bracket/brace/paren is escaped,
+    // set the index to the next closing character
+    var open = match[1];
+    var close = open ? chars[open] : null;
+    if (open && close) {
+      var n = str.indexOf(close, idx);
+      if (n !== -1) {
+        idx = n + 1;
+      }
+    }
+
+    str = str.slice(idx);
+  }
+  return false;
 };
 
 
 /***/ }),
-/* 297 */
-/***/ (function(module, exports, __webpack_require__) {
+/* 302 */
+/***/ (function(module, exports) {
 
-"use strict";
-
-const fs = __webpack_require__(133);
-const arrayUnion = __webpack_require__(298);
-const merge2 = __webpack_require__(299);
-const glob = __webpack_require__(146);
-const fastGlob = __webpack_require__(300);
-const dirGlob = __webpack_require__(369);
-const gitignore = __webpack_require__(371);
-const {FilterStream, UniqueStream} = __webpack_require__(374);
+/*!
+ * is-extglob <https://github.com/jonschlinkert/is-extglob>
+ *
+ * Copyright (c) 2014-2016, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
 
-const DEFAULT_FILTER = () => false;
+module.exports = function isExtglob(str) {
+  if (typeof str !== 'string' || str === '') {
+    return false;
+  }
 
-const isNegative = pattern => pattern[0] === '!';
+  var match;
+  while ((match = /(\\).|([@?!+*]\(.*\))/g.exec(str))) {
+    if (match[2]) return true;
+    str = str.slice(match.index + match[0].length);
+  }
 
-const assertPatternsInput = patterns => {
-	if (!patterns.every(pattern => typeof pattern === 'string')) {
-		throw new TypeError('Patterns must be a string or an array of strings');
-	}
+  return false;
 };
 
-const checkCwdOption = (options = {}) => {
-	if (!options.cwd) {
-		return;
-	}
 
-	let stat;
-	try {
-		stat = fs.statSync(options.cwd);
-	} catch (_) {
-		return;
-	}
+/***/ }),
+/* 303 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	if (!stat.isDirectory()) {
-		throw new Error('The `cwd` option must be a path to a directory');
-	}
-};
+"use strict";
 
-const getPathString = p => p.stats instanceof fs.Stats ? p.path : p;
 
-const generateGlobTasks = (patterns, taskOptions) => {
-	patterns = arrayUnion([].concat(patterns));
-	assertPatternsInput(patterns);
-	checkCwdOption(taskOptions);
+const util = __webpack_require__(111);
+const braces = __webpack_require__(304);
+const picomatch = __webpack_require__(314);
+const utils = __webpack_require__(317);
+const isEmptyString = val => typeof val === 'string' && (val === '' || val === './');
 
-	const globTasks = [];
+/**
+ * Returns an array of strings that match one or more glob patterns.
+ *
+ * ```js
+ * const mm = require('micromatch');
+ * // mm(list, patterns[, options]);
+ *
+ * console.log(mm(['a.js', 'a.txt'], ['*.js']));
+ * //=> [ 'a.js' ]
+ * ```
+ * @param {String|Array<string>} list List of strings to match.
+ * @param {String|Array<string>} patterns One or more glob patterns to use for matching.
+ * @param {Object} options See available [options](#options)
+ * @return {Array} Returns an array of matches
+ * @summary false
+ * @api public
+ */
 
-	taskOptions = {
-		ignore: [],
-		expandDirectories: true,
-		...taskOptions
-	};
+const micromatch = (list, patterns, options) => {
+  patterns = [].concat(patterns);
+  list = [].concat(list);
 
-	for (const [index, pattern] of patterns.entries()) {
-		if (isNegative(pattern)) {
-			continue;
-		}
+  let omit = new Set();
+  let keep = new Set();
+  let items = new Set();
+  let negatives = 0;
 
-		const ignore = patterns
-			.slice(index)
-			.filter(isNegative)
-			.map(pattern => pattern.slice(1));
+  let onResult = state => {
+    items.add(state.output);
+    if (options && options.onResult) {
+      options.onResult(state);
+    }
+  };
 
-		const options = {
-			...taskOptions,
-			ignore: taskOptions.ignore.concat(ignore)
-		};
+  for (let i = 0; i < patterns.length; i++) {
+    let isMatch = picomatch(String(patterns[i]), { ...options, onResult }, true);
+    let negated = isMatch.state.negated || isMatch.state.negatedExtglob;
+    if (negated) negatives++;
 
-		globTasks.push({pattern, options});
-	}
+    for (let item of list) {
+      let matched = isMatch(item, true);
 
-	return globTasks;
-};
+      let match = negated ? !matched.isMatch : matched.isMatch;
+      if (!match) continue;
 
-const globDirs = (task, fn) => {
-	let options = {};
-	if (task.options.cwd) {
-		options.cwd = task.options.cwd;
-	}
+      if (negated) {
+        omit.add(matched.output);
+      } else {
+        omit.delete(matched.output);
+        keep.add(matched.output);
+      }
+    }
+  }
 
-	if (Array.isArray(task.options.expandDirectories)) {
-		options = {
-			...options,
-			files: task.options.expandDirectories
-		};
-	} else if (typeof task.options.expandDirectories === 'object') {
-		options = {
-			...options,
-			...task.options.expandDirectories
-		};
-	}
+  let result = negatives === patterns.length ? [...items] : [...keep];
+  let matches = result.filter(item => !omit.has(item));
 
-	return fn(task.pattern, options);
-};
+  if (options && matches.length === 0) {
+    if (options.failglob === true) {
+      throw new Error(`No matches found for "${patterns.join(', ')}"`);
+    }
 
-const getPattern = (task, fn) => task.options.expandDirectories ? globDirs(task, fn) : [task.pattern];
+    if (options.nonull === true || options.nullglob === true) {
+      return options.unescape ? patterns.map(p => p.replace(/\\/g, '')) : patterns;
+    }
+  }
 
-const getFilterSync = options => {
-	return options && options.gitignore ?
-		gitignore.sync({cwd: options.cwd, ignore: options.ignore}) :
-		DEFAULT_FILTER;
+  return matches;
 };
 
-const globToTask = task => glob => {
-	const {options} = task;
-	if (options.ignore && Array.isArray(options.ignore) && options.expandDirectories) {
-		options.ignore = dirGlob.sync(options.ignore);
-	}
+/**
+ * Backwards compatibility
+ */
 
-	return {
-		pattern: glob,
-		options
-	};
-};
+micromatch.match = micromatch;
 
-module.exports = async (patterns, options) => {
-	const globTasks = generateGlobTasks(patterns, options);
+/**
+ * Returns a matcher function from the given glob `pattern` and `options`.
+ * The returned function takes a string to match as its only argument and returns
+ * true if the string is a match.
+ *
+ * ```js
+ * const mm = require('micromatch');
+ * // mm.matcher(pattern[, options]);
+ *
+ * const isMatch = mm.matcher('*.!(*a)');
+ * console.log(isMatch('a.a')); //=> false
+ * console.log(isMatch('a.b')); //=> true
+ * ```
+ * @param {String} `pattern` Glob pattern
+ * @param {Object} `options`
+ * @return {Function} Returns a matcher function.
+ * @api public
+ */
 
-	const getFilter = async () => {
-		return options && options.gitignore ?
-			gitignore({cwd: options.cwd, ignore: options.ignore}) :
-			DEFAULT_FILTER;
-	};
+micromatch.matcher = (pattern, options) => picomatch(pattern, options);
 
-	const getTasks = async () => {
-		const tasks = await Promise.all(globTasks.map(async task => {
-			const globs = await getPattern(task, dirGlob);
-			return Promise.all(globs.map(globToTask(task)));
-		}));
+/**
+ * Returns true if **any** of the given glob `patterns` match the specified `string`.
+ *
+ * ```js
+ * const mm = require('micromatch');
+ * // mm.isMatch(string, patterns[, options]);
+ *
+ * console.log(mm.isMatch('a.a', ['b.*', '*.a'])); //=> true
+ * console.log(mm.isMatch('a.a', 'b.*')); //=> false
+ * ```
+ * @param {String} str The string to test.
+ * @param {String|Array} patterns One or more glob patterns to use for matching.
+ * @param {Object} [options] See available [options](#options).
+ * @return {Boolean} Returns true if any patterns match `str`
+ * @api public
+ */
 
-		return arrayUnion(...tasks);
-	};
+micromatch.isMatch = (str, patterns, options) => picomatch(patterns, options)(str);
 
-	const [filter, tasks] = await Promise.all([getFilter(), getTasks()]);
-	const paths = await Promise.all(tasks.map(task => fastGlob(task.pattern, task.options)));
+/**
+ * Backwards compatibility
+ */
 
-	return arrayUnion(...paths).filter(path_ => !filter(getPathString(path_)));
-};
+micromatch.any = micromatch.isMatch;
 
-module.exports.sync = (patterns, options) => {
-	const globTasks = generateGlobTasks(patterns, options);
+/**
+ * Returns a list of strings that _**do not match any**_ of the given `patterns`.
+ *
+ * ```js
+ * const mm = require('micromatch');
+ * // mm.not(list, patterns[, options]);
+ *
+ * console.log(mm.not(['a.a', 'b.b', 'c.c'], '*.a'));
+ * //=> ['b.b', 'c.c']
+ * ```
+ * @param {Array} `list` Array of strings to match.
+ * @param {String|Array} `patterns` One or more glob pattern to use for matching.
+ * @param {Object} `options` See available [options](#options) for changing how matches are performed
+ * @return {Array} Returns an array of strings that **do not match** the given patterns.
+ * @api public
+ */
 
-	const tasks = globTasks.reduce((tasks, task) => {
-		const newTask = getPattern(task, dirGlob.sync).map(globToTask(task));
-		return tasks.concat(newTask);
-	}, []);
+micromatch.not = (list, patterns, options = {}) => {
+  patterns = [].concat(patterns).map(String);
+  let result = new Set();
+  let items = [];
 
-	const filter = getFilterSync(options);
+  let onResult = state => {
+    if (options.onResult) options.onResult(state);
+    items.push(state.output);
+  };
 
-	return tasks.reduce(
-		(matches, task) => arrayUnion(matches, fastGlob.sync(task.pattern, task.options)),
-		[]
-	).filter(path_ => !filter(path_));
-};
+  let matches = micromatch(list, patterns, { ...options, onResult });
 
-module.exports.stream = (patterns, options) => {
-	const globTasks = generateGlobTasks(patterns, options);
+  for (let item of items) {
+    if (!matches.includes(item)) {
+      result.add(item);
+    }
+  }
+  return [...result];
+};
 
-	const tasks = globTasks.reduce((tasks, task) => {
-		const newTask = getPattern(task, dirGlob.sync).map(globToTask(task));
-		return tasks.concat(newTask);
-	}, []);
+/**
+ * Returns true if the given `string` contains the given pattern. Similar
+ * to [.isMatch](#isMatch) but the pattern can match any part of the string.
+ *
+ * ```js
+ * var mm = require('micromatch');
+ * // mm.contains(string, pattern[, options]);
+ *
+ * console.log(mm.contains('aa/bb/cc', '*b'));
+ * //=> true
+ * console.log(mm.contains('aa/bb/cc', '*d'));
+ * //=> false
+ * ```
+ * @param {String} `str` The string to match.
+ * @param {String|Array} `patterns` Glob pattern to use for matching.
+ * @param {Object} `options` See available [options](#options) for changing how matches are performed
+ * @return {Boolean} Returns true if the patter matches any part of `str`.
+ * @api public
+ */
 
-	const filter = getFilterSync(options);
-	const filterStream = new FilterStream(p => !filter(p));
-	const uniqueStream = new UniqueStream();
+micromatch.contains = (str, pattern, options) => {
+  if (typeof str !== 'string') {
+    throw new TypeError(`Expected a string: "${util.inspect(str)}"`);
+  }
 
-	return merge2(tasks.map(task => fastGlob.stream(task.pattern, task.options)))
-		.pipe(filterStream)
-		.pipe(uniqueStream);
-};
+  if (Array.isArray(pattern)) {
+    return pattern.some(p => micromatch.contains(str, p, options));
+  }
 
-module.exports.generateGlobTasks = generateGlobTasks;
+  if (typeof pattern === 'string') {
+    if (isEmptyString(str) || isEmptyString(pattern)) {
+      return false;
+    }
 
-module.exports.hasMagic = (patterns, options) => []
-	.concat(patterns)
-	.some(pattern => glob.hasMagic(pattern, options));
+    if (str.includes(pattern) || (str.startsWith('./') && str.slice(2).includes(pattern))) {
+      return true;
+    }
+  }
 
-module.exports.gitignore = gitignore;
+  return micromatch.isMatch(str, pattern, { ...options, contains: true });
+};
 
+/**
+ * Filter the keys of the given object with the given `glob` pattern
+ * and `options`. Does not attempt to match nested keys. If you need this feature,
+ * use [glob-object][] instead.
+ *
+ * ```js
+ * const mm = require('micromatch');
+ * // mm.matchKeys(object, patterns[, options]);
+ *
+ * const obj = { aa: 'a', ab: 'b', ac: 'c' };
+ * console.log(mm.matchKeys(obj, '*b'));
+ * //=> { ab: 'b' }
+ * ```
+ * @param {Object} `object` The object with keys to filter.
+ * @param {String|Array} `patterns` One or more glob patterns to use for matching.
+ * @param {Object} `options` See available [options](#options) for changing how matches are performed
+ * @return {Object} Returns an object with only keys that match the given patterns.
+ * @api public
+ */
 
-/***/ }),
-/* 298 */
-/***/ (function(module, exports, __webpack_require__) {
+micromatch.matchKeys = (obj, patterns, options) => {
+  if (!utils.isObject(obj)) {
+    throw new TypeError('Expected the first argument to be an object');
+  }
+  let keys = micromatch(Object.keys(obj), patterns, options);
+  let res = {};
+  for (let key of keys) res[key] = obj[key];
+  return res;
+};
 
-"use strict";
+/**
+ * Returns true if some of the strings in the given `list` match any of the given glob `patterns`.
+ *
+ * ```js
+ * const mm = require('micromatch');
+ * // mm.some(list, patterns[, options]);
+ *
+ * console.log(mm.some(['foo.js', 'bar.js'], ['*.js', '!foo.js']));
+ * // true
+ * console.log(mm.some(['foo.js'], ['*.js', '!foo.js']));
+ * // false
+ * ```
+ * @param {String|Array} `list` The string or array of strings to test. Returns as soon as the first match is found.
+ * @param {String|Array} `patterns` One or more glob patterns to use for matching.
+ * @param {Object} `options` See available [options](#options) for changing how matches are performed
+ * @return {Boolean} Returns true if any patterns match `str`
+ * @api public
+ */
 
+micromatch.some = (list, patterns, options) => {
+  let items = [].concat(list);
 
-module.exports = (...arguments_) => {
-	return [...new Set([].concat(...arguments_))];
+  for (let pattern of [].concat(patterns)) {
+    let isMatch = picomatch(String(pattern), options);
+    if (items.some(item => isMatch(item))) {
+      return true;
+    }
+  }
+  return false;
 };
 
+/**
+ * Returns true if every string in the given `list` matches
+ * any of the given glob `patterns`.
+ *
+ * ```js
+ * const mm = require('micromatch');
+ * // mm.every(list, patterns[, options]);
+ *
+ * console.log(mm.every('foo.js', ['foo.js']));
+ * // true
+ * console.log(mm.every(['foo.js', 'bar.js'], ['*.js']));
+ * // true
+ * console.log(mm.every(['foo.js', 'bar.js'], ['*.js', '!foo.js']));
+ * // false
+ * console.log(mm.every(['foo.js'], ['*.js', '!foo.js']));
+ * // false
+ * ```
+ * @param {String|Array} `list` The string or array of strings to test.
+ * @param {String|Array} `patterns` One or more glob patterns to use for matching.
+ * @param {Object} `options` See available [options](#options) for changing how matches are performed
+ * @return {Boolean} Returns true if any patterns match `str`
+ * @api public
+ */
 
-/***/ }),
-/* 299 */
-/***/ (function(module, exports, __webpack_require__) {
+micromatch.every = (list, patterns, options) => {
+  let items = [].concat(list);
 
-"use strict";
+  for (let pattern of [].concat(patterns)) {
+    let isMatch = picomatch(String(pattern), options);
+    if (!items.every(item => isMatch(item))) {
+      return false;
+    }
+  }
+  return true;
+};
 
-/*
- * merge2
- * https://github.com/teambition/merge2
+/**
+ * Returns true if **all** of the given `patterns` match
+ * the specified string.
  *
- * Copyright (c) 2014-2020 Teambition
- * Licensed under the MIT license.
+ * ```js
+ * const mm = require('micromatch');
+ * // mm.all(string, patterns[, options]);
+ *
+ * console.log(mm.all('foo.js', ['foo.js']));
+ * // true
+ *
+ * console.log(mm.all('foo.js', ['*.js', '!foo.js']));
+ * // false
+ *
+ * console.log(mm.all('foo.js', ['*.js', 'foo.js']));
+ * // true
+ *
+ * console.log(mm.all('foo.js', ['*.js', 'f*', '*o*', '*o.js']));
+ * // true
+ * ```
+ * @param {String|Array} `str` The string to test.
+ * @param {String|Array} `patterns` One or more glob patterns to use for matching.
+ * @param {Object} `options` See available [options](#options) for changing how matches are performed
+ * @return {Boolean} Returns true if any patterns match `str`
+ * @api public
  */
-const Stream = __webpack_require__(137)
-const PassThrough = Stream.PassThrough
-const slice = Array.prototype.slice
 
-module.exports = merge2
+micromatch.all = (str, patterns, options) => {
+  if (typeof str !== 'string') {
+    throw new TypeError(`Expected a string: "${util.inspect(str)}"`);
+  }
 
-function merge2 () {
-  const streamsQueue = []
-  const args = slice.call(arguments)
-  let merging = false
-  let options = args[args.length - 1]
+  return [].concat(patterns).every(p => picomatch(p, options)(str));
+};
 
-  if (options && !Array.isArray(options) && options.pipe == null) {
-    args.pop()
-  } else {
-    options = {}
-  }
+/**
+ * Returns an array of matches captured by `pattern` in `string, or `null` if the pattern did not match.
+ *
+ * ```js
+ * const mm = require('micromatch');
+ * // mm.capture(pattern, string[, options]);
+ *
+ * console.log(mm.capture('test/*.js', 'test/foo.js'));
+ * //=> ['foo']
+ * console.log(mm.capture('test/*.js', 'foo/bar.css'));
+ * //=> null
+ * ```
+ * @param {String} `glob` Glob pattern to use for matching.
+ * @param {String} `input` String to match
+ * @param {Object} `options` See available [options](#options) for changing how matches are performed
+ * @return {Boolean} Returns an array of captures if the input matches the glob pattern, otherwise `null`.
+ * @api public
+ */
 
-  const doEnd = options.end !== false
-  const doPipeError = options.pipeError === true
-  if (options.objectMode == null) {
-    options.objectMode = true
-  }
-  if (options.highWaterMark == null) {
-    options.highWaterMark = 64 * 1024
-  }
-  const mergedStream = PassThrough(options)
+micromatch.capture = (glob, input, options) => {
+  let posix = utils.isWindows(options);
+  let regex = picomatch.makeRe(String(glob), { ...options, capture: true });
+  let match = regex.exec(posix ? utils.toPosixSlashes(input) : input);
 
-  function addStream () {
-    for (let i = 0, len = arguments.length; i < len; i++) {
-      streamsQueue.push(pauseStreams(arguments[i], options))
-    }
-    mergeStream()
-    return this
+  if (match) {
+    return match.slice(1).map(v => v === void 0 ? '' : v);
   }
+};
 
-  function mergeStream () {
-    if (merging) {
-      return
-    }
-    merging = true
+/**
+ * Create a regular expression from the given glob `pattern`.
+ *
+ * ```js
+ * const mm = require('micromatch');
+ * // mm.makeRe(pattern[, options]);
+ *
+ * console.log(mm.makeRe('*.js'));
+ * //=> /^(?:(\.[\\\/])?(?!\.)(?=.)[^\/]*?\.js)$/
+ * ```
+ * @param {String} `pattern` A glob pattern to convert to regex.
+ * @param {Object} `options`
+ * @return {RegExp} Returns a regex created from the given pattern.
+ * @api public
+ */
 
-    let streams = streamsQueue.shift()
-    if (!streams) {
-      process.nextTick(endStream)
-      return
-    }
-    if (!Array.isArray(streams)) {
-      streams = [streams]
-    }
+micromatch.makeRe = (...args) => picomatch.makeRe(...args);
 
-    let pipesCount = streams.length + 1
+/**
+ * Scan a glob pattern to separate the pattern into segments. Used
+ * by the [split](#split) method.
+ *
+ * ```js
+ * const mm = require('micromatch');
+ * const state = mm.scan(pattern[, options]);
+ * ```
+ * @param {String} `pattern`
+ * @param {Object} `options`
+ * @return {Object} Returns an object with
+ * @api public
+ */
 
-    function next () {
-      if (--pipesCount > 0) {
-        return
-      }
-      merging = false
-      mergeStream()
+micromatch.scan = (...args) => picomatch.scan(...args);
+
+/**
+ * Parse a glob pattern to create the source string for a regular
+ * expression.
+ *
+ * ```js
+ * const mm = require('micromatch');
+ * const state = mm(pattern[, options]);
+ * ```
+ * @param {String} `glob`
+ * @param {Object} `options`
+ * @return {Object} Returns an object with useful properties and output to be used as regex source string.
+ * @api public
+ */
+
+micromatch.parse = (patterns, options) => {
+  let res = [];
+  for (let pattern of [].concat(patterns || [])) {
+    for (let str of braces(String(pattern), options)) {
+      res.push(picomatch.parse(str, options));
     }
+  }
+  return res;
+};
 
-    function pipe (stream) {
-      function onend () {
-        stream.removeListener('merge2UnpipeEnd', onend)
-        stream.removeListener('end', onend)
-        if (doPipeError) {
-          stream.removeListener('error', onerror)
-        }
-        next()
-      }
-      function onerror (err) {
-        mergedStream.emit('error', err)
-      }
-      // skip ended stream
-      if (stream._readableState.endEmitted) {
-        return next()
-      }
+/**
+ * Process the given brace `pattern`.
+ *
+ * ```js
+ * const { braces } = require('micromatch');
+ * console.log(braces('foo/{a,b,c}/bar'));
+ * //=> [ 'foo/(a|b|c)/bar' ]
+ *
+ * console.log(braces('foo/{a,b,c}/bar', { expand: true }));
+ * //=> [ 'foo/a/bar', 'foo/b/bar', 'foo/c/bar' ]
+ * ```
+ * @param {String} `pattern` String with brace pattern to process.
+ * @param {Object} `options` Any [options](#options) to change how expansion is performed. See the [braces][] library for all available options.
+ * @return {Array}
+ * @api public
+ */
 
-      stream.on('merge2UnpipeEnd', onend)
-      stream.on('end', onend)
+micromatch.braces = (pattern, options) => {
+  if (typeof pattern !== 'string') throw new TypeError('Expected a string');
+  if ((options && options.nobrace === true) || !/\{.*\}/.test(pattern)) {
+    return [pattern];
+  }
+  return braces(pattern, options);
+};
 
-      if (doPipeError) {
-        stream.on('error', onerror)
-      }
+/**
+ * Expand braces
+ */
 
-      stream.pipe(mergedStream, { end: false })
-      // compatible for old stream
-      stream.resume()
-    }
+micromatch.braceExpand = (pattern, options) => {
+  if (typeof pattern !== 'string') throw new TypeError('Expected a string');
+  return micromatch.braces(pattern, { ...options, expand: true });
+};
 
-    for (let i = 0; i < streams.length; i++) {
-      pipe(streams[i])
-    }
+/**
+ * Expose micromatch
+ */
 
-    next()
-  }
+module.exports = micromatch;
 
-  function endStream () {
-    merging = false
-    // emit 'queueDrain' when all streams merged.
-    mergedStream.emit('queueDrain')
-    if (doEnd) {
-      mergedStream.end()
-    }
-  }
 
-  mergedStream.setMaxListeners(0)
-  mergedStream.add = addStream
-  mergedStream.on('unpipe', function (stream) {
-    stream.emit('merge2UnpipeEnd')
-  })
+/***/ }),
+/* 304 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (args.length) {
-    addStream.apply(null, args)
-  }
-  return mergedStream
-}
+"use strict";
 
-// check and pause streams for pipe.
-function pauseStreams (streams, options) {
-  if (!Array.isArray(streams)) {
-    // Backwards-compat with old-style streams
-    if (!streams._readableState && streams.pipe) {
-      streams = streams.pipe(PassThrough(options))
-    }
-    if (!streams._readableState || !streams.pause || !streams.pipe) {
-      throw new Error('Only readable stream can be merged.')
+
+const stringify = __webpack_require__(305);
+const compile = __webpack_require__(307);
+const expand = __webpack_require__(311);
+const parse = __webpack_require__(312);
+
+/**
+ * Expand the given pattern or create a regex-compatible string.
+ *
+ * ```js
+ * const braces = require('braces');
+ * console.log(braces('{a,b,c}', { compile: true })); //=> ['(a|b|c)']
+ * console.log(braces('{a,b,c}')); //=> ['a', 'b', 'c']
+ * ```
+ * @param {String} `str`
+ * @param {Object} `options`
+ * @return {String}
+ * @api public
+ */
+
+const braces = (input, options = {}) => {
+  let output = [];
+
+  if (Array.isArray(input)) {
+    for (let pattern of input) {
+      let result = braces.create(pattern, options);
+      if (Array.isArray(result)) {
+        output.push(...result);
+      } else {
+        output.push(result);
+      }
     }
-    streams.pause()
   } else {
-    for (let i = 0, len = streams.length; i < len; i++) {
-      streams[i] = pauseStreams(streams[i], options)
-    }
+    output = [].concat(braces.create(input, options));
   }
-  return streams
-}
 
+  if (options && options.expand === true && options.nodupes === true) {
+    output = [...new Set(output)];
+  }
+  return output;
+};
 
-/***/ }),
-/* 300 */
-/***/ (function(module, exports, __webpack_require__) {
+/**
+ * Parse the given `str` with the given `options`.
+ *
+ * ```js
+ * // braces.parse(pattern, [, options]);
+ * const ast = braces.parse('a/{b,c}/d');
+ * console.log(ast);
+ * ```
+ * @param {String} pattern Brace pattern to parse
+ * @param {Object} options
+ * @return {Object} Returns an AST
+ * @api public
+ */
 
-"use strict";
-
-const taskManager = __webpack_require__(301);
-const async_1 = __webpack_require__(330);
-const stream_1 = __webpack_require__(365);
-const sync_1 = __webpack_require__(366);
-const settings_1 = __webpack_require__(368);
-const utils = __webpack_require__(302);
-async function FastGlob(source, options) {
-    assertPatternsInput(source);
-    const works = getWorks(source, async_1.default, options);
-    const result = await Promise.all(works);
-    return utils.array.flatten(result);
-}
-// https://github.com/typescript-eslint/typescript-eslint/issues/60
-// eslint-disable-next-line no-redeclare
-(function (FastGlob) {
-    function sync(source, options) {
-        assertPatternsInput(source);
-        const works = getWorks(source, sync_1.default, options);
-        return utils.array.flatten(works);
-    }
-    FastGlob.sync = sync;
-    function stream(source, options) {
-        assertPatternsInput(source);
-        const works = getWorks(source, stream_1.default, options);
-        /**
-         * The stream returned by the provider cannot work with an asynchronous iterator.
-         * To support asynchronous iterators, regardless of the number of tasks, we always multiplex streams.
-         * This affects performance (+25%). I don't see best solution right now.
-         */
-        return utils.stream.merge(works);
-    }
-    FastGlob.stream = stream;
-    function generateTasks(source, options) {
-        assertPatternsInput(source);
-        const patterns = [].concat(source);
-        const settings = new settings_1.default(options);
-        return taskManager.generate(patterns, settings);
-    }
-    FastGlob.generateTasks = generateTasks;
-    function isDynamicPattern(source, options) {
-        assertPatternsInput(source);
-        const settings = new settings_1.default(options);
-        return utils.pattern.isDynamicPattern(source, settings);
-    }
-    FastGlob.isDynamicPattern = isDynamicPattern;
-    function escapePath(source) {
-        assertPatternsInput(source);
-        return utils.path.escape(source);
-    }
-    FastGlob.escapePath = escapePath;
-})(FastGlob || (FastGlob = {}));
-function getWorks(source, _Provider, options) {
-    const patterns = [].concat(source);
-    const settings = new settings_1.default(options);
-    const tasks = taskManager.generate(patterns, settings);
-    const provider = new _Provider(settings);
-    return tasks.map(provider.read, provider);
-}
-function assertPatternsInput(input) {
-    const source = [].concat(input);
-    const isValidSource = source.every((item) => utils.string.isString(item) && !utils.string.isEmpty(item));
-    if (!isValidSource) {
-        throw new TypeError('Patterns must be a string (non empty) or an array of strings');
-    }
-}
-module.exports = FastGlob;
+braces.parse = (input, options = {}) => parse(input, options);
 
+/**
+ * Creates a braces string from an AST, or an AST node.
+ *
+ * ```js
+ * const braces = require('braces');
+ * let ast = braces.parse('foo/{a,b}/bar');
+ * console.log(stringify(ast.nodes[2])); //=> '{a,b}'
+ * ```
+ * @param {String} `input` Brace pattern or AST.
+ * @param {Object} `options`
+ * @return {Array} Returns an array of expanded values.
+ * @api public
+ */
 
-/***/ }),
-/* 301 */
-/***/ (function(module, exports, __webpack_require__) {
+braces.stringify = (input, options = {}) => {
+  if (typeof input === 'string') {
+    return stringify(braces.parse(input, options), options);
+  }
+  return stringify(input, options);
+};
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(302);
-function generate(patterns, settings) {
-    const positivePatterns = getPositivePatterns(patterns);
-    const negativePatterns = getNegativePatternsAsPositive(patterns, settings.ignore);
-    const staticPatterns = positivePatterns.filter((pattern) => utils.pattern.isStaticPattern(pattern, settings));
-    const dynamicPatterns = positivePatterns.filter((pattern) => utils.pattern.isDynamicPattern(pattern, settings));
-    const staticTasks = convertPatternsToTasks(staticPatterns, negativePatterns, /* dynamic */ false);
-    const dynamicTasks = convertPatternsToTasks(dynamicPatterns, negativePatterns, /* dynamic */ true);
-    return staticTasks.concat(dynamicTasks);
-}
-exports.generate = generate;
-function convertPatternsToTasks(positive, negative, dynamic) {
-    const positivePatternsGroup = groupPatternsByBaseDirectory(positive);
-    // When we have a global group – there is no reason to divide the patterns into independent tasks.
-    // In this case, the global task covers the rest.
-    if ('.' in positivePatternsGroup) {
-        const task = convertPatternGroupToTask('.', positive, negative, dynamic);
-        return [task];
-    }
-    return convertPatternGroupsToTasks(positivePatternsGroup, negative, dynamic);
-}
-exports.convertPatternsToTasks = convertPatternsToTasks;
-function getPositivePatterns(patterns) {
-    return utils.pattern.getPositivePatterns(patterns);
-}
-exports.getPositivePatterns = getPositivePatterns;
-function getNegativePatternsAsPositive(patterns, ignore) {
-    const negative = utils.pattern.getNegativePatterns(patterns).concat(ignore);
-    const positive = negative.map(utils.pattern.convertToPositivePattern);
-    return positive;
-}
-exports.getNegativePatternsAsPositive = getNegativePatternsAsPositive;
-function groupPatternsByBaseDirectory(patterns) {
-    const group = {};
-    return patterns.reduce((collection, pattern) => {
-        const base = utils.pattern.getBaseDirectory(pattern);
-        if (base in collection) {
-            collection[base].push(pattern);
-        }
-        else {
-            collection[base] = [pattern];
-        }
-        return collection;
-    }, group);
-}
-exports.groupPatternsByBaseDirectory = groupPatternsByBaseDirectory;
-function convertPatternGroupsToTasks(positive, negative, dynamic) {
-    return Object.keys(positive).map((base) => {
-        return convertPatternGroupToTask(base, positive[base], negative, dynamic);
-    });
-}
-exports.convertPatternGroupsToTasks = convertPatternGroupsToTasks;
-function convertPatternGroupToTask(base, positive, negative, dynamic) {
-    return {
-        dynamic,
-        positive,
-        negative,
-        base,
-        patterns: [].concat(positive, negative.map(utils.pattern.convertToNegativePattern))
-    };
-}
-exports.convertPatternGroupToTask = convertPatternGroupToTask;
+/**
+ * Compiles a brace pattern into a regex-compatible, optimized string.
+ * This method is called by the main [braces](#braces) function by default.
+ *
+ * ```js
+ * const braces = require('braces');
+ * console.log(braces.compile('a/{b,c}/d'));
+ * //=> ['a/(b|c)/d']
+ * ```
+ * @param {String} `input` Brace pattern or AST.
+ * @param {Object} `options`
+ * @return {Array} Returns an array of expanded values.
+ * @api public
+ */
 
+braces.compile = (input, options = {}) => {
+  if (typeof input === 'string') {
+    input = braces.parse(input, options);
+  }
+  return compile(input, options);
+};
 
-/***/ }),
-/* 302 */
-/***/ (function(module, exports, __webpack_require__) {
+/**
+ * Expands a brace pattern into an array. This method is called by the
+ * main [braces](#braces) function when `options.expand` is true. Before
+ * using this method it's recommended that you read the [performance notes](#performance))
+ * and advantages of using [.compile](#compile) instead.
+ *
+ * ```js
+ * const braces = require('braces');
+ * console.log(braces.expand('a/{b,c}/d'));
+ * //=> ['a/b/d', 'a/c/d'];
+ * ```
+ * @param {String} `pattern` Brace pattern
+ * @param {Object} `options`
+ * @return {Array} Returns an array of expanded values.
+ * @api public
+ */
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const array = __webpack_require__(303);
-exports.array = array;
-const errno = __webpack_require__(304);
-exports.errno = errno;
-const fs = __webpack_require__(305);
-exports.fs = fs;
-const path = __webpack_require__(306);
-exports.path = path;
-const pattern = __webpack_require__(307);
-exports.pattern = pattern;
-const stream = __webpack_require__(328);
-exports.stream = stream;
-const string = __webpack_require__(329);
-exports.string = string;
+braces.expand = (input, options = {}) => {
+  if (typeof input === 'string') {
+    input = braces.parse(input, options);
+  }
 
+  let result = expand(input, options);
 
-/***/ }),
-/* 303 */
-/***/ (function(module, exports, __webpack_require__) {
+  // filter out empty strings if specified
+  if (options.noempty === true) {
+    result = result.filter(Boolean);
+  }
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-function flatten(items) {
-    return items.reduce((collection, item) => [].concat(collection, item), []);
-}
-exports.flatten = flatten;
-function splitWhen(items, predicate) {
-    const result = [[]];
-    let groupIndex = 0;
-    for (const item of items) {
-        if (predicate(item)) {
-            groupIndex++;
-            result[groupIndex] = [];
-        }
-        else {
-            result[groupIndex].push(item);
-        }
-    }
-    return result;
-}
-exports.splitWhen = splitWhen;
+  // filter out duplicates if specified
+  if (options.nodupes === true) {
+    result = [...new Set(result)];
+  }
 
+  return result;
+};
 
-/***/ }),
-/* 304 */
-/***/ (function(module, exports, __webpack_require__) {
+/**
+ * Processes a brace pattern and returns either an expanded array
+ * (if `options.expand` is true), a highly optimized regex-compatible string.
+ * This method is called by the main [braces](#braces) function.
+ *
+ * ```js
+ * const braces = require('braces');
+ * console.log(braces.create('user-{200..300}/project-{a,b,c}-{1..10}'))
+ * //=> 'user-(20[0-9]|2[1-9][0-9]|300)/project-(a|b|c)-([1-9]|10)'
+ * ```
+ * @param {String} `pattern` Brace pattern
+ * @param {Object} `options`
+ * @return {Array} Returns an array of expanded values.
+ * @api public
+ */
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-function isEnoentCodeError(error) {
-    return error.code === 'ENOENT';
-}
-exports.isEnoentCodeError = isEnoentCodeError;
+braces.create = (input, options = {}) => {
+  if (input === '' || input.length < 3) {
+    return [input];
+  }
+
+ return options.expand !== true
+    ? braces.compile(input, options)
+    : braces.expand(input, options);
+};
+
+/**
+ * Expose "braces"
+ */
+
+module.exports = braces;
 
 
 /***/ }),
@@ -41854,6159 +41298,6203 @@ exports.isEnoentCodeError = isEnoentCodeError;
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-class DirentFromStats {
-    constructor(name, stats) {
-        this.name = name;
-        this.isBlockDevice = stats.isBlockDevice.bind(stats);
-        this.isCharacterDevice = stats.isCharacterDevice.bind(stats);
-        this.isDirectory = stats.isDirectory.bind(stats);
-        this.isFIFO = stats.isFIFO.bind(stats);
-        this.isFile = stats.isFile.bind(stats);
-        this.isSocket = stats.isSocket.bind(stats);
-        this.isSymbolicLink = stats.isSymbolicLink.bind(stats);
-    }
-}
-function createDirentFromStats(name, stats) {
-    return new DirentFromStats(name, stats);
-}
-exports.createDirentFromStats = createDirentFromStats;
 
 
-/***/ }),
-/* 306 */
-/***/ (function(module, exports, __webpack_require__) {
+const utils = __webpack_require__(306);
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = __webpack_require__(4);
-const LEADING_DOT_SEGMENT_CHARACTERS_COUNT = 2; // ./ or .\\
-const UNESCAPED_GLOB_SYMBOLS_RE = /(\\?)([()*?[\]{|}]|^!|[!+@](?=\())/g;
-/**
- * Designed to work only with simple paths: `dir\\file`.
- */
-function unixify(filepath) {
-    return filepath.replace(/\\/g, '/');
-}
-exports.unixify = unixify;
-function makeAbsolute(cwd, filepath) {
-    return path.resolve(cwd, filepath);
-}
-exports.makeAbsolute = makeAbsolute;
-function escape(pattern) {
-    return pattern.replace(UNESCAPED_GLOB_SYMBOLS_RE, '\\$2');
-}
-exports.escape = escape;
-function removeLeadingDotSegment(entry) {
-    // We do not use `startsWith` because this is 10x slower than current implementation for some cases.
-    // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
-    if (entry.charAt(0) === '.') {
-        const secondCharactery = entry.charAt(1);
-        if (secondCharactery === '/' || secondCharactery === '\\') {
-            return entry.slice(LEADING_DOT_SEGMENT_CHARACTERS_COUNT);
-        }
-    }
-    return entry;
-}
-exports.removeLeadingDotSegment = removeLeadingDotSegment;
+module.exports = (ast, options = {}) => {
+  let stringify = (node, parent = {}) => {
+    let invalidBlock = options.escapeInvalid && utils.isInvalidBrace(parent);
+    let invalidNode = node.invalid === true && options.escapeInvalid === true;
+    let output = '';
 
+    if (node.value) {
+      if ((invalidBlock || invalidNode) && utils.isOpenOrClose(node)) {
+        return '\\' + node.value;
+      }
+      return node.value;
+    }
 
-/***/ }),
-/* 307 */
-/***/ (function(module, exports, __webpack_require__) {
+    if (node.value) {
+      return node.value;
+    }
+
+    if (node.nodes) {
+      for (let child of node.nodes) {
+        output += stringify(child);
+      }
+    }
+    return output;
+  };
+
+  return stringify(ast);
+};
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = __webpack_require__(4);
-const globParent = __webpack_require__(308);
-const micromatch = __webpack_require__(311);
-const picomatch = __webpack_require__(322);
-const GLOBSTAR = '**';
-const ESCAPE_SYMBOL = '\\';
-const COMMON_GLOB_SYMBOLS_RE = /[*?]|^!/;
-const REGEX_CHARACTER_CLASS_SYMBOLS_RE = /\[.*]/;
-const REGEX_GROUP_SYMBOLS_RE = /(?:^|[^!*+?@])\(.*\|.*\)/;
-const GLOB_EXTENSION_SYMBOLS_RE = /[!*+?@]\(.*\)/;
-const BRACE_EXPANSIONS_SYMBOLS_RE = /{.*(?:,|\.\.).*}/;
-function isStaticPattern(pattern, options = {}) {
-    return !isDynamicPattern(pattern, options);
-}
-exports.isStaticPattern = isStaticPattern;
-function isDynamicPattern(pattern, options = {}) {
-    /**
-     * When the `caseSensitiveMatch` option is disabled, all patterns must be marked as dynamic, because we cannot check
-     * filepath directly (without read directory).
-     */
-    if (options.caseSensitiveMatch === false || pattern.includes(ESCAPE_SYMBOL)) {
-        return true;
-    }
-    if (COMMON_GLOB_SYMBOLS_RE.test(pattern) || REGEX_CHARACTER_CLASS_SYMBOLS_RE.test(pattern) || REGEX_GROUP_SYMBOLS_RE.test(pattern)) {
-        return true;
-    }
-    if (options.extglob !== false && GLOB_EXTENSION_SYMBOLS_RE.test(pattern)) {
-        return true;
-    }
-    if (options.braceExpansion !== false && BRACE_EXPANSIONS_SYMBOLS_RE.test(pattern)) {
-        return true;
-    }
-    return false;
-}
-exports.isDynamicPattern = isDynamicPattern;
-function convertToPositivePattern(pattern) {
-    return isNegativePattern(pattern) ? pattern.slice(1) : pattern;
-}
-exports.convertToPositivePattern = convertToPositivePattern;
-function convertToNegativePattern(pattern) {
-    return '!' + pattern;
-}
-exports.convertToNegativePattern = convertToNegativePattern;
-function isNegativePattern(pattern) {
-    return pattern.startsWith('!') && pattern[1] !== '(';
-}
-exports.isNegativePattern = isNegativePattern;
-function isPositivePattern(pattern) {
-    return !isNegativePattern(pattern);
-}
-exports.isPositivePattern = isPositivePattern;
-function getNegativePatterns(patterns) {
-    return patterns.filter(isNegativePattern);
-}
-exports.getNegativePatterns = getNegativePatterns;
-function getPositivePatterns(patterns) {
-    return patterns.filter(isPositivePattern);
-}
-exports.getPositivePatterns = getPositivePatterns;
-function getBaseDirectory(pattern) {
-    return globParent(pattern, { flipBackslashes: false });
-}
-exports.getBaseDirectory = getBaseDirectory;
-function hasGlobStar(pattern) {
-    return pattern.includes(GLOBSTAR);
-}
-exports.hasGlobStar = hasGlobStar;
-function endsWithSlashGlobStar(pattern) {
-    return pattern.endsWith('/' + GLOBSTAR);
-}
-exports.endsWithSlashGlobStar = endsWithSlashGlobStar;
-function isAffectDepthOfReadingPattern(pattern) {
-    const basename = path.basename(pattern);
-    return endsWithSlashGlobStar(pattern) || isStaticPattern(basename);
-}
-exports.isAffectDepthOfReadingPattern = isAffectDepthOfReadingPattern;
-function expandPatternsWithBraceExpansion(patterns) {
-    return patterns.reduce((collection, pattern) => {
-        return collection.concat(expandBraceExpansion(pattern));
-    }, []);
-}
-exports.expandPatternsWithBraceExpansion = expandPatternsWithBraceExpansion;
-function expandBraceExpansion(pattern) {
-    return micromatch.braces(pattern, {
-        expand: true,
-        nodupes: true
-    });
-}
-exports.expandBraceExpansion = expandBraceExpansion;
-function getPatternParts(pattern, options) {
-    const info = picomatch.scan(pattern, Object.assign(Object.assign({}, options), { parts: true }));
-    // See micromatch/picomatch#58 for more details
-    if (info.parts.length === 0) {
-        return [pattern];
-    }
-    return info.parts;
-}
-exports.getPatternParts = getPatternParts;
-function makeRe(pattern, options) {
-    return micromatch.makeRe(pattern, options);
-}
-exports.makeRe = makeRe;
-function convertPatternsToRe(patterns, options) {
-    return patterns.map((pattern) => makeRe(pattern, options));
-}
-exports.convertPatternsToRe = convertPatternsToRe;
-function matchAny(entry, patternsRe) {
-    return patternsRe.some((patternRe) => patternRe.test(entry));
-}
-exports.matchAny = matchAny;
 
 
 /***/ }),
-/* 308 */
+/* 306 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isGlob = __webpack_require__(309);
-var pathPosixDirname = __webpack_require__(4).posix.dirname;
-var isWin32 = __webpack_require__(120).platform() === 'win32';
-
-var slash = '/';
-var backslash = /\\/g;
-var enclosure = /[\{\[].*[\/]*.*[\}\]]$/;
-var globby = /(^|[^\\])([\{\[]|\([^\)]+$)/;
-var escaped = /\\([\!\*\?\|\[\]\(\)\{\}])/g;
+exports.isInteger = num => {
+  if (typeof num === 'number') {
+    return Number.isInteger(num);
+  }
+  if (typeof num === 'string' && num.trim() !== '') {
+    return Number.isInteger(Number(num));
+  }
+  return false;
+};
 
 /**
- * @param {string} str
- * @param {Object} opts
- * @param {boolean} [opts.flipBackslashes=true]
+ * Find a node of the given type
  */
-module.exports = function globParent(str, opts) {
-  var options = Object.assign({ flipBackslashes: true }, opts);
-
-  // flip windows path separators
-  if (options.flipBackslashes && isWin32 && str.indexOf(slash) < 0) {
-    str = str.replace(backslash, slash);
-  }
-
-  // special case for strings ending in enclosure containing path separator
-  if (enclosure.test(str)) {
-    str += slash;
-  }
 
-  // preserves full path in case of trailing path separator
-  str += 'a';
+exports.find = (node, type) => node.nodes.find(node => node.type === type);
 
-  // remove path parts that are globby
-  do {
-    str = pathPosixDirname(str);
-  } while (isGlob(str) || globby.test(str));
+/**
+ * Find a node of the given type
+ */
 
-  // remove escape chars and return result
-  return str.replace(escaped, '$1');
+exports.exceedsLimit = (min, max, step = 1, limit) => {
+  if (limit === false) return false;
+  if (!exports.isInteger(min) || !exports.isInteger(max)) return false;
+  return ((Number(max) - Number(min)) / Number(step)) >= limit;
 };
 
-
-/***/ }),
-/* 309 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/*!
- * is-glob <https://github.com/jonschlinkert/is-glob>
- *
- * Copyright (c) 2014-2017, Jon Schlinkert.
- * Released under the MIT License.
+/**
+ * Escape the given node with '\\' before node.value
  */
 
-var isExtglob = __webpack_require__(310);
-var chars = { '{': '}', '(': ')', '[': ']'};
-var strictRegex = /\\(.)|(^!|\*|[\].+)]\?|\[[^\\\]]+\]|\{[^\\}]+\}|\(\?[:!=][^\\)]+\)|\([^|]+\|[^\\)]+\))/;
-var relaxedRegex = /\\(.)|(^!|[*?{}()[\]]|\(\?)/;
+exports.escapeNode = (block, n = 0, type) => {
+  let node = block.nodes[n];
+  if (!node) return;
 
-module.exports = function isGlob(str, options) {
-  if (typeof str !== 'string' || str === '') {
-    return false;
+  if ((type && node.type === type) || node.type === 'open' || node.type === 'close') {
+    if (node.escaped !== true) {
+      node.value = '\\' + node.value;
+      node.escaped = true;
+    }
   }
+};
 
-  if (isExtglob(str)) {
+/**
+ * Returns true if the given brace node should be enclosed in literal braces
+ */
+
+exports.encloseBrace = node => {
+  if (node.type !== 'brace') return false;
+  if ((node.commas >> 0 + node.ranges >> 0) === 0) {
+    node.invalid = true;
     return true;
   }
+  return false;
+};
 
-  var regex = strictRegex;
-  var match;
+/**
+ * Returns true if a brace node is invalid.
+ */
 
-  // optionally relax regex
-  if (options && options.strict === false) {
-    regex = relaxedRegex;
+exports.isInvalidBrace = block => {
+  if (block.type !== 'brace') return false;
+  if (block.invalid === true || block.dollar) return true;
+  if ((block.commas >> 0 + block.ranges >> 0) === 0) {
+    block.invalid = true;
+    return true;
   }
-
-  while ((match = regex.exec(str))) {
-    if (match[2]) return true;
-    var idx = match.index + match[0].length;
-
-    // if an open bracket/brace/paren is escaped,
-    // set the index to the next closing character
-    var open = match[1];
-    var close = open ? chars[open] : null;
-    if (open && close) {
-      var n = str.indexOf(close, idx);
-      if (n !== -1) {
-        idx = n + 1;
-      }
-    }
-
-    str = str.slice(idx);
+  if (block.open !== true || block.close !== true) {
+    block.invalid = true;
+    return true;
   }
   return false;
 };
 
+/**
+ * Returns true if a node is an open or close node
+ */
 
-/***/ }),
-/* 310 */
-/***/ (function(module, exports) {
+exports.isOpenOrClose = node => {
+  if (node.type === 'open' || node.type === 'close') {
+    return true;
+  }
+  return node.open === true || node.close === true;
+};
 
-/*!
- * is-extglob <https://github.com/jonschlinkert/is-extglob>
- *
- * Copyright (c) 2014-2016, Jon Schlinkert.
- * Licensed under the MIT License.
+/**
+ * Reduce an array of text nodes.
  */
 
-module.exports = function isExtglob(str) {
-  if (typeof str !== 'string' || str === '') {
-    return false;
-  }
+exports.reduce = nodes => nodes.reduce((acc, node) => {
+  if (node.type === 'text') acc.push(node.value);
+  if (node.type === 'range') node.type = 'text';
+  return acc;
+}, []);
 
-  var match;
-  while ((match = /(\\).|([@?!+*]\(.*\))/g.exec(str))) {
-    if (match[2]) return true;
-    str = str.slice(match.index + match[0].length);
-  }
+/**
+ * Flatten an array
+ */
 
-  return false;
+exports.flatten = (...args) => {
+  const result = [];
+  const flat = arr => {
+    for (let i = 0; i < arr.length; i++) {
+      let ele = arr[i];
+      Array.isArray(ele) ? flat(ele, result) : ele !== void 0 && result.push(ele);
+    }
+    return result;
+  };
+  flat(args);
+  return result;
 };
 
 
 /***/ }),
-/* 311 */
+/* 307 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const util = __webpack_require__(111);
-const braces = __webpack_require__(312);
-const picomatch = __webpack_require__(322);
-const utils = __webpack_require__(325);
-const isEmptyString = val => typeof val === 'string' && (val === '' || val === './');
-
-/**
- * Returns an array of strings that match one or more glob patterns.
- *
- * ```js
- * const mm = require('micromatch');
- * // mm(list, patterns[, options]);
- *
- * console.log(mm(['a.js', 'a.txt'], ['*.js']));
- * //=> [ 'a.js' ]
- * ```
- * @param {String|Array<string>} list List of strings to match.
- * @param {String|Array<string>} patterns One or more glob patterns to use for matching.
- * @param {Object} options See available [options](#options)
- * @return {Array} Returns an array of matches
- * @summary false
- * @api public
- */
-
-const micromatch = (list, patterns, options) => {
-  patterns = [].concat(patterns);
-  list = [].concat(list);
+const fill = __webpack_require__(308);
+const utils = __webpack_require__(306);
 
-  let omit = new Set();
-  let keep = new Set();
-  let items = new Set();
-  let negatives = 0;
+const compile = (ast, options = {}) => {
+  let walk = (node, parent = {}) => {
+    let invalidBlock = utils.isInvalidBrace(parent);
+    let invalidNode = node.invalid === true && options.escapeInvalid === true;
+    let invalid = invalidBlock === true || invalidNode === true;
+    let prefix = options.escapeInvalid === true ? '\\' : '';
+    let output = '';
 
-  let onResult = state => {
-    items.add(state.output);
-    if (options && options.onResult) {
-      options.onResult(state);
+    if (node.isOpen === true) {
+      return prefix + node.value;
+    }
+    if (node.isClose === true) {
+      return prefix + node.value;
     }
-  };
 
-  for (let i = 0; i < patterns.length; i++) {
-    let isMatch = picomatch(String(patterns[i]), { ...options, onResult }, true);
-    let negated = isMatch.state.negated || isMatch.state.negatedExtglob;
-    if (negated) negatives++;
+    if (node.type === 'open') {
+      return invalid ? (prefix + node.value) : '(';
+    }
 
-    for (let item of list) {
-      let matched = isMatch(item, true);
+    if (node.type === 'close') {
+      return invalid ? (prefix + node.value) : ')';
+    }
 
-      let match = negated ? !matched.isMatch : matched.isMatch;
-      if (!match) continue;
+    if (node.type === 'comma') {
+      return node.prev.type === 'comma' ? '' : (invalid ? node.value : '|');
+    }
 
-      if (negated) {
-        omit.add(matched.output);
-      } else {
-        omit.delete(matched.output);
-        keep.add(matched.output);
-      }
+    if (node.value) {
+      return node.value;
     }
-  }
 
-  let result = negatives === patterns.length ? [...items] : [...keep];
-  let matches = result.filter(item => !omit.has(item));
+    if (node.nodes && node.ranges > 0) {
+      let args = utils.reduce(node.nodes);
+      let range = fill(...args, { ...options, wrap: false, toRegex: true });
 
-  if (options && matches.length === 0) {
-    if (options.failglob === true) {
-      throw new Error(`No matches found for "${patterns.join(', ')}"`);
+      if (range.length !== 0) {
+        return args.length > 1 && range.length > 1 ? `(${range})` : range;
+      }
     }
 
-    if (options.nonull === true || options.nullglob === true) {
-      return options.unescape ? patterns.map(p => p.replace(/\\/g, '')) : patterns;
+    if (node.nodes) {
+      for (let child of node.nodes) {
+        output += walk(child, node);
+      }
     }
-  }
+    return output;
+  };
 
-  return matches;
+  return walk(ast);
 };
 
-/**
- * Backwards compatibility
- */
+module.exports = compile;
 
-micromatch.match = micromatch;
 
-/**
- * Returns a matcher function from the given glob `pattern` and `options`.
- * The returned function takes a string to match as its only argument and returns
- * true if the string is a match.
- *
- * ```js
- * const mm = require('micromatch');
- * // mm.matcher(pattern[, options]);
+/***/ }),
+/* 308 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * fill-range <https://github.com/jonschlinkert/fill-range>
  *
- * const isMatch = mm.matcher('*.!(*a)');
- * console.log(isMatch('a.a')); //=> false
- * console.log(isMatch('a.b')); //=> true
- * ```
- * @param {String} `pattern` Glob pattern
- * @param {Object} `options`
- * @return {Function} Returns a matcher function.
- * @api public
+ * Copyright (c) 2014-present, Jon Schlinkert.
+ * Licensed under the MIT License.
  */
 
-micromatch.matcher = (pattern, options) => picomatch(pattern, options);
 
-/**
- * Returns true if **any** of the given glob `patterns` match the specified `string`.
- *
- * ```js
- * const mm = require('micromatch');
- * // mm.isMatch(string, patterns[, options]);
- *
- * console.log(mm.isMatch('a.a', ['b.*', '*.a'])); //=> true
- * console.log(mm.isMatch('a.a', 'b.*')); //=> false
- * ```
- * @param {String} str The string to test.
- * @param {String|Array} patterns One or more glob patterns to use for matching.
- * @param {Object} [options] See available [options](#options).
- * @return {Boolean} Returns true if any patterns match `str`
- * @api public
- */
 
-micromatch.isMatch = (str, patterns, options) => picomatch(patterns, options)(str);
+const util = __webpack_require__(111);
+const toRegexRange = __webpack_require__(309);
 
-/**
- * Backwards compatibility
- */
+const isObject = val => val !== null && typeof val === 'object' && !Array.isArray(val);
 
-micromatch.any = micromatch.isMatch;
+const transform = toNumber => {
+  return value => toNumber === true ? Number(value) : String(value);
+};
 
-/**
- * Returns a list of strings that _**do not match any**_ of the given `patterns`.
- *
- * ```js
- * const mm = require('micromatch');
- * // mm.not(list, patterns[, options]);
- *
- * console.log(mm.not(['a.a', 'b.b', 'c.c'], '*.a'));
- * //=> ['b.b', 'c.c']
- * ```
- * @param {Array} `list` Array of strings to match.
- * @param {String|Array} `patterns` One or more glob pattern to use for matching.
- * @param {Object} `options` See available [options](#options) for changing how matches are performed
- * @return {Array} Returns an array of strings that **do not match** the given patterns.
- * @api public
- */
+const isValidValue = value => {
+  return typeof value === 'number' || (typeof value === 'string' && value !== '');
+};
 
-micromatch.not = (list, patterns, options = {}) => {
-  patterns = [].concat(patterns).map(String);
-  let result = new Set();
-  let items = [];
+const isNumber = num => Number.isInteger(+num);
 
-  let onResult = state => {
-    if (options.onResult) options.onResult(state);
-    items.push(state.output);
-  };
+const zeros = input => {
+  let value = `${input}`;
+  let index = -1;
+  if (value[0] === '-') value = value.slice(1);
+  if (value === '0') return false;
+  while (value[++index] === '0');
+  return index > 0;
+};
 
-  let matches = micromatch(list, patterns, { ...options, onResult });
+const stringify = (start, end, options) => {
+  if (typeof start === 'string' || typeof end === 'string') {
+    return true;
+  }
+  return options.stringify === true;
+};
 
-  for (let item of items) {
-    if (!matches.includes(item)) {
-      result.add(item);
-    }
+const pad = (input, maxLength, toNumber) => {
+  if (maxLength > 0) {
+    let dash = input[0] === '-' ? '-' : '';
+    if (dash) input = input.slice(1);
+    input = (dash + input.padStart(dash ? maxLength - 1 : maxLength, '0'));
   }
-  return [...result];
+  if (toNumber === false) {
+    return String(input);
+  }
+  return input;
 };
 
-/**
- * Returns true if the given `string` contains the given pattern. Similar
- * to [.isMatch](#isMatch) but the pattern can match any part of the string.
- *
- * ```js
- * var mm = require('micromatch');
- * // mm.contains(string, pattern[, options]);
- *
- * console.log(mm.contains('aa/bb/cc', '*b'));
- * //=> true
- * console.log(mm.contains('aa/bb/cc', '*d'));
- * //=> false
- * ```
- * @param {String} `str` The string to match.
- * @param {String|Array} `patterns` Glob pattern to use for matching.
- * @param {Object} `options` See available [options](#options) for changing how matches are performed
- * @return {Boolean} Returns true if the patter matches any part of `str`.
- * @api public
- */
+const toMaxLen = (input, maxLength) => {
+  let negative = input[0] === '-' ? '-' : '';
+  if (negative) {
+    input = input.slice(1);
+    maxLength--;
+  }
+  while (input.length < maxLength) input = '0' + input;
+  return negative ? ('-' + input) : input;
+};
 
-micromatch.contains = (str, pattern, options) => {
-  if (typeof str !== 'string') {
-    throw new TypeError(`Expected a string: "${util.inspect(str)}"`);
+const toSequence = (parts, options) => {
+  parts.negatives.sort((a, b) => a < b ? -1 : a > b ? 1 : 0);
+  parts.positives.sort((a, b) => a < b ? -1 : a > b ? 1 : 0);
+
+  let prefix = options.capture ? '' : '?:';
+  let positives = '';
+  let negatives = '';
+  let result;
+
+  if (parts.positives.length) {
+    positives = parts.positives.join('|');
   }
 
-  if (Array.isArray(pattern)) {
-    return pattern.some(p => micromatch.contains(str, p, options));
+  if (parts.negatives.length) {
+    negatives = `-(${prefix}${parts.negatives.join('|')})`;
   }
 
-  if (typeof pattern === 'string') {
-    if (isEmptyString(str) || isEmptyString(pattern)) {
-      return false;
-    }
+  if (positives && negatives) {
+    result = `${positives}|${negatives}`;
+  } else {
+    result = positives || negatives;
+  }
 
-    if (str.includes(pattern) || (str.startsWith('./') && str.slice(2).includes(pattern))) {
-      return true;
-    }
+  if (options.wrap) {
+    return `(${prefix}${result})`;
   }
 
-  return micromatch.isMatch(str, pattern, { ...options, contains: true });
+  return result;
 };
 
-/**
- * Filter the keys of the given object with the given `glob` pattern
- * and `options`. Does not attempt to match nested keys. If you need this feature,
- * use [glob-object][] instead.
- *
- * ```js
- * const mm = require('micromatch');
- * // mm.matchKeys(object, patterns[, options]);
- *
- * const obj = { aa: 'a', ab: 'b', ac: 'c' };
- * console.log(mm.matchKeys(obj, '*b'));
- * //=> { ab: 'b' }
- * ```
- * @param {Object} `object` The object with keys to filter.
- * @param {String|Array} `patterns` One or more glob patterns to use for matching.
- * @param {Object} `options` See available [options](#options) for changing how matches are performed
- * @return {Object} Returns an object with only keys that match the given patterns.
- * @api public
- */
-
-micromatch.matchKeys = (obj, patterns, options) => {
-  if (!utils.isObject(obj)) {
-    throw new TypeError('Expected the first argument to be an object');
+const toRange = (a, b, isNumbers, options) => {
+  if (isNumbers) {
+    return toRegexRange(a, b, { wrap: false, ...options });
   }
-  let keys = micromatch(Object.keys(obj), patterns, options);
-  let res = {};
-  for (let key of keys) res[key] = obj[key];
-  return res;
-};
 
-/**
- * Returns true if some of the strings in the given `list` match any of the given glob `patterns`.
- *
- * ```js
- * const mm = require('micromatch');
- * // mm.some(list, patterns[, options]);
- *
- * console.log(mm.some(['foo.js', 'bar.js'], ['*.js', '!foo.js']));
- * // true
- * console.log(mm.some(['foo.js'], ['*.js', '!foo.js']));
- * // false
- * ```
- * @param {String|Array} `list` The string or array of strings to test. Returns as soon as the first match is found.
- * @param {String|Array} `patterns` One or more glob patterns to use for matching.
- * @param {Object} `options` See available [options](#options) for changing how matches are performed
- * @return {Boolean} Returns true if any patterns match `str`
- * @api public
- */
+  let start = String.fromCharCode(a);
+  if (a === b) return start;
 
-micromatch.some = (list, patterns, options) => {
-  let items = [].concat(list);
+  let stop = String.fromCharCode(b);
+  return `[${start}-${stop}]`;
+};
 
-  for (let pattern of [].concat(patterns)) {
-    let isMatch = picomatch(String(pattern), options);
-    if (items.some(item => isMatch(item))) {
-      return true;
-    }
+const toRegex = (start, end, options) => {
+  if (Array.isArray(start)) {
+    let wrap = options.wrap === true;
+    let prefix = options.capture ? '' : '?:';
+    return wrap ? `(${prefix}${start.join('|')})` : start.join('|');
   }
-  return false;
+  return toRegexRange(start, end, options);
 };
 
-/**
- * Returns true if every string in the given `list` matches
- * any of the given glob `patterns`.
- *
- * ```js
- * const mm = require('micromatch');
- * // mm.every(list, patterns[, options]);
- *
- * console.log(mm.every('foo.js', ['foo.js']));
- * // true
- * console.log(mm.every(['foo.js', 'bar.js'], ['*.js']));
- * // true
- * console.log(mm.every(['foo.js', 'bar.js'], ['*.js', '!foo.js']));
- * // false
- * console.log(mm.every(['foo.js'], ['*.js', '!foo.js']));
- * // false
- * ```
- * @param {String|Array} `list` The string or array of strings to test.
- * @param {String|Array} `patterns` One or more glob patterns to use for matching.
- * @param {Object} `options` See available [options](#options) for changing how matches are performed
- * @return {Boolean} Returns true if any patterns match `str`
- * @api public
- */
+const rangeError = (...args) => {
+  return new RangeError('Invalid range arguments: ' + util.inspect(...args));
+};
 
-micromatch.every = (list, patterns, options) => {
-  let items = [].concat(list);
+const invalidRange = (start, end, options) => {
+  if (options.strictRanges === true) throw rangeError([start, end]);
+  return [];
+};
 
-  for (let pattern of [].concat(patterns)) {
-    let isMatch = picomatch(String(pattern), options);
-    if (!items.every(item => isMatch(item))) {
-      return false;
-    }
+const invalidStep = (step, options) => {
+  if (options.strictRanges === true) {
+    throw new TypeError(`Expected step "${step}" to be a number`);
   }
-  return true;
+  return [];
 };
 
-/**
- * Returns true if **all** of the given `patterns` match
- * the specified string.
- *
- * ```js
- * const mm = require('micromatch');
- * // mm.all(string, patterns[, options]);
- *
- * console.log(mm.all('foo.js', ['foo.js']));
- * // true
- *
- * console.log(mm.all('foo.js', ['*.js', '!foo.js']));
- * // false
- *
- * console.log(mm.all('foo.js', ['*.js', 'foo.js']));
- * // true
- *
- * console.log(mm.all('foo.js', ['*.js', 'f*', '*o*', '*o.js']));
- * // true
- * ```
- * @param {String|Array} `str` The string to test.
- * @param {String|Array} `patterns` One or more glob patterns to use for matching.
- * @param {Object} `options` See available [options](#options) for changing how matches are performed
- * @return {Boolean} Returns true if any patterns match `str`
- * @api public
- */
+const fillNumbers = (start, end, step = 1, options = {}) => {
+  let a = Number(start);
+  let b = Number(end);
 
-micromatch.all = (str, patterns, options) => {
-  if (typeof str !== 'string') {
-    throw new TypeError(`Expected a string: "${util.inspect(str)}"`);
+  if (!Number.isInteger(a) || !Number.isInteger(b)) {
+    if (options.strictRanges === true) throw rangeError([start, end]);
+    return [];
   }
 
-  return [].concat(patterns).every(p => picomatch(p, options)(str));
-};
+  // fix negative zero
+  if (a === 0) a = 0;
+  if (b === 0) b = 0;
 
-/**
- * Returns an array of matches captured by `pattern` in `string, or `null` if the pattern did not match.
- *
- * ```js
- * const mm = require('micromatch');
- * // mm.capture(pattern, string[, options]);
- *
- * console.log(mm.capture('test/*.js', 'test/foo.js'));
- * //=> ['foo']
- * console.log(mm.capture('test/*.js', 'foo/bar.css'));
- * //=> null
- * ```
- * @param {String} `glob` Glob pattern to use for matching.
- * @param {String} `input` String to match
- * @param {Object} `options` See available [options](#options) for changing how matches are performed
- * @return {Boolean} Returns an array of captures if the input matches the glob pattern, otherwise `null`.
- * @api public
- */
+  let descending = a > b;
+  let startString = String(start);
+  let endString = String(end);
+  let stepString = String(step);
+  step = Math.max(Math.abs(step), 1);
 
-micromatch.capture = (glob, input, options) => {
-  let posix = utils.isWindows(options);
-  let regex = picomatch.makeRe(String(glob), { ...options, capture: true });
-  let match = regex.exec(posix ? utils.toPosixSlashes(input) : input);
+  let padded = zeros(startString) || zeros(endString) || zeros(stepString);
+  let maxLen = padded ? Math.max(startString.length, endString.length, stepString.length) : 0;
+  let toNumber = padded === false && stringify(start, end, options) === false;
+  let format = options.transform || transform(toNumber);
 
-  if (match) {
-    return match.slice(1).map(v => v === void 0 ? '' : v);
+  if (options.toRegex && step === 1) {
+    return toRange(toMaxLen(start, maxLen), toMaxLen(end, maxLen), true, options);
+  }
+
+  let parts = { negatives: [], positives: [] };
+  let push = num => parts[num < 0 ? 'negatives' : 'positives'].push(Math.abs(num));
+  let range = [];
+  let index = 0;
+
+  while (descending ? a >= b : a <= b) {
+    if (options.toRegex === true && step > 1) {
+      push(a);
+    } else {
+      range.push(pad(format(a, index), maxLen, toNumber));
+    }
+    a = descending ? a - step : a + step;
+    index++;
+  }
+
+  if (options.toRegex === true) {
+    return step > 1
+      ? toSequence(parts, options)
+      : toRegex(range, null, { wrap: false, ...options });
   }
+
+  return range;
 };
 
-/**
- * Create a regular expression from the given glob `pattern`.
- *
- * ```js
- * const mm = require('micromatch');
- * // mm.makeRe(pattern[, options]);
- *
- * console.log(mm.makeRe('*.js'));
- * //=> /^(?:(\.[\\\/])?(?!\.)(?=.)[^\/]*?\.js)$/
- * ```
- * @param {String} `pattern` A glob pattern to convert to regex.
- * @param {Object} `options`
- * @return {RegExp} Returns a regex created from the given pattern.
- * @api public
- */
+const fillLetters = (start, end, step = 1, options = {}) => {
+  if ((!isNumber(start) && start.length > 1) || (!isNumber(end) && end.length > 1)) {
+    return invalidRange(start, end, options);
+  }
 
-micromatch.makeRe = (...args) => picomatch.makeRe(...args);
 
-/**
- * Scan a glob pattern to separate the pattern into segments. Used
- * by the [split](#split) method.
- *
- * ```js
- * const mm = require('micromatch');
- * const state = mm.scan(pattern[, options]);
- * ```
- * @param {String} `pattern`
- * @param {Object} `options`
- * @return {Object} Returns an object with
- * @api public
- */
+  let format = options.transform || (val => String.fromCharCode(val));
+  let a = `${start}`.charCodeAt(0);
+  let b = `${end}`.charCodeAt(0);
 
-micromatch.scan = (...args) => picomatch.scan(...args);
+  let descending = a > b;
+  let min = Math.min(a, b);
+  let max = Math.max(a, b);
 
-/**
- * Parse a glob pattern to create the source string for a regular
- * expression.
- *
- * ```js
- * const mm = require('micromatch');
- * const state = mm(pattern[, options]);
- * ```
- * @param {String} `glob`
- * @param {Object} `options`
- * @return {Object} Returns an object with useful properties and output to be used as regex source string.
- * @api public
- */
+  if (options.toRegex && step === 1) {
+    return toRange(min, max, false, options);
+  }
 
-micromatch.parse = (patterns, options) => {
-  let res = [];
-  for (let pattern of [].concat(patterns || [])) {
-    for (let str of braces(String(pattern), options)) {
-      res.push(picomatch.parse(str, options));
-    }
+  let range = [];
+  let index = 0;
+
+  while (descending ? a >= b : a <= b) {
+    range.push(format(a, index));
+    a = descending ? a - step : a + step;
+    index++;
   }
-  return res;
+
+  if (options.toRegex === true) {
+    return toRegex(range, null, { wrap: false, options });
+  }
+
+  return range;
 };
 
-/**
- * Process the given brace `pattern`.
- *
- * ```js
- * const { braces } = require('micromatch');
- * console.log(braces('foo/{a,b,c}/bar'));
- * //=> [ 'foo/(a|b|c)/bar' ]
- *
- * console.log(braces('foo/{a,b,c}/bar', { expand: true }));
- * //=> [ 'foo/a/bar', 'foo/b/bar', 'foo/c/bar' ]
- * ```
- * @param {String} `pattern` String with brace pattern to process.
- * @param {Object} `options` Any [options](#options) to change how expansion is performed. See the [braces][] library for all available options.
- * @return {Array}
- * @api public
- */
+const fill = (start, end, step, options = {}) => {
+  if (end == null && isValidValue(start)) {
+    return [start];
+  }
 
-micromatch.braces = (pattern, options) => {
-  if (typeof pattern !== 'string') throw new TypeError('Expected a string');
-  if ((options && options.nobrace === true) || !/\{.*\}/.test(pattern)) {
-    return [pattern];
+  if (!isValidValue(start) || !isValidValue(end)) {
+    return invalidRange(start, end, options);
   }
-  return braces(pattern, options);
-};
 
-/**
- * Expand braces
- */
+  if (typeof step === 'function') {
+    return fill(start, end, 1, { transform: step });
+  }
 
-micromatch.braceExpand = (pattern, options) => {
-  if (typeof pattern !== 'string') throw new TypeError('Expected a string');
-  return micromatch.braces(pattern, { ...options, expand: true });
-};
+  if (isObject(step)) {
+    return fill(start, end, 0, step);
+  }
 
-/**
- * Expose micromatch
- */
+  let opts = { ...options };
+  if (opts.capture === true) opts.wrap = true;
+  step = step || opts.step || 1;
 
-module.exports = micromatch;
+  if (!isNumber(step)) {
+    if (step != null && !isObject(step)) return invalidStep(step, opts);
+    return fill(start, end, 1, step);
+  }
+
+  if (isNumber(start) && isNumber(end)) {
+    return fillNumbers(start, end, step, opts);
+  }
+
+  return fillLetters(start, end, Math.max(Math.abs(step), 1), opts);
+};
+
+module.exports = fill;
 
 
 /***/ }),
-/* 312 */
+/* 309 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
+/*!
+ * to-regex-range <https://github.com/micromatch/to-regex-range>
+ *
+ * Copyright (c) 2015-present, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
 
-const stringify = __webpack_require__(313);
-const compile = __webpack_require__(315);
-const expand = __webpack_require__(319);
-const parse = __webpack_require__(320);
 
-/**
- * Expand the given pattern or create a regex-compatible string.
- *
- * ```js
- * const braces = require('braces');
- * console.log(braces('{a,b,c}', { compile: true })); //=> ['(a|b|c)']
- * console.log(braces('{a,b,c}')); //=> ['a', 'b', 'c']
- * ```
- * @param {String} `str`
- * @param {Object} `options`
- * @return {String}
- * @api public
- */
+const isNumber = __webpack_require__(310);
 
-const braces = (input, options = {}) => {
-  let output = [];
+const toRegexRange = (min, max, options) => {
+  if (isNumber(min) === false) {
+    throw new TypeError('toRegexRange: expected the first argument to be a number');
+  }
 
-  if (Array.isArray(input)) {
-    for (let pattern of input) {
-      let result = braces.create(pattern, options);
-      if (Array.isArray(result)) {
-        output.push(...result);
-      } else {
-        output.push(result);
-      }
-    }
-  } else {
-    output = [].concat(braces.create(input, options));
+  if (max === void 0 || min === max) {
+    return String(min);
   }
 
-  if (options && options.expand === true && options.nodupes === true) {
-    output = [...new Set(output)];
+  if (isNumber(max) === false) {
+    throw new TypeError('toRegexRange: expected the second argument to be a number.');
   }
-  return output;
-};
 
-/**
- * Parse the given `str` with the given `options`.
- *
- * ```js
- * // braces.parse(pattern, [, options]);
- * const ast = braces.parse('a/{b,c}/d');
- * console.log(ast);
- * ```
- * @param {String} pattern Brace pattern to parse
- * @param {Object} options
- * @return {Object} Returns an AST
- * @api public
- */
-
-braces.parse = (input, options = {}) => parse(input, options);
+  let opts = { relaxZeros: true, ...options };
+  if (typeof opts.strictZeros === 'boolean') {
+    opts.relaxZeros = opts.strictZeros === false;
+  }
 
-/**
- * Creates a braces string from an AST, or an AST node.
- *
- * ```js
- * const braces = require('braces');
- * let ast = braces.parse('foo/{a,b}/bar');
- * console.log(stringify(ast.nodes[2])); //=> '{a,b}'
- * ```
- * @param {String} `input` Brace pattern or AST.
- * @param {Object} `options`
- * @return {Array} Returns an array of expanded values.
- * @api public
- */
+  let relax = String(opts.relaxZeros);
+  let shorthand = String(opts.shorthand);
+  let capture = String(opts.capture);
+  let wrap = String(opts.wrap);
+  let cacheKey = min + ':' + max + '=' + relax + shorthand + capture + wrap;
 
-braces.stringify = (input, options = {}) => {
-  if (typeof input === 'string') {
-    return stringify(braces.parse(input, options), options);
+  if (toRegexRange.cache.hasOwnProperty(cacheKey)) {
+    return toRegexRange.cache[cacheKey].result;
   }
-  return stringify(input, options);
-};
 
-/**
- * Compiles a brace pattern into a regex-compatible, optimized string.
- * This method is called by the main [braces](#braces) function by default.
- *
- * ```js
- * const braces = require('braces');
- * console.log(braces.compile('a/{b,c}/d'));
- * //=> ['a/(b|c)/d']
- * ```
- * @param {String} `input` Brace pattern or AST.
- * @param {Object} `options`
- * @return {Array} Returns an array of expanded values.
- * @api public
- */
+  let a = Math.min(min, max);
+  let b = Math.max(min, max);
 
-braces.compile = (input, options = {}) => {
-  if (typeof input === 'string') {
-    input = braces.parse(input, options);
+  if (Math.abs(a - b) === 1) {
+    let result = min + '|' + max;
+    if (opts.capture) {
+      return `(${result})`;
+    }
+    if (opts.wrap === false) {
+      return result;
+    }
+    return `(?:${result})`;
   }
-  return compile(input, options);
-};
 
-/**
- * Expands a brace pattern into an array. This method is called by the
- * main [braces](#braces) function when `options.expand` is true. Before
- * using this method it's recommended that you read the [performance notes](#performance))
- * and advantages of using [.compile](#compile) instead.
- *
- * ```js
- * const braces = require('braces');
- * console.log(braces.expand('a/{b,c}/d'));
- * //=> ['a/b/d', 'a/c/d'];
- * ```
- * @param {String} `pattern` Brace pattern
- * @param {Object} `options`
- * @return {Array} Returns an array of expanded values.
- * @api public
- */
+  let isPadded = hasPadding(min) || hasPadding(max);
+  let state = { min, max, a, b };
+  let positives = [];
+  let negatives = [];
 
-braces.expand = (input, options = {}) => {
-  if (typeof input === 'string') {
-    input = braces.parse(input, options);
+  if (isPadded) {
+    state.isPadded = isPadded;
+    state.maxLen = String(state.max).length;
   }
 
-  let result = expand(input, options);
+  if (a < 0) {
+    let newMin = b < 0 ? Math.abs(b) : 1;
+    negatives = splitToPatterns(newMin, Math.abs(a), state, opts);
+    a = state.a = 0;
+  }
 
-  // filter out empty strings if specified
-  if (options.noempty === true) {
-    result = result.filter(Boolean);
+  if (b >= 0) {
+    positives = splitToPatterns(a, b, state, opts);
   }
 
-  // filter out duplicates if specified
-  if (options.nodupes === true) {
-    result = [...new Set(result)];
+  state.negatives = negatives;
+  state.positives = positives;
+  state.result = collatePatterns(negatives, positives, opts);
+
+  if (opts.capture === true) {
+    state.result = `(${state.result})`;
+  } else if (opts.wrap !== false && (positives.length + negatives.length) > 1) {
+    state.result = `(?:${state.result})`;
   }
 
-  return result;
+  toRegexRange.cache[cacheKey] = state;
+  return state.result;
 };
 
-/**
- * Processes a brace pattern and returns either an expanded array
- * (if `options.expand` is true), a highly optimized regex-compatible string.
- * This method is called by the main [braces](#braces) function.
- *
- * ```js
- * const braces = require('braces');
- * console.log(braces.create('user-{200..300}/project-{a,b,c}-{1..10}'))
- * //=> 'user-(20[0-9]|2[1-9][0-9]|300)/project-(a|b|c)-([1-9]|10)'
- * ```
- * @param {String} `pattern` Brace pattern
- * @param {Object} `options`
- * @return {Array} Returns an array of expanded values.
- * @api public
- */
+function collatePatterns(neg, pos, options) {
+  let onlyNegative = filterPatterns(neg, pos, '-', false, options) || [];
+  let onlyPositive = filterPatterns(pos, neg, '', false, options) || [];
+  let intersected = filterPatterns(neg, pos, '-?', true, options) || [];
+  let subpatterns = onlyNegative.concat(intersected).concat(onlyPositive);
+  return subpatterns.join('|');
+}
 
-braces.create = (input, options = {}) => {
-  if (input === '' || input.length < 3) {
-    return [input];
+function splitToRanges(min, max) {
+  let nines = 1;
+  let zeros = 1;
+
+  let stop = countNines(min, nines);
+  let stops = new Set([max]);
+
+  while (min <= stop && stop <= max) {
+    stops.add(stop);
+    nines += 1;
+    stop = countNines(min, nines);
   }
 
- return options.expand !== true
-    ? braces.compile(input, options)
-    : braces.expand(input, options);
-};
+  stop = countZeros(max + 1, zeros) - 1;
+
+  while (min < stop && stop <= max) {
+    stops.add(stop);
+    zeros += 1;
+    stop = countZeros(max + 1, zeros) - 1;
+  }
+
+  stops = [...stops];
+  stops.sort(compare);
+  return stops;
+}
 
 /**
- * Expose "braces"
+ * Convert a range to a regex pattern
+ * @param {Number} `start`
+ * @param {Number} `stop`
+ * @return {String}
  */
 
-module.exports = braces;
+function rangeToPattern(start, stop, options) {
+  if (start === stop) {
+    return { pattern: start, count: [], digits: 0 };
+  }
+
+  let zipped = zip(start, stop);
+  let digits = zipped.length;
+  let pattern = '';
+  let count = 0;
 
+  for (let i = 0; i < digits; i++) {
+    let [startDigit, stopDigit] = zipped[i];
 
-/***/ }),
-/* 313 */
-/***/ (function(module, exports, __webpack_require__) {
+    if (startDigit === stopDigit) {
+      pattern += startDigit;
 
-"use strict";
+    } else if (startDigit !== '0' || stopDigit !== '9') {
+      pattern += toCharacterClass(startDigit, stopDigit, options);
+
+    } else {
+      count++;
+    }
+  }
 
+  if (count) {
+    pattern += options.shorthand === true ? '\\d' : '[0-9]';
+  }
 
-const utils = __webpack_require__(314);
+  return { pattern, count: [count], digits };
+}
 
-module.exports = (ast, options = {}) => {
-  let stringify = (node, parent = {}) => {
-    let invalidBlock = options.escapeInvalid && utils.isInvalidBrace(parent);
-    let invalidNode = node.invalid === true && options.escapeInvalid === true;
-    let output = '';
+function splitToPatterns(min, max, tok, options) {
+  let ranges = splitToRanges(min, max);
+  let tokens = [];
+  let start = min;
+  let prev;
 
-    if (node.value) {
-      if ((invalidBlock || invalidNode) && utils.isOpenOrClose(node)) {
-        return '\\' + node.value;
+  for (let i = 0; i < ranges.length; i++) {
+    let max = ranges[i];
+    let obj = rangeToPattern(String(start), String(max), options);
+    let zeros = '';
+
+    if (!tok.isPadded && prev && prev.pattern === obj.pattern) {
+      if (prev.count.length > 1) {
+        prev.count.pop();
       }
-      return node.value;
-    }
 
-    if (node.value) {
-      return node.value;
+      prev.count.push(obj.count[0]);
+      prev.string = prev.pattern + toQuantifier(prev.count);
+      start = max + 1;
+      continue;
     }
 
-    if (node.nodes) {
-      for (let child of node.nodes) {
-        output += stringify(child);
-      }
+    if (tok.isPadded) {
+      zeros = padZeros(max, tok, options);
     }
-    return output;
-  };
-
-  return stringify(ast);
-};
 
+    obj.string = zeros + obj.pattern + toQuantifier(obj.count);
+    tokens.push(obj);
+    start = max + 1;
+    prev = obj;
+  }
 
+  return tokens;
+}
 
-/***/ }),
-/* 314 */
-/***/ (function(module, exports, __webpack_require__) {
+function filterPatterns(arr, comparison, prefix, intersection, options) {
+  let result = [];
 
-"use strict";
+  for (let ele of arr) {
+    let { string } = ele;
 
+    // only push if _both_ are negative...
+    if (!intersection && !contains(comparison, 'string', string)) {
+      result.push(prefix + string);
+    }
 
-exports.isInteger = num => {
-  if (typeof num === 'number') {
-    return Number.isInteger(num);
-  }
-  if (typeof num === 'string' && num.trim() !== '') {
-    return Number.isInteger(Number(num));
+    // or _both_ are positive
+    if (intersection && contains(comparison, 'string', string)) {
+      result.push(prefix + string);
+    }
   }
-  return false;
-};
+  return result;
+}
 
 /**
- * Find a node of the given type
+ * Zip strings
  */
 
-exports.find = (node, type) => node.nodes.find(node => node.type === type);
+function zip(a, b) {
+  let arr = [];
+  for (let i = 0; i < a.length; i++) arr.push([a[i], b[i]]);
+  return arr;
+}
 
-/**
- * Find a node of the given type
- */
+function compare(a, b) {
+  return a > b ? 1 : b > a ? -1 : 0;
+}
 
-exports.exceedsLimit = (min, max, step = 1, limit) => {
-  if (limit === false) return false;
-  if (!exports.isInteger(min) || !exports.isInteger(max)) return false;
-  return ((Number(max) - Number(min)) / Number(step)) >= limit;
-};
+function contains(arr, key, val) {
+  return arr.some(ele => ele[key] === val);
+}
 
-/**
- * Escape the given node with '\\' before node.value
- */
+function countNines(min, len) {
+  return Number(String(min).slice(0, -len) + '9'.repeat(len));
+}
 
-exports.escapeNode = (block, n = 0, type) => {
-  let node = block.nodes[n];
-  if (!node) return;
+function countZeros(integer, zeros) {
+  return integer - (integer % Math.pow(10, zeros));
+}
 
-  if ((type && node.type === type) || node.type === 'open' || node.type === 'close') {
-    if (node.escaped !== true) {
-      node.value = '\\' + node.value;
-      node.escaped = true;
-    }
+function toQuantifier(digits) {
+  let [start = 0, stop = ''] = digits;
+  if (stop || start > 1) {
+    return `{${start + (stop ? ',' + stop : '')}}`;
   }
-};
+  return '';
+}
 
-/**
- * Returns true if the given brace node should be enclosed in literal braces
- */
+function toCharacterClass(a, b, options) {
+  return `[${a}${(b - a === 1) ? '' : '-'}${b}]`;
+}
 
-exports.encloseBrace = node => {
-  if (node.type !== 'brace') return false;
-  if ((node.commas >> 0 + node.ranges >> 0) === 0) {
-    node.invalid = true;
-    return true;
+function hasPadding(str) {
+  return /^-?(0+)\d/.test(str);
+}
+
+function padZeros(value, tok, options) {
+  if (!tok.isPadded) {
+    return value;
   }
-  return false;
-};
 
-/**
- * Returns true if a brace node is invalid.
- */
+  let diff = Math.abs(tok.maxLen - String(value).length);
+  let relax = options.relaxZeros !== false;
 
-exports.isInvalidBrace = block => {
-  if (block.type !== 'brace') return false;
-  if (block.invalid === true || block.dollar) return true;
-  if ((block.commas >> 0 + block.ranges >> 0) === 0) {
-    block.invalid = true;
-    return true;
-  }
-  if (block.open !== true || block.close !== true) {
-    block.invalid = true;
-    return true;
+  switch (diff) {
+    case 0:
+      return '';
+    case 1:
+      return relax ? '0?' : '0';
+    case 2:
+      return relax ? '0{0,2}' : '00';
+    default: {
+      return relax ? `0{0,${diff}}` : `0{${diff}}`;
+    }
   }
-  return false;
-};
+}
 
 /**
- * Returns true if a node is an open or close node
+ * Cache
  */
 
-exports.isOpenOrClose = node => {
-  if (node.type === 'open' || node.type === 'close') {
-    return true;
-  }
-  return node.open === true || node.close === true;
-};
+toRegexRange.cache = {};
+toRegexRange.clearCache = () => (toRegexRange.cache = {});
 
 /**
- * Reduce an array of text nodes.
+ * Expose `toRegexRange`
  */
 
-exports.reduce = nodes => nodes.reduce((acc, node) => {
-  if (node.type === 'text') acc.push(node.value);
-  if (node.type === 'range') node.type = 'text';
-  return acc;
-}, []);
+module.exports = toRegexRange;
 
-/**
- * Flatten an array
+
+/***/ }),
+/* 310 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * is-number <https://github.com/jonschlinkert/is-number>
+ *
+ * Copyright (c) 2014-present, Jon Schlinkert.
+ * Released under the MIT License.
  */
 
-exports.flatten = (...args) => {
-  const result = [];
-  const flat = arr => {
-    for (let i = 0; i < arr.length; i++) {
-      let ele = arr[i];
-      Array.isArray(ele) ? flat(ele, result) : ele !== void 0 && result.push(ele);
-    }
-    return result;
-  };
-  flat(args);
-  return result;
+
+
+module.exports = function(num) {
+  if (typeof num === 'number') {
+    return num - num === 0;
+  }
+  if (typeof num === 'string' && num.trim() !== '') {
+    return Number.isFinite ? Number.isFinite(+num) : isFinite(+num);
+  }
+  return false;
 };
 
 
 /***/ }),
-/* 315 */
+/* 311 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const fill = __webpack_require__(316);
-const utils = __webpack_require__(314);
+const fill = __webpack_require__(308);
+const stringify = __webpack_require__(305);
+const utils = __webpack_require__(306);
 
-const compile = (ast, options = {}) => {
-  let walk = (node, parent = {}) => {
-    let invalidBlock = utils.isInvalidBrace(parent);
-    let invalidNode = node.invalid === true && options.escapeInvalid === true;
-    let invalid = invalidBlock === true || invalidNode === true;
-    let prefix = options.escapeInvalid === true ? '\\' : '';
-    let output = '';
+const append = (queue = '', stash = '', enclose = false) => {
+  let result = [];
 
-    if (node.isOpen === true) {
-      return prefix + node.value;
-    }
-    if (node.isClose === true) {
-      return prefix + node.value;
-    }
+  queue = [].concat(queue);
+  stash = [].concat(stash);
 
-    if (node.type === 'open') {
-      return invalid ? (prefix + node.value) : '(';
+  if (!stash.length) return queue;
+  if (!queue.length) {
+    return enclose ? utils.flatten(stash).map(ele => `{${ele}}`) : stash;
+  }
+
+  for (let item of queue) {
+    if (Array.isArray(item)) {
+      for (let value of item) {
+        result.push(append(value, stash, enclose));
+      }
+    } else {
+      for (let ele of stash) {
+        if (enclose === true && typeof ele === 'string') ele = `{${ele}}`;
+        result.push(Array.isArray(ele) ? append(item, ele, enclose) : (item + ele));
+      }
     }
+  }
+  return utils.flatten(result);
+};
 
-    if (node.type === 'close') {
-      return invalid ? (prefix + node.value) : ')';
+const expand = (ast, options = {}) => {
+  let rangeLimit = options.rangeLimit === void 0 ? 1000 : options.rangeLimit;
+
+  let walk = (node, parent = {}) => {
+    node.queue = [];
+
+    let p = parent;
+    let q = parent.queue;
+
+    while (p.type !== 'brace' && p.type !== 'root' && p.parent) {
+      p = p.parent;
+      q = p.queue;
     }
 
-    if (node.type === 'comma') {
-      return node.prev.type === 'comma' ? '' : (invalid ? node.value : '|');
+    if (node.invalid || node.dollar) {
+      q.push(append(q.pop(), stringify(node, options)));
+      return;
     }
 
-    if (node.value) {
-      return node.value;
+    if (node.type === 'brace' && node.invalid !== true && node.nodes.length === 2) {
+      q.push(append(q.pop(), ['{}']));
+      return;
     }
 
     if (node.nodes && node.ranges > 0) {
       let args = utils.reduce(node.nodes);
-      let range = fill(...args, { ...options, wrap: false, toRegex: true });
 
-      if (range.length !== 0) {
-        return args.length > 1 && range.length > 1 ? `(${range})` : range;
+      if (utils.exceedsLimit(...args, options.step, rangeLimit)) {
+        throw new RangeError('expanded array length exceeds range limit. Use options.rangeLimit to increase or disable the limit.');
       }
-    }
 
-    if (node.nodes) {
-      for (let child of node.nodes) {
-        output += walk(child, node);
+      let range = fill(...args, options);
+      if (range.length === 0) {
+        range = stringify(node, options);
       }
+
+      q.push(append(q.pop(), range));
+      node.nodes = [];
+      return;
     }
-    return output;
-  };
 
-  return walk(ast);
-};
+    let enclose = utils.encloseBrace(node);
+    let queue = node.queue;
+    let block = node;
 
-module.exports = compile;
+    while (block.type !== 'brace' && block.type !== 'root' && block.parent) {
+      block = block.parent;
+      queue = block.queue;
+    }
 
+    for (let i = 0; i < node.nodes.length; i++) {
+      let child = node.nodes[i];
 
-/***/ }),
-/* 316 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * fill-range <https://github.com/jonschlinkert/fill-range>
- *
- * Copyright (c) 2014-present, Jon Schlinkert.
- * Licensed under the MIT License.
- */
+      if (child.type === 'comma' && node.type === 'brace') {
+        if (i === 1) queue.push('');
+        queue.push('');
+        continue;
+      }
 
+      if (child.type === 'close') {
+        q.push(append(q.pop(), queue, enclose));
+        continue;
+      }
 
+      if (child.value && child.type !== 'open') {
+        queue.push(append(queue.pop(), child.value));
+        continue;
+      }
 
-const util = __webpack_require__(111);
-const toRegexRange = __webpack_require__(317);
+      if (child.nodes) {
+        walk(child, node);
+      }
+    }
 
-const isObject = val => val !== null && typeof val === 'object' && !Array.isArray(val);
+    return queue;
+  };
 
-const transform = toNumber => {
-  return value => toNumber === true ? Number(value) : String(value);
+  return utils.flatten(walk(ast));
 };
 
-const isValidValue = value => {
-  return typeof value === 'number' || (typeof value === 'string' && value !== '');
-};
+module.exports = expand;
 
-const isNumber = num => Number.isInteger(+num);
 
-const zeros = input => {
-  let value = `${input}`;
-  let index = -1;
-  if (value[0] === '-') value = value.slice(1);
-  if (value === '0') return false;
-  while (value[++index] === '0');
-  return index > 0;
-};
+/***/ }),
+/* 312 */
+/***/ (function(module, exports, __webpack_require__) {
 
-const stringify = (start, end, options) => {
-  if (typeof start === 'string' || typeof end === 'string') {
-    return true;
-  }
-  return options.stringify === true;
-};
+"use strict";
 
-const pad = (input, maxLength, toNumber) => {
-  if (maxLength > 0) {
-    let dash = input[0] === '-' ? '-' : '';
-    if (dash) input = input.slice(1);
-    input = (dash + input.padStart(dash ? maxLength - 1 : maxLength, '0'));
-  }
-  if (toNumber === false) {
-    return String(input);
-  }
-  return input;
-};
 
-const toMaxLen = (input, maxLength) => {
-  let negative = input[0] === '-' ? '-' : '';
-  if (negative) {
-    input = input.slice(1);
-    maxLength--;
-  }
-  while (input.length < maxLength) input = '0' + input;
-  return negative ? ('-' + input) : input;
-};
+const stringify = __webpack_require__(305);
 
-const toSequence = (parts, options) => {
-  parts.negatives.sort((a, b) => a < b ? -1 : a > b ? 1 : 0);
-  parts.positives.sort((a, b) => a < b ? -1 : a > b ? 1 : 0);
+/**
+ * Constants
+ */
 
-  let prefix = options.capture ? '' : '?:';
-  let positives = '';
-  let negatives = '';
-  let result;
+const {
+  MAX_LENGTH,
+  CHAR_BACKSLASH, /* \ */
+  CHAR_BACKTICK, /* ` */
+  CHAR_COMMA, /* , */
+  CHAR_DOT, /* . */
+  CHAR_LEFT_PARENTHESES, /* ( */
+  CHAR_RIGHT_PARENTHESES, /* ) */
+  CHAR_LEFT_CURLY_BRACE, /* { */
+  CHAR_RIGHT_CURLY_BRACE, /* } */
+  CHAR_LEFT_SQUARE_BRACKET, /* [ */
+  CHAR_RIGHT_SQUARE_BRACKET, /* ] */
+  CHAR_DOUBLE_QUOTE, /* " */
+  CHAR_SINGLE_QUOTE, /* ' */
+  CHAR_NO_BREAK_SPACE,
+  CHAR_ZERO_WIDTH_NOBREAK_SPACE
+} = __webpack_require__(313);
 
-  if (parts.positives.length) {
-    positives = parts.positives.join('|');
-  }
+/**
+ * parse
+ */
 
-  if (parts.negatives.length) {
-    negatives = `-(${prefix}${parts.negatives.join('|')})`;
+const parse = (input, options = {}) => {
+  if (typeof input !== 'string') {
+    throw new TypeError('Expected a string');
   }
 
-  if (positives && negatives) {
-    result = `${positives}|${negatives}`;
-  } else {
-    result = positives || negatives;
+  let opts = options || {};
+  let max = typeof opts.maxLength === 'number' ? Math.min(MAX_LENGTH, opts.maxLength) : MAX_LENGTH;
+  if (input.length > max) {
+    throw new SyntaxError(`Input length (${input.length}), exceeds max characters (${max})`);
   }
 
-  if (options.wrap) {
-    return `(${prefix}${result})`;
-  }
+  let ast = { type: 'root', input, nodes: [] };
+  let stack = [ast];
+  let block = ast;
+  let prev = ast;
+  let brackets = 0;
+  let length = input.length;
+  let index = 0;
+  let depth = 0;
+  let value;
+  let memo = {};
 
-  return result;
-};
+  /**
+   * Helpers
+   */
 
-const toRange = (a, b, isNumbers, options) => {
-  if (isNumbers) {
-    return toRegexRange(a, b, { wrap: false, ...options });
-  }
+  const advance = () => input[index++];
+  const push = node => {
+    if (node.type === 'text' && prev.type === 'dot') {
+      prev.type = 'text';
+    }
 
-  let start = String.fromCharCode(a);
-  if (a === b) return start;
+    if (prev && prev.type === 'text' && node.type === 'text') {
+      prev.value += node.value;
+      return;
+    }
 
-  let stop = String.fromCharCode(b);
-  return `[${start}-${stop}]`;
-};
+    block.nodes.push(node);
+    node.parent = block;
+    node.prev = prev;
+    prev = node;
+    return node;
+  };
 
-const toRegex = (start, end, options) => {
-  if (Array.isArray(start)) {
-    let wrap = options.wrap === true;
-    let prefix = options.capture ? '' : '?:';
-    return wrap ? `(${prefix}${start.join('|')})` : start.join('|');
-  }
-  return toRegexRange(start, end, options);
-};
+  push({ type: 'bos' });
 
-const rangeError = (...args) => {
-  return new RangeError('Invalid range arguments: ' + util.inspect(...args));
-};
+  while (index < length) {
+    block = stack[stack.length - 1];
+    value = advance();
 
-const invalidRange = (start, end, options) => {
-  if (options.strictRanges === true) throw rangeError([start, end]);
-  return [];
-};
+    /**
+     * Invalid chars
+     */
 
-const invalidStep = (step, options) => {
-  if (options.strictRanges === true) {
-    throw new TypeError(`Expected step "${step}" to be a number`);
-  }
-  return [];
-};
+    if (value === CHAR_ZERO_WIDTH_NOBREAK_SPACE || value === CHAR_NO_BREAK_SPACE) {
+      continue;
+    }
 
-const fillNumbers = (start, end, step = 1, options = {}) => {
-  let a = Number(start);
-  let b = Number(end);
+    /**
+     * Escaped chars
+     */
 
-  if (!Number.isInteger(a) || !Number.isInteger(b)) {
-    if (options.strictRanges === true) throw rangeError([start, end]);
-    return [];
-  }
+    if (value === CHAR_BACKSLASH) {
+      push({ type: 'text', value: (options.keepEscaping ? value : '') + advance() });
+      continue;
+    }
 
-  // fix negative zero
-  if (a === 0) a = 0;
-  if (b === 0) b = 0;
+    /**
+     * Right square bracket (literal): ']'
+     */
 
-  let descending = a > b;
-  let startString = String(start);
-  let endString = String(end);
-  let stepString = String(step);
-  step = Math.max(Math.abs(step), 1);
+    if (value === CHAR_RIGHT_SQUARE_BRACKET) {
+      push({ type: 'text', value: '\\' + value });
+      continue;
+    }
 
-  let padded = zeros(startString) || zeros(endString) || zeros(stepString);
-  let maxLen = padded ? Math.max(startString.length, endString.length, stepString.length) : 0;
-  let toNumber = padded === false && stringify(start, end, options) === false;
-  let format = options.transform || transform(toNumber);
+    /**
+     * Left square bracket: '['
+     */
 
-  if (options.toRegex && step === 1) {
-    return toRange(toMaxLen(start, maxLen), toMaxLen(end, maxLen), true, options);
-  }
+    if (value === CHAR_LEFT_SQUARE_BRACKET) {
+      brackets++;
 
-  let parts = { negatives: [], positives: [] };
-  let push = num => parts[num < 0 ? 'negatives' : 'positives'].push(Math.abs(num));
-  let range = [];
-  let index = 0;
+      let closed = true;
+      let next;
 
-  while (descending ? a >= b : a <= b) {
-    if (options.toRegex === true && step > 1) {
-      push(a);
-    } else {
-      range.push(pad(format(a, index), maxLen, toNumber));
-    }
-    a = descending ? a - step : a + step;
-    index++;
-  }
+      while (index < length && (next = advance())) {
+        value += next;
 
-  if (options.toRegex === true) {
-    return step > 1
-      ? toSequence(parts, options)
-      : toRegex(range, null, { wrap: false, ...options });
-  }
+        if (next === CHAR_LEFT_SQUARE_BRACKET) {
+          brackets++;
+          continue;
+        }
 
-  return range;
-};
+        if (next === CHAR_BACKSLASH) {
+          value += advance();
+          continue;
+        }
 
-const fillLetters = (start, end, step = 1, options = {}) => {
-  if ((!isNumber(start) && start.length > 1) || (!isNumber(end) && end.length > 1)) {
-    return invalidRange(start, end, options);
-  }
+        if (next === CHAR_RIGHT_SQUARE_BRACKET) {
+          brackets--;
 
+          if (brackets === 0) {
+            break;
+          }
+        }
+      }
 
-  let format = options.transform || (val => String.fromCharCode(val));
-  let a = `${start}`.charCodeAt(0);
-  let b = `${end}`.charCodeAt(0);
+      push({ type: 'text', value });
+      continue;
+    }
 
-  let descending = a > b;
-  let min = Math.min(a, b);
-  let max = Math.max(a, b);
+    /**
+     * Parentheses
+     */
 
-  if (options.toRegex && step === 1) {
-    return toRange(min, max, false, options);
-  }
+    if (value === CHAR_LEFT_PARENTHESES) {
+      block = push({ type: 'paren', nodes: [] });
+      stack.push(block);
+      push({ type: 'text', value });
+      continue;
+    }
 
-  let range = [];
-  let index = 0;
+    if (value === CHAR_RIGHT_PARENTHESES) {
+      if (block.type !== 'paren') {
+        push({ type: 'text', value });
+        continue;
+      }
+      block = stack.pop();
+      push({ type: 'text', value });
+      block = stack[stack.length - 1];
+      continue;
+    }
 
-  while (descending ? a >= b : a <= b) {
-    range.push(format(a, index));
-    a = descending ? a - step : a + step;
-    index++;
-  }
+    /**
+     * Quotes: '|"|`
+     */
 
-  if (options.toRegex === true) {
-    return toRegex(range, null, { wrap: false, options });
-  }
+    if (value === CHAR_DOUBLE_QUOTE || value === CHAR_SINGLE_QUOTE || value === CHAR_BACKTICK) {
+      let open = value;
+      let next;
 
-  return range;
-};
+      if (options.keepQuotes !== true) {
+        value = '';
+      }
 
-const fill = (start, end, step, options = {}) => {
-  if (end == null && isValidValue(start)) {
-    return [start];
-  }
+      while (index < length && (next = advance())) {
+        if (next === CHAR_BACKSLASH) {
+          value += next + advance();
+          continue;
+        }
 
-  if (!isValidValue(start) || !isValidValue(end)) {
-    return invalidRange(start, end, options);
-  }
+        if (next === open) {
+          if (options.keepQuotes === true) value += next;
+          break;
+        }
 
-  if (typeof step === 'function') {
-    return fill(start, end, 1, { transform: step });
-  }
+        value += next;
+      }
 
-  if (isObject(step)) {
-    return fill(start, end, 0, step);
-  }
+      push({ type: 'text', value });
+      continue;
+    }
 
-  let opts = { ...options };
-  if (opts.capture === true) opts.wrap = true;
-  step = step || opts.step || 1;
+    /**
+     * Left curly brace: '{'
+     */
 
-  if (!isNumber(step)) {
-    if (step != null && !isObject(step)) return invalidStep(step, opts);
-    return fill(start, end, 1, step);
-  }
+    if (value === CHAR_LEFT_CURLY_BRACE) {
+      depth++;
 
-  if (isNumber(start) && isNumber(end)) {
-    return fillNumbers(start, end, step, opts);
-  }
+      let dollar = prev.value && prev.value.slice(-1) === '$' || block.dollar === true;
+      let brace = {
+        type: 'brace',
+        open: true,
+        close: false,
+        dollar,
+        depth,
+        commas: 0,
+        ranges: 0,
+        nodes: []
+      };
 
-  return fillLetters(start, end, Math.max(Math.abs(step), 1), opts);
-};
+      block = push(brace);
+      stack.push(block);
+      push({ type: 'open', value });
+      continue;
+    }
 
-module.exports = fill;
+    /**
+     * Right curly brace: '}'
+     */
 
+    if (value === CHAR_RIGHT_CURLY_BRACE) {
+      if (block.type !== 'brace') {
+        push({ type: 'text', value });
+        continue;
+      }
 
-/***/ }),
-/* 317 */
-/***/ (function(module, exports, __webpack_require__) {
+      let type = 'close';
+      block = stack.pop();
+      block.close = true;
 
-"use strict";
-/*!
- * to-regex-range <https://github.com/micromatch/to-regex-range>
- *
- * Copyright (c) 2015-present, Jon Schlinkert.
- * Released under the MIT License.
- */
+      push({ type, value });
+      depth--;
 
+      block = stack[stack.length - 1];
+      continue;
+    }
 
+    /**
+     * Comma: ','
+     */
 
-const isNumber = __webpack_require__(318);
+    if (value === CHAR_COMMA && depth > 0) {
+      if (block.ranges > 0) {
+        block.ranges = 0;
+        let open = block.nodes.shift();
+        block.nodes = [open, { type: 'text', value: stringify(block) }];
+      }
 
-const toRegexRange = (min, max, options) => {
-  if (isNumber(min) === false) {
-    throw new TypeError('toRegexRange: expected the first argument to be a number');
-  }
+      push({ type: 'comma', value });
+      block.commas++;
+      continue;
+    }
 
-  if (max === void 0 || min === max) {
-    return String(min);
-  }
+    /**
+     * Dot: '.'
+     */
 
-  if (isNumber(max) === false) {
-    throw new TypeError('toRegexRange: expected the second argument to be a number.');
-  }
+    if (value === CHAR_DOT && depth > 0 && block.commas === 0) {
+      let siblings = block.nodes;
 
-  let opts = { relaxZeros: true, ...options };
-  if (typeof opts.strictZeros === 'boolean') {
-    opts.relaxZeros = opts.strictZeros === false;
-  }
+      if (depth === 0 || siblings.length === 0) {
+        push({ type: 'text', value });
+        continue;
+      }
 
-  let relax = String(opts.relaxZeros);
-  let shorthand = String(opts.shorthand);
-  let capture = String(opts.capture);
-  let wrap = String(opts.wrap);
-  let cacheKey = min + ':' + max + '=' + relax + shorthand + capture + wrap;
+      if (prev.type === 'dot') {
+        block.range = [];
+        prev.value += value;
+        prev.type = 'range';
 
-  if (toRegexRange.cache.hasOwnProperty(cacheKey)) {
-    return toRegexRange.cache[cacheKey].result;
-  }
+        if (block.nodes.length !== 3 && block.nodes.length !== 5) {
+          block.invalid = true;
+          block.ranges = 0;
+          prev.type = 'text';
+          continue;
+        }
 
-  let a = Math.min(min, max);
-  let b = Math.max(min, max);
+        block.ranges++;
+        block.args = [];
+        continue;
+      }
 
-  if (Math.abs(a - b) === 1) {
-    let result = min + '|' + max;
-    if (opts.capture) {
-      return `(${result})`;
-    }
-    if (opts.wrap === false) {
-      return result;
+      if (prev.type === 'range') {
+        siblings.pop();
+
+        let before = siblings[siblings.length - 1];
+        before.value += prev.value + value;
+        prev = before;
+        block.ranges--;
+        continue;
+      }
+
+      push({ type: 'dot', value });
+      continue;
     }
-    return `(?:${result})`;
-  }
 
-  let isPadded = hasPadding(min) || hasPadding(max);
-  let state = { min, max, a, b };
-  let positives = [];
-  let negatives = [];
+    /**
+     * Text
+     */
 
-  if (isPadded) {
-    state.isPadded = isPadded;
-    state.maxLen = String(state.max).length;
+    push({ type: 'text', value });
   }
 
-  if (a < 0) {
-    let newMin = b < 0 ? Math.abs(b) : 1;
-    negatives = splitToPatterns(newMin, Math.abs(a), state, opts);
-    a = state.a = 0;
-  }
-
-  if (b >= 0) {
-    positives = splitToPatterns(a, b, state, opts);
-  }
+  // Mark imbalanced braces and brackets as invalid
+  do {
+    block = stack.pop();
 
-  state.negatives = negatives;
-  state.positives = positives;
-  state.result = collatePatterns(negatives, positives, opts);
+    if (block.type !== 'root') {
+      block.nodes.forEach(node => {
+        if (!node.nodes) {
+          if (node.type === 'open') node.isOpen = true;
+          if (node.type === 'close') node.isClose = true;
+          if (!node.nodes) node.type = 'text';
+          node.invalid = true;
+        }
+      });
 
-  if (opts.capture === true) {
-    state.result = `(${state.result})`;
-  } else if (opts.wrap !== false && (positives.length + negatives.length) > 1) {
-    state.result = `(?:${state.result})`;
-  }
+      // get the location of the block on parent.nodes (block's siblings)
+      let parent = stack[stack.length - 1];
+      let index = parent.nodes.indexOf(block);
+      // replace the (invalid) block with it's nodes
+      parent.nodes.splice(index, 1, ...block.nodes);
+    }
+  } while (stack.length > 0);
 
-  toRegexRange.cache[cacheKey] = state;
-  return state.result;
+  push({ type: 'eos' });
+  return ast;
 };
 
-function collatePatterns(neg, pos, options) {
-  let onlyNegative = filterPatterns(neg, pos, '-', false, options) || [];
-  let onlyPositive = filterPatterns(pos, neg, '', false, options) || [];
-  let intersected = filterPatterns(neg, pos, '-?', true, options) || [];
-  let subpatterns = onlyNegative.concat(intersected).concat(onlyPositive);
-  return subpatterns.join('|');
-}
+module.exports = parse;
 
-function splitToRanges(min, max) {
-  let nines = 1;
-  let zeros = 1;
 
-  let stop = countNines(min, nines);
-  let stops = new Set([max]);
+/***/ }),
+/* 313 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  while (min <= stop && stop <= max) {
-    stops.add(stop);
-    nines += 1;
-    stop = countNines(min, nines);
-  }
+"use strict";
 
-  stop = countZeros(max + 1, zeros) - 1;
 
-  while (min < stop && stop <= max) {
-    stops.add(stop);
-    zeros += 1;
-    stop = countZeros(max + 1, zeros) - 1;
-  }
+module.exports = {
+  MAX_LENGTH: 1024 * 64,
 
-  stops = [...stops];
-  stops.sort(compare);
-  return stops;
-}
+  // Digits
+  CHAR_0: '0', /* 0 */
+  CHAR_9: '9', /* 9 */
 
-/**
- * Convert a range to a regex pattern
- * @param {Number} `start`
- * @param {Number} `stop`
- * @return {String}
- */
+  // Alphabet chars.
+  CHAR_UPPERCASE_A: 'A', /* A */
+  CHAR_LOWERCASE_A: 'a', /* a */
+  CHAR_UPPERCASE_Z: 'Z', /* Z */
+  CHAR_LOWERCASE_Z: 'z', /* z */
 
-function rangeToPattern(start, stop, options) {
-  if (start === stop) {
-    return { pattern: start, count: [], digits: 0 };
-  }
+  CHAR_LEFT_PARENTHESES: '(', /* ( */
+  CHAR_RIGHT_PARENTHESES: ')', /* ) */
 
-  let zipped = zip(start, stop);
-  let digits = zipped.length;
-  let pattern = '';
-  let count = 0;
+  CHAR_ASTERISK: '*', /* * */
 
-  for (let i = 0; i < digits; i++) {
-    let [startDigit, stopDigit] = zipped[i];
+  // Non-alphabetic chars.
+  CHAR_AMPERSAND: '&', /* & */
+  CHAR_AT: '@', /* @ */
+  CHAR_BACKSLASH: '\\', /* \ */
+  CHAR_BACKTICK: '`', /* ` */
+  CHAR_CARRIAGE_RETURN: '\r', /* \r */
+  CHAR_CIRCUMFLEX_ACCENT: '^', /* ^ */
+  CHAR_COLON: ':', /* : */
+  CHAR_COMMA: ',', /* , */
+  CHAR_DOLLAR: '$', /* . */
+  CHAR_DOT: '.', /* . */
+  CHAR_DOUBLE_QUOTE: '"', /* " */
+  CHAR_EQUAL: '=', /* = */
+  CHAR_EXCLAMATION_MARK: '!', /* ! */
+  CHAR_FORM_FEED: '\f', /* \f */
+  CHAR_FORWARD_SLASH: '/', /* / */
+  CHAR_HASH: '#', /* # */
+  CHAR_HYPHEN_MINUS: '-', /* - */
+  CHAR_LEFT_ANGLE_BRACKET: '<', /* < */
+  CHAR_LEFT_CURLY_BRACE: '{', /* { */
+  CHAR_LEFT_SQUARE_BRACKET: '[', /* [ */
+  CHAR_LINE_FEED: '\n', /* \n */
+  CHAR_NO_BREAK_SPACE: '\u00A0', /* \u00A0 */
+  CHAR_PERCENT: '%', /* % */
+  CHAR_PLUS: '+', /* + */
+  CHAR_QUESTION_MARK: '?', /* ? */
+  CHAR_RIGHT_ANGLE_BRACKET: '>', /* > */
+  CHAR_RIGHT_CURLY_BRACE: '}', /* } */
+  CHAR_RIGHT_SQUARE_BRACKET: ']', /* ] */
+  CHAR_SEMICOLON: ';', /* ; */
+  CHAR_SINGLE_QUOTE: '\'', /* ' */
+  CHAR_SPACE: ' ', /*   */
+  CHAR_TAB: '\t', /* \t */
+  CHAR_UNDERSCORE: '_', /* _ */
+  CHAR_VERTICAL_LINE: '|', /* | */
+  CHAR_ZERO_WIDTH_NOBREAK_SPACE: '\uFEFF' /* \uFEFF */
+};
 
-    if (startDigit === stopDigit) {
-      pattern += startDigit;
 
-    } else if (startDigit !== '0' || stopDigit !== '9') {
-      pattern += toCharacterClass(startDigit, stopDigit, options);
+/***/ }),
+/* 314 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    } else {
-      count++;
-    }
-  }
+"use strict";
 
-  if (count) {
-    pattern += options.shorthand === true ? '\\d' : '[0-9]';
-  }
 
-  return { pattern, count: [count], digits };
-}
+module.exports = __webpack_require__(315);
 
-function splitToPatterns(min, max, tok, options) {
-  let ranges = splitToRanges(min, max);
-  let tokens = [];
-  let start = min;
-  let prev;
 
-  for (let i = 0; i < ranges.length; i++) {
-    let max = ranges[i];
-    let obj = rangeToPattern(String(start), String(max), options);
-    let zeros = '';
+/***/ }),
+/* 315 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    if (!tok.isPadded && prev && prev.pattern === obj.pattern) {
-      if (prev.count.length > 1) {
-        prev.count.pop();
-      }
+"use strict";
 
-      prev.count.push(obj.count[0]);
-      prev.string = prev.pattern + toQuantifier(prev.count);
-      start = max + 1;
-      continue;
-    }
 
-    if (tok.isPadded) {
-      zeros = padZeros(max, tok, options);
-    }
+const path = __webpack_require__(4);
+const scan = __webpack_require__(316);
+const parse = __webpack_require__(319);
+const utils = __webpack_require__(317);
+const constants = __webpack_require__(318);
+const isObject = val => val && typeof val === 'object' && !Array.isArray(val);
 
-    obj.string = zeros + obj.pattern + toQuantifier(obj.count);
-    tokens.push(obj);
-    start = max + 1;
-    prev = obj;
+/**
+ * Creates a matcher function from one or more glob patterns. The
+ * returned function takes a string to match as its first argument,
+ * and returns true if the string is a match. The returned matcher
+ * function also takes a boolean as the second argument that, when true,
+ * returns an object with additional information.
+ *
+ * ```js
+ * const picomatch = require('picomatch');
+ * // picomatch(glob[, options]);
+ *
+ * const isMatch = picomatch('*.!(*a)');
+ * console.log(isMatch('a.a')); //=> false
+ * console.log(isMatch('a.b')); //=> true
+ * ```
+ * @name picomatch
+ * @param {String|Array} `globs` One or more glob patterns.
+ * @param {Object=} `options`
+ * @return {Function=} Returns a matcher function.
+ * @api public
+ */
+
+const picomatch = (glob, options, returnState = false) => {
+  if (Array.isArray(glob)) {
+    const fns = glob.map(input => picomatch(input, options, returnState));
+    const arrayMatcher = str => {
+      for (const isMatch of fns) {
+        const state = isMatch(str);
+        if (state) return state;
+      }
+      return false;
+    };
+    return arrayMatcher;
   }
 
-  return tokens;
-}
+  const isState = isObject(glob) && glob.tokens && glob.input;
 
-function filterPatterns(arr, comparison, prefix, intersection, options) {
-  let result = [];
+  if (glob === '' || (typeof glob !== 'string' && !isState)) {
+    throw new TypeError('Expected pattern to be a non-empty string');
+  }
 
-  for (let ele of arr) {
-    let { string } = ele;
+  const opts = options || {};
+  const posix = utils.isWindows(options);
+  const regex = isState
+    ? picomatch.compileRe(glob, options)
+    : picomatch.makeRe(glob, options, false, true);
 
-    // only push if _both_ are negative...
-    if (!intersection && !contains(comparison, 'string', string)) {
-      result.push(prefix + string);
-    }
+  const state = regex.state;
+  delete regex.state;
 
-    // or _both_ are positive
-    if (intersection && contains(comparison, 'string', string)) {
-      result.push(prefix + string);
-    }
+  let isIgnored = () => false;
+  if (opts.ignore) {
+    const ignoreOpts = { ...options, ignore: null, onMatch: null, onResult: null };
+    isIgnored = picomatch(opts.ignore, ignoreOpts, returnState);
   }
-  return result;
-}
-
-/**
- * Zip strings
- */
 
-function zip(a, b) {
-  let arr = [];
-  for (let i = 0; i < a.length; i++) arr.push([a[i], b[i]]);
-  return arr;
-}
+  const matcher = (input, returnObject = false) => {
+    const { isMatch, match, output } = picomatch.test(input, regex, options, { glob, posix });
+    const result = { glob, state, regex, posix, input, output, match, isMatch };
 
-function compare(a, b) {
-  return a > b ? 1 : b > a ? -1 : 0;
-}
+    if (typeof opts.onResult === 'function') {
+      opts.onResult(result);
+    }
 
-function contains(arr, key, val) {
-  return arr.some(ele => ele[key] === val);
-}
+    if (isMatch === false) {
+      result.isMatch = false;
+      return returnObject ? result : false;
+    }
 
-function countNines(min, len) {
-  return Number(String(min).slice(0, -len) + '9'.repeat(len));
-}
+    if (isIgnored(input)) {
+      if (typeof opts.onIgnore === 'function') {
+        opts.onIgnore(result);
+      }
+      result.isMatch = false;
+      return returnObject ? result : false;
+    }
 
-function countZeros(integer, zeros) {
-  return integer - (integer % Math.pow(10, zeros));
-}
+    if (typeof opts.onMatch === 'function') {
+      opts.onMatch(result);
+    }
+    return returnObject ? result : true;
+  };
 
-function toQuantifier(digits) {
-  let [start = 0, stop = ''] = digits;
-  if (stop || start > 1) {
-    return `{${start + (stop ? ',' + stop : '')}}`;
+  if (returnState) {
+    matcher.state = state;
   }
-  return '';
-}
 
-function toCharacterClass(a, b, options) {
-  return `[${a}${(b - a === 1) ? '' : '-'}${b}]`;
-}
+  return matcher;
+};
 
-function hasPadding(str) {
-  return /^-?(0+)\d/.test(str);
-}
+/**
+ * Test `input` with the given `regex`. This is used by the main
+ * `picomatch()` function to test the input string.
+ *
+ * ```js
+ * const picomatch = require('picomatch');
+ * // picomatch.test(input, regex[, options]);
+ *
+ * console.log(picomatch.test('foo/bar', /^(?:([^/]*?)\/([^/]*?))$/));
+ * // { isMatch: true, match: [ 'foo/', 'foo', 'bar' ], output: 'foo/bar' }
+ * ```
+ * @param {String} `input` String to test.
+ * @param {RegExp} `regex`
+ * @return {Object} Returns an object with matching info.
+ * @api public
+ */
 
-function padZeros(value, tok, options) {
-  if (!tok.isPadded) {
-    return value;
+picomatch.test = (input, regex, options, { glob, posix } = {}) => {
+  if (typeof input !== 'string') {
+    throw new TypeError('Expected input to be a string');
   }
 
-  let diff = Math.abs(tok.maxLen - String(value).length);
-  let relax = options.relaxZeros !== false;
+  if (input === '') {
+    return { isMatch: false, output: '' };
+  }
 
-  switch (diff) {
-    case 0:
-      return '';
-    case 1:
-      return relax ? '0?' : '0';
-    case 2:
-      return relax ? '0{0,2}' : '00';
-    default: {
-      return relax ? `0{0,${diff}}` : `0{${diff}}`;
+  const opts = options || {};
+  const format = opts.format || (posix ? utils.toPosixSlashes : null);
+  let match = input === glob;
+  let output = (match && format) ? format(input) : input;
+
+  if (match === false) {
+    output = format ? format(input) : input;
+    match = output === glob;
+  }
+
+  if (match === false || opts.capture === true) {
+    if (opts.matchBase === true || opts.basename === true) {
+      match = picomatch.matchBase(input, regex, options, posix);
+    } else {
+      match = regex.exec(output);
     }
   }
-}
+
+  return { isMatch: Boolean(match), match, output };
+};
 
 /**
- * Cache
+ * Match the basename of a filepath.
+ *
+ * ```js
+ * const picomatch = require('picomatch');
+ * // picomatch.matchBase(input, glob[, options]);
+ * console.log(picomatch.matchBase('foo/bar.js', '*.js'); // true
+ * ```
+ * @param {String} `input` String to test.
+ * @param {RegExp|String} `glob` Glob pattern or regex created by [.makeRe](#makeRe).
+ * @return {Boolean}
+ * @api public
  */
 
-toRegexRange.cache = {};
-toRegexRange.clearCache = () => (toRegexRange.cache = {});
+picomatch.matchBase = (input, glob, options, posix = utils.isWindows(options)) => {
+  const regex = glob instanceof RegExp ? glob : picomatch.makeRe(glob, options);
+  return regex.test(path.basename(input));
+};
 
 /**
- * Expose `toRegexRange`
+ * Returns true if **any** of the given glob `patterns` match the specified `string`.
+ *
+ * ```js
+ * const picomatch = require('picomatch');
+ * // picomatch.isMatch(string, patterns[, options]);
+ *
+ * console.log(picomatch.isMatch('a.a', ['b.*', '*.a'])); //=> true
+ * console.log(picomatch.isMatch('a.a', 'b.*')); //=> false
+ * ```
+ * @param {String|Array} str The string to test.
+ * @param {String|Array} patterns One or more glob patterns to use for matching.
+ * @param {Object} [options] See available [options](#options).
+ * @return {Boolean} Returns true if any patterns match `str`
+ * @api public
  */
 
-module.exports = toRegexRange;
+picomatch.isMatch = (str, patterns, options) => picomatch(patterns, options)(str);
 
+/**
+ * Parse a glob pattern to create the source string for a regular
+ * expression.
+ *
+ * ```js
+ * const picomatch = require('picomatch');
+ * const result = picomatch.parse(pattern[, options]);
+ * ```
+ * @param {String} `pattern`
+ * @param {Object} `options`
+ * @return {Object} Returns an object with useful properties and output to be used as a regex source string.
+ * @api public
+ */
 
-/***/ }),
-/* 318 */
-/***/ (function(module, exports, __webpack_require__) {
+picomatch.parse = (pattern, options) => {
+  if (Array.isArray(pattern)) return pattern.map(p => picomatch.parse(p, options));
+  return parse(pattern, { ...options, fastpaths: false });
+};
 
-"use strict";
-/*!
- * is-number <https://github.com/jonschlinkert/is-number>
+/**
+ * Scan a glob pattern to separate the pattern into segments.
  *
- * Copyright (c) 2014-present, Jon Schlinkert.
- * Released under the MIT License.
+ * ```js
+ * const picomatch = require('picomatch');
+ * // picomatch.scan(input[, options]);
+ *
+ * const result = picomatch.scan('!./foo/*.js');
+ * console.log(result);
+ * { prefix: '!./',
+ *   input: '!./foo/*.js',
+ *   start: 3,
+ *   base: 'foo',
+ *   glob: '*.js',
+ *   isBrace: false,
+ *   isBracket: false,
+ *   isGlob: true,
+ *   isExtglob: false,
+ *   isGlobstar: false,
+ *   negated: true }
+ * ```
+ * @param {String} `input` Glob pattern to scan.
+ * @param {Object} `options`
+ * @return {Object} Returns an object with
+ * @api public
  */
 
+picomatch.scan = (input, options) => scan(input, options);
 
+/**
+ * Create a regular expression from a parsed glob pattern.
+ *
+ * ```js
+ * const picomatch = require('picomatch');
+ * const state = picomatch.parse('*.js');
+ * // picomatch.compileRe(state[, options]);
+ *
+ * console.log(picomatch.compileRe(state));
+ * //=> /^(?:(?!\.)(?=.)[^/]*?\.js)$/
+ * ```
+ * @param {String} `state` The object returned from the `.parse` method.
+ * @param {Object} `options`
+ * @return {RegExp} Returns a regex created from the given pattern.
+ * @api public
+ */
 
-module.exports = function(num) {
-  if (typeof num === 'number') {
-    return num - num === 0;
-  }
-  if (typeof num === 'string' && num.trim() !== '') {
-    return Number.isFinite ? Number.isFinite(+num) : isFinite(+num);
+picomatch.compileRe = (parsed, options, returnOutput = false, returnState = false) => {
+  if (returnOutput === true) {
+    return parsed.output;
   }
-  return false;
-};
-
 
-/***/ }),
-/* 319 */
-/***/ (function(module, exports, __webpack_require__) {
+  const opts = options || {};
+  const prepend = opts.contains ? '' : '^';
+  const append = opts.contains ? '' : '$';
 
-"use strict";
+  let source = `${prepend}(?:${parsed.output})${append}`;
+  if (parsed && parsed.negated === true) {
+    source = `^(?!${source}).*$`;
+  }
 
+  const regex = picomatch.toRegex(source, options);
+  if (returnState === true) {
+    regex.state = parsed;
+  }
 
-const fill = __webpack_require__(316);
-const stringify = __webpack_require__(313);
-const utils = __webpack_require__(314);
+  return regex;
+};
 
-const append = (queue = '', stash = '', enclose = false) => {
-  let result = [];
+picomatch.makeRe = (input, options, returnOutput = false, returnState = false) => {
+  if (!input || typeof input !== 'string') {
+    throw new TypeError('Expected a non-empty string');
+  }
 
-  queue = [].concat(queue);
-  stash = [].concat(stash);
+  const opts = options || {};
+  let parsed = { negated: false, fastpaths: true };
+  let prefix = '';
+  let output;
 
-  if (!stash.length) return queue;
-  if (!queue.length) {
-    return enclose ? utils.flatten(stash).map(ele => `{${ele}}`) : stash;
+  if (input.startsWith('./')) {
+    input = input.slice(2);
+    prefix = parsed.prefix = './';
   }
 
-  for (let item of queue) {
-    if (Array.isArray(item)) {
-      for (let value of item) {
-        result.push(append(value, stash, enclose));
-      }
-    } else {
-      for (let ele of stash) {
-        if (enclose === true && typeof ele === 'string') ele = `{${ele}}`;
-        result.push(Array.isArray(ele) ? append(item, ele, enclose) : (item + ele));
-      }
-    }
+  if (opts.fastpaths !== false && (input[0] === '.' || input[0] === '*')) {
+    output = parse.fastpaths(input, options);
   }
-  return utils.flatten(result);
-};
-
-const expand = (ast, options = {}) => {
-  let rangeLimit = options.rangeLimit === void 0 ? 1000 : options.rangeLimit;
-
-  let walk = (node, parent = {}) => {
-    node.queue = [];
-
-    let p = parent;
-    let q = parent.queue;
-
-    while (p.type !== 'brace' && p.type !== 'root' && p.parent) {
-      p = p.parent;
-      q = p.queue;
-    }
-
-    if (node.invalid || node.dollar) {
-      q.push(append(q.pop(), stringify(node, options)));
-      return;
-    }
-
-    if (node.type === 'brace' && node.invalid !== true && node.nodes.length === 2) {
-      q.push(append(q.pop(), ['{}']));
-      return;
-    }
-
-    if (node.nodes && node.ranges > 0) {
-      let args = utils.reduce(node.nodes);
-
-      if (utils.exceedsLimit(...args, options.step, rangeLimit)) {
-        throw new RangeError('expanded array length exceeds range limit. Use options.rangeLimit to increase or disable the limit.');
-      }
-
-      let range = fill(...args, options);
-      if (range.length === 0) {
-        range = stringify(node, options);
-      }
-
-      q.push(append(q.pop(), range));
-      node.nodes = [];
-      return;
-    }
-
-    let enclose = utils.encloseBrace(node);
-    let queue = node.queue;
-    let block = node;
-
-    while (block.type !== 'brace' && block.type !== 'root' && block.parent) {
-      block = block.parent;
-      queue = block.queue;
-    }
 
-    for (let i = 0; i < node.nodes.length; i++) {
-      let child = node.nodes[i];
+  if (output === undefined) {
+    parsed = parse(input, options);
+    parsed.prefix = prefix + (parsed.prefix || '');
+  } else {
+    parsed.output = output;
+  }
 
-      if (child.type === 'comma' && node.type === 'brace') {
-        if (i === 1) queue.push('');
-        queue.push('');
-        continue;
-      }
+  return picomatch.compileRe(parsed, options, returnOutput, returnState);
+};
 
-      if (child.type === 'close') {
-        q.push(append(q.pop(), queue, enclose));
-        continue;
-      }
+/**
+ * Create a regular expression from the given regex source string.
+ *
+ * ```js
+ * const picomatch = require('picomatch');
+ * // picomatch.toRegex(source[, options]);
+ *
+ * const { output } = picomatch.parse('*.js');
+ * console.log(picomatch.toRegex(output));
+ * //=> /^(?:(?!\.)(?=.)[^/]*?\.js)$/
+ * ```
+ * @param {String} `source` Regular expression source string.
+ * @param {Object} `options`
+ * @return {RegExp}
+ * @api public
+ */
 
-      if (child.value && child.type !== 'open') {
-        queue.push(append(queue.pop(), child.value));
-        continue;
-      }
+picomatch.toRegex = (source, options) => {
+  try {
+    const opts = options || {};
+    return new RegExp(source, opts.flags || (opts.nocase ? 'i' : ''));
+  } catch (err) {
+    if (options && options.debug === true) throw err;
+    return /$^/;
+  }
+};
 
-      if (child.nodes) {
-        walk(child, node);
-      }
-    }
+/**
+ * Picomatch constants.
+ * @return {Object}
+ */
 
-    return queue;
-  };
+picomatch.constants = constants;
 
-  return utils.flatten(walk(ast));
-};
+/**
+ * Expose "picomatch"
+ */
 
-module.exports = expand;
+module.exports = picomatch;
 
 
 /***/ }),
-/* 320 */
+/* 316 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const stringify = __webpack_require__(313);
-
-/**
- * Constants
- */
-
+const utils = __webpack_require__(317);
 const {
-  MAX_LENGTH,
-  CHAR_BACKSLASH, /* \ */
-  CHAR_BACKTICK, /* ` */
-  CHAR_COMMA, /* , */
-  CHAR_DOT, /* . */
-  CHAR_LEFT_PARENTHESES, /* ( */
-  CHAR_RIGHT_PARENTHESES, /* ) */
-  CHAR_LEFT_CURLY_BRACE, /* { */
-  CHAR_RIGHT_CURLY_BRACE, /* } */
-  CHAR_LEFT_SQUARE_BRACKET, /* [ */
-  CHAR_RIGHT_SQUARE_BRACKET, /* ] */
-  CHAR_DOUBLE_QUOTE, /* " */
-  CHAR_SINGLE_QUOTE, /* ' */
-  CHAR_NO_BREAK_SPACE,
-  CHAR_ZERO_WIDTH_NOBREAK_SPACE
-} = __webpack_require__(321);
-
-/**
- * parse
- */
+  CHAR_ASTERISK,             /* * */
+  CHAR_AT,                   /* @ */
+  CHAR_BACKWARD_SLASH,       /* \ */
+  CHAR_COMMA,                /* , */
+  CHAR_DOT,                  /* . */
+  CHAR_EXCLAMATION_MARK,     /* ! */
+  CHAR_FORWARD_SLASH,        /* / */
+  CHAR_LEFT_CURLY_BRACE,     /* { */
+  CHAR_LEFT_PARENTHESES,     /* ( */
+  CHAR_LEFT_SQUARE_BRACKET,  /* [ */
+  CHAR_PLUS,                 /* + */
+  CHAR_QUESTION_MARK,        /* ? */
+  CHAR_RIGHT_CURLY_BRACE,    /* } */
+  CHAR_RIGHT_PARENTHESES,    /* ) */
+  CHAR_RIGHT_SQUARE_BRACKET  /* ] */
+} = __webpack_require__(318);
 
-const parse = (input, options = {}) => {
-  if (typeof input !== 'string') {
-    throw new TypeError('Expected a string');
-  }
+const isPathSeparator = code => {
+  return code === CHAR_FORWARD_SLASH || code === CHAR_BACKWARD_SLASH;
+};
 
-  let opts = options || {};
-  let max = typeof opts.maxLength === 'number' ? Math.min(MAX_LENGTH, opts.maxLength) : MAX_LENGTH;
-  if (input.length > max) {
-    throw new SyntaxError(`Input length (${input.length}), exceeds max characters (${max})`);
+const depth = token => {
+  if (token.isPrefix !== true) {
+    token.depth = token.isGlobstar ? Infinity : 1;
   }
+};
 
-  let ast = { type: 'root', input, nodes: [] };
-  let stack = [ast];
-  let block = ast;
-  let prev = ast;
-  let brackets = 0;
-  let length = input.length;
-  let index = 0;
-  let depth = 0;
-  let value;
-  let memo = {};
+/**
+ * Quickly scans a glob pattern and returns an object with a handful of
+ * useful properties, like `isGlob`, `path` (the leading non-glob, if it exists),
+ * `glob` (the actual pattern), and `negated` (true if the path starts with `!`).
+ *
+ * ```js
+ * const pm = require('picomatch');
+ * console.log(pm.scan('foo/bar/*.js'));
+ * { isGlob: true, input: 'foo/bar/*.js', base: 'foo/bar', glob: '*.js' }
+ * ```
+ * @param {String} `str`
+ * @param {Object} `options`
+ * @return {Object} Returns an object with tokens and regex source string.
+ * @api public
+ */
 
-  /**
-   * Helpers
-   */
+const scan = (input, options) => {
+  const opts = options || {};
 
-  const advance = () => input[index++];
-  const push = node => {
-    if (node.type === 'text' && prev.type === 'dot') {
-      prev.type = 'text';
-    }
+  const length = input.length - 1;
+  const scanToEnd = opts.parts === true || opts.scanToEnd === true;
+  const slashes = [];
+  const tokens = [];
+  const parts = [];
 
-    if (prev && prev.type === 'text' && node.type === 'text') {
-      prev.value += node.value;
-      return;
-    }
+  let str = input;
+  let index = -1;
+  let start = 0;
+  let lastIndex = 0;
+  let isBrace = false;
+  let isBracket = false;
+  let isGlob = false;
+  let isExtglob = false;
+  let isGlobstar = false;
+  let braceEscaped = false;
+  let backslashes = false;
+  let negated = false;
+  let finished = false;
+  let braces = 0;
+  let prev;
+  let code;
+  let token = { value: '', depth: 0, isGlob: false };
 
-    block.nodes.push(node);
-    node.parent = block;
-    node.prev = prev;
-    prev = node;
-    return node;
+  const eos = () => index >= length;
+  const peek = () => str.charCodeAt(index + 1);
+  const advance = () => {
+    prev = code;
+    return str.charCodeAt(++index);
   };
 
-  push({ type: 'bos' });
-
   while (index < length) {
-    block = stack[stack.length - 1];
-    value = advance();
+    code = advance();
+    let next;
 
-    /**
-     * Invalid chars
-     */
+    if (code === CHAR_BACKWARD_SLASH) {
+      backslashes = token.backslashes = true;
+      code = advance();
 
-    if (value === CHAR_ZERO_WIDTH_NOBREAK_SPACE || value === CHAR_NO_BREAK_SPACE) {
+      if (code === CHAR_LEFT_CURLY_BRACE) {
+        braceEscaped = true;
+      }
       continue;
     }
 
-    /**
-     * Escaped chars
-     */
-
-    if (value === CHAR_BACKSLASH) {
-      push({ type: 'text', value: (options.keepEscaping ? value : '') + advance() });
-      continue;
-    }
+    if (braceEscaped === true || code === CHAR_LEFT_CURLY_BRACE) {
+      braces++;
 
-    /**
-     * Right square bracket (literal): ']'
-     */
+      while (eos() !== true && (code = advance())) {
+        if (code === CHAR_BACKWARD_SLASH) {
+          backslashes = token.backslashes = true;
+          advance();
+          continue;
+        }
 
-    if (value === CHAR_RIGHT_SQUARE_BRACKET) {
-      push({ type: 'text', value: '\\' + value });
-      continue;
-    }
+        if (code === CHAR_LEFT_CURLY_BRACE) {
+          braces++;
+          continue;
+        }
 
-    /**
-     * Left square bracket: '['
-     */
+        if (braceEscaped !== true && code === CHAR_DOT && (code = advance()) === CHAR_DOT) {
+          isBrace = token.isBrace = true;
+          isGlob = token.isGlob = true;
+          finished = true;
 
-    if (value === CHAR_LEFT_SQUARE_BRACKET) {
-      brackets++;
+          if (scanToEnd === true) {
+            continue;
+          }
 
-      let closed = true;
-      let next;
+          break;
+        }
 
-      while (index < length && (next = advance())) {
-        value += next;
+        if (braceEscaped !== true && code === CHAR_COMMA) {
+          isBrace = token.isBrace = true;
+          isGlob = token.isGlob = true;
+          finished = true;
 
-        if (next === CHAR_LEFT_SQUARE_BRACKET) {
-          brackets++;
-          continue;
-        }
+          if (scanToEnd === true) {
+            continue;
+          }
 
-        if (next === CHAR_BACKSLASH) {
-          value += advance();
-          continue;
+          break;
         }
 
-        if (next === CHAR_RIGHT_SQUARE_BRACKET) {
-          brackets--;
+        if (code === CHAR_RIGHT_CURLY_BRACE) {
+          braces--;
 
-          if (brackets === 0) {
+          if (braces === 0) {
+            braceEscaped = false;
+            isBrace = token.isBrace = true;
+            finished = true;
             break;
           }
         }
       }
 
-      push({ type: 'text', value });
-      continue;
-    }
-
-    /**
-     * Parentheses
-     */
+      if (scanToEnd === true) {
+        continue;
+      }
 
-    if (value === CHAR_LEFT_PARENTHESES) {
-      block = push({ type: 'paren', nodes: [] });
-      stack.push(block);
-      push({ type: 'text', value });
-      continue;
+      break;
     }
 
-    if (value === CHAR_RIGHT_PARENTHESES) {
-      if (block.type !== 'paren') {
-        push({ type: 'text', value });
+    if (code === CHAR_FORWARD_SLASH) {
+      slashes.push(index);
+      tokens.push(token);
+      token = { value: '', depth: 0, isGlob: false };
+
+      if (finished === true) continue;
+      if (prev === CHAR_DOT && index === (start + 1)) {
+        start += 2;
         continue;
       }
-      block = stack.pop();
-      push({ type: 'text', value });
-      block = stack[stack.length - 1];
+
+      lastIndex = index + 1;
       continue;
     }
 
-    /**
-     * Quotes: '|"|`
-     */
+    if (opts.noext !== true) {
+      const isExtglobChar = code === CHAR_PLUS
+        || code === CHAR_AT
+        || code === CHAR_ASTERISK
+        || code === CHAR_QUESTION_MARK
+        || code === CHAR_EXCLAMATION_MARK;
 
-    if (value === CHAR_DOUBLE_QUOTE || value === CHAR_SINGLE_QUOTE || value === CHAR_BACKTICK) {
-      let open = value;
-      let next;
+      if (isExtglobChar === true && peek() === CHAR_LEFT_PARENTHESES) {
+        isGlob = token.isGlob = true;
+        isExtglob = token.isExtglob = true;
+        finished = true;
 
-      if (options.keepQuotes !== true) {
-        value = '';
-      }
+        if (scanToEnd === true) {
+          while (eos() !== true && (code = advance())) {
+            if (code === CHAR_BACKWARD_SLASH) {
+              backslashes = token.backslashes = true;
+              code = advance();
+              continue;
+            }
 
-      while (index < length && (next = advance())) {
-        if (next === CHAR_BACKSLASH) {
-          value += next + advance();
+            if (code === CHAR_RIGHT_PARENTHESES) {
+              isGlob = token.isGlob = true;
+              finished = true;
+              break;
+            }
+          }
           continue;
         }
+        break;
+      }
+    }
 
-        if (next === open) {
-          if (options.keepQuotes === true) value += next;
-          break;
-        }
+    if (code === CHAR_ASTERISK) {
+      if (prev === CHAR_ASTERISK) isGlobstar = token.isGlobstar = true;
+      isGlob = token.isGlob = true;
+      finished = true;
 
-        value += next;
+      if (scanToEnd === true) {
+        continue;
       }
+      break;
+    }
 
-      push({ type: 'text', value });
-      continue;
+    if (code === CHAR_QUESTION_MARK) {
+      isGlob = token.isGlob = true;
+      finished = true;
+
+      if (scanToEnd === true) {
+        continue;
+      }
+      break;
     }
 
-    /**
-     * Left curly brace: '{'
-     */
+    if (code === CHAR_LEFT_SQUARE_BRACKET) {
+      while (eos() !== true && (next = advance())) {
+        if (next === CHAR_BACKWARD_SLASH) {
+          backslashes = token.backslashes = true;
+          advance();
+          continue;
+        }
 
-    if (value === CHAR_LEFT_CURLY_BRACE) {
-      depth++;
+        if (next === CHAR_RIGHT_SQUARE_BRACKET) {
+          isBracket = token.isBracket = true;
+          isGlob = token.isGlob = true;
+          finished = true;
 
-      let dollar = prev.value && prev.value.slice(-1) === '$' || block.dollar === true;
-      let brace = {
-        type: 'brace',
-        open: true,
-        close: false,
-        dollar,
-        depth,
-        commas: 0,
-        ranges: 0,
-        nodes: []
-      };
+          if (scanToEnd === true) {
+            continue;
+          }
+          break;
+        }
+      }
+    }
 
-      block = push(brace);
-      stack.push(block);
-      push({ type: 'open', value });
+    if (opts.nonegate !== true && code === CHAR_EXCLAMATION_MARK && index === start) {
+      negated = token.negated = true;
+      start++;
       continue;
     }
 
-    /**
-     * Right curly brace: '}'
-     */
+    if (opts.noparen !== true && code === CHAR_LEFT_PARENTHESES) {
+      isGlob = token.isGlob = true;
 
-    if (value === CHAR_RIGHT_CURLY_BRACE) {
-      if (block.type !== 'brace') {
-        push({ type: 'text', value });
+      if (scanToEnd === true) {
+        while (eos() !== true && (code = advance())) {
+          if (code === CHAR_LEFT_PARENTHESES) {
+            backslashes = token.backslashes = true;
+            code = advance();
+            continue;
+          }
+
+          if (code === CHAR_RIGHT_PARENTHESES) {
+            finished = true;
+            break;
+          }
+        }
         continue;
       }
+      break;
+    }
 
-      let type = 'close';
-      block = stack.pop();
-      block.close = true;
+    if (isGlob === true) {
+      finished = true;
 
-      push({ type, value });
-      depth--;
+      if (scanToEnd === true) {
+        continue;
+      }
 
-      block = stack[stack.length - 1];
-      continue;
+      break;
     }
+  }
 
-    /**
-     * Comma: ','
-     */
+  if (opts.noext === true) {
+    isExtglob = false;
+    isGlob = false;
+  }
 
-    if (value === CHAR_COMMA && depth > 0) {
-      if (block.ranges > 0) {
-        block.ranges = 0;
-        let open = block.nodes.shift();
-        block.nodes = [open, { type: 'text', value: stringify(block) }];
-      }
+  let base = str;
+  let prefix = '';
+  let glob = '';
 
-      push({ type: 'comma', value });
-      block.commas++;
-      continue;
+  if (start > 0) {
+    prefix = str.slice(0, start);
+    str = str.slice(start);
+    lastIndex -= start;
+  }
+
+  if (base && isGlob === true && lastIndex > 0) {
+    base = str.slice(0, lastIndex);
+    glob = str.slice(lastIndex);
+  } else if (isGlob === true) {
+    base = '';
+    glob = str;
+  } else {
+    base = str;
+  }
+
+  if (base && base !== '' && base !== '/' && base !== str) {
+    if (isPathSeparator(base.charCodeAt(base.length - 1))) {
+      base = base.slice(0, -1);
     }
+  }
 
-    /**
-     * Dot: '.'
-     */
+  if (opts.unescape === true) {
+    if (glob) glob = utils.removeBackslashes(glob);
 
-    if (value === CHAR_DOT && depth > 0 && block.commas === 0) {
-      let siblings = block.nodes;
+    if (base && backslashes === true) {
+      base = utils.removeBackslashes(base);
+    }
+  }
 
-      if (depth === 0 || siblings.length === 0) {
-        push({ type: 'text', value });
-        continue;
-      }
+  const state = {
+    prefix,
+    input,
+    start,
+    base,
+    glob,
+    isBrace,
+    isBracket,
+    isGlob,
+    isExtglob,
+    isGlobstar,
+    negated
+  };
 
-      if (prev.type === 'dot') {
-        block.range = [];
-        prev.value += value;
-        prev.type = 'range';
+  if (opts.tokens === true) {
+    state.maxDepth = 0;
+    if (!isPathSeparator(code)) {
+      tokens.push(token);
+    }
+    state.tokens = tokens;
+  }
 
-        if (block.nodes.length !== 3 && block.nodes.length !== 5) {
-          block.invalid = true;
-          block.ranges = 0;
-          prev.type = 'text';
-          continue;
-        }
+  if (opts.parts === true || opts.tokens === true) {
+    let prevIndex;
 
-        block.ranges++;
-        block.args = [];
-        continue;
+    for (let idx = 0; idx < slashes.length; idx++) {
+      const n = prevIndex ? prevIndex + 1 : start;
+      const i = slashes[idx];
+      const value = input.slice(n, i);
+      if (opts.tokens) {
+        if (idx === 0 && start !== 0) {
+          tokens[idx].isPrefix = true;
+          tokens[idx].value = prefix;
+        } else {
+          tokens[idx].value = value;
+        }
+        depth(tokens[idx]);
+        state.maxDepth += tokens[idx].depth;
+      }
+      if (idx !== 0 || value !== '') {
+        parts.push(value);
       }
+      prevIndex = i;
+    }
 
-      if (prev.type === 'range') {
-        siblings.pop();
+    if (prevIndex && prevIndex + 1 < input.length) {
+      const value = input.slice(prevIndex + 1);
+      parts.push(value);
 
-        let before = siblings[siblings.length - 1];
-        before.value += prev.value + value;
-        prev = before;
-        block.ranges--;
-        continue;
+      if (opts.tokens) {
+        tokens[tokens.length - 1].value = value;
+        depth(tokens[tokens.length - 1]);
+        state.maxDepth += tokens[tokens.length - 1].depth;
       }
-
-      push({ type: 'dot', value });
-      continue;
     }
 
-    /**
-     * Text
-     */
-
-    push({ type: 'text', value });
+    state.slashes = slashes;
+    state.parts = parts;
   }
 
-  // Mark imbalanced braces and brackets as invalid
-  do {
-    block = stack.pop();
-
-    if (block.type !== 'root') {
-      block.nodes.forEach(node => {
-        if (!node.nodes) {
-          if (node.type === 'open') node.isOpen = true;
-          if (node.type === 'close') node.isClose = true;
-          if (!node.nodes) node.type = 'text';
-          node.invalid = true;
-        }
-      });
-
-      // get the location of the block on parent.nodes (block's siblings)
-      let parent = stack[stack.length - 1];
-      let index = parent.nodes.indexOf(block);
-      // replace the (invalid) block with it's nodes
-      parent.nodes.splice(index, 1, ...block.nodes);
-    }
-  } while (stack.length > 0);
-
-  push({ type: 'eos' });
-  return ast;
+  return state;
 };
 
-module.exports = parse;
+module.exports = scan;
 
 
 /***/ }),
-/* 321 */
+/* 317 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-module.exports = {
-  MAX_LENGTH: 1024 * 64,
-
-  // Digits
-  CHAR_0: '0', /* 0 */
-  CHAR_9: '9', /* 9 */
-
-  // Alphabet chars.
-  CHAR_UPPERCASE_A: 'A', /* A */
-  CHAR_LOWERCASE_A: 'a', /* a */
-  CHAR_UPPERCASE_Z: 'Z', /* Z */
-  CHAR_LOWERCASE_Z: 'z', /* z */
+const path = __webpack_require__(4);
+const win32 = process.platform === 'win32';
+const {
+  REGEX_BACKSLASH,
+  REGEX_REMOVE_BACKSLASH,
+  REGEX_SPECIAL_CHARS,
+  REGEX_SPECIAL_CHARS_GLOBAL
+} = __webpack_require__(318);
 
-  CHAR_LEFT_PARENTHESES: '(', /* ( */
-  CHAR_RIGHT_PARENTHESES: ')', /* ) */
+exports.isObject = val => val !== null && typeof val === 'object' && !Array.isArray(val);
+exports.hasRegexChars = str => REGEX_SPECIAL_CHARS.test(str);
+exports.isRegexChar = str => str.length === 1 && exports.hasRegexChars(str);
+exports.escapeRegex = str => str.replace(REGEX_SPECIAL_CHARS_GLOBAL, '\\$1');
+exports.toPosixSlashes = str => str.replace(REGEX_BACKSLASH, '/');
 
-  CHAR_ASTERISK: '*', /* * */
+exports.removeBackslashes = str => {
+  return str.replace(REGEX_REMOVE_BACKSLASH, match => {
+    return match === '\\' ? '' : match;
+  });
+};
 
-  // Non-alphabetic chars.
-  CHAR_AMPERSAND: '&', /* & */
-  CHAR_AT: '@', /* @ */
-  CHAR_BACKSLASH: '\\', /* \ */
-  CHAR_BACKTICK: '`', /* ` */
-  CHAR_CARRIAGE_RETURN: '\r', /* \r */
-  CHAR_CIRCUMFLEX_ACCENT: '^', /* ^ */
-  CHAR_COLON: ':', /* : */
-  CHAR_COMMA: ',', /* , */
-  CHAR_DOLLAR: '$', /* . */
-  CHAR_DOT: '.', /* . */
-  CHAR_DOUBLE_QUOTE: '"', /* " */
-  CHAR_EQUAL: '=', /* = */
-  CHAR_EXCLAMATION_MARK: '!', /* ! */
-  CHAR_FORM_FEED: '\f', /* \f */
-  CHAR_FORWARD_SLASH: '/', /* / */
-  CHAR_HASH: '#', /* # */
-  CHAR_HYPHEN_MINUS: '-', /* - */
-  CHAR_LEFT_ANGLE_BRACKET: '<', /* < */
-  CHAR_LEFT_CURLY_BRACE: '{', /* { */
-  CHAR_LEFT_SQUARE_BRACKET: '[', /* [ */
-  CHAR_LINE_FEED: '\n', /* \n */
-  CHAR_NO_BREAK_SPACE: '\u00A0', /* \u00A0 */
-  CHAR_PERCENT: '%', /* % */
-  CHAR_PLUS: '+', /* + */
-  CHAR_QUESTION_MARK: '?', /* ? */
-  CHAR_RIGHT_ANGLE_BRACKET: '>', /* > */
-  CHAR_RIGHT_CURLY_BRACE: '}', /* } */
-  CHAR_RIGHT_SQUARE_BRACKET: ']', /* ] */
-  CHAR_SEMICOLON: ';', /* ; */
-  CHAR_SINGLE_QUOTE: '\'', /* ' */
-  CHAR_SPACE: ' ', /*   */
-  CHAR_TAB: '\t', /* \t */
-  CHAR_UNDERSCORE: '_', /* _ */
-  CHAR_VERTICAL_LINE: '|', /* | */
-  CHAR_ZERO_WIDTH_NOBREAK_SPACE: '\uFEFF' /* \uFEFF */
+exports.supportsLookbehinds = () => {
+  const segs = process.version.slice(1).split('.').map(Number);
+  if (segs.length === 3 && segs[0] >= 9 || (segs[0] === 8 && segs[1] >= 10)) {
+    return true;
+  }
+  return false;
 };
 
+exports.isWindows = options => {
+  if (options && typeof options.windows === 'boolean') {
+    return options.windows;
+  }
+  return win32 === true || path.sep === '\\';
+};
 
-/***/ }),
-/* 322 */
-/***/ (function(module, exports, __webpack_require__) {
+exports.escapeLast = (input, char, lastIdx) => {
+  const idx = input.lastIndexOf(char, lastIdx);
+  if (idx === -1) return input;
+  if (input[idx - 1] === '\\') return exports.escapeLast(input, char, idx - 1);
+  return `${input.slice(0, idx)}\\${input.slice(idx)}`;
+};
 
-"use strict";
+exports.removePrefix = (input, state = {}) => {
+  let output = input;
+  if (output.startsWith('./')) {
+    output = output.slice(2);
+    state.prefix = './';
+  }
+  return output;
+};
 
+exports.wrapOutput = (input, state = {}, options = {}) => {
+  const prepend = options.contains ? '' : '^';
+  const append = options.contains ? '' : '$';
 
-module.exports = __webpack_require__(323);
+  let output = `${prepend}(?:${input})${append}`;
+  if (state.negated === true) {
+    output = `(?:^(?!${output}).*$)`;
+  }
+  return output;
+};
 
 
 /***/ }),
-/* 323 */
+/* 318 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 const path = __webpack_require__(4);
-const scan = __webpack_require__(324);
-const parse = __webpack_require__(327);
-const utils = __webpack_require__(325);
-const constants = __webpack_require__(326);
-const isObject = val => val && typeof val === 'object' && !Array.isArray(val);
+const WIN_SLASH = '\\\\/';
+const WIN_NO_SLASH = `[^${WIN_SLASH}]`;
 
 /**
- * Creates a matcher function from one or more glob patterns. The
- * returned function takes a string to match as its first argument,
- * and returns true if the string is a match. The returned matcher
- * function also takes a boolean as the second argument that, when true,
- * returns an object with additional information.
- *
- * ```js
- * const picomatch = require('picomatch');
- * // picomatch(glob[, options]);
- *
- * const isMatch = picomatch('*.!(*a)');
- * console.log(isMatch('a.a')); //=> false
- * console.log(isMatch('a.b')); //=> true
- * ```
- * @name picomatch
- * @param {String|Array} `globs` One or more glob patterns.
- * @param {Object=} `options`
- * @return {Function=} Returns a matcher function.
- * @api public
+ * Posix glob regex
  */
 
-const picomatch = (glob, options, returnState = false) => {
-  if (Array.isArray(glob)) {
-    const fns = glob.map(input => picomatch(input, options, returnState));
-    const arrayMatcher = str => {
-      for (const isMatch of fns) {
-        const state = isMatch(str);
-        if (state) return state;
-      }
-      return false;
-    };
-    return arrayMatcher;
-  }
-
-  const isState = isObject(glob) && glob.tokens && glob.input;
-
-  if (glob === '' || (typeof glob !== 'string' && !isState)) {
-    throw new TypeError('Expected pattern to be a non-empty string');
-  }
-
-  const opts = options || {};
-  const posix = utils.isWindows(options);
-  const regex = isState
-    ? picomatch.compileRe(glob, options)
-    : picomatch.makeRe(glob, options, false, true);
-
-  const state = regex.state;
-  delete regex.state;
-
-  let isIgnored = () => false;
-  if (opts.ignore) {
-    const ignoreOpts = { ...options, ignore: null, onMatch: null, onResult: null };
-    isIgnored = picomatch(opts.ignore, ignoreOpts, returnState);
-  }
-
-  const matcher = (input, returnObject = false) => {
-    const { isMatch, match, output } = picomatch.test(input, regex, options, { glob, posix });
-    const result = { glob, state, regex, posix, input, output, match, isMatch };
-
-    if (typeof opts.onResult === 'function') {
-      opts.onResult(result);
-    }
-
-    if (isMatch === false) {
-      result.isMatch = false;
-      return returnObject ? result : false;
-    }
+const DOT_LITERAL = '\\.';
+const PLUS_LITERAL = '\\+';
+const QMARK_LITERAL = '\\?';
+const SLASH_LITERAL = '\\/';
+const ONE_CHAR = '(?=.)';
+const QMARK = '[^/]';
+const END_ANCHOR = `(?:${SLASH_LITERAL}|$)`;
+const START_ANCHOR = `(?:^|${SLASH_LITERAL})`;
+const DOTS_SLASH = `${DOT_LITERAL}{1,2}${END_ANCHOR}`;
+const NO_DOT = `(?!${DOT_LITERAL})`;
+const NO_DOTS = `(?!${START_ANCHOR}${DOTS_SLASH})`;
+const NO_DOT_SLASH = `(?!${DOT_LITERAL}{0,1}${END_ANCHOR})`;
+const NO_DOTS_SLASH = `(?!${DOTS_SLASH})`;
+const QMARK_NO_DOT = `[^.${SLASH_LITERAL}]`;
+const STAR = `${QMARK}*?`;
 
-    if (isIgnored(input)) {
-      if (typeof opts.onIgnore === 'function') {
-        opts.onIgnore(result);
-      }
-      result.isMatch = false;
-      return returnObject ? result : false;
-    }
+const POSIX_CHARS = {
+  DOT_LITERAL,
+  PLUS_LITERAL,
+  QMARK_LITERAL,
+  SLASH_LITERAL,
+  ONE_CHAR,
+  QMARK,
+  END_ANCHOR,
+  DOTS_SLASH,
+  NO_DOT,
+  NO_DOTS,
+  NO_DOT_SLASH,
+  NO_DOTS_SLASH,
+  QMARK_NO_DOT,
+  STAR,
+  START_ANCHOR
+};
 
-    if (typeof opts.onMatch === 'function') {
-      opts.onMatch(result);
-    }
-    return returnObject ? result : true;
-  };
+/**
+ * Windows glob regex
+ */
 
-  if (returnState) {
-    matcher.state = state;
-  }
+const WINDOWS_CHARS = {
+  ...POSIX_CHARS,
 
-  return matcher;
+  SLASH_LITERAL: `[${WIN_SLASH}]`,
+  QMARK: WIN_NO_SLASH,
+  STAR: `${WIN_NO_SLASH}*?`,
+  DOTS_SLASH: `${DOT_LITERAL}{1,2}(?:[${WIN_SLASH}]|$)`,
+  NO_DOT: `(?!${DOT_LITERAL})`,
+  NO_DOTS: `(?!(?:^|[${WIN_SLASH}])${DOT_LITERAL}{1,2}(?:[${WIN_SLASH}]|$))`,
+  NO_DOT_SLASH: `(?!${DOT_LITERAL}{0,1}(?:[${WIN_SLASH}]|$))`,
+  NO_DOTS_SLASH: `(?!${DOT_LITERAL}{1,2}(?:[${WIN_SLASH}]|$))`,
+  QMARK_NO_DOT: `[^.${WIN_SLASH}]`,
+  START_ANCHOR: `(?:^|[${WIN_SLASH}])`,
+  END_ANCHOR: `(?:[${WIN_SLASH}]|$)`
 };
 
 /**
- * Test `input` with the given `regex`. This is used by the main
- * `picomatch()` function to test the input string.
- *
- * ```js
- * const picomatch = require('picomatch');
- * // picomatch.test(input, regex[, options]);
- *
- * console.log(picomatch.test('foo/bar', /^(?:([^/]*?)\/([^/]*?))$/));
- * // { isMatch: true, match: [ 'foo/', 'foo', 'bar' ], output: 'foo/bar' }
- * ```
- * @param {String} `input` String to test.
- * @param {RegExp} `regex`
- * @return {Object} Returns an object with matching info.
- * @api public
+ * POSIX Bracket Regex
  */
 
-picomatch.test = (input, regex, options, { glob, posix } = {}) => {
-  if (typeof input !== 'string') {
-    throw new TypeError('Expected input to be a string');
-  }
+const POSIX_REGEX_SOURCE = {
+  alnum: 'a-zA-Z0-9',
+  alpha: 'a-zA-Z',
+  ascii: '\\x00-\\x7F',
+  blank: ' \\t',
+  cntrl: '\\x00-\\x1F\\x7F',
+  digit: '0-9',
+  graph: '\\x21-\\x7E',
+  lower: 'a-z',
+  print: '\\x20-\\x7E ',
+  punct: '\\-!"#$%&\'()\\*+,./:;<=>?@[\\]^_`{|}~',
+  space: ' \\t\\r\\n\\v\\f',
+  upper: 'A-Z',
+  word: 'A-Za-z0-9_',
+  xdigit: 'A-Fa-f0-9'
+};
 
-  if (input === '') {
-    return { isMatch: false, output: '' };
-  }
+module.exports = {
+  MAX_LENGTH: 1024 * 64,
+  POSIX_REGEX_SOURCE,
 
-  const opts = options || {};
-  const format = opts.format || (posix ? utils.toPosixSlashes : null);
-  let match = input === glob;
-  let output = (match && format) ? format(input) : input;
+  // regular expressions
+  REGEX_BACKSLASH: /\\(?![*+?^${}(|)[\]])/g,
+  REGEX_NON_SPECIAL_CHARS: /^[^@![\].,$*+?^{}()|\\/]+/,
+  REGEX_SPECIAL_CHARS: /[-*+?.^${}(|)[\]]/,
+  REGEX_SPECIAL_CHARS_BACKREF: /(\\?)((\W)(\3*))/g,
+  REGEX_SPECIAL_CHARS_GLOBAL: /([-*+?.^${}(|)[\]])/g,
+  REGEX_REMOVE_BACKSLASH: /(?:\[.*?[^\\]\]|\\(?=.))/g,
 
-  if (match === false) {
-    output = format ? format(input) : input;
-    match = output === glob;
-  }
+  // Replace globs with equivalent patterns to reduce parsing time.
+  REPLACEMENTS: {
+    '***': '*',
+    '**/**': '**',
+    '**/**/**': '**'
+  },
 
-  if (match === false || opts.capture === true) {
-    if (opts.matchBase === true || opts.basename === true) {
-      match = picomatch.matchBase(input, regex, options, posix);
-    } else {
-      match = regex.exec(output);
-    }
-  }
+  // Digits
+  CHAR_0: 48, /* 0 */
+  CHAR_9: 57, /* 9 */
 
-  return { isMatch: Boolean(match), match, output };
-};
+  // Alphabet chars.
+  CHAR_UPPERCASE_A: 65, /* A */
+  CHAR_LOWERCASE_A: 97, /* a */
+  CHAR_UPPERCASE_Z: 90, /* Z */
+  CHAR_LOWERCASE_Z: 122, /* z */
 
-/**
- * Match the basename of a filepath.
- *
- * ```js
- * const picomatch = require('picomatch');
- * // picomatch.matchBase(input, glob[, options]);
- * console.log(picomatch.matchBase('foo/bar.js', '*.js'); // true
- * ```
- * @param {String} `input` String to test.
- * @param {RegExp|String} `glob` Glob pattern or regex created by [.makeRe](#makeRe).
- * @return {Boolean}
- * @api public
- */
+  CHAR_LEFT_PARENTHESES: 40, /* ( */
+  CHAR_RIGHT_PARENTHESES: 41, /* ) */
 
-picomatch.matchBase = (input, glob, options, posix = utils.isWindows(options)) => {
-  const regex = glob instanceof RegExp ? glob : picomatch.makeRe(glob, options);
-  return regex.test(path.basename(input));
-};
+  CHAR_ASTERISK: 42, /* * */
 
-/**
- * Returns true if **any** of the given glob `patterns` match the specified `string`.
- *
- * ```js
- * const picomatch = require('picomatch');
- * // picomatch.isMatch(string, patterns[, options]);
- *
- * console.log(picomatch.isMatch('a.a', ['b.*', '*.a'])); //=> true
- * console.log(picomatch.isMatch('a.a', 'b.*')); //=> false
- * ```
- * @param {String|Array} str The string to test.
- * @param {String|Array} patterns One or more glob patterns to use for matching.
- * @param {Object} [options] See available [options](#options).
- * @return {Boolean} Returns true if any patterns match `str`
- * @api public
- */
+  // Non-alphabetic chars.
+  CHAR_AMPERSAND: 38, /* & */
+  CHAR_AT: 64, /* @ */
+  CHAR_BACKWARD_SLASH: 92, /* \ */
+  CHAR_CARRIAGE_RETURN: 13, /* \r */
+  CHAR_CIRCUMFLEX_ACCENT: 94, /* ^ */
+  CHAR_COLON: 58, /* : */
+  CHAR_COMMA: 44, /* , */
+  CHAR_DOT: 46, /* . */
+  CHAR_DOUBLE_QUOTE: 34, /* " */
+  CHAR_EQUAL: 61, /* = */
+  CHAR_EXCLAMATION_MARK: 33, /* ! */
+  CHAR_FORM_FEED: 12, /* \f */
+  CHAR_FORWARD_SLASH: 47, /* / */
+  CHAR_GRAVE_ACCENT: 96, /* ` */
+  CHAR_HASH: 35, /* # */
+  CHAR_HYPHEN_MINUS: 45, /* - */
+  CHAR_LEFT_ANGLE_BRACKET: 60, /* < */
+  CHAR_LEFT_CURLY_BRACE: 123, /* { */
+  CHAR_LEFT_SQUARE_BRACKET: 91, /* [ */
+  CHAR_LINE_FEED: 10, /* \n */
+  CHAR_NO_BREAK_SPACE: 160, /* \u00A0 */
+  CHAR_PERCENT: 37, /* % */
+  CHAR_PLUS: 43, /* + */
+  CHAR_QUESTION_MARK: 63, /* ? */
+  CHAR_RIGHT_ANGLE_BRACKET: 62, /* > */
+  CHAR_RIGHT_CURLY_BRACE: 125, /* } */
+  CHAR_RIGHT_SQUARE_BRACKET: 93, /* ] */
+  CHAR_SEMICOLON: 59, /* ; */
+  CHAR_SINGLE_QUOTE: 39, /* ' */
+  CHAR_SPACE: 32, /*   */
+  CHAR_TAB: 9, /* \t */
+  CHAR_UNDERSCORE: 95, /* _ */
+  CHAR_VERTICAL_LINE: 124, /* | */
+  CHAR_ZERO_WIDTH_NOBREAK_SPACE: 65279, /* \uFEFF */
 
-picomatch.isMatch = (str, patterns, options) => picomatch(patterns, options)(str);
+  SEP: path.sep,
 
-/**
- * Parse a glob pattern to create the source string for a regular
- * expression.
- *
- * ```js
- * const picomatch = require('picomatch');
- * const result = picomatch.parse(pattern[, options]);
- * ```
- * @param {String} `pattern`
- * @param {Object} `options`
- * @return {Object} Returns an object with useful properties and output to be used as a regex source string.
- * @api public
- */
+  /**
+   * Create EXTGLOB_CHARS
+   */
 
-picomatch.parse = (pattern, options) => {
-  if (Array.isArray(pattern)) return pattern.map(p => picomatch.parse(p, options));
-  return parse(pattern, { ...options, fastpaths: false });
-};
+  extglobChars(chars) {
+    return {
+      '!': { type: 'negate', open: '(?:(?!(?:', close: `))${chars.STAR})` },
+      '?': { type: 'qmark', open: '(?:', close: ')?' },
+      '+': { type: 'plus', open: '(?:', close: ')+' },
+      '*': { type: 'star', open: '(?:', close: ')*' },
+      '@': { type: 'at', open: '(?:', close: ')' }
+    };
+  },
 
-/**
- * Scan a glob pattern to separate the pattern into segments.
- *
- * ```js
- * const picomatch = require('picomatch');
- * // picomatch.scan(input[, options]);
- *
- * const result = picomatch.scan('!./foo/*.js');
- * console.log(result);
- * { prefix: '!./',
- *   input: '!./foo/*.js',
- *   start: 3,
- *   base: 'foo',
- *   glob: '*.js',
- *   isBrace: false,
- *   isBracket: false,
- *   isGlob: true,
- *   isExtglob: false,
- *   isGlobstar: false,
- *   negated: true }
- * ```
- * @param {String} `input` Glob pattern to scan.
- * @param {Object} `options`
- * @return {Object} Returns an object with
- * @api public
- */
+  /**
+   * Create GLOB_CHARS
+   */
 
-picomatch.scan = (input, options) => scan(input, options);
+  globChars(win32) {
+    return win32 === true ? WINDOWS_CHARS : POSIX_CHARS;
+  }
+};
 
-/**
- * Create a regular expression from a parsed glob pattern.
- *
- * ```js
- * const picomatch = require('picomatch');
- * const state = picomatch.parse('*.js');
- * // picomatch.compileRe(state[, options]);
- *
- * console.log(picomatch.compileRe(state));
- * //=> /^(?:(?!\.)(?=.)[^/]*?\.js)$/
- * ```
- * @param {String} `state` The object returned from the `.parse` method.
- * @param {Object} `options`
- * @return {RegExp} Returns a regex created from the given pattern.
- * @api public
- */
 
-picomatch.compileRe = (parsed, options, returnOutput = false, returnState = false) => {
-  if (returnOutput === true) {
-    return parsed.output;
-  }
+/***/ }),
+/* 319 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  const opts = options || {};
-  const prepend = opts.contains ? '' : '^';
-  const append = opts.contains ? '' : '$';
+"use strict";
 
-  let source = `${prepend}(?:${parsed.output})${append}`;
-  if (parsed && parsed.negated === true) {
-    source = `^(?!${source}).*$`;
-  }
 
-  const regex = picomatch.toRegex(source, options);
-  if (returnState === true) {
-    regex.state = parsed;
-  }
+const constants = __webpack_require__(318);
+const utils = __webpack_require__(317);
 
-  return regex;
-};
+/**
+ * Constants
+ */
 
-picomatch.makeRe = (input, options, returnOutput = false, returnState = false) => {
-  if (!input || typeof input !== 'string') {
-    throw new TypeError('Expected a non-empty string');
-  }
+const {
+  MAX_LENGTH,
+  POSIX_REGEX_SOURCE,
+  REGEX_NON_SPECIAL_CHARS,
+  REGEX_SPECIAL_CHARS_BACKREF,
+  REPLACEMENTS
+} = constants;
 
-  const opts = options || {};
-  let parsed = { negated: false, fastpaths: true };
-  let prefix = '';
-  let output;
+/**
+ * Helpers
+ */
 
-  if (input.startsWith('./')) {
-    input = input.slice(2);
-    prefix = parsed.prefix = './';
+const expandRange = (args, options) => {
+  if (typeof options.expandRange === 'function') {
+    return options.expandRange(...args, options);
   }
 
-  if (opts.fastpaths !== false && (input[0] === '.' || input[0] === '*')) {
-    output = parse.fastpaths(input, options);
-  }
+  args.sort();
+  const value = `[${args.join('-')}]`;
 
-  if (output === undefined) {
-    parsed = parse(input, options);
-    parsed.prefix = prefix + (parsed.prefix || '');
-  } else {
-    parsed.output = output;
+  try {
+    /* eslint-disable-next-line no-new */
+    new RegExp(value);
+  } catch (ex) {
+    return args.map(v => utils.escapeRegex(v)).join('..');
   }
 
-  return picomatch.compileRe(parsed, options, returnOutput, returnState);
+  return value;
 };
 
 /**
- * Create a regular expression from the given regex source string.
- *
- * ```js
- * const picomatch = require('picomatch');
- * // picomatch.toRegex(source[, options]);
- *
- * const { output } = picomatch.parse('*.js');
- * console.log(picomatch.toRegex(output));
- * //=> /^(?:(?!\.)(?=.)[^/]*?\.js)$/
- * ```
- * @param {String} `source` Regular expression source string.
- * @param {Object} `options`
- * @return {RegExp}
- * @api public
+ * Create the message for a syntax error
  */
 
-picomatch.toRegex = (source, options) => {
-  try {
-    const opts = options || {};
-    return new RegExp(source, opts.flags || (opts.nocase ? 'i' : ''));
-  } catch (err) {
-    if (options && options.debug === true) throw err;
-    return /$^/;
-  }
+const syntaxError = (type, char) => {
+  return `Missing ${type}: "${char}" - use "\\\\${char}" to match literal characters`;
 };
 
 /**
- * Picomatch constants.
+ * Parse the given input string.
+ * @param {String} input
+ * @param {Object} options
  * @return {Object}
  */
 
-picomatch.constants = constants;
+const parse = (input, options) => {
+  if (typeof input !== 'string') {
+    throw new TypeError('Expected a string');
+  }
 
-/**
- * Expose "picomatch"
- */
+  input = REPLACEMENTS[input] || input;
 
-module.exports = picomatch;
+  const opts = { ...options };
+  const max = typeof opts.maxLength === 'number' ? Math.min(MAX_LENGTH, opts.maxLength) : MAX_LENGTH;
 
+  let len = input.length;
+  if (len > max) {
+    throw new SyntaxError(`Input length: ${len}, exceeds maximum allowed length: ${max}`);
+  }
 
-/***/ }),
-/* 324 */
-/***/ (function(module, exports, __webpack_require__) {
+  const bos = { type: 'bos', value: '', output: opts.prepend || '' };
+  const tokens = [bos];
 
-"use strict";
+  const capture = opts.capture ? '' : '?:';
+  const win32 = utils.isWindows(options);
 
+  // create constants based on platform, for windows or posix
+  const PLATFORM_CHARS = constants.globChars(win32);
+  const EXTGLOB_CHARS = constants.extglobChars(PLATFORM_CHARS);
 
-const utils = __webpack_require__(325);
-const {
-  CHAR_ASTERISK,             /* * */
-  CHAR_AT,                   /* @ */
-  CHAR_BACKWARD_SLASH,       /* \ */
-  CHAR_COMMA,                /* , */
-  CHAR_DOT,                  /* . */
-  CHAR_EXCLAMATION_MARK,     /* ! */
-  CHAR_FORWARD_SLASH,        /* / */
-  CHAR_LEFT_CURLY_BRACE,     /* { */
-  CHAR_LEFT_PARENTHESES,     /* ( */
-  CHAR_LEFT_SQUARE_BRACKET,  /* [ */
-  CHAR_PLUS,                 /* + */
-  CHAR_QUESTION_MARK,        /* ? */
-  CHAR_RIGHT_CURLY_BRACE,    /* } */
-  CHAR_RIGHT_PARENTHESES,    /* ) */
-  CHAR_RIGHT_SQUARE_BRACKET  /* ] */
-} = __webpack_require__(326);
+  const {
+    DOT_LITERAL,
+    PLUS_LITERAL,
+    SLASH_LITERAL,
+    ONE_CHAR,
+    DOTS_SLASH,
+    NO_DOT,
+    NO_DOT_SLASH,
+    NO_DOTS_SLASH,
+    QMARK,
+    QMARK_NO_DOT,
+    STAR,
+    START_ANCHOR
+  } = PLATFORM_CHARS;
 
-const isPathSeparator = code => {
-  return code === CHAR_FORWARD_SLASH || code === CHAR_BACKWARD_SLASH;
-};
+  const globstar = (opts) => {
+    return `(${capture}(?:(?!${START_ANCHOR}${opts.dot ? DOTS_SLASH : DOT_LITERAL}).)*?)`;
+  };
 
-const depth = token => {
-  if (token.isPrefix !== true) {
-    token.depth = token.isGlobstar ? Infinity : 1;
+  const nodot = opts.dot ? '' : NO_DOT;
+  const qmarkNoDot = opts.dot ? QMARK : QMARK_NO_DOT;
+  let star = opts.bash === true ? globstar(opts) : STAR;
+
+  if (opts.capture) {
+    star = `(${star})`;
   }
-};
 
-/**
- * Quickly scans a glob pattern and returns an object with a handful of
- * useful properties, like `isGlob`, `path` (the leading non-glob, if it exists),
- * `glob` (the actual pattern), and `negated` (true if the path starts with `!`).
- *
- * ```js
- * const pm = require('picomatch');
- * console.log(pm.scan('foo/bar/*.js'));
- * { isGlob: true, input: 'foo/bar/*.js', base: 'foo/bar', glob: '*.js' }
- * ```
- * @param {String} `str`
- * @param {Object} `options`
- * @return {Object} Returns an object with tokens and regex source string.
- * @api public
- */
+  // minimatch options support
+  if (typeof opts.noext === 'boolean') {
+    opts.noextglob = opts.noext;
+  }
 
-const scan = (input, options) => {
-  const opts = options || {};
+  const state = {
+    input,
+    index: -1,
+    start: 0,
+    dot: opts.dot === true,
+    consumed: '',
+    output: '',
+    prefix: '',
+    backtrack: false,
+    negated: false,
+    brackets: 0,
+    braces: 0,
+    parens: 0,
+    quotes: 0,
+    globstar: false,
+    tokens
+  };
 
-  const length = input.length - 1;
-  const scanToEnd = opts.parts === true || opts.scanToEnd === true;
-  const slashes = [];
-  const tokens = [];
-  const parts = [];
+  input = utils.removePrefix(input, state);
+  len = input.length;
 
-  let str = input;
-  let index = -1;
-  let start = 0;
-  let lastIndex = 0;
-  let isBrace = false;
-  let isBracket = false;
-  let isGlob = false;
-  let isExtglob = false;
-  let isGlobstar = false;
-  let braceEscaped = false;
-  let backslashes = false;
-  let negated = false;
-  let finished = false;
-  let braces = 0;
-  let prev;
-  let code;
-  let token = { value: '', depth: 0, isGlob: false };
+  const extglobs = [];
+  const braces = [];
+  const stack = [];
+  let prev = bos;
+  let value;
 
-  const eos = () => index >= length;
-  const peek = () => str.charCodeAt(index + 1);
-  const advance = () => {
-    prev = code;
-    return str.charCodeAt(++index);
+  /**
+   * Tokenizing helpers
+   */
+
+  const eos = () => state.index === len - 1;
+  const peek = state.peek = (n = 1) => input[state.index + n];
+  const advance = state.advance = () => input[++state.index];
+  const remaining = () => input.slice(state.index + 1);
+  const consume = (value = '', num = 0) => {
+    state.consumed += value;
+    state.index += num;
+  };
+  const append = token => {
+    state.output += token.output != null ? token.output : token.value;
+    consume(token.value);
   };
 
-  while (index < length) {
-    code = advance();
-    let next;
+  const negate = () => {
+    let count = 1;
 
-    if (code === CHAR_BACKWARD_SLASH) {
-      backslashes = token.backslashes = true;
-      code = advance();
+    while (peek() === '!' && (peek(2) !== '(' || peek(3) === '?')) {
+      advance();
+      state.start++;
+      count++;
+    }
 
-      if (code === CHAR_LEFT_CURLY_BRACE) {
-        braceEscaped = true;
-      }
-      continue;
+    if (count % 2 === 0) {
+      return false;
     }
 
-    if (braceEscaped === true || code === CHAR_LEFT_CURLY_BRACE) {
-      braces++;
+    state.negated = true;
+    state.start++;
+    return true;
+  };
 
-      while (eos() !== true && (code = advance())) {
-        if (code === CHAR_BACKWARD_SLASH) {
-          backslashes = token.backslashes = true;
-          advance();
-          continue;
-        }
+  const increment = type => {
+    state[type]++;
+    stack.push(type);
+  };
 
-        if (code === CHAR_LEFT_CURLY_BRACE) {
-          braces++;
-          continue;
-        }
+  const decrement = type => {
+    state[type]--;
+    stack.pop();
+  };
 
-        if (braceEscaped !== true && code === CHAR_DOT && (code = advance()) === CHAR_DOT) {
-          isBrace = token.isBrace = true;
-          isGlob = token.isGlob = true;
-          finished = true;
+  /**
+   * Push tokens onto the tokens array. This helper speeds up
+   * tokenizing by 1) helping us avoid backtracking as much as possible,
+   * and 2) helping us avoid creating extra tokens when consecutive
+   * characters are plain text. This improves performance and simplifies
+   * lookbehinds.
+   */
 
-          if (scanToEnd === true) {
-            continue;
-          }
+  const push = tok => {
+    if (prev.type === 'globstar') {
+      const isBrace = state.braces > 0 && (tok.type === 'comma' || tok.type === 'brace');
+      const isExtglob = tok.extglob === true || (extglobs.length && (tok.type === 'pipe' || tok.type === 'paren'));
 
-          break;
-        }
+      if (tok.type !== 'slash' && tok.type !== 'paren' && !isBrace && !isExtglob) {
+        state.output = state.output.slice(0, -prev.output.length);
+        prev.type = 'star';
+        prev.value = '*';
+        prev.output = star;
+        state.output += prev.output;
+      }
+    }
 
-        if (braceEscaped !== true && code === CHAR_COMMA) {
-          isBrace = token.isBrace = true;
-          isGlob = token.isGlob = true;
-          finished = true;
+    if (extglobs.length && tok.type !== 'paren' && !EXTGLOB_CHARS[tok.value]) {
+      extglobs[extglobs.length - 1].inner += tok.value;
+    }
 
-          if (scanToEnd === true) {
-            continue;
-          }
+    if (tok.value || tok.output) append(tok);
+    if (prev && prev.type === 'text' && tok.type === 'text') {
+      prev.value += tok.value;
+      prev.output = (prev.output || '') + tok.value;
+      return;
+    }
 
-          break;
-        }
+    tok.prev = prev;
+    tokens.push(tok);
+    prev = tok;
+  };
 
-        if (code === CHAR_RIGHT_CURLY_BRACE) {
-          braces--;
+  const extglobOpen = (type, value) => {
+    const token = { ...EXTGLOB_CHARS[value], conditions: 1, inner: '' };
 
-          if (braces === 0) {
-            braceEscaped = false;
-            isBrace = token.isBrace = true;
-            finished = true;
-            break;
-          }
-        }
-      }
+    token.prev = prev;
+    token.parens = state.parens;
+    token.output = state.output;
+    const output = (opts.capture ? '(' : '') + token.open;
 
-      if (scanToEnd === true) {
-        continue;
-      }
+    increment('parens');
+    push({ type, value, output: state.output ? '' : ONE_CHAR });
+    push({ type: 'paren', extglob: true, value: advance(), output });
+    extglobs.push(token);
+  };
 
-      break;
-    }
+  const extglobClose = token => {
+    let output = token.close + (opts.capture ? ')' : '');
 
-    if (code === CHAR_FORWARD_SLASH) {
-      slashes.push(index);
-      tokens.push(token);
-      token = { value: '', depth: 0, isGlob: false };
+    if (token.type === 'negate') {
+      let extglobStar = star;
 
-      if (finished === true) continue;
-      if (prev === CHAR_DOT && index === (start + 1)) {
-        start += 2;
-        continue;
+      if (token.inner && token.inner.length > 1 && token.inner.includes('/')) {
+        extglobStar = globstar(opts);
       }
 
-      lastIndex = index + 1;
-      continue;
-    }
-
-    if (opts.noext !== true) {
-      const isExtglobChar = code === CHAR_PLUS
-        || code === CHAR_AT
-        || code === CHAR_ASTERISK
-        || code === CHAR_QUESTION_MARK
-        || code === CHAR_EXCLAMATION_MARK;
-
-      if (isExtglobChar === true && peek() === CHAR_LEFT_PARENTHESES) {
-        isGlob = token.isGlob = true;
-        isExtglob = token.isExtglob = true;
-        finished = true;
-
-        if (scanToEnd === true) {
-          while (eos() !== true && (code = advance())) {
-            if (code === CHAR_BACKWARD_SLASH) {
-              backslashes = token.backslashes = true;
-              code = advance();
-              continue;
-            }
+      if (extglobStar !== star || eos() || /^\)+$/.test(remaining())) {
+        output = token.close = `)$))${extglobStar}`;
+      }
 
-            if (code === CHAR_RIGHT_PARENTHESES) {
-              isGlob = token.isGlob = true;
-              finished = true;
-              break;
-            }
-          }
-          continue;
-        }
-        break;
+      if (token.prev.type === 'bos' && eos()) {
+        state.negatedExtglob = true;
       }
     }
 
-    if (code === CHAR_ASTERISK) {
-      if (prev === CHAR_ASTERISK) isGlobstar = token.isGlobstar = true;
-      isGlob = token.isGlob = true;
-      finished = true;
+    push({ type: 'paren', extglob: true, value, output });
+    decrement('parens');
+  };
 
-      if (scanToEnd === true) {
-        continue;
-      }
-      break;
-    }
+  /**
+   * Fast paths
+   */
 
-    if (code === CHAR_QUESTION_MARK) {
-      isGlob = token.isGlob = true;
-      finished = true;
+  if (opts.fastpaths !== false && !/(^[*!]|[/()[\]{}"])/.test(input)) {
+    let backslashes = false;
 
-      if (scanToEnd === true) {
-        continue;
+    let output = input.replace(REGEX_SPECIAL_CHARS_BACKREF, (m, esc, chars, first, rest, index) => {
+      if (first === '\\') {
+        backslashes = true;
+        return m;
       }
-      break;
-    }
 
-    if (code === CHAR_LEFT_SQUARE_BRACKET) {
-      while (eos() !== true && (next = advance())) {
-        if (next === CHAR_BACKWARD_SLASH) {
-          backslashes = token.backslashes = true;
-          advance();
-          continue;
+      if (first === '?') {
+        if (esc) {
+          return esc + first + (rest ? QMARK.repeat(rest.length) : '');
+        }
+        if (index === 0) {
+          return qmarkNoDot + (rest ? QMARK.repeat(rest.length) : '');
         }
+        return QMARK.repeat(chars.length);
+      }
 
-        if (next === CHAR_RIGHT_SQUARE_BRACKET) {
-          isBracket = token.isBracket = true;
-          isGlob = token.isGlob = true;
-          finished = true;
+      if (first === '.') {
+        return DOT_LITERAL.repeat(chars.length);
+      }
 
-          if (scanToEnd === true) {
-            continue;
-          }
-          break;
+      if (first === '*') {
+        if (esc) {
+          return esc + first + (rest ? star : '');
         }
+        return star;
+      }
+      return esc ? m : `\\${m}`;
+    });
+
+    if (backslashes === true) {
+      if (opts.unescape === true) {
+        output = output.replace(/\\/g, '');
+      } else {
+        output = output.replace(/\\+/g, m => {
+          return m.length % 2 === 0 ? '\\\\' : (m ? '\\' : '');
+        });
       }
     }
 
-    if (opts.nonegate !== true && code === CHAR_EXCLAMATION_MARK && index === start) {
-      negated = token.negated = true;
-      start++;
+    if (output === input && opts.contains === true) {
+      state.output = input;
+      return state;
+    }
+
+    state.output = utils.wrapOutput(output, state, options);
+    return state;
+  }
+
+  /**
+   * Tokenize input until we reach end-of-string
+   */
+
+  while (!eos()) {
+    value = advance();
+
+    if (value === '\u0000') {
       continue;
     }
 
-    if (opts.noparen !== true && code === CHAR_LEFT_PARENTHESES) {
-      isGlob = token.isGlob = true;
+    /**
+     * Escaped characters
+     */
 
-      if (scanToEnd === true) {
-        while (eos() !== true && (code = advance())) {
-          if (code === CHAR_LEFT_PARENTHESES) {
-            backslashes = token.backslashes = true;
-            code = advance();
-            continue;
-          }
+    if (value === '\\') {
+      const next = peek();
 
-          if (code === CHAR_RIGHT_PARENTHESES) {
-            finished = true;
-            break;
-          }
-        }
+      if (next === '/' && opts.bash !== true) {
         continue;
       }
-      break;
-    }
 
-    if (isGlob === true) {
-      finished = true;
+      if (next === '.' || next === ';') {
+        continue;
+      }
 
-      if (scanToEnd === true) {
+      if (!next) {
+        value += '\\';
+        push({ type: 'text', value });
         continue;
       }
 
-      break;
+      // collapse slashes to reduce potential for exploits
+      const match = /^\\+/.exec(remaining());
+      let slashes = 0;
+
+      if (match && match[0].length > 2) {
+        slashes = match[0].length;
+        state.index += slashes;
+        if (slashes % 2 !== 0) {
+          value += '\\';
+        }
+      }
+
+      if (opts.unescape === true) {
+        value = advance() || '';
+      } else {
+        value += advance() || '';
+      }
+
+      if (state.brackets === 0) {
+        push({ type: 'text', value });
+        continue;
+      }
     }
-  }
 
-  if (opts.noext === true) {
-    isExtglob = false;
-    isGlob = false;
-  }
+    /**
+     * If we're inside a regex character class, continue
+     * until we reach the closing bracket.
+     */
 
-  let base = str;
-  let prefix = '';
-  let glob = '';
+    if (state.brackets > 0 && (value !== ']' || prev.value === '[' || prev.value === '[^')) {
+      if (opts.posix !== false && value === ':') {
+        const inner = prev.value.slice(1);
+        if (inner.includes('[')) {
+          prev.posix = true;
 
-  if (start > 0) {
-    prefix = str.slice(0, start);
-    str = str.slice(start);
-    lastIndex -= start;
-  }
+          if (inner.includes(':')) {
+            const idx = prev.value.lastIndexOf('[');
+            const pre = prev.value.slice(0, idx);
+            const rest = prev.value.slice(idx + 2);
+            const posix = POSIX_REGEX_SOURCE[rest];
+            if (posix) {
+              prev.value = pre + posix;
+              state.backtrack = true;
+              advance();
 
-  if (base && isGlob === true && lastIndex > 0) {
-    base = str.slice(0, lastIndex);
-    glob = str.slice(lastIndex);
-  } else if (isGlob === true) {
-    base = '';
-    glob = str;
-  } else {
-    base = str;
-  }
+              if (!bos.output && tokens.indexOf(prev) === 1) {
+                bos.output = ONE_CHAR;
+              }
+              continue;
+            }
+          }
+        }
+      }
 
-  if (base && base !== '' && base !== '/' && base !== str) {
-    if (isPathSeparator(base.charCodeAt(base.length - 1))) {
-      base = base.slice(0, -1);
+      if ((value === '[' && peek() !== ':') || (value === '-' && peek() === ']')) {
+        value = `\\${value}`;
+      }
+
+      if (value === ']' && (prev.value === '[' || prev.value === '[^')) {
+        value = `\\${value}`;
+      }
+
+      if (opts.posix === true && value === '!' && prev.value === '[') {
+        value = '^';
+      }
+
+      prev.value += value;
+      append({ value });
+      continue;
     }
-  }
 
-  if (opts.unescape === true) {
-    if (glob) glob = utils.removeBackslashes(glob);
+    /**
+     * If we're inside a quoted string, continue
+     * until we reach the closing double quote.
+     */
 
-    if (base && backslashes === true) {
-      base = utils.removeBackslashes(base);
+    if (state.quotes === 1 && value !== '"') {
+      value = utils.escapeRegex(value);
+      prev.value += value;
+      append({ value });
+      continue;
     }
-  }
 
-  const state = {
-    prefix,
-    input,
-    start,
-    base,
-    glob,
-    isBrace,
-    isBracket,
-    isGlob,
-    isExtglob,
-    isGlobstar,
-    negated
-  };
+    /**
+     * Double quotes
+     */
 
-  if (opts.tokens === true) {
-    state.maxDepth = 0;
-    if (!isPathSeparator(code)) {
-      tokens.push(token);
+    if (value === '"') {
+      state.quotes = state.quotes === 1 ? 0 : 1;
+      if (opts.keepQuotes === true) {
+        push({ type: 'text', value });
+      }
+      continue;
     }
-    state.tokens = tokens;
-  }
 
-  if (opts.parts === true || opts.tokens === true) {
-    let prevIndex;
+    /**
+     * Parentheses
+     */
 
-    for (let idx = 0; idx < slashes.length; idx++) {
-      const n = prevIndex ? prevIndex + 1 : start;
-      const i = slashes[idx];
-      const value = input.slice(n, i);
-      if (opts.tokens) {
-        if (idx === 0 && start !== 0) {
-          tokens[idx].isPrefix = true;
-          tokens[idx].value = prefix;
-        } else {
-          tokens[idx].value = value;
-        }
-        depth(tokens[idx]);
-        state.maxDepth += tokens[idx].depth;
+    if (value === '(') {
+      increment('parens');
+      push({ type: 'paren', value });
+      continue;
+    }
+
+    if (value === ')') {
+      if (state.parens === 0 && opts.strictBrackets === true) {
+        throw new SyntaxError(syntaxError('opening', '('));
       }
-      if (idx !== 0 || value !== '') {
-        parts.push(value);
+
+      const extglob = extglobs[extglobs.length - 1];
+      if (extglob && state.parens === extglob.parens + 1) {
+        extglobClose(extglobs.pop());
+        continue;
       }
-      prevIndex = i;
+
+      push({ type: 'paren', value, output: state.parens ? ')' : '\\)' });
+      decrement('parens');
+      continue;
     }
 
-    if (prevIndex && prevIndex + 1 < input.length) {
-      const value = input.slice(prevIndex + 1);
-      parts.push(value);
+    /**
+     * Square brackets
+     */
 
-      if (opts.tokens) {
-        tokens[tokens.length - 1].value = value;
-        depth(tokens[tokens.length - 1]);
-        state.maxDepth += tokens[tokens.length - 1].depth;
+    if (value === '[') {
+      if (opts.nobracket === true || !remaining().includes(']')) {
+        if (opts.nobracket !== true && opts.strictBrackets === true) {
+          throw new SyntaxError(syntaxError('closing', ']'));
+        }
+
+        value = `\\${value}`;
+      } else {
+        increment('brackets');
       }
+
+      push({ type: 'bracket', value });
+      continue;
     }
 
-    state.slashes = slashes;
-    state.parts = parts;
-  }
+    if (value === ']') {
+      if (opts.nobracket === true || (prev && prev.type === 'bracket' && prev.value.length === 1)) {
+        push({ type: 'text', value, output: `\\${value}` });
+        continue;
+      }
 
-  return state;
-};
+      if (state.brackets === 0) {
+        if (opts.strictBrackets === true) {
+          throw new SyntaxError(syntaxError('opening', '['));
+        }
 
-module.exports = scan;
+        push({ type: 'text', value, output: `\\${value}` });
+        continue;
+      }
 
+      decrement('brackets');
 
-/***/ }),
-/* 325 */
-/***/ (function(module, exports, __webpack_require__) {
+      const prevValue = prev.value.slice(1);
+      if (prev.posix !== true && prevValue[0] === '^' && !prevValue.includes('/')) {
+        value = `/${value}`;
+      }
 
-"use strict";
+      prev.value += value;
+      append({ value });
 
+      // when literal brackets are explicitly disabled
+      // assume we should match with a regex character class
+      if (opts.literalBrackets === false || utils.hasRegexChars(prevValue)) {
+        continue;
+      }
 
-const path = __webpack_require__(4);
-const win32 = process.platform === 'win32';
-const {
-  REGEX_BACKSLASH,
-  REGEX_REMOVE_BACKSLASH,
-  REGEX_SPECIAL_CHARS,
-  REGEX_SPECIAL_CHARS_GLOBAL
-} = __webpack_require__(326);
+      const escaped = utils.escapeRegex(prev.value);
+      state.output = state.output.slice(0, -prev.value.length);
 
-exports.isObject = val => val !== null && typeof val === 'object' && !Array.isArray(val);
-exports.hasRegexChars = str => REGEX_SPECIAL_CHARS.test(str);
-exports.isRegexChar = str => str.length === 1 && exports.hasRegexChars(str);
-exports.escapeRegex = str => str.replace(REGEX_SPECIAL_CHARS_GLOBAL, '\\$1');
-exports.toPosixSlashes = str => str.replace(REGEX_BACKSLASH, '/');
+      // when literal brackets are explicitly enabled
+      // assume we should escape the brackets to match literal characters
+      if (opts.literalBrackets === true) {
+        state.output += escaped;
+        prev.value = escaped;
+        continue;
+      }
 
-exports.removeBackslashes = str => {
-  return str.replace(REGEX_REMOVE_BACKSLASH, match => {
-    return match === '\\' ? '' : match;
-  });
-};
+      // when the user specifies nothing, try to match both
+      prev.value = `(${capture}${escaped}|${prev.value})`;
+      state.output += prev.value;
+      continue;
+    }
 
-exports.supportsLookbehinds = () => {
-  const segs = process.version.slice(1).split('.').map(Number);
-  if (segs.length === 3 && segs[0] >= 9 || (segs[0] === 8 && segs[1] >= 10)) {
-    return true;
-  }
-  return false;
-};
+    /**
+     * Braces
+     */
 
-exports.isWindows = options => {
-  if (options && typeof options.windows === 'boolean') {
-    return options.windows;
-  }
-  return win32 === true || path.sep === '\\';
-};
+    if (value === '{' && opts.nobrace !== true) {
+      increment('braces');
 
-exports.escapeLast = (input, char, lastIdx) => {
-  const idx = input.lastIndexOf(char, lastIdx);
-  if (idx === -1) return input;
-  if (input[idx - 1] === '\\') return exports.escapeLast(input, char, idx - 1);
-  return `${input.slice(0, idx)}\\${input.slice(idx)}`;
-};
+      const open = {
+        type: 'brace',
+        value,
+        output: '(',
+        outputIndex: state.output.length,
+        tokensIndex: state.tokens.length
+      };
 
-exports.removePrefix = (input, state = {}) => {
-  let output = input;
-  if (output.startsWith('./')) {
-    output = output.slice(2);
-    state.prefix = './';
-  }
-  return output;
-};
+      braces.push(open);
+      push(open);
+      continue;
+    }
 
-exports.wrapOutput = (input, state = {}, options = {}) => {
-  const prepend = options.contains ? '' : '^';
-  const append = options.contains ? '' : '$';
+    if (value === '}') {
+      const brace = braces[braces.length - 1];
 
-  let output = `${prepend}(?:${input})${append}`;
-  if (state.negated === true) {
-    output = `(?:^(?!${output}).*$)`;
-  }
-  return output;
-};
+      if (opts.nobrace === true || !brace) {
+        push({ type: 'text', value, output: value });
+        continue;
+      }
 
+      let output = ')';
 
-/***/ }),
-/* 326 */
-/***/ (function(module, exports, __webpack_require__) {
+      if (brace.dots === true) {
+        const arr = tokens.slice();
+        const range = [];
 
-"use strict";
+        for (let i = arr.length - 1; i >= 0; i--) {
+          tokens.pop();
+          if (arr[i].type === 'brace') {
+            break;
+          }
+          if (arr[i].type !== 'dots') {
+            range.unshift(arr[i].value);
+          }
+        }
 
+        output = expandRange(range, opts);
+        state.backtrack = true;
+      }
 
-const path = __webpack_require__(4);
-const WIN_SLASH = '\\\\/';
-const WIN_NO_SLASH = `[^${WIN_SLASH}]`;
+      if (brace.comma !== true && brace.dots !== true) {
+        const out = state.output.slice(0, brace.outputIndex);
+        const toks = state.tokens.slice(brace.tokensIndex);
+        brace.value = brace.output = '\\{';
+        value = output = '\\}';
+        state.output = out;
+        for (const t of toks) {
+          state.output += (t.output || t.value);
+        }
+      }
 
-/**
- * Posix glob regex
- */
+      push({ type: 'brace', value, output });
+      decrement('braces');
+      braces.pop();
+      continue;
+    }
 
-const DOT_LITERAL = '\\.';
-const PLUS_LITERAL = '\\+';
-const QMARK_LITERAL = '\\?';
-const SLASH_LITERAL = '\\/';
-const ONE_CHAR = '(?=.)';
-const QMARK = '[^/]';
-const END_ANCHOR = `(?:${SLASH_LITERAL}|$)`;
-const START_ANCHOR = `(?:^|${SLASH_LITERAL})`;
-const DOTS_SLASH = `${DOT_LITERAL}{1,2}${END_ANCHOR}`;
-const NO_DOT = `(?!${DOT_LITERAL})`;
-const NO_DOTS = `(?!${START_ANCHOR}${DOTS_SLASH})`;
-const NO_DOT_SLASH = `(?!${DOT_LITERAL}{0,1}${END_ANCHOR})`;
-const NO_DOTS_SLASH = `(?!${DOTS_SLASH})`;
-const QMARK_NO_DOT = `[^.${SLASH_LITERAL}]`;
-const STAR = `${QMARK}*?`;
-
-const POSIX_CHARS = {
-  DOT_LITERAL,
-  PLUS_LITERAL,
-  QMARK_LITERAL,
-  SLASH_LITERAL,
-  ONE_CHAR,
-  QMARK,
-  END_ANCHOR,
-  DOTS_SLASH,
-  NO_DOT,
-  NO_DOTS,
-  NO_DOT_SLASH,
-  NO_DOTS_SLASH,
-  QMARK_NO_DOT,
-  STAR,
-  START_ANCHOR
-};
+    /**
+     * Pipes
+     */
 
-/**
- * Windows glob regex
- */
+    if (value === '|') {
+      if (extglobs.length > 0) {
+        extglobs[extglobs.length - 1].conditions++;
+      }
+      push({ type: 'text', value });
+      continue;
+    }
 
-const WINDOWS_CHARS = {
-  ...POSIX_CHARS,
+    /**
+     * Commas
+     */
 
-  SLASH_LITERAL: `[${WIN_SLASH}]`,
-  QMARK: WIN_NO_SLASH,
-  STAR: `${WIN_NO_SLASH}*?`,
-  DOTS_SLASH: `${DOT_LITERAL}{1,2}(?:[${WIN_SLASH}]|$)`,
-  NO_DOT: `(?!${DOT_LITERAL})`,
-  NO_DOTS: `(?!(?:^|[${WIN_SLASH}])${DOT_LITERAL}{1,2}(?:[${WIN_SLASH}]|$))`,
-  NO_DOT_SLASH: `(?!${DOT_LITERAL}{0,1}(?:[${WIN_SLASH}]|$))`,
-  NO_DOTS_SLASH: `(?!${DOT_LITERAL}{1,2}(?:[${WIN_SLASH}]|$))`,
-  QMARK_NO_DOT: `[^.${WIN_SLASH}]`,
-  START_ANCHOR: `(?:^|[${WIN_SLASH}])`,
-  END_ANCHOR: `(?:[${WIN_SLASH}]|$)`
-};
+    if (value === ',') {
+      let output = value;
 
-/**
- * POSIX Bracket Regex
- */
+      const brace = braces[braces.length - 1];
+      if (brace && stack[stack.length - 1] === 'braces') {
+        brace.comma = true;
+        output = '|';
+      }
 
-const POSIX_REGEX_SOURCE = {
-  alnum: 'a-zA-Z0-9',
-  alpha: 'a-zA-Z',
-  ascii: '\\x00-\\x7F',
-  blank: ' \\t',
-  cntrl: '\\x00-\\x1F\\x7F',
-  digit: '0-9',
-  graph: '\\x21-\\x7E',
-  lower: 'a-z',
-  print: '\\x20-\\x7E ',
-  punct: '\\-!"#$%&\'()\\*+,./:;<=>?@[\\]^_`{|}~',
-  space: ' \\t\\r\\n\\v\\f',
-  upper: 'A-Z',
-  word: 'A-Za-z0-9_',
-  xdigit: 'A-Fa-f0-9'
-};
+      push({ type: 'comma', value, output });
+      continue;
+    }
 
-module.exports = {
-  MAX_LENGTH: 1024 * 64,
-  POSIX_REGEX_SOURCE,
+    /**
+     * Slashes
+     */
 
-  // regular expressions
-  REGEX_BACKSLASH: /\\(?![*+?^${}(|)[\]])/g,
-  REGEX_NON_SPECIAL_CHARS: /^[^@![\].,$*+?^{}()|\\/]+/,
-  REGEX_SPECIAL_CHARS: /[-*+?.^${}(|)[\]]/,
-  REGEX_SPECIAL_CHARS_BACKREF: /(\\?)((\W)(\3*))/g,
-  REGEX_SPECIAL_CHARS_GLOBAL: /([-*+?.^${}(|)[\]])/g,
-  REGEX_REMOVE_BACKSLASH: /(?:\[.*?[^\\]\]|\\(?=.))/g,
+    if (value === '/') {
+      // if the beginning of the glob is "./", advance the start
+      // to the current index, and don't add the "./" characters
+      // to the state. This greatly simplifies lookbehinds when
+      // checking for BOS characters like "!" and "." (not "./")
+      if (prev.type === 'dot' && state.index === state.start + 1) {
+        state.start = state.index + 1;
+        state.consumed = '';
+        state.output = '';
+        tokens.pop();
+        prev = bos; // reset "prev" to the first token
+        continue;
+      }
 
-  // Replace globs with equivalent patterns to reduce parsing time.
-  REPLACEMENTS: {
-    '***': '*',
-    '**/**': '**',
-    '**/**/**': '**'
-  },
+      push({ type: 'slash', value, output: SLASH_LITERAL });
+      continue;
+    }
 
-  // Digits
-  CHAR_0: 48, /* 0 */
-  CHAR_9: 57, /* 9 */
+    /**
+     * Dots
+     */
 
-  // Alphabet chars.
-  CHAR_UPPERCASE_A: 65, /* A */
-  CHAR_LOWERCASE_A: 97, /* a */
-  CHAR_UPPERCASE_Z: 90, /* Z */
-  CHAR_LOWERCASE_Z: 122, /* z */
+    if (value === '.') {
+      if (state.braces > 0 && prev.type === 'dot') {
+        if (prev.value === '.') prev.output = DOT_LITERAL;
+        const brace = braces[braces.length - 1];
+        prev.type = 'dots';
+        prev.output += value;
+        prev.value += value;
+        brace.dots = true;
+        continue;
+      }
 
-  CHAR_LEFT_PARENTHESES: 40, /* ( */
-  CHAR_RIGHT_PARENTHESES: 41, /* ) */
+      if ((state.braces + state.parens) === 0 && prev.type !== 'bos' && prev.type !== 'slash') {
+        push({ type: 'text', value, output: DOT_LITERAL });
+        continue;
+      }
 
-  CHAR_ASTERISK: 42, /* * */
+      push({ type: 'dot', value, output: DOT_LITERAL });
+      continue;
+    }
 
-  // Non-alphabetic chars.
-  CHAR_AMPERSAND: 38, /* & */
-  CHAR_AT: 64, /* @ */
-  CHAR_BACKWARD_SLASH: 92, /* \ */
-  CHAR_CARRIAGE_RETURN: 13, /* \r */
-  CHAR_CIRCUMFLEX_ACCENT: 94, /* ^ */
-  CHAR_COLON: 58, /* : */
-  CHAR_COMMA: 44, /* , */
-  CHAR_DOT: 46, /* . */
-  CHAR_DOUBLE_QUOTE: 34, /* " */
-  CHAR_EQUAL: 61, /* = */
-  CHAR_EXCLAMATION_MARK: 33, /* ! */
-  CHAR_FORM_FEED: 12, /* \f */
-  CHAR_FORWARD_SLASH: 47, /* / */
-  CHAR_GRAVE_ACCENT: 96, /* ` */
-  CHAR_HASH: 35, /* # */
-  CHAR_HYPHEN_MINUS: 45, /* - */
-  CHAR_LEFT_ANGLE_BRACKET: 60, /* < */
-  CHAR_LEFT_CURLY_BRACE: 123, /* { */
-  CHAR_LEFT_SQUARE_BRACKET: 91, /* [ */
-  CHAR_LINE_FEED: 10, /* \n */
-  CHAR_NO_BREAK_SPACE: 160, /* \u00A0 */
-  CHAR_PERCENT: 37, /* % */
-  CHAR_PLUS: 43, /* + */
-  CHAR_QUESTION_MARK: 63, /* ? */
-  CHAR_RIGHT_ANGLE_BRACKET: 62, /* > */
-  CHAR_RIGHT_CURLY_BRACE: 125, /* } */
-  CHAR_RIGHT_SQUARE_BRACKET: 93, /* ] */
-  CHAR_SEMICOLON: 59, /* ; */
-  CHAR_SINGLE_QUOTE: 39, /* ' */
-  CHAR_SPACE: 32, /*   */
-  CHAR_TAB: 9, /* \t */
-  CHAR_UNDERSCORE: 95, /* _ */
-  CHAR_VERTICAL_LINE: 124, /* | */
-  CHAR_ZERO_WIDTH_NOBREAK_SPACE: 65279, /* \uFEFF */
+    /**
+     * Question marks
+     */
 
-  SEP: path.sep,
+    if (value === '?') {
+      const isGroup = prev && prev.value === '(';
+      if (!isGroup && opts.noextglob !== true && peek() === '(' && peek(2) !== '?') {
+        extglobOpen('qmark', value);
+        continue;
+      }
 
-  /**
-   * Create EXTGLOB_CHARS
-   */
+      if (prev && prev.type === 'paren') {
+        const next = peek();
+        let output = value;
 
-  extglobChars(chars) {
-    return {
-      '!': { type: 'negate', open: '(?:(?!(?:', close: `))${chars.STAR})` },
-      '?': { type: 'qmark', open: '(?:', close: ')?' },
-      '+': { type: 'plus', open: '(?:', close: ')+' },
-      '*': { type: 'star', open: '(?:', close: ')*' },
-      '@': { type: 'at', open: '(?:', close: ')' }
-    };
-  },
+        if (next === '<' && !utils.supportsLookbehinds()) {
+          throw new Error('Node.js v10 or higher is required for regex lookbehinds');
+        }
 
-  /**
-   * Create GLOB_CHARS
-   */
+        if ((prev.value === '(' && !/[!=<:]/.test(next)) || (next === '<' && !/<([!=]|\w+>)/.test(remaining()))) {
+          output = `\\${value}`;
+        }
 
-  globChars(win32) {
-    return win32 === true ? WINDOWS_CHARS : POSIX_CHARS;
-  }
-};
+        push({ type: 'text', value, output });
+        continue;
+      }
 
+      if (opts.dot !== true && (prev.type === 'slash' || prev.type === 'bos')) {
+        push({ type: 'qmark', value, output: QMARK_NO_DOT });
+        continue;
+      }
 
-/***/ }),
-/* 327 */
-/***/ (function(module, exports, __webpack_require__) {
+      push({ type: 'qmark', value, output: QMARK });
+      continue;
+    }
 
-"use strict";
+    /**
+     * Exclamation
+     */
 
+    if (value === '!') {
+      if (opts.noextglob !== true && peek() === '(') {
+        if (peek(2) !== '?' || !/[!=<:]/.test(peek(3))) {
+          extglobOpen('negate', value);
+          continue;
+        }
+      }
 
-const constants = __webpack_require__(326);
-const utils = __webpack_require__(325);
+      if (opts.nonegate !== true && state.index === 0) {
+        negate();
+        continue;
+      }
+    }
 
-/**
- * Constants
- */
+    /**
+     * Plus
+     */
 
-const {
-  MAX_LENGTH,
-  POSIX_REGEX_SOURCE,
-  REGEX_NON_SPECIAL_CHARS,
-  REGEX_SPECIAL_CHARS_BACKREF,
-  REPLACEMENTS
-} = constants;
+    if (value === '+') {
+      if (opts.noextglob !== true && peek() === '(' && peek(2) !== '?') {
+        extglobOpen('plus', value);
+        continue;
+      }
 
-/**
- * Helpers
- */
+      if ((prev && prev.value === '(') || opts.regex === false) {
+        push({ type: 'plus', value, output: PLUS_LITERAL });
+        continue;
+      }
 
-const expandRange = (args, options) => {
-  if (typeof options.expandRange === 'function') {
-    return options.expandRange(...args, options);
-  }
+      if ((prev && (prev.type === 'bracket' || prev.type === 'paren' || prev.type === 'brace')) || state.parens > 0) {
+        push({ type: 'plus', value });
+        continue;
+      }
 
-  args.sort();
-  const value = `[${args.join('-')}]`;
+      push({ type: 'plus', value: PLUS_LITERAL });
+      continue;
+    }
 
-  try {
-    /* eslint-disable-next-line no-new */
-    new RegExp(value);
-  } catch (ex) {
-    return args.map(v => utils.escapeRegex(v)).join('..');
-  }
+    /**
+     * Plain text
+     */
 
-  return value;
-};
+    if (value === '@') {
+      if (opts.noextglob !== true && peek() === '(' && peek(2) !== '?') {
+        push({ type: 'at', extglob: true, value, output: '' });
+        continue;
+      }
 
-/**
- * Create the message for a syntax error
- */
+      push({ type: 'text', value });
+      continue;
+    }
 
-const syntaxError = (type, char) => {
-  return `Missing ${type}: "${char}" - use "\\\\${char}" to match literal characters`;
-};
+    /**
+     * Plain text
+     */
 
-/**
- * Parse the given input string.
- * @param {String} input
- * @param {Object} options
- * @return {Object}
- */
+    if (value !== '*') {
+      if (value === '$' || value === '^') {
+        value = `\\${value}`;
+      }
 
-const parse = (input, options) => {
-  if (typeof input !== 'string') {
-    throw new TypeError('Expected a string');
-  }
+      const match = REGEX_NON_SPECIAL_CHARS.exec(remaining());
+      if (match) {
+        value += match[0];
+        state.index += match[0].length;
+      }
 
-  input = REPLACEMENTS[input] || input;
+      push({ type: 'text', value });
+      continue;
+    }
 
-  const opts = { ...options };
-  const max = typeof opts.maxLength === 'number' ? Math.min(MAX_LENGTH, opts.maxLength) : MAX_LENGTH;
+    /**
+     * Stars
+     */
 
-  let len = input.length;
-  if (len > max) {
-    throw new SyntaxError(`Input length: ${len}, exceeds maximum allowed length: ${max}`);
-  }
+    if (prev && (prev.type === 'globstar' || prev.star === true)) {
+      prev.type = 'star';
+      prev.star = true;
+      prev.value += value;
+      prev.output = star;
+      state.backtrack = true;
+      state.globstar = true;
+      consume(value);
+      continue;
+    }
 
-  const bos = { type: 'bos', value: '', output: opts.prepend || '' };
-  const tokens = [bos];
+    let rest = remaining();
+    if (opts.noextglob !== true && /^\([^?]/.test(rest)) {
+      extglobOpen('star', value);
+      continue;
+    }
 
-  const capture = opts.capture ? '' : '?:';
-  const win32 = utils.isWindows(options);
+    if (prev.type === 'star') {
+      if (opts.noglobstar === true) {
+        consume(value);
+        continue;
+      }
 
-  // create constants based on platform, for windows or posix
-  const PLATFORM_CHARS = constants.globChars(win32);
-  const EXTGLOB_CHARS = constants.extglobChars(PLATFORM_CHARS);
+      const prior = prev.prev;
+      const before = prior.prev;
+      const isStart = prior.type === 'slash' || prior.type === 'bos';
+      const afterStar = before && (before.type === 'star' || before.type === 'globstar');
 
-  const {
-    DOT_LITERAL,
-    PLUS_LITERAL,
-    SLASH_LITERAL,
-    ONE_CHAR,
-    DOTS_SLASH,
-    NO_DOT,
-    NO_DOT_SLASH,
-    NO_DOTS_SLASH,
-    QMARK,
-    QMARK_NO_DOT,
-    STAR,
-    START_ANCHOR
-  } = PLATFORM_CHARS;
+      if (opts.bash === true && (!isStart || (rest[0] && rest[0] !== '/'))) {
+        push({ type: 'star', value, output: '' });
+        continue;
+      }
 
-  const globstar = (opts) => {
-    return `(${capture}(?:(?!${START_ANCHOR}${opts.dot ? DOTS_SLASH : DOT_LITERAL}).)*?)`;
-  };
+      const isBrace = state.braces > 0 && (prior.type === 'comma' || prior.type === 'brace');
+      const isExtglob = extglobs.length && (prior.type === 'pipe' || prior.type === 'paren');
+      if (!isStart && prior.type !== 'paren' && !isBrace && !isExtglob) {
+        push({ type: 'star', value, output: '' });
+        continue;
+      }
 
-  const nodot = opts.dot ? '' : NO_DOT;
-  const qmarkNoDot = opts.dot ? QMARK : QMARK_NO_DOT;
-  let star = opts.bash === true ? globstar(opts) : STAR;
+      // strip consecutive `/**/`
+      while (rest.slice(0, 3) === '/**') {
+        const after = input[state.index + 4];
+        if (after && after !== '/') {
+          break;
+        }
+        rest = rest.slice(3);
+        consume('/**', 3);
+      }
 
-  if (opts.capture) {
-    star = `(${star})`;
-  }
+      if (prior.type === 'bos' && eos()) {
+        prev.type = 'globstar';
+        prev.value += value;
+        prev.output = globstar(opts);
+        state.output = prev.output;
+        state.globstar = true;
+        consume(value);
+        continue;
+      }
 
-  // minimatch options support
-  if (typeof opts.noext === 'boolean') {
-    opts.noextglob = opts.noext;
-  }
+      if (prior.type === 'slash' && prior.prev.type !== 'bos' && !afterStar && eos()) {
+        state.output = state.output.slice(0, -(prior.output + prev.output).length);
+        prior.output = `(?:${prior.output}`;
 
-  const state = {
-    input,
-    index: -1,
-    start: 0,
-    dot: opts.dot === true,
-    consumed: '',
-    output: '',
-    prefix: '',
-    backtrack: false,
-    negated: false,
-    brackets: 0,
-    braces: 0,
-    parens: 0,
-    quotes: 0,
-    globstar: false,
-    tokens
-  };
+        prev.type = 'globstar';
+        prev.output = globstar(opts) + (opts.strictSlashes ? ')' : '|$)');
+        prev.value += value;
+        state.globstar = true;
+        state.output += prior.output + prev.output;
+        consume(value);
+        continue;
+      }
 
-  input = utils.removePrefix(input, state);
-  len = input.length;
+      if (prior.type === 'slash' && prior.prev.type !== 'bos' && rest[0] === '/') {
+        const end = rest[1] !== void 0 ? '|$' : '';
 
-  const extglobs = [];
-  const braces = [];
-  const stack = [];
-  let prev = bos;
-  let value;
+        state.output = state.output.slice(0, -(prior.output + prev.output).length);
+        prior.output = `(?:${prior.output}`;
 
-  /**
-   * Tokenizing helpers
-   */
+        prev.type = 'globstar';
+        prev.output = `${globstar(opts)}${SLASH_LITERAL}|${SLASH_LITERAL}${end})`;
+        prev.value += value;
 
-  const eos = () => state.index === len - 1;
-  const peek = state.peek = (n = 1) => input[state.index + n];
-  const advance = state.advance = () => input[++state.index];
-  const remaining = () => input.slice(state.index + 1);
-  const consume = (value = '', num = 0) => {
-    state.consumed += value;
-    state.index += num;
-  };
-  const append = token => {
-    state.output += token.output != null ? token.output : token.value;
-    consume(token.value);
-  };
+        state.output += prior.output + prev.output;
+        state.globstar = true;
 
-  const negate = () => {
-    let count = 1;
+        consume(value + advance());
 
-    while (peek() === '!' && (peek(2) !== '(' || peek(3) === '?')) {
-      advance();
-      state.start++;
-      count++;
-    }
+        push({ type: 'slash', value: '/', output: '' });
+        continue;
+      }
 
-    if (count % 2 === 0) {
-      return false;
-    }
-
-    state.negated = true;
-    state.start++;
-    return true;
-  };
+      if (prior.type === 'bos' && rest[0] === '/') {
+        prev.type = 'globstar';
+        prev.value += value;
+        prev.output = `(?:^|${SLASH_LITERAL}|${globstar(opts)}${SLASH_LITERAL})`;
+        state.output = prev.output;
+        state.globstar = true;
+        consume(value + advance());
+        push({ type: 'slash', value: '/', output: '' });
+        continue;
+      }
 
-  const increment = type => {
-    state[type]++;
-    stack.push(type);
-  };
+      // remove single star from output
+      state.output = state.output.slice(0, -prev.output.length);
 
-  const decrement = type => {
-    state[type]--;
-    stack.pop();
-  };
+      // reset previous token to globstar
+      prev.type = 'globstar';
+      prev.output = globstar(opts);
+      prev.value += value;
 
-  /**
-   * Push tokens onto the tokens array. This helper speeds up
-   * tokenizing by 1) helping us avoid backtracking as much as possible,
-   * and 2) helping us avoid creating extra tokens when consecutive
-   * characters are plain text. This improves performance and simplifies
-   * lookbehinds.
-   */
+      // reset output with globstar
+      state.output += prev.output;
+      state.globstar = true;
+      consume(value);
+      continue;
+    }
 
-  const push = tok => {
-    if (prev.type === 'globstar') {
-      const isBrace = state.braces > 0 && (tok.type === 'comma' || tok.type === 'brace');
-      const isExtglob = tok.extglob === true || (extglobs.length && (tok.type === 'pipe' || tok.type === 'paren'));
+    const token = { type: 'star', value, output: star };
 
-      if (tok.type !== 'slash' && tok.type !== 'paren' && !isBrace && !isExtglob) {
-        state.output = state.output.slice(0, -prev.output.length);
-        prev.type = 'star';
-        prev.value = '*';
-        prev.output = star;
-        state.output += prev.output;
+    if (opts.bash === true) {
+      token.output = '.*?';
+      if (prev.type === 'bos' || prev.type === 'slash') {
+        token.output = nodot + token.output;
       }
+      push(token);
+      continue;
     }
 
-    if (extglobs.length && tok.type !== 'paren' && !EXTGLOB_CHARS[tok.value]) {
-      extglobs[extglobs.length - 1].inner += tok.value;
-    }
-
-    if (tok.value || tok.output) append(tok);
-    if (prev && prev.type === 'text' && tok.type === 'text') {
-      prev.value += tok.value;
-      prev.output = (prev.output || '') + tok.value;
-      return;
+    if (prev && (prev.type === 'bracket' || prev.type === 'paren') && opts.regex === true) {
+      token.output = value;
+      push(token);
+      continue;
     }
 
-    tok.prev = prev;
-    tokens.push(tok);
-    prev = tok;
-  };
-
-  const extglobOpen = (type, value) => {
-    const token = { ...EXTGLOB_CHARS[value], conditions: 1, inner: '' };
-
-    token.prev = prev;
-    token.parens = state.parens;
-    token.output = state.output;
-    const output = (opts.capture ? '(' : '') + token.open;
-
-    increment('parens');
-    push({ type, value, output: state.output ? '' : ONE_CHAR });
-    push({ type: 'paren', extglob: true, value: advance(), output });
-    extglobs.push(token);
-  };
-
-  const extglobClose = token => {
-    let output = token.close + (opts.capture ? ')' : '');
-
-    if (token.type === 'negate') {
-      let extglobStar = star;
+    if (state.index === state.start || prev.type === 'slash' || prev.type === 'dot') {
+      if (prev.type === 'dot') {
+        state.output += NO_DOT_SLASH;
+        prev.output += NO_DOT_SLASH;
 
-      if (token.inner && token.inner.length > 1 && token.inner.includes('/')) {
-        extglobStar = globstar(opts);
-      }
+      } else if (opts.dot === true) {
+        state.output += NO_DOTS_SLASH;
+        prev.output += NO_DOTS_SLASH;
 
-      if (extglobStar !== star || eos() || /^\)+$/.test(remaining())) {
-        output = token.close = `)$))${extglobStar}`;
+      } else {
+        state.output += nodot;
+        prev.output += nodot;
       }
 
-      if (token.prev.type === 'bos' && eos()) {
-        state.negatedExtglob = true;
+      if (peek() !== '*') {
+        state.output += ONE_CHAR;
+        prev.output += ONE_CHAR;
       }
     }
 
-    push({ type: 'paren', extglob: true, value, output });
-    decrement('parens');
-  };
+    push(token);
+  }
 
-  /**
-   * Fast paths
-   */
+  while (state.brackets > 0) {
+    if (opts.strictBrackets === true) throw new SyntaxError(syntaxError('closing', ']'));
+    state.output = utils.escapeLast(state.output, '[');
+    decrement('brackets');
+  }
 
-  if (opts.fastpaths !== false && !/(^[*!]|[/()[\]{}"])/.test(input)) {
-    let backslashes = false;
+  while (state.parens > 0) {
+    if (opts.strictBrackets === true) throw new SyntaxError(syntaxError('closing', ')'));
+    state.output = utils.escapeLast(state.output, '(');
+    decrement('parens');
+  }
 
-    let output = input.replace(REGEX_SPECIAL_CHARS_BACKREF, (m, esc, chars, first, rest, index) => {
-      if (first === '\\') {
-        backslashes = true;
-        return m;
-      }
+  while (state.braces > 0) {
+    if (opts.strictBrackets === true) throw new SyntaxError(syntaxError('closing', '}'));
+    state.output = utils.escapeLast(state.output, '{');
+    decrement('braces');
+  }
 
-      if (first === '?') {
-        if (esc) {
-          return esc + first + (rest ? QMARK.repeat(rest.length) : '');
-        }
-        if (index === 0) {
-          return qmarkNoDot + (rest ? QMARK.repeat(rest.length) : '');
-        }
-        return QMARK.repeat(chars.length);
-      }
+  if (opts.strictSlashes !== true && (prev.type === 'star' || prev.type === 'bracket')) {
+    push({ type: 'maybe_slash', value: '', output: `${SLASH_LITERAL}?` });
+  }
 
-      if (first === '.') {
-        return DOT_LITERAL.repeat(chars.length);
-      }
+  // rebuild the output if we had to backtrack at any point
+  if (state.backtrack === true) {
+    state.output = '';
 
-      if (first === '*') {
-        if (esc) {
-          return esc + first + (rest ? star : '');
-        }
-        return star;
-      }
-      return esc ? m : `\\${m}`;
-    });
+    for (const token of state.tokens) {
+      state.output += token.output != null ? token.output : token.value;
 
-    if (backslashes === true) {
-      if (opts.unescape === true) {
-        output = output.replace(/\\/g, '');
-      } else {
-        output = output.replace(/\\+/g, m => {
-          return m.length % 2 === 0 ? '\\\\' : (m ? '\\' : '');
-        });
+      if (token.suffix) {
+        state.output += token.suffix;
       }
     }
-
-    if (output === input && opts.contains === true) {
-      state.output = input;
-      return state;
-    }
-
-    state.output = utils.wrapOutput(output, state, options);
-    return state;
   }
 
-  /**
-   * Tokenize input until we reach end-of-string
-   */
-
-  while (!eos()) {
-    value = advance();
-
-    if (value === '\u0000') {
-      continue;
-    }
-
-    /**
-     * Escaped characters
-     */
-
-    if (value === '\\') {
-      const next = peek();
-
-      if (next === '/' && opts.bash !== true) {
-        continue;
-      }
+  return state;
+};
 
-      if (next === '.' || next === ';') {
-        continue;
-      }
+/**
+ * Fast paths for creating regular expressions for common glob patterns.
+ * This can significantly speed up processing and has very little downside
+ * impact when none of the fast paths match.
+ */
 
-      if (!next) {
-        value += '\\';
-        push({ type: 'text', value });
-        continue;
-      }
+parse.fastpaths = (input, options) => {
+  const opts = { ...options };
+  const max = typeof opts.maxLength === 'number' ? Math.min(MAX_LENGTH, opts.maxLength) : MAX_LENGTH;
+  const len = input.length;
+  if (len > max) {
+    throw new SyntaxError(`Input length: ${len}, exceeds maximum allowed length: ${max}`);
+  }
 
-      // collapse slashes to reduce potential for exploits
-      const match = /^\\+/.exec(remaining());
-      let slashes = 0;
+  input = REPLACEMENTS[input] || input;
+  const win32 = utils.isWindows(options);
 
-      if (match && match[0].length > 2) {
-        slashes = match[0].length;
-        state.index += slashes;
-        if (slashes % 2 !== 0) {
-          value += '\\';
-        }
-      }
+  // create constants based on platform, for windows or posix
+  const {
+    DOT_LITERAL,
+    SLASH_LITERAL,
+    ONE_CHAR,
+    DOTS_SLASH,
+    NO_DOT,
+    NO_DOTS,
+    NO_DOTS_SLASH,
+    STAR,
+    START_ANCHOR
+  } = constants.globChars(win32);
 
-      if (opts.unescape === true) {
-        value = advance() || '';
-      } else {
-        value += advance() || '';
-      }
+  const nodot = opts.dot ? NO_DOTS : NO_DOT;
+  const slashDot = opts.dot ? NO_DOTS_SLASH : NO_DOT;
+  const capture = opts.capture ? '' : '?:';
+  const state = { negated: false, prefix: '' };
+  let star = opts.bash === true ? '.*?' : STAR;
 
-      if (state.brackets === 0) {
-        push({ type: 'text', value });
-        continue;
-      }
-    }
+  if (opts.capture) {
+    star = `(${star})`;
+  }
 
-    /**
-     * If we're inside a regex character class, continue
-     * until we reach the closing bracket.
-     */
+  const globstar = (opts) => {
+    if (opts.noglobstar === true) return star;
+    return `(${capture}(?:(?!${START_ANCHOR}${opts.dot ? DOTS_SLASH : DOT_LITERAL}).)*?)`;
+  };
 
-    if (state.brackets > 0 && (value !== ']' || prev.value === '[' || prev.value === '[^')) {
-      if (opts.posix !== false && value === ':') {
-        const inner = prev.value.slice(1);
-        if (inner.includes('[')) {
-          prev.posix = true;
+  const create = str => {
+    switch (str) {
+      case '*':
+        return `${nodot}${ONE_CHAR}${star}`;
 
-          if (inner.includes(':')) {
-            const idx = prev.value.lastIndexOf('[');
-            const pre = prev.value.slice(0, idx);
-            const rest = prev.value.slice(idx + 2);
-            const posix = POSIX_REGEX_SOURCE[rest];
-            if (posix) {
-              prev.value = pre + posix;
-              state.backtrack = true;
-              advance();
+      case '.*':
+        return `${DOT_LITERAL}${ONE_CHAR}${star}`;
 
-              if (!bos.output && tokens.indexOf(prev) === 1) {
-                bos.output = ONE_CHAR;
-              }
-              continue;
-            }
-          }
-        }
-      }
+      case '*.*':
+        return `${nodot}${star}${DOT_LITERAL}${ONE_CHAR}${star}`;
 
-      if ((value === '[' && peek() !== ':') || (value === '-' && peek() === ']')) {
-        value = `\\${value}`;
-      }
+      case '*/*':
+        return `${nodot}${star}${SLASH_LITERAL}${ONE_CHAR}${slashDot}${star}`;
 
-      if (value === ']' && (prev.value === '[' || prev.value === '[^')) {
-        value = `\\${value}`;
-      }
+      case '**':
+        return nodot + globstar(opts);
 
-      if (opts.posix === true && value === '!' && prev.value === '[') {
-        value = '^';
-      }
+      case '**/*':
+        return `(?:${nodot}${globstar(opts)}${SLASH_LITERAL})?${slashDot}${ONE_CHAR}${star}`;
 
-      prev.value += value;
-      append({ value });
-      continue;
-    }
+      case '**/*.*':
+        return `(?:${nodot}${globstar(opts)}${SLASH_LITERAL})?${slashDot}${star}${DOT_LITERAL}${ONE_CHAR}${star}`;
 
-    /**
-     * If we're inside a quoted string, continue
-     * until we reach the closing double quote.
-     */
+      case '**/.*':
+        return `(?:${nodot}${globstar(opts)}${SLASH_LITERAL})?${DOT_LITERAL}${ONE_CHAR}${star}`;
 
-    if (state.quotes === 1 && value !== '"') {
-      value = utils.escapeRegex(value);
-      prev.value += value;
-      append({ value });
-      continue;
-    }
+      default: {
+        const match = /^(.*?)\.(\w+)$/.exec(str);
+        if (!match) return;
 
-    /**
-     * Double quotes
-     */
+        const source = create(match[1]);
+        if (!source) return;
 
-    if (value === '"') {
-      state.quotes = state.quotes === 1 ? 0 : 1;
-      if (opts.keepQuotes === true) {
-        push({ type: 'text', value });
+        return source + DOT_LITERAL + match[2];
       }
-      continue;
     }
+  };
 
-    /**
-     * Parentheses
-     */
+  const output = utils.removePrefix(input, state);
+  let source = create(output);
 
-    if (value === '(') {
-      increment('parens');
-      push({ type: 'paren', value });
-      continue;
-    }
+  if (source && opts.strictSlashes !== true) {
+    source += `${SLASH_LITERAL}?`;
+  }
 
-    if (value === ')') {
-      if (state.parens === 0 && opts.strictBrackets === true) {
-        throw new SyntaxError(syntaxError('opening', '('));
-      }
+  return source;
+};
 
-      const extglob = extglobs[extglobs.length - 1];
-      if (extglob && state.parens === extglob.parens + 1) {
-        extglobClose(extglobs.pop());
-        continue;
-      }
+module.exports = parse;
 
-      push({ type: 'paren', value, output: state.parens ? ')' : '\\)' });
-      decrement('parens');
-      continue;
-    }
 
-    /**
-     * Square brackets
-     */
+/***/ }),
+/* 320 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    if (value === '[') {
-      if (opts.nobracket === true || !remaining().includes(']')) {
-        if (opts.nobracket !== true && opts.strictBrackets === true) {
-          throw new SyntaxError(syntaxError('closing', ']'));
-        }
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const merge2 = __webpack_require__(291);
+function merge(streams) {
+    const mergedStream = merge2(streams);
+    streams.forEach((stream) => {
+        stream.once('error', (error) => mergedStream.emit('error', error));
+    });
+    mergedStream.once('close', () => propagateCloseEventToSources(streams));
+    mergedStream.once('end', () => propagateCloseEventToSources(streams));
+    return mergedStream;
+}
+exports.merge = merge;
+function propagateCloseEventToSources(streams) {
+    streams.forEach((stream) => stream.emit('close'));
+}
 
-        value = `\\${value}`;
-      } else {
-        increment('brackets');
-      }
 
-      push({ type: 'bracket', value });
-      continue;
-    }
+/***/ }),
+/* 321 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    if (value === ']') {
-      if (opts.nobracket === true || (prev && prev.type === 'bracket' && prev.value.length === 1)) {
-        push({ type: 'text', value, output: `\\${value}` });
-        continue;
-      }
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+function isString(input) {
+    return typeof input === 'string';
+}
+exports.isString = isString;
+function isEmpty(input) {
+    return input === '';
+}
+exports.isEmpty = isEmpty;
 
-      if (state.brackets === 0) {
-        if (opts.strictBrackets === true) {
-          throw new SyntaxError(syntaxError('opening', '['));
-        }
 
-        push({ type: 'text', value, output: `\\${value}` });
-        continue;
-      }
+/***/ }),
+/* 322 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      decrement('brackets');
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const stream_1 = __webpack_require__(323);
+const provider_1 = __webpack_require__(350);
+class ProviderAsync extends provider_1.default {
+    constructor() {
+        super(...arguments);
+        this._reader = new stream_1.default(this._settings);
+    }
+    read(task) {
+        const root = this._getRootDirectory(task);
+        const options = this._getReaderOptions(task);
+        const entries = [];
+        return new Promise((resolve, reject) => {
+            const stream = this.api(root, task, options);
+            stream.once('error', reject);
+            stream.on('data', (entry) => entries.push(options.transform(entry)));
+            stream.once('end', () => resolve(entries));
+        });
+    }
+    api(root, task, options) {
+        if (task.dynamic) {
+            return this._reader.dynamic(root, options);
+        }
+        return this._reader.static(task.patterns, options);
+    }
+}
+exports.default = ProviderAsync;
 
-      const prevValue = prev.value.slice(1);
-      if (prev.posix !== true && prevValue[0] === '^' && !prevValue.includes('/')) {
-        value = `/${value}`;
-      }
 
-      prev.value += value;
-      append({ value });
+/***/ }),
+/* 323 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      // when literal brackets are explicitly disabled
-      // assume we should match with a regex character class
-      if (opts.literalBrackets === false || utils.hasRegexChars(prevValue)) {
-        continue;
-      }
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const stream_1 = __webpack_require__(137);
+const fsStat = __webpack_require__(324);
+const fsWalk = __webpack_require__(329);
+const reader_1 = __webpack_require__(349);
+class ReaderStream extends reader_1.default {
+    constructor() {
+        super(...arguments);
+        this._walkStream = fsWalk.walkStream;
+        this._stat = fsStat.stat;
+    }
+    dynamic(root, options) {
+        return this._walkStream(root, options);
+    }
+    static(patterns, options) {
+        const filepaths = patterns.map(this._getFullEntryPath, this);
+        const stream = new stream_1.PassThrough({ objectMode: true });
+        stream._write = (index, _enc, done) => {
+            return this._getEntry(filepaths[index], patterns[index], options)
+                .then((entry) => {
+                if (entry !== null && options.entryFilter(entry)) {
+                    stream.push(entry);
+                }
+                if (index === filepaths.length - 1) {
+                    stream.end();
+                }
+                done();
+            })
+                .catch(done);
+        };
+        for (let i = 0; i < filepaths.length; i++) {
+            stream.write(i);
+        }
+        return stream;
+    }
+    _getEntry(filepath, pattern, options) {
+        return this._getStat(filepath)
+            .then((stats) => this._makeEntry(stats, pattern))
+            .catch((error) => {
+            if (options.errorFilter(error)) {
+                return null;
+            }
+            throw error;
+        });
+    }
+    _getStat(filepath) {
+        return new Promise((resolve, reject) => {
+            this._stat(filepath, this._fsStatSettings, (error, stats) => {
+                return error === null ? resolve(stats) : reject(error);
+            });
+        });
+    }
+}
+exports.default = ReaderStream;
 
-      const escaped = utils.escapeRegex(prev.value);
-      state.output = state.output.slice(0, -prev.value.length);
 
-      // when literal brackets are explicitly enabled
-      // assume we should escape the brackets to match literal characters
-      if (opts.literalBrackets === true) {
-        state.output += escaped;
-        prev.value = escaped;
-        continue;
-      }
+/***/ }),
+/* 324 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      // when the user specifies nothing, try to match both
-      prev.value = `(${capture}${escaped}|${prev.value})`;
-      state.output += prev.value;
-      continue;
-    }
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const async = __webpack_require__(325);
+const sync = __webpack_require__(326);
+const settings_1 = __webpack_require__(327);
+exports.Settings = settings_1.default;
+function stat(path, optionsOrSettingsOrCallback, callback) {
+    if (typeof optionsOrSettingsOrCallback === 'function') {
+        return async.read(path, getSettings(), optionsOrSettingsOrCallback);
+    }
+    async.read(path, getSettings(optionsOrSettingsOrCallback), callback);
+}
+exports.stat = stat;
+function statSync(path, optionsOrSettings) {
+    const settings = getSettings(optionsOrSettings);
+    return sync.read(path, settings);
+}
+exports.statSync = statSync;
+function getSettings(settingsOrOptions = {}) {
+    if (settingsOrOptions instanceof settings_1.default) {
+        return settingsOrOptions;
+    }
+    return new settings_1.default(settingsOrOptions);
+}
 
-    /**
-     * Braces
-     */
 
-    if (value === '{' && opts.nobrace !== true) {
-      increment('braces');
+/***/ }),
+/* 325 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      const open = {
-        type: 'brace',
-        value,
-        output: '(',
-        outputIndex: state.output.length,
-        tokensIndex: state.tokens.length
-      };
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+function read(path, settings, callback) {
+    settings.fs.lstat(path, (lstatError, lstat) => {
+        if (lstatError !== null) {
+            return callFailureCallback(callback, lstatError);
+        }
+        if (!lstat.isSymbolicLink() || !settings.followSymbolicLink) {
+            return callSuccessCallback(callback, lstat);
+        }
+        settings.fs.stat(path, (statError, stat) => {
+            if (statError !== null) {
+                if (settings.throwErrorOnBrokenSymbolicLink) {
+                    return callFailureCallback(callback, statError);
+                }
+                return callSuccessCallback(callback, lstat);
+            }
+            if (settings.markSymbolicLink) {
+                stat.isSymbolicLink = () => true;
+            }
+            callSuccessCallback(callback, stat);
+        });
+    });
+}
+exports.read = read;
+function callFailureCallback(callback, error) {
+    callback(error);
+}
+function callSuccessCallback(callback, result) {
+    callback(null, result);
+}
 
-      braces.push(open);
-      push(open);
-      continue;
-    }
 
-    if (value === '}') {
-      const brace = braces[braces.length - 1];
+/***/ }),
+/* 326 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      if (opts.nobrace === true || !brace) {
-        push({ type: 'text', value, output: value });
-        continue;
-      }
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+function read(path, settings) {
+    const lstat = settings.fs.lstatSync(path);
+    if (!lstat.isSymbolicLink() || !settings.followSymbolicLink) {
+        return lstat;
+    }
+    try {
+        const stat = settings.fs.statSync(path);
+        if (settings.markSymbolicLink) {
+            stat.isSymbolicLink = () => true;
+        }
+        return stat;
+    }
+    catch (error) {
+        if (!settings.throwErrorOnBrokenSymbolicLink) {
+            return lstat;
+        }
+        throw error;
+    }
+}
+exports.read = read;
 
-      let output = ')';
 
-      if (brace.dots === true) {
-        const arr = tokens.slice();
-        const range = [];
+/***/ }),
+/* 327 */
+/***/ (function(module, exports, __webpack_require__) {
 
-        for (let i = arr.length - 1; i >= 0; i--) {
-          tokens.pop();
-          if (arr[i].type === 'brace') {
-            break;
-          }
-          if (arr[i].type !== 'dots') {
-            range.unshift(arr[i].value);
-          }
-        }
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __webpack_require__(328);
+class Settings {
+    constructor(_options = {}) {
+        this._options = _options;
+        this.followSymbolicLink = this._getValue(this._options.followSymbolicLink, true);
+        this.fs = fs.createFileSystemAdapter(this._options.fs);
+        this.markSymbolicLink = this._getValue(this._options.markSymbolicLink, false);
+        this.throwErrorOnBrokenSymbolicLink = this._getValue(this._options.throwErrorOnBrokenSymbolicLink, true);
+    }
+    _getValue(option, value) {
+        return option === undefined ? value : option;
+    }
+}
+exports.default = Settings;
 
-        output = expandRange(range, opts);
-        state.backtrack = true;
-      }
 
-      if (brace.comma !== true && brace.dots !== true) {
-        const out = state.output.slice(0, brace.outputIndex);
-        const toks = state.tokens.slice(brace.tokensIndex);
-        brace.value = brace.output = '\\{';
-        value = output = '\\}';
-        state.output = out;
-        for (const t of toks) {
-          state.output += (t.output || t.value);
-        }
-      }
+/***/ }),
+/* 328 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      push({ type: 'brace', value, output });
-      decrement('braces');
-      braces.pop();
-      continue;
-    }
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __webpack_require__(133);
+exports.FILE_SYSTEM_ADAPTER = {
+    lstat: fs.lstat,
+    stat: fs.stat,
+    lstatSync: fs.lstatSync,
+    statSync: fs.statSync
+};
+function createFileSystemAdapter(fsMethods) {
+    if (fsMethods === undefined) {
+        return exports.FILE_SYSTEM_ADAPTER;
+    }
+    return Object.assign(Object.assign({}, exports.FILE_SYSTEM_ADAPTER), fsMethods);
+}
+exports.createFileSystemAdapter = createFileSystemAdapter;
 
-    /**
-     * Pipes
-     */
 
-    if (value === '|') {
-      if (extglobs.length > 0) {
-        extglobs[extglobs.length - 1].conditions++;
-      }
-      push({ type: 'text', value });
-      continue;
-    }
+/***/ }),
+/* 329 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    /**
-     * Commas
-     */
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const async_1 = __webpack_require__(330);
+const stream_1 = __webpack_require__(345);
+const sync_1 = __webpack_require__(346);
+const settings_1 = __webpack_require__(348);
+exports.Settings = settings_1.default;
+function walk(directory, optionsOrSettingsOrCallback, callback) {
+    if (typeof optionsOrSettingsOrCallback === 'function') {
+        return new async_1.default(directory, getSettings()).read(optionsOrSettingsOrCallback);
+    }
+    new async_1.default(directory, getSettings(optionsOrSettingsOrCallback)).read(callback);
+}
+exports.walk = walk;
+function walkSync(directory, optionsOrSettings) {
+    const settings = getSettings(optionsOrSettings);
+    const provider = new sync_1.default(directory, settings);
+    return provider.read();
+}
+exports.walkSync = walkSync;
+function walkStream(directory, optionsOrSettings) {
+    const settings = getSettings(optionsOrSettings);
+    const provider = new stream_1.default(directory, settings);
+    return provider.read();
+}
+exports.walkStream = walkStream;
+function getSettings(settingsOrOptions = {}) {
+    if (settingsOrOptions instanceof settings_1.default) {
+        return settingsOrOptions;
+    }
+    return new settings_1.default(settingsOrOptions);
+}
 
-    if (value === ',') {
-      let output = value;
 
-      const brace = braces[braces.length - 1];
-      if (brace && stack[stack.length - 1] === 'braces') {
-        brace.comma = true;
-        output = '|';
-      }
+/***/ }),
+/* 330 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      push({ type: 'comma', value, output });
-      continue;
-    }
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const async_1 = __webpack_require__(331);
+class AsyncProvider {
+    constructor(_root, _settings) {
+        this._root = _root;
+        this._settings = _settings;
+        this._reader = new async_1.default(this._root, this._settings);
+        this._storage = new Set();
+    }
+    read(callback) {
+        this._reader.onError((error) => {
+            callFailureCallback(callback, error);
+        });
+        this._reader.onEntry((entry) => {
+            this._storage.add(entry);
+        });
+        this._reader.onEnd(() => {
+            callSuccessCallback(callback, [...this._storage]);
+        });
+        this._reader.read();
+    }
+}
+exports.default = AsyncProvider;
+function callFailureCallback(callback, error) {
+    callback(error);
+}
+function callSuccessCallback(callback, entries) {
+    callback(null, entries);
+}
 
-    /**
-     * Slashes
-     */
 
-    if (value === '/') {
-      // if the beginning of the glob is "./", advance the start
-      // to the current index, and don't add the "./" characters
-      // to the state. This greatly simplifies lookbehinds when
-      // checking for BOS characters like "!" and "." (not "./")
-      if (prev.type === 'dot' && state.index === state.start + 1) {
-        state.start = state.index + 1;
-        state.consumed = '';
-        state.output = '';
-        tokens.pop();
-        prev = bos; // reset "prev" to the first token
-        continue;
-      }
+/***/ }),
+/* 331 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      push({ type: 'slash', value, output: SLASH_LITERAL });
-      continue;
-    }
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const events_1 = __webpack_require__(155);
+const fsScandir = __webpack_require__(332);
+const fastq = __webpack_require__(341);
+const common = __webpack_require__(343);
+const reader_1 = __webpack_require__(344);
+class AsyncReader extends reader_1.default {
+    constructor(_root, _settings) {
+        super(_root, _settings);
+        this._settings = _settings;
+        this._scandir = fsScandir.scandir;
+        this._emitter = new events_1.EventEmitter();
+        this._queue = fastq(this._worker.bind(this), this._settings.concurrency);
+        this._isFatalError = false;
+        this._isDestroyed = false;
+        this._queue.drain = () => {
+            if (!this._isFatalError) {
+                this._emitter.emit('end');
+            }
+        };
+    }
+    read() {
+        this._isFatalError = false;
+        this._isDestroyed = false;
+        setImmediate(() => {
+            this._pushToQueue(this._root, this._settings.basePath);
+        });
+        return this._emitter;
+    }
+    destroy() {
+        if (this._isDestroyed) {
+            throw new Error('The reader is already destroyed');
+        }
+        this._isDestroyed = true;
+        this._queue.killAndDrain();
+    }
+    onEntry(callback) {
+        this._emitter.on('entry', callback);
+    }
+    onError(callback) {
+        this._emitter.once('error', callback);
+    }
+    onEnd(callback) {
+        this._emitter.once('end', callback);
+    }
+    _pushToQueue(directory, base) {
+        const queueItem = { directory, base };
+        this._queue.push(queueItem, (error) => {
+            if (error !== null) {
+                this._handleError(error);
+            }
+        });
+    }
+    _worker(item, done) {
+        this._scandir(item.directory, this._settings.fsScandirSettings, (error, entries) => {
+            if (error !== null) {
+                return done(error, undefined);
+            }
+            for (const entry of entries) {
+                this._handleEntry(entry, item.base);
+            }
+            done(null, undefined);
+        });
+    }
+    _handleError(error) {
+        if (!common.isFatalError(this._settings, error)) {
+            return;
+        }
+        this._isFatalError = true;
+        this._isDestroyed = true;
+        this._emitter.emit('error', error);
+    }
+    _handleEntry(entry, base) {
+        if (this._isDestroyed || this._isFatalError) {
+            return;
+        }
+        const fullpath = entry.path;
+        if (base !== undefined) {
+            entry.path = common.joinPathSegments(base, entry.name, this._settings.pathSegmentSeparator);
+        }
+        if (common.isAppliedFilter(this._settings.entryFilter, entry)) {
+            this._emitEntry(entry);
+        }
+        if (entry.dirent.isDirectory() && common.isAppliedFilter(this._settings.deepFilter, entry)) {
+            this._pushToQueue(fullpath, entry.path);
+        }
+    }
+    _emitEntry(entry) {
+        this._emitter.emit('entry', entry);
+    }
+}
+exports.default = AsyncReader;
 
-    /**
-     * Dots
-     */
 
-    if (value === '.') {
-      if (state.braces > 0 && prev.type === 'dot') {
-        if (prev.value === '.') prev.output = DOT_LITERAL;
-        const brace = braces[braces.length - 1];
-        prev.type = 'dots';
-        prev.output += value;
-        prev.value += value;
-        brace.dots = true;
-        continue;
-      }
+/***/ }),
+/* 332 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      if ((state.braces + state.parens) === 0 && prev.type !== 'bos' && prev.type !== 'slash') {
-        push({ type: 'text', value, output: DOT_LITERAL });
-        continue;
-      }
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const async = __webpack_require__(333);
+const sync = __webpack_require__(338);
+const settings_1 = __webpack_require__(339);
+exports.Settings = settings_1.default;
+function scandir(path, optionsOrSettingsOrCallback, callback) {
+    if (typeof optionsOrSettingsOrCallback === 'function') {
+        return async.read(path, getSettings(), optionsOrSettingsOrCallback);
+    }
+    async.read(path, getSettings(optionsOrSettingsOrCallback), callback);
+}
+exports.scandir = scandir;
+function scandirSync(path, optionsOrSettings) {
+    const settings = getSettings(optionsOrSettings);
+    return sync.read(path, settings);
+}
+exports.scandirSync = scandirSync;
+function getSettings(settingsOrOptions = {}) {
+    if (settingsOrOptions instanceof settings_1.default) {
+        return settingsOrOptions;
+    }
+    return new settings_1.default(settingsOrOptions);
+}
 
-      push({ type: 'dot', value, output: DOT_LITERAL });
-      continue;
-    }
 
-    /**
-     * Question marks
-     */
+/***/ }),
+/* 333 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    if (value === '?') {
-      const isGroup = prev && prev.value === '(';
-      if (!isGroup && opts.noextglob !== true && peek() === '(' && peek(2) !== '?') {
-        extglobOpen('qmark', value);
-        continue;
-      }
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fsStat = __webpack_require__(324);
+const rpl = __webpack_require__(334);
+const constants_1 = __webpack_require__(335);
+const utils = __webpack_require__(336);
+function read(directory, settings, callback) {
+    if (!settings.stats && constants_1.IS_SUPPORT_READDIR_WITH_FILE_TYPES) {
+        return readdirWithFileTypes(directory, settings, callback);
+    }
+    return readdir(directory, settings, callback);
+}
+exports.read = read;
+function readdirWithFileTypes(directory, settings, callback) {
+    settings.fs.readdir(directory, { withFileTypes: true }, (readdirError, dirents) => {
+        if (readdirError !== null) {
+            return callFailureCallback(callback, readdirError);
+        }
+        const entries = dirents.map((dirent) => ({
+            dirent,
+            name: dirent.name,
+            path: `${directory}${settings.pathSegmentSeparator}${dirent.name}`
+        }));
+        if (!settings.followSymbolicLinks) {
+            return callSuccessCallback(callback, entries);
+        }
+        const tasks = entries.map((entry) => makeRplTaskEntry(entry, settings));
+        rpl(tasks, (rplError, rplEntries) => {
+            if (rplError !== null) {
+                return callFailureCallback(callback, rplError);
+            }
+            callSuccessCallback(callback, rplEntries);
+        });
+    });
+}
+exports.readdirWithFileTypes = readdirWithFileTypes;
+function makeRplTaskEntry(entry, settings) {
+    return (done) => {
+        if (!entry.dirent.isSymbolicLink()) {
+            return done(null, entry);
+        }
+        settings.fs.stat(entry.path, (statError, stats) => {
+            if (statError !== null) {
+                if (settings.throwErrorOnBrokenSymbolicLink) {
+                    return done(statError);
+                }
+                return done(null, entry);
+            }
+            entry.dirent = utils.fs.createDirentFromStats(entry.name, stats);
+            return done(null, entry);
+        });
+    };
+}
+function readdir(directory, settings, callback) {
+    settings.fs.readdir(directory, (readdirError, names) => {
+        if (readdirError !== null) {
+            return callFailureCallback(callback, readdirError);
+        }
+        const filepaths = names.map((name) => `${directory}${settings.pathSegmentSeparator}${name}`);
+        const tasks = filepaths.map((filepath) => {
+            return (done) => fsStat.stat(filepath, settings.fsStatSettings, done);
+        });
+        rpl(tasks, (rplError, results) => {
+            if (rplError !== null) {
+                return callFailureCallback(callback, rplError);
+            }
+            const entries = [];
+            names.forEach((name, index) => {
+                const stats = results[index];
+                const entry = {
+                    name,
+                    path: filepaths[index],
+                    dirent: utils.fs.createDirentFromStats(name, stats)
+                };
+                if (settings.stats) {
+                    entry.stats = stats;
+                }
+                entries.push(entry);
+            });
+            callSuccessCallback(callback, entries);
+        });
+    });
+}
+exports.readdir = readdir;
+function callFailureCallback(callback, error) {
+    callback(error);
+}
+function callSuccessCallback(callback, result) {
+    callback(null, result);
+}
 
-      if (prev && prev.type === 'paren') {
-        const next = peek();
-        let output = value;
 
-        if (next === '<' && !utils.supportsLookbehinds()) {
-          throw new Error('Node.js v10 or higher is required for regex lookbehinds');
-        }
+/***/ }),
+/* 334 */
+/***/ (function(module, exports) {
 
-        if ((prev.value === '(' && !/[!=<:]/.test(next)) || (next === '<' && !/<([!=]|\w+>)/.test(remaining()))) {
-          output = `\\${value}`;
-        }
+module.exports = runParallel
 
-        push({ type: 'text', value, output });
-        continue;
-      }
+function runParallel (tasks, cb) {
+  var results, pending, keys
+  var isSync = true
 
-      if (opts.dot !== true && (prev.type === 'slash' || prev.type === 'bos')) {
-        push({ type: 'qmark', value, output: QMARK_NO_DOT });
-        continue;
-      }
+  if (Array.isArray(tasks)) {
+    results = []
+    pending = tasks.length
+  } else {
+    keys = Object.keys(tasks)
+    results = {}
+    pending = keys.length
+  }
 
-      push({ type: 'qmark', value, output: QMARK });
-      continue;
+  function done (err) {
+    function end () {
+      if (cb) cb(err, results)
+      cb = null
     }
+    if (isSync) process.nextTick(end)
+    else end()
+  }
 
-    /**
-     * Exclamation
-     */
-
-    if (value === '!') {
-      if (opts.noextglob !== true && peek() === '(') {
-        if (peek(2) !== '?' || !/[!=<:]/.test(peek(3))) {
-          extglobOpen('negate', value);
-          continue;
-        }
-      }
-
-      if (opts.nonegate !== true && state.index === 0) {
-        negate();
-        continue;
-      }
+  function each (i, err, result) {
+    results[i] = result
+    if (--pending === 0 || err) {
+      done(err)
     }
+  }
 
-    /**
-     * Plus
-     */
-
-    if (value === '+') {
-      if (opts.noextglob !== true && peek() === '(' && peek(2) !== '?') {
-        extglobOpen('plus', value);
-        continue;
-      }
-
-      if ((prev && prev.value === '(') || opts.regex === false) {
-        push({ type: 'plus', value, output: PLUS_LITERAL });
-        continue;
-      }
-
-      if ((prev && (prev.type === 'bracket' || prev.type === 'paren' || prev.type === 'brace')) || state.parens > 0) {
-        push({ type: 'plus', value });
-        continue;
-      }
+  if (!pending) {
+    // empty
+    done(null)
+  } else if (keys) {
+    // object
+    keys.forEach(function (key) {
+      tasks[key](function (err, result) { each(key, err, result) })
+    })
+  } else {
+    // array
+    tasks.forEach(function (task, i) {
+      task(function (err, result) { each(i, err, result) })
+    })
+  }
 
-      push({ type: 'plus', value: PLUS_LITERAL });
-      continue;
-    }
+  isSync = false
+}
 
-    /**
-     * Plain text
-     */
 
-    if (value === '@') {
-      if (opts.noextglob !== true && peek() === '(' && peek(2) !== '?') {
-        push({ type: 'at', extglob: true, value, output: '' });
-        continue;
-      }
+/***/ }),
+/* 335 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      push({ type: 'text', value });
-      continue;
-    }
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const NODE_PROCESS_VERSION_PARTS = process.versions.node.split('.');
+const MAJOR_VERSION = parseInt(NODE_PROCESS_VERSION_PARTS[0], 10);
+const MINOR_VERSION = parseInt(NODE_PROCESS_VERSION_PARTS[1], 10);
+const SUPPORTED_MAJOR_VERSION = 10;
+const SUPPORTED_MINOR_VERSION = 10;
+const IS_MATCHED_BY_MAJOR = MAJOR_VERSION > SUPPORTED_MAJOR_VERSION;
+const IS_MATCHED_BY_MAJOR_AND_MINOR = MAJOR_VERSION === SUPPORTED_MAJOR_VERSION && MINOR_VERSION >= SUPPORTED_MINOR_VERSION;
+/**
+ * IS `true` for Node.js 10.10 and greater.
+ */
+exports.IS_SUPPORT_READDIR_WITH_FILE_TYPES = IS_MATCHED_BY_MAJOR || IS_MATCHED_BY_MAJOR_AND_MINOR;
 
-    /**
-     * Plain text
-     */
 
-    if (value !== '*') {
-      if (value === '$' || value === '^') {
-        value = `\\${value}`;
-      }
+/***/ }),
+/* 336 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      const match = REGEX_NON_SPECIAL_CHARS.exec(remaining());
-      if (match) {
-        value += match[0];
-        state.index += match[0].length;
-      }
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __webpack_require__(337);
+exports.fs = fs;
 
-      push({ type: 'text', value });
-      continue;
-    }
 
-    /**
-     * Stars
-     */
+/***/ }),
+/* 337 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    if (prev && (prev.type === 'globstar' || prev.star === true)) {
-      prev.type = 'star';
-      prev.star = true;
-      prev.value += value;
-      prev.output = star;
-      state.backtrack = true;
-      state.globstar = true;
-      consume(value);
-      continue;
-    }
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+class DirentFromStats {
+    constructor(name, stats) {
+        this.name = name;
+        this.isBlockDevice = stats.isBlockDevice.bind(stats);
+        this.isCharacterDevice = stats.isCharacterDevice.bind(stats);
+        this.isDirectory = stats.isDirectory.bind(stats);
+        this.isFIFO = stats.isFIFO.bind(stats);
+        this.isFile = stats.isFile.bind(stats);
+        this.isSocket = stats.isSocket.bind(stats);
+        this.isSymbolicLink = stats.isSymbolicLink.bind(stats);
+    }
+}
+function createDirentFromStats(name, stats) {
+    return new DirentFromStats(name, stats);
+}
+exports.createDirentFromStats = createDirentFromStats;
 
-    let rest = remaining();
-    if (opts.noextglob !== true && /^\([^?]/.test(rest)) {
-      extglobOpen('star', value);
-      continue;
-    }
 
-    if (prev.type === 'star') {
-      if (opts.noglobstar === true) {
-        consume(value);
-        continue;
-      }
+/***/ }),
+/* 338 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      const prior = prev.prev;
-      const before = prior.prev;
-      const isStart = prior.type === 'slash' || prior.type === 'bos';
-      const afterStar = before && (before.type === 'star' || before.type === 'globstar');
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fsStat = __webpack_require__(324);
+const constants_1 = __webpack_require__(335);
+const utils = __webpack_require__(336);
+function read(directory, settings) {
+    if (!settings.stats && constants_1.IS_SUPPORT_READDIR_WITH_FILE_TYPES) {
+        return readdirWithFileTypes(directory, settings);
+    }
+    return readdir(directory, settings);
+}
+exports.read = read;
+function readdirWithFileTypes(directory, settings) {
+    const dirents = settings.fs.readdirSync(directory, { withFileTypes: true });
+    return dirents.map((dirent) => {
+        const entry = {
+            dirent,
+            name: dirent.name,
+            path: `${directory}${settings.pathSegmentSeparator}${dirent.name}`
+        };
+        if (entry.dirent.isSymbolicLink() && settings.followSymbolicLinks) {
+            try {
+                const stats = settings.fs.statSync(entry.path);
+                entry.dirent = utils.fs.createDirentFromStats(entry.name, stats);
+            }
+            catch (error) {
+                if (settings.throwErrorOnBrokenSymbolicLink) {
+                    throw error;
+                }
+            }
+        }
+        return entry;
+    });
+}
+exports.readdirWithFileTypes = readdirWithFileTypes;
+function readdir(directory, settings) {
+    const names = settings.fs.readdirSync(directory);
+    return names.map((name) => {
+        const entryPath = `${directory}${settings.pathSegmentSeparator}${name}`;
+        const stats = fsStat.statSync(entryPath, settings.fsStatSettings);
+        const entry = {
+            name,
+            path: entryPath,
+            dirent: utils.fs.createDirentFromStats(name, stats)
+        };
+        if (settings.stats) {
+            entry.stats = stats;
+        }
+        return entry;
+    });
+}
+exports.readdir = readdir;
 
-      if (opts.bash === true && (!isStart || (rest[0] && rest[0] !== '/'))) {
-        push({ type: 'star', value, output: '' });
-        continue;
-      }
 
-      const isBrace = state.braces > 0 && (prior.type === 'comma' || prior.type === 'brace');
-      const isExtglob = extglobs.length && (prior.type === 'pipe' || prior.type === 'paren');
-      if (!isStart && prior.type !== 'paren' && !isBrace && !isExtglob) {
-        push({ type: 'star', value, output: '' });
-        continue;
-      }
+/***/ }),
+/* 339 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      // strip consecutive `/**/`
-      while (rest.slice(0, 3) === '/**') {
-        const after = input[state.index + 4];
-        if (after && after !== '/') {
-          break;
-        }
-        rest = rest.slice(3);
-        consume('/**', 3);
-      }
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = __webpack_require__(4);
+const fsStat = __webpack_require__(324);
+const fs = __webpack_require__(340);
+class Settings {
+    constructor(_options = {}) {
+        this._options = _options;
+        this.followSymbolicLinks = this._getValue(this._options.followSymbolicLinks, false);
+        this.fs = fs.createFileSystemAdapter(this._options.fs);
+        this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path.sep);
+        this.stats = this._getValue(this._options.stats, false);
+        this.throwErrorOnBrokenSymbolicLink = this._getValue(this._options.throwErrorOnBrokenSymbolicLink, true);
+        this.fsStatSettings = new fsStat.Settings({
+            followSymbolicLink: this.followSymbolicLinks,
+            fs: this.fs,
+            throwErrorOnBrokenSymbolicLink: this.throwErrorOnBrokenSymbolicLink
+        });
+    }
+    _getValue(option, value) {
+        return option === undefined ? value : option;
+    }
+}
+exports.default = Settings;
 
-      if (prior.type === 'bos' && eos()) {
-        prev.type = 'globstar';
-        prev.value += value;
-        prev.output = globstar(opts);
-        state.output = prev.output;
-        state.globstar = true;
-        consume(value);
-        continue;
-      }
 
-      if (prior.type === 'slash' && prior.prev.type !== 'bos' && !afterStar && eos()) {
-        state.output = state.output.slice(0, -(prior.output + prev.output).length);
-        prior.output = `(?:${prior.output}`;
+/***/ }),
+/* 340 */
+/***/ (function(module, exports, __webpack_require__) {
 
-        prev.type = 'globstar';
-        prev.output = globstar(opts) + (opts.strictSlashes ? ')' : '|$)');
-        prev.value += value;
-        state.globstar = true;
-        state.output += prior.output + prev.output;
-        consume(value);
-        continue;
-      }
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __webpack_require__(133);
+exports.FILE_SYSTEM_ADAPTER = {
+    lstat: fs.lstat,
+    stat: fs.stat,
+    lstatSync: fs.lstatSync,
+    statSync: fs.statSync,
+    readdir: fs.readdir,
+    readdirSync: fs.readdirSync
+};
+function createFileSystemAdapter(fsMethods) {
+    if (fsMethods === undefined) {
+        return exports.FILE_SYSTEM_ADAPTER;
+    }
+    return Object.assign(Object.assign({}, exports.FILE_SYSTEM_ADAPTER), fsMethods);
+}
+exports.createFileSystemAdapter = createFileSystemAdapter;
 
-      if (prior.type === 'slash' && prior.prev.type !== 'bos' && rest[0] === '/') {
-        const end = rest[1] !== void 0 ? '|$' : '';
 
-        state.output = state.output.slice(0, -(prior.output + prev.output).length);
-        prior.output = `(?:${prior.output}`;
+/***/ }),
+/* 341 */
+/***/ (function(module, exports, __webpack_require__) {
 
-        prev.type = 'globstar';
-        prev.output = `${globstar(opts)}${SLASH_LITERAL}|${SLASH_LITERAL}${end})`;
-        prev.value += value;
+"use strict";
 
-        state.output += prior.output + prev.output;
-        state.globstar = true;
 
-        consume(value + advance());
+var reusify = __webpack_require__(342)
 
-        push({ type: 'slash', value: '/', output: '' });
-        continue;
-      }
+function fastqueue (context, worker, concurrency) {
+  if (typeof context === 'function') {
+    concurrency = worker
+    worker = context
+    context = null
+  }
 
-      if (prior.type === 'bos' && rest[0] === '/') {
-        prev.type = 'globstar';
-        prev.value += value;
-        prev.output = `(?:^|${SLASH_LITERAL}|${globstar(opts)}${SLASH_LITERAL})`;
-        state.output = prev.output;
-        state.globstar = true;
-        consume(value + advance());
-        push({ type: 'slash', value: '/', output: '' });
-        continue;
-      }
+  var cache = reusify(Task)
+  var queueHead = null
+  var queueTail = null
+  var _running = 0
 
-      // remove single star from output
-      state.output = state.output.slice(0, -prev.output.length);
+  var self = {
+    push: push,
+    drain: noop,
+    saturated: noop,
+    pause: pause,
+    paused: false,
+    concurrency: concurrency,
+    running: running,
+    resume: resume,
+    idle: idle,
+    length: length,
+    unshift: unshift,
+    empty: noop,
+    kill: kill,
+    killAndDrain: killAndDrain
+  }
 
-      // reset previous token to globstar
-      prev.type = 'globstar';
-      prev.output = globstar(opts);
-      prev.value += value;
+  return self
 
-      // reset output with globstar
-      state.output += prev.output;
-      state.globstar = true;
-      consume(value);
-      continue;
-    }
+  function running () {
+    return _running
+  }
 
-    const token = { type: 'star', value, output: star };
+  function pause () {
+    self.paused = true
+  }
 
-    if (opts.bash === true) {
-      token.output = '.*?';
-      if (prev.type === 'bos' || prev.type === 'slash') {
-        token.output = nodot + token.output;
-      }
-      push(token);
-      continue;
+  function length () {
+    var current = queueHead
+    var counter = 0
+
+    while (current) {
+      current = current.next
+      counter++
     }
 
-    if (prev && (prev.type === 'bracket' || prev.type === 'paren') && opts.regex === true) {
-      token.output = value;
-      push(token);
-      continue;
+    return counter
+  }
+
+  function resume () {
+    if (!self.paused) return
+    self.paused = false
+    for (var i = 0; i < self.concurrency; i++) {
+      _running++
+      release()
     }
+  }
 
-    if (state.index === state.start || prev.type === 'slash' || prev.type === 'dot') {
-      if (prev.type === 'dot') {
-        state.output += NO_DOT_SLASH;
-        prev.output += NO_DOT_SLASH;
+  function idle () {
+    return _running === 0 && self.length() === 0
+  }
 
-      } else if (opts.dot === true) {
-        state.output += NO_DOTS_SLASH;
-        prev.output += NO_DOTS_SLASH;
+  function push (value, done) {
+    var current = cache.get()
+
+    current.context = context
+    current.release = release
+    current.value = value
+    current.callback = done || noop
 
+    if (_running === self.concurrency || self.paused) {
+      if (queueTail) {
+        queueTail.next = current
+        queueTail = current
       } else {
-        state.output += nodot;
-        prev.output += nodot;
+        queueHead = current
+        queueTail = current
+        self.saturated()
       }
+    } else {
+      _running++
+      worker.call(context, current.value, current.worked)
+    }
+  }
 
-      if (peek() !== '*') {
-        state.output += ONE_CHAR;
-        prev.output += ONE_CHAR;
+  function unshift (value, done) {
+    var current = cache.get()
+
+    current.context = context
+    current.release = release
+    current.value = value
+    current.callback = done || noop
+
+    if (_running === self.concurrency || self.paused) {
+      if (queueHead) {
+        current.next = queueHead
+        queueHead = current
+      } else {
+        queueHead = current
+        queueTail = current
+        self.saturated()
       }
+    } else {
+      _running++
+      worker.call(context, current.value, current.worked)
     }
-
-    push(token);
   }
 
-  while (state.brackets > 0) {
-    if (opts.strictBrackets === true) throw new SyntaxError(syntaxError('closing', ']'));
-    state.output = utils.escapeLast(state.output, '[');
-    decrement('brackets');
+  function release (holder) {
+    if (holder) {
+      cache.release(holder)
+    }
+    var next = queueHead
+    if (next) {
+      if (!self.paused) {
+        if (queueTail === queueHead) {
+          queueTail = null
+        }
+        queueHead = next.next
+        next.next = null
+        worker.call(context, next.value, next.worked)
+        if (queueTail === null) {
+          self.empty()
+        }
+      } else {
+        _running--
+      }
+    } else if (--_running === 0) {
+      self.drain()
+    }
   }
 
-  while (state.parens > 0) {
-    if (opts.strictBrackets === true) throw new SyntaxError(syntaxError('closing', ')'));
-    state.output = utils.escapeLast(state.output, '(');
-    decrement('parens');
+  function kill () {
+    queueHead = null
+    queueTail = null
+    self.drain = noop
   }
 
-  while (state.braces > 0) {
-    if (opts.strictBrackets === true) throw new SyntaxError(syntaxError('closing', '}'));
-    state.output = utils.escapeLast(state.output, '{');
-    decrement('braces');
+  function killAndDrain () {
+    queueHead = null
+    queueTail = null
+    self.drain()
+    self.drain = noop
   }
+}
 
-  if (opts.strictSlashes !== true && (prev.type === 'star' || prev.type === 'bracket')) {
-    push({ type: 'maybe_slash', value: '', output: `${SLASH_LITERAL}?` });
-  }
+function noop () {}
 
-  // rebuild the output if we had to backtrack at any point
-  if (state.backtrack === true) {
-    state.output = '';
+function Task () {
+  this.value = null
+  this.callback = noop
+  this.next = null
+  this.release = noop
+  this.context = null
 
-    for (const token of state.tokens) {
-      state.output += token.output != null ? token.output : token.value;
+  var self = this
 
-      if (token.suffix) {
-        state.output += token.suffix;
-      }
-    }
+  this.worked = function worked (err, result) {
+    var callback = self.callback
+    self.value = null
+    self.callback = noop
+    callback.call(self.context, err, result)
+    self.release(self)
   }
+}
 
-  return state;
-};
+module.exports = fastqueue
 
-/**
- * Fast paths for creating regular expressions for common glob patterns.
- * This can significantly speed up processing and has very little downside
- * impact when none of the fast paths match.
- */
 
-parse.fastpaths = (input, options) => {
-  const opts = { ...options };
-  const max = typeof opts.maxLength === 'number' ? Math.min(MAX_LENGTH, opts.maxLength) : MAX_LENGTH;
-  const len = input.length;
-  if (len > max) {
-    throw new SyntaxError(`Input length: ${len}, exceeds maximum allowed length: ${max}`);
-  }
+/***/ }),
+/* 342 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  input = REPLACEMENTS[input] || input;
-  const win32 = utils.isWindows(options);
+"use strict";
 
-  // create constants based on platform, for windows or posix
-  const {
-    DOT_LITERAL,
-    SLASH_LITERAL,
-    ONE_CHAR,
-    DOTS_SLASH,
-    NO_DOT,
-    NO_DOTS,
-    NO_DOTS_SLASH,
-    STAR,
-    START_ANCHOR
-  } = constants.globChars(win32);
 
-  const nodot = opts.dot ? NO_DOTS : NO_DOT;
-  const slashDot = opts.dot ? NO_DOTS_SLASH : NO_DOT;
-  const capture = opts.capture ? '' : '?:';
-  const state = { negated: false, prefix: '' };
-  let star = opts.bash === true ? '.*?' : STAR;
+function reusify (Constructor) {
+  var head = new Constructor()
+  var tail = head
 
-  if (opts.capture) {
-    star = `(${star})`;
-  }
+  function get () {
+    var current = head
 
-  const globstar = (opts) => {
-    if (opts.noglobstar === true) return star;
-    return `(${capture}(?:(?!${START_ANCHOR}${opts.dot ? DOTS_SLASH : DOT_LITERAL}).)*?)`;
-  };
+    if (current.next) {
+      head = current.next
+    } else {
+      head = new Constructor()
+      tail = head
+    }
 
-  const create = str => {
-    switch (str) {
-      case '*':
-        return `${nodot}${ONE_CHAR}${star}`;
+    current.next = null
 
-      case '.*':
-        return `${DOT_LITERAL}${ONE_CHAR}${star}`;
+    return current
+  }
 
-      case '*.*':
-        return `${nodot}${star}${DOT_LITERAL}${ONE_CHAR}${star}`;
+  function release (obj) {
+    tail.next = obj
+    tail = obj
+  }
 
-      case '*/*':
-        return `${nodot}${star}${SLASH_LITERAL}${ONE_CHAR}${slashDot}${star}`;
+  return {
+    get: get,
+    release: release
+  }
+}
 
-      case '**':
-        return nodot + globstar(opts);
+module.exports = reusify
 
-      case '**/*':
-        return `(?:${nodot}${globstar(opts)}${SLASH_LITERAL})?${slashDot}${ONE_CHAR}${star}`;
 
-      case '**/*.*':
-        return `(?:${nodot}${globstar(opts)}${SLASH_LITERAL})?${slashDot}${star}${DOT_LITERAL}${ONE_CHAR}${star}`;
+/***/ }),
+/* 343 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      case '**/.*':
-        return `(?:${nodot}${globstar(opts)}${SLASH_LITERAL})?${DOT_LITERAL}${ONE_CHAR}${star}`;
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+function isFatalError(settings, error) {
+    if (settings.errorFilter === null) {
+        return true;
+    }
+    return !settings.errorFilter(error);
+}
+exports.isFatalError = isFatalError;
+function isAppliedFilter(filter, value) {
+    return filter === null || filter(value);
+}
+exports.isAppliedFilter = isAppliedFilter;
+function replacePathSegmentSeparator(filepath, separator) {
+    return filepath.split(/[\\/]/).join(separator);
+}
+exports.replacePathSegmentSeparator = replacePathSegmentSeparator;
+function joinPathSegments(a, b, separator) {
+    if (a === '') {
+        return b;
+    }
+    return a + separator + b;
+}
+exports.joinPathSegments = joinPathSegments;
 
-      default: {
-        const match = /^(.*?)\.(\w+)$/.exec(str);
-        if (!match) return;
 
-        const source = create(match[1]);
-        if (!source) return;
+/***/ }),
+/* 344 */
+/***/ (function(module, exports, __webpack_require__) {
 
-        return source + DOT_LITERAL + match[2];
-      }
-    }
-  };
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const common = __webpack_require__(343);
+class Reader {
+    constructor(_root, _settings) {
+        this._root = _root;
+        this._settings = _settings;
+        this._root = common.replacePathSegmentSeparator(_root, _settings.pathSegmentSeparator);
+    }
+}
+exports.default = Reader;
 
-  const output = utils.removePrefix(input, state);
-  let source = create(output);
 
-  if (source && opts.strictSlashes !== true) {
-    source += `${SLASH_LITERAL}?`;
-  }
+/***/ }),
+/* 345 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  return source;
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const stream_1 = __webpack_require__(137);
+const async_1 = __webpack_require__(331);
+class StreamProvider {
+    constructor(_root, _settings) {
+        this._root = _root;
+        this._settings = _settings;
+        this._reader = new async_1.default(this._root, this._settings);
+        this._stream = new stream_1.Readable({
+            objectMode: true,
+            read: () => { },
+            destroy: this._reader.destroy.bind(this._reader)
+        });
+    }
+    read() {
+        this._reader.onError((error) => {
+            this._stream.emit('error', error);
+        });
+        this._reader.onEntry((entry) => {
+            this._stream.push(entry);
+        });
+        this._reader.onEnd(() => {
+            this._stream.push(null);
+        });
+        this._reader.read();
+        return this._stream;
+    }
+}
+exports.default = StreamProvider;
 
-module.exports = parse;
+
+/***/ }),
+/* 346 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const sync_1 = __webpack_require__(347);
+class SyncProvider {
+    constructor(_root, _settings) {
+        this._root = _root;
+        this._settings = _settings;
+        this._reader = new sync_1.default(this._root, this._settings);
+    }
+    read() {
+        return this._reader.read();
+    }
+}
+exports.default = SyncProvider;
 
 
 /***/ }),
-/* 328 */
+/* 347 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const merge2 = __webpack_require__(299);
-function merge(streams) {
-    const mergedStream = merge2(streams);
-    streams.forEach((stream) => {
-        stream.once('error', (error) => mergedStream.emit('error', error));
-    });
-    mergedStream.once('close', () => propagateCloseEventToSources(streams));
-    mergedStream.once('end', () => propagateCloseEventToSources(streams));
-    return mergedStream;
+const fsScandir = __webpack_require__(332);
+const common = __webpack_require__(343);
+const reader_1 = __webpack_require__(344);
+class SyncReader extends reader_1.default {
+    constructor() {
+        super(...arguments);
+        this._scandir = fsScandir.scandirSync;
+        this._storage = new Set();
+        this._queue = new Set();
+    }
+    read() {
+        this._pushToQueue(this._root, this._settings.basePath);
+        this._handleQueue();
+        return [...this._storage];
+    }
+    _pushToQueue(directory, base) {
+        this._queue.add({ directory, base });
+    }
+    _handleQueue() {
+        for (const item of this._queue.values()) {
+            this._handleDirectory(item.directory, item.base);
+        }
+    }
+    _handleDirectory(directory, base) {
+        try {
+            const entries = this._scandir(directory, this._settings.fsScandirSettings);
+            for (const entry of entries) {
+                this._handleEntry(entry, base);
+            }
+        }
+        catch (error) {
+            this._handleError(error);
+        }
+    }
+    _handleError(error) {
+        if (!common.isFatalError(this._settings, error)) {
+            return;
+        }
+        throw error;
+    }
+    _handleEntry(entry, base) {
+        const fullpath = entry.path;
+        if (base !== undefined) {
+            entry.path = common.joinPathSegments(base, entry.name, this._settings.pathSegmentSeparator);
+        }
+        if (common.isAppliedFilter(this._settings.entryFilter, entry)) {
+            this._pushToStorage(entry);
+        }
+        if (entry.dirent.isDirectory() && common.isAppliedFilter(this._settings.deepFilter, entry)) {
+            this._pushToQueue(fullpath, entry.path);
+        }
+    }
+    _pushToStorage(entry) {
+        this._storage.add(entry);
+    }
 }
-exports.merge = merge;
-function propagateCloseEventToSources(streams) {
-    streams.forEach((stream) => stream.emit('close'));
+exports.default = SyncReader;
+
+
+/***/ }),
+/* 348 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = __webpack_require__(4);
+const fsScandir = __webpack_require__(332);
+class Settings {
+    constructor(_options = {}) {
+        this._options = _options;
+        this.basePath = this._getValue(this._options.basePath, undefined);
+        this.concurrency = this._getValue(this._options.concurrency, Infinity);
+        this.deepFilter = this._getValue(this._options.deepFilter, null);
+        this.entryFilter = this._getValue(this._options.entryFilter, null);
+        this.errorFilter = this._getValue(this._options.errorFilter, null);
+        this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path.sep);
+        this.fsScandirSettings = new fsScandir.Settings({
+            followSymbolicLinks: this._options.followSymbolicLinks,
+            fs: this._options.fs,
+            pathSegmentSeparator: this._options.pathSegmentSeparator,
+            stats: this._options.stats,
+            throwErrorOnBrokenSymbolicLink: this._options.throwErrorOnBrokenSymbolicLink
+        });
+    }
+    _getValue(option, value) {
+        return option === undefined ? value : option;
+    }
 }
+exports.default = Settings;
 
 
 /***/ }),
-/* 329 */
+/* 349 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-function isString(input) {
-    return typeof input === 'string';
-}
-exports.isString = isString;
-function isEmpty(input) {
-    return input === '';
+const path = __webpack_require__(4);
+const fsStat = __webpack_require__(324);
+const utils = __webpack_require__(294);
+class Reader {
+    constructor(_settings) {
+        this._settings = _settings;
+        this._fsStatSettings = new fsStat.Settings({
+            followSymbolicLink: this._settings.followSymbolicLinks,
+            fs: this._settings.fs,
+            throwErrorOnBrokenSymbolicLink: this._settings.followSymbolicLinks
+        });
+    }
+    _getFullEntryPath(filepath) {
+        return path.resolve(this._settings.cwd, filepath);
+    }
+    _makeEntry(stats, pattern) {
+        const entry = {
+            name: pattern,
+            path: pattern,
+            dirent: utils.fs.createDirentFromStats(pattern, stats)
+        };
+        if (this._settings.stats) {
+            entry.stats = stats;
+        }
+        return entry;
+    }
+    _isFatalError(error) {
+        return !utils.errno.isEnoentCodeError(error) && !this._settings.suppressErrors;
+    }
 }
-exports.isEmpty = isEmpty;
+exports.default = Reader;
 
 
 /***/ }),
-/* 330 */
+/* 350 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const stream_1 = __webpack_require__(331);
-const provider_1 = __webpack_require__(358);
-class ProviderAsync extends provider_1.default {
-    constructor() {
-        super(...arguments);
-        this._reader = new stream_1.default(this._settings);
+const path = __webpack_require__(4);
+const deep_1 = __webpack_require__(351);
+const entry_1 = __webpack_require__(354);
+const error_1 = __webpack_require__(355);
+const entry_2 = __webpack_require__(356);
+class Provider {
+    constructor(_settings) {
+        this._settings = _settings;
+        this.errorFilter = new error_1.default(this._settings);
+        this.entryFilter = new entry_1.default(this._settings, this._getMicromatchOptions());
+        this.deepFilter = new deep_1.default(this._settings, this._getMicromatchOptions());
+        this.entryTransformer = new entry_2.default(this._settings);
     }
-    read(task) {
-        const root = this._getRootDirectory(task);
-        const options = this._getReaderOptions(task);
-        const entries = [];
-        return new Promise((resolve, reject) => {
-            const stream = this.api(root, task, options);
-            stream.once('error', reject);
-            stream.on('data', (entry) => entries.push(options.transform(entry)));
-            stream.once('end', () => resolve(entries));
-        });
+    _getRootDirectory(task) {
+        return path.resolve(this._settings.cwd, task.base);
     }
-    api(root, task, options) {
-        if (task.dynamic) {
-            return this._reader.dynamic(root, options);
-        }
-        return this._reader.static(task.patterns, options);
+    _getReaderOptions(task) {
+        const basePath = task.base === '.' ? '' : task.base;
+        return {
+            basePath,
+            pathSegmentSeparator: '/',
+            concurrency: this._settings.concurrency,
+            deepFilter: this.deepFilter.getFilter(basePath, task.positive, task.negative),
+            entryFilter: this.entryFilter.getFilter(task.positive, task.negative),
+            errorFilter: this.errorFilter.getFilter(),
+            followSymbolicLinks: this._settings.followSymbolicLinks,
+            fs: this._settings.fs,
+            stats: this._settings.stats,
+            throwErrorOnBrokenSymbolicLink: this._settings.throwErrorOnBrokenSymbolicLink,
+            transform: this.entryTransformer.getTransformer()
+        };
+    }
+    _getMicromatchOptions() {
+        return {
+            dot: this._settings.dot,
+            matchBase: this._settings.baseNameMatch,
+            nobrace: !this._settings.braceExpansion,
+            nocase: !this._settings.caseSensitiveMatch,
+            noext: !this._settings.extglob,
+            noglobstar: !this._settings.globstar,
+            posix: true,
+            strictSlashes: false
+        };
     }
 }
-exports.default = ProviderAsync;
+exports.default = Provider;
 
 
 /***/ }),
-/* 331 */
+/* 351 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const stream_1 = __webpack_require__(137);
-const fsStat = __webpack_require__(332);
-const fsWalk = __webpack_require__(337);
-const reader_1 = __webpack_require__(357);
-class ReaderStream extends reader_1.default {
-    constructor() {
-        super(...arguments);
-        this._walkStream = fsWalk.walkStream;
-        this._stat = fsStat.stat;
+const utils = __webpack_require__(294);
+const partial_1 = __webpack_require__(352);
+class DeepFilter {
+    constructor(_settings, _micromatchOptions) {
+        this._settings = _settings;
+        this._micromatchOptions = _micromatchOptions;
     }
-    dynamic(root, options) {
-        return this._walkStream(root, options);
+    getFilter(basePath, positive, negative) {
+        const matcher = this._getMatcher(positive);
+        const negativeRe = this._getNegativePatternsRe(negative);
+        return (entry) => this._filter(basePath, entry, matcher, negativeRe);
     }
-    static(patterns, options) {
-        const filepaths = patterns.map(this._getFullEntryPath, this);
-        const stream = new stream_1.PassThrough({ objectMode: true });
-        stream._write = (index, _enc, done) => {
-            return this._getEntry(filepaths[index], patterns[index], options)
-                .then((entry) => {
-                if (entry !== null && options.entryFilter(entry)) {
-                    stream.push(entry);
-                }
-                if (index === filepaths.length - 1) {
-                    stream.end();
-                }
-                done();
-            })
-                .catch(done);
-        };
-        for (let i = 0; i < filepaths.length; i++) {
-            stream.write(i);
+    _getMatcher(patterns) {
+        return new partial_1.default(patterns, this._settings, this._micromatchOptions);
+    }
+    _getNegativePatternsRe(patterns) {
+        const affectDepthOfReadingPatterns = patterns.filter(utils.pattern.isAffectDepthOfReadingPattern);
+        return utils.pattern.convertPatternsToRe(affectDepthOfReadingPatterns, this._micromatchOptions);
+    }
+    _filter(basePath, entry, matcher, negativeRe) {
+        const depth = this._getEntryLevel(basePath, entry.path);
+        if (this._isSkippedByDeep(depth)) {
+            return false;
         }
-        return stream;
+        if (this._isSkippedSymbolicLink(entry)) {
+            return false;
+        }
+        const filepath = utils.path.removeLeadingDotSegment(entry.path);
+        if (this._isSkippedByPositivePatterns(filepath, matcher)) {
+            return false;
+        }
+        return this._isSkippedByNegativePatterns(filepath, negativeRe);
     }
-    _getEntry(filepath, pattern, options) {
-        return this._getStat(filepath)
-            .then((stats) => this._makeEntry(stats, pattern))
-            .catch((error) => {
-            if (options.errorFilter(error)) {
-                return null;
-            }
-            throw error;
-        });
+    _isSkippedByDeep(entryDepth) {
+        return entryDepth >= this._settings.deep;
     }
-    _getStat(filepath) {
-        return new Promise((resolve, reject) => {
-            this._stat(filepath, this._fsStatSettings, (error, stats) => {
-                return error === null ? resolve(stats) : reject(error);
-            });
-        });
+    _isSkippedSymbolicLink(entry) {
+        return !this._settings.followSymbolicLinks && entry.dirent.isSymbolicLink();
+    }
+    _getEntryLevel(basePath, entryPath) {
+        const basePathDepth = basePath.split('/').length;
+        const entryPathDepth = entryPath.split('/').length;
+        return entryPathDepth - (basePath === '' ? 0 : basePathDepth);
+    }
+    _isSkippedByPositivePatterns(entryPath, matcher) {
+        return !this._settings.baseNameMatch && !matcher.match(entryPath);
+    }
+    _isSkippedByNegativePatterns(entryPath, negativeRe) {
+        return !utils.pattern.matchAny(entryPath, negativeRe);
     }
 }
-exports.default = ReaderStream;
+exports.default = DeepFilter;
 
 
 /***/ }),
-/* 332 */
+/* 352 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const async = __webpack_require__(333);
-const sync = __webpack_require__(334);
-const settings_1 = __webpack_require__(335);
-exports.Settings = settings_1.default;
-function stat(path, optionsOrSettingsOrCallback, callback) {
-    if (typeof optionsOrSettingsOrCallback === 'function') {
-        return async.read(path, getSettings(), optionsOrSettingsOrCallback);
-    }
-    async.read(path, getSettings(optionsOrSettingsOrCallback), callback);
-}
-exports.stat = stat;
-function statSync(path, optionsOrSettings) {
-    const settings = getSettings(optionsOrSettings);
-    return sync.read(path, settings);
-}
-exports.statSync = statSync;
-function getSettings(settingsOrOptions = {}) {
-    if (settingsOrOptions instanceof settings_1.default) {
-        return settingsOrOptions;
+const matcher_1 = __webpack_require__(353);
+class PartialMatcher extends matcher_1.default {
+    match(filepath) {
+        const parts = filepath.split('/');
+        const levels = parts.length;
+        const patterns = this._storage.filter((info) => !info.complete || info.segments.length > levels);
+        for (const pattern of patterns) {
+            const section = pattern.sections[0];
+            /**
+             * In this case, the pattern has a globstar and we must read all directories unconditionally,
+             * but only if the level has reached the end of the first group.
+             *
+             * fixtures/{a,b}/**
+             *  ^ true/false  ^ always true
+            */
+            if (!pattern.complete && levels > section.length) {
+                return true;
+            }
+            const match = parts.every((part, index) => {
+                const segment = pattern.segments[index];
+                if (segment.dynamic && segment.patternRe.test(part)) {
+                    return true;
+                }
+                if (!segment.dynamic && segment.pattern === part) {
+                    return true;
+                }
+                return false;
+            });
+            if (match) {
+                return true;
+            }
+        }
+        return false;
     }
-    return new settings_1.default(settingsOrOptions);
 }
+exports.default = PartialMatcher;
 
 
 /***/ }),
-/* 333 */
+/* 353 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-function read(path, settings, callback) {
-    settings.fs.lstat(path, (lstatError, lstat) => {
-        if (lstatError !== null) {
-            return callFailureCallback(callback, lstatError);
-        }
-        if (!lstat.isSymbolicLink() || !settings.followSymbolicLink) {
-            return callSuccessCallback(callback, lstat);
+const utils = __webpack_require__(294);
+class Matcher {
+    constructor(_patterns, _settings, _micromatchOptions) {
+        this._patterns = _patterns;
+        this._settings = _settings;
+        this._micromatchOptions = _micromatchOptions;
+        this._storage = [];
+        this._fillStorage();
+    }
+    _fillStorage() {
+        /**
+         * The original pattern may include `{,*,**,a/*}`, which will lead to problems with matching (unresolved level).
+         * So, before expand patterns with brace expansion into separated patterns.
+         */
+        const patterns = utils.pattern.expandPatternsWithBraceExpansion(this._patterns);
+        for (const pattern of patterns) {
+            const segments = this._getPatternSegments(pattern);
+            const sections = this._splitSegmentsIntoSections(segments);
+            this._storage.push({
+                complete: sections.length <= 1,
+                pattern,
+                segments,
+                sections
+            });
         }
-        settings.fs.stat(path, (statError, stat) => {
-            if (statError !== null) {
-                if (settings.throwErrorOnBrokenSymbolicLink) {
-                    return callFailureCallback(callback, statError);
-                }
-                return callSuccessCallback(callback, lstat);
-            }
-            if (settings.markSymbolicLink) {
-                stat.isSymbolicLink = () => true;
+    }
+    _getPatternSegments(pattern) {
+        const parts = utils.pattern.getPatternParts(pattern, this._micromatchOptions);
+        return parts.map((part) => {
+            const dynamic = utils.pattern.isDynamicPattern(part, this._settings);
+            if (!dynamic) {
+                return {
+                    dynamic: false,
+                    pattern: part
+                };
             }
-            callSuccessCallback(callback, stat);
+            return {
+                dynamic: true,
+                pattern: part,
+                patternRe: utils.pattern.makeRe(part, this._micromatchOptions)
+            };
         });
-    });
-}
-exports.read = read;
-function callFailureCallback(callback, error) {
-    callback(error);
-}
-function callSuccessCallback(callback, result) {
-    callback(null, result);
+    }
+    _splitSegmentsIntoSections(segments) {
+        return utils.array.splitWhen(segments, (segment) => segment.dynamic && utils.pattern.hasGlobStar(segment.pattern));
+    }
 }
+exports.default = Matcher;
 
 
 /***/ }),
-/* 334 */
+/* 354 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-function read(path, settings) {
-    const lstat = settings.fs.lstatSync(path);
-    if (!lstat.isSymbolicLink() || !settings.followSymbolicLink) {
-        return lstat;
+const utils = __webpack_require__(294);
+class EntryFilter {
+    constructor(_settings, _micromatchOptions) {
+        this._settings = _settings;
+        this._micromatchOptions = _micromatchOptions;
+        this.index = new Map();
     }
-    try {
-        const stat = settings.fs.statSync(path);
-        if (settings.markSymbolicLink) {
-            stat.isSymbolicLink = () => true;
+    getFilter(positive, negative) {
+        const positiveRe = utils.pattern.convertPatternsToRe(positive, this._micromatchOptions);
+        const negativeRe = utils.pattern.convertPatternsToRe(negative, this._micromatchOptions);
+        return (entry) => this._filter(entry, positiveRe, negativeRe);
+    }
+    _filter(entry, positiveRe, negativeRe) {
+        if (this._settings.unique) {
+            if (this._isDuplicateEntry(entry)) {
+                return false;
+            }
+            this._createIndexRecord(entry);
         }
-        return stat;
+        if (this._onlyFileFilter(entry) || this._onlyDirectoryFilter(entry)) {
+            return false;
+        }
+        if (this._isSkippedByAbsoluteNegativePatterns(entry, negativeRe)) {
+            return false;
+        }
+        const filepath = this._settings.baseNameMatch ? entry.name : entry.path;
+        return this._isMatchToPatterns(filepath, positiveRe) && !this._isMatchToPatterns(entry.path, negativeRe);
     }
-    catch (error) {
-        if (!settings.throwErrorOnBrokenSymbolicLink) {
-            return lstat;
+    _isDuplicateEntry(entry) {
+        return this.index.has(entry.path);
+    }
+    _createIndexRecord(entry) {
+        this.index.set(entry.path, undefined);
+    }
+    _onlyFileFilter(entry) {
+        return this._settings.onlyFiles && !entry.dirent.isFile();
+    }
+    _onlyDirectoryFilter(entry) {
+        return this._settings.onlyDirectories && !entry.dirent.isDirectory();
+    }
+    _isSkippedByAbsoluteNegativePatterns(entry, negativeRe) {
+        if (!this._settings.absolute) {
+            return false;
         }
-        throw error;
+        const fullpath = utils.path.makeAbsolute(this._settings.cwd, entry.path);
+        return this._isMatchToPatterns(fullpath, negativeRe);
+    }
+    _isMatchToPatterns(entryPath, patternsRe) {
+        const filepath = utils.path.removeLeadingDotSegment(entryPath);
+        return utils.pattern.matchAny(filepath, patternsRe);
     }
 }
-exports.read = read;
+exports.default = EntryFilter;
 
 
 /***/ }),
-/* 335 */
+/* 355 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs = __webpack_require__(336);
-class Settings {
-    constructor(_options = {}) {
-        this._options = _options;
-        this.followSymbolicLink = this._getValue(this._options.followSymbolicLink, true);
-        this.fs = fs.createFileSystemAdapter(this._options.fs);
-        this.markSymbolicLink = this._getValue(this._options.markSymbolicLink, false);
-        this.throwErrorOnBrokenSymbolicLink = this._getValue(this._options.throwErrorOnBrokenSymbolicLink, true);
+const utils = __webpack_require__(294);
+class ErrorFilter {
+    constructor(_settings) {
+        this._settings = _settings;
     }
-    _getValue(option, value) {
-        return option === undefined ? value : option;
+    getFilter() {
+        return (error) => this._isNonFatalError(error);
     }
-}
-exports.default = Settings;
-
-
-/***/ }),
-/* 336 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs = __webpack_require__(133);
-exports.FILE_SYSTEM_ADAPTER = {
-    lstat: fs.lstat,
-    stat: fs.stat,
-    lstatSync: fs.lstatSync,
-    statSync: fs.statSync
-};
-function createFileSystemAdapter(fsMethods) {
-    if (fsMethods === undefined) {
-        return exports.FILE_SYSTEM_ADAPTER;
+    _isNonFatalError(error) {
+        return utils.errno.isEnoentCodeError(error) || this._settings.suppressErrors;
     }
-    return Object.assign(Object.assign({}, exports.FILE_SYSTEM_ADAPTER), fsMethods);
 }
-exports.createFileSystemAdapter = createFileSystemAdapter;
+exports.default = ErrorFilter;
 
 
 /***/ }),
-/* 337 */
+/* 356 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const async_1 = __webpack_require__(338);
-const stream_1 = __webpack_require__(353);
-const sync_1 = __webpack_require__(354);
-const settings_1 = __webpack_require__(356);
-exports.Settings = settings_1.default;
-function walk(directory, optionsOrSettingsOrCallback, callback) {
-    if (typeof optionsOrSettingsOrCallback === 'function') {
-        return new async_1.default(directory, getSettings()).read(optionsOrSettingsOrCallback);
+const utils = __webpack_require__(294);
+class EntryTransformer {
+    constructor(_settings) {
+        this._settings = _settings;
     }
-    new async_1.default(directory, getSettings(optionsOrSettingsOrCallback)).read(callback);
-}
-exports.walk = walk;
-function walkSync(directory, optionsOrSettings) {
-    const settings = getSettings(optionsOrSettings);
-    const provider = new sync_1.default(directory, settings);
-    return provider.read();
-}
-exports.walkSync = walkSync;
-function walkStream(directory, optionsOrSettings) {
-    const settings = getSettings(optionsOrSettings);
-    const provider = new stream_1.default(directory, settings);
-    return provider.read();
-}
-exports.walkStream = walkStream;
-function getSettings(settingsOrOptions = {}) {
-    if (settingsOrOptions instanceof settings_1.default) {
-        return settingsOrOptions;
+    getTransformer() {
+        return (entry) => this._transform(entry);
+    }
+    _transform(entry) {
+        let filepath = entry.path;
+        if (this._settings.absolute) {
+            filepath = utils.path.makeAbsolute(this._settings.cwd, filepath);
+            filepath = utils.path.unixify(filepath);
+        }
+        if (this._settings.markDirectories && entry.dirent.isDirectory()) {
+            filepath += '/';
+        }
+        if (!this._settings.objectMode) {
+            return filepath;
+        }
+        return Object.assign(Object.assign({}, entry), { path: filepath });
     }
-    return new settings_1.default(settingsOrOptions);
 }
+exports.default = EntryTransformer;
 
 
 /***/ }),
-/* 338 */
+/* 357 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const async_1 = __webpack_require__(339);
-class AsyncProvider {
-    constructor(_root, _settings) {
-        this._root = _root;
-        this._settings = _settings;
-        this._reader = new async_1.default(this._root, this._settings);
-        this._storage = new Set();
+const stream_1 = __webpack_require__(137);
+const stream_2 = __webpack_require__(323);
+const provider_1 = __webpack_require__(350);
+class ProviderStream extends provider_1.default {
+    constructor() {
+        super(...arguments);
+        this._reader = new stream_2.default(this._settings);
     }
-    read(callback) {
-        this._reader.onError((error) => {
-            callFailureCallback(callback, error);
-        });
-        this._reader.onEntry((entry) => {
-            this._storage.add(entry);
-        });
-        this._reader.onEnd(() => {
-            callSuccessCallback(callback, [...this._storage]);
-        });
-        this._reader.read();
+    read(task) {
+        const root = this._getRootDirectory(task);
+        const options = this._getReaderOptions(task);
+        const source = this.api(root, task, options);
+        const destination = new stream_1.Readable({ objectMode: true, read: () => { } });
+        source
+            .once('error', (error) => destination.emit('error', error))
+            .on('data', (entry) => destination.emit('data', options.transform(entry)))
+            .once('end', () => destination.emit('end'));
+        destination
+            .once('close', () => source.destroy());
+        return destination;
+    }
+    api(root, task, options) {
+        if (task.dynamic) {
+            return this._reader.dynamic(root, options);
+        }
+        return this._reader.static(task.patterns, options);
     }
 }
-exports.default = AsyncProvider;
-function callFailureCallback(callback, error) {
-    callback(error);
-}
-function callSuccessCallback(callback, entries) {
-    callback(null, entries);
-}
+exports.default = ProviderStream;
 
 
 /***/ }),
-/* 339 */
+/* 358 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const events_1 = __webpack_require__(155);
-const fsScandir = __webpack_require__(340);
-const fastq = __webpack_require__(349);
-const common = __webpack_require__(351);
-const reader_1 = __webpack_require__(352);
-class AsyncReader extends reader_1.default {
-    constructor(_root, _settings) {
-        super(_root, _settings);
-        this._settings = _settings;
-        this._scandir = fsScandir.scandir;
-        this._emitter = new events_1.EventEmitter();
-        this._queue = fastq(this._worker.bind(this), this._settings.concurrency);
-        this._isFatalError = false;
-        this._isDestroyed = false;
-        this._queue.drain = () => {
-            if (!this._isFatalError) {
-                this._emitter.emit('end');
-            }
-        };
+const sync_1 = __webpack_require__(359);
+const provider_1 = __webpack_require__(350);
+class ProviderSync extends provider_1.default {
+    constructor() {
+        super(...arguments);
+        this._reader = new sync_1.default(this._settings);
     }
-    read() {
-        this._isFatalError = false;
-        this._isDestroyed = false;
-        setImmediate(() => {
-            this._pushToQueue(this._root, this._settings.basePath);
-        });
-        return this._emitter;
+    read(task) {
+        const root = this._getRootDirectory(task);
+        const options = this._getReaderOptions(task);
+        const entries = this.api(root, task, options);
+        return entries.map(options.transform);
     }
-    destroy() {
-        if (this._isDestroyed) {
-            throw new Error('The reader is already destroyed');
+    api(root, task, options) {
+        if (task.dynamic) {
+            return this._reader.dynamic(root, options);
         }
-        this._isDestroyed = true;
-        this._queue.killAndDrain();
-    }
-    onEntry(callback) {
-        this._emitter.on('entry', callback);
-    }
-    onError(callback) {
-        this._emitter.once('error', callback);
+        return this._reader.static(task.patterns, options);
     }
-    onEnd(callback) {
-        this._emitter.once('end', callback);
+}
+exports.default = ProviderSync;
+
+
+/***/ }),
+/* 359 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fsStat = __webpack_require__(324);
+const fsWalk = __webpack_require__(329);
+const reader_1 = __webpack_require__(349);
+class ReaderSync extends reader_1.default {
+    constructor() {
+        super(...arguments);
+        this._walkSync = fsWalk.walkSync;
+        this._statSync = fsStat.statSync;
     }
-    _pushToQueue(directory, base) {
-        const queueItem = { directory, base };
-        this._queue.push(queueItem, (error) => {
-            if (error !== null) {
-                this._handleError(error);
-            }
-        });
+    dynamic(root, options) {
+        return this._walkSync(root, options);
     }
-    _worker(item, done) {
-        this._scandir(item.directory, this._settings.fsScandirSettings, (error, entries) => {
-            if (error !== null) {
-                return done(error, undefined);
-            }
-            for (const entry of entries) {
-                this._handleEntry(entry, item.base);
+    static(patterns, options) {
+        const entries = [];
+        for (const pattern of patterns) {
+            const filepath = this._getFullEntryPath(pattern);
+            const entry = this._getEntry(filepath, pattern, options);
+            if (entry === null || !options.entryFilter(entry)) {
+                continue;
             }
-            done(null, undefined);
-        });
-    }
-    _handleError(error) {
-        if (!common.isFatalError(this._settings, error)) {
-            return;
+            entries.push(entry);
         }
-        this._isFatalError = true;
-        this._isDestroyed = true;
-        this._emitter.emit('error', error);
+        return entries;
     }
-    _handleEntry(entry, base) {
-        if (this._isDestroyed || this._isFatalError) {
-            return;
-        }
-        const fullpath = entry.path;
-        if (base !== undefined) {
-            entry.path = common.joinPathSegments(base, entry.name, this._settings.pathSegmentSeparator);
-        }
-        if (common.isAppliedFilter(this._settings.entryFilter, entry)) {
-            this._emitEntry(entry);
+    _getEntry(filepath, pattern, options) {
+        try {
+            const stats = this._getStat(filepath);
+            return this._makeEntry(stats, pattern);
         }
-        if (entry.dirent.isDirectory() && common.isAppliedFilter(this._settings.deepFilter, entry)) {
-            this._pushToQueue(fullpath, entry.path);
+        catch (error) {
+            if (options.errorFilter(error)) {
+                return null;
+            }
+            throw error;
         }
     }
-    _emitEntry(entry) {
-        this._emitter.emit('entry', entry);
+    _getStat(filepath) {
+        return this._statSync(filepath, this._fsStatSettings);
     }
 }
-exports.default = AsyncReader;
+exports.default = ReaderSync;
 
 
 /***/ }),
-/* 340 */
+/* 360 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const async = __webpack_require__(341);
-const sync = __webpack_require__(346);
-const settings_1 = __webpack_require__(347);
-exports.Settings = settings_1.default;
-function scandir(path, optionsOrSettingsOrCallback, callback) {
-    if (typeof optionsOrSettingsOrCallback === 'function') {
-        return async.read(path, getSettings(), optionsOrSettingsOrCallback);
+const fs = __webpack_require__(133);
+const os = __webpack_require__(120);
+const CPU_COUNT = os.cpus().length;
+exports.DEFAULT_FILE_SYSTEM_ADAPTER = {
+    lstat: fs.lstat,
+    lstatSync: fs.lstatSync,
+    stat: fs.stat,
+    statSync: fs.statSync,
+    readdir: fs.readdir,
+    readdirSync: fs.readdirSync
+};
+class Settings {
+    constructor(_options = {}) {
+        this._options = _options;
+        this.absolute = this._getValue(this._options.absolute, false);
+        this.baseNameMatch = this._getValue(this._options.baseNameMatch, false);
+        this.braceExpansion = this._getValue(this._options.braceExpansion, true);
+        this.caseSensitiveMatch = this._getValue(this._options.caseSensitiveMatch, true);
+        this.concurrency = this._getValue(this._options.concurrency, CPU_COUNT);
+        this.cwd = this._getValue(this._options.cwd, process.cwd());
+        this.deep = this._getValue(this._options.deep, Infinity);
+        this.dot = this._getValue(this._options.dot, false);
+        this.extglob = this._getValue(this._options.extglob, true);
+        this.followSymbolicLinks = this._getValue(this._options.followSymbolicLinks, true);
+        this.fs = this._getFileSystemMethods(this._options.fs);
+        this.globstar = this._getValue(this._options.globstar, true);
+        this.ignore = this._getValue(this._options.ignore, []);
+        this.markDirectories = this._getValue(this._options.markDirectories, false);
+        this.objectMode = this._getValue(this._options.objectMode, false);
+        this.onlyDirectories = this._getValue(this._options.onlyDirectories, false);
+        this.onlyFiles = this._getValue(this._options.onlyFiles, true);
+        this.stats = this._getValue(this._options.stats, false);
+        this.suppressErrors = this._getValue(this._options.suppressErrors, false);
+        this.throwErrorOnBrokenSymbolicLink = this._getValue(this._options.throwErrorOnBrokenSymbolicLink, false);
+        this.unique = this._getValue(this._options.unique, true);
+        if (this.onlyDirectories) {
+            this.onlyFiles = false;
+        }
+        if (this.stats) {
+            this.objectMode = true;
+        }
     }
-    async.read(path, getSettings(optionsOrSettingsOrCallback), callback);
-}
-exports.scandir = scandir;
-function scandirSync(path, optionsOrSettings) {
-    const settings = getSettings(optionsOrSettings);
-    return sync.read(path, settings);
-}
-exports.scandirSync = scandirSync;
-function getSettings(settingsOrOptions = {}) {
-    if (settingsOrOptions instanceof settings_1.default) {
-        return settingsOrOptions;
+    _getValue(option, value) {
+        return option === undefined ? value : option;
+    }
+    _getFileSystemMethods(methods = {}) {
+        return Object.assign(Object.assign({}, exports.DEFAULT_FILE_SYSTEM_ADAPTER), methods);
     }
-    return new settings_1.default(settingsOrOptions);
 }
+exports.default = Settings;
 
 
 /***/ }),
-/* 341 */
+/* 361 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const fsStat = __webpack_require__(332);
-const rpl = __webpack_require__(342);
-const constants_1 = __webpack_require__(343);
-const utils = __webpack_require__(344);
-function read(directory, settings, callback) {
-    if (!settings.stats && constants_1.IS_SUPPORT_READDIR_WITH_FILE_TYPES) {
-        return readdirWithFileTypes(directory, settings, callback);
-    }
-    return readdir(directory, settings, callback);
-}
-exports.read = read;
-function readdirWithFileTypes(directory, settings, callback) {
-    settings.fs.readdir(directory, { withFileTypes: true }, (readdirError, dirents) => {
-        if (readdirError !== null) {
-            return callFailureCallback(callback, readdirError);
-        }
-        const entries = dirents.map((dirent) => ({
-            dirent,
-            name: dirent.name,
-            path: `${directory}${settings.pathSegmentSeparator}${dirent.name}`
-        }));
-        if (!settings.followSymbolicLinks) {
-            return callSuccessCallback(callback, entries);
-        }
-        const tasks = entries.map((entry) => makeRplTaskEntry(entry, settings));
-        rpl(tasks, (rplError, rplEntries) => {
-            if (rplError !== null) {
-                return callFailureCallback(callback, rplError);
-            }
-            callSuccessCallback(callback, rplEntries);
-        });
-    });
-}
-exports.readdirWithFileTypes = readdirWithFileTypes;
-function makeRplTaskEntry(entry, settings) {
-    return (done) => {
-        if (!entry.dirent.isSymbolicLink()) {
-            return done(null, entry);
-        }
-        settings.fs.stat(entry.path, (statError, stats) => {
-            if (statError !== null) {
-                if (settings.throwErrorOnBrokenSymbolicLink) {
-                    return done(statError);
-                }
-                return done(null, entry);
-            }
-            entry.dirent = utils.fs.createDirentFromStats(entry.name, stats);
-            return done(null, entry);
-        });
-    };
-}
-function readdir(directory, settings, callback) {
-    settings.fs.readdir(directory, (readdirError, names) => {
-        if (readdirError !== null) {
-            return callFailureCallback(callback, readdirError);
-        }
-        const filepaths = names.map((name) => `${directory}${settings.pathSegmentSeparator}${name}`);
-        const tasks = filepaths.map((filepath) => {
-            return (done) => fsStat.stat(filepath, settings.fsStatSettings, done);
-        });
-        rpl(tasks, (rplError, results) => {
-            if (rplError !== null) {
-                return callFailureCallback(callback, rplError);
-            }
-            const entries = [];
-            names.forEach((name, index) => {
-                const stats = results[index];
-                const entry = {
-                    name,
-                    path: filepaths[index],
-                    dirent: utils.fs.createDirentFromStats(name, stats)
-                };
-                if (settings.stats) {
-                    entry.stats = stats;
-                }
-                entries.push(entry);
-            });
-            callSuccessCallback(callback, entries);
-        });
-    });
-}
-exports.readdir = readdir;
-function callFailureCallback(callback, error) {
-    callback(error);
-}
-function callSuccessCallback(callback, result) {
-    callback(null, result);
-}
+
+const path = __webpack_require__(4);
+const pathType = __webpack_require__(362);
+
+const getExtensions = extensions => extensions.length > 1 ? `{${extensions.join(',')}}` : extensions[0];
+
+const getPath = (filepath, cwd) => {
+	const pth = filepath[0] === '!' ? filepath.slice(1) : filepath;
+	return path.isAbsolute(pth) ? pth : path.join(cwd, pth);
+};
+
+const addExtensions = (file, extensions) => {
+	if (path.extname(file)) {
+		return `**/${file}`;
+	}
+
+	return `**/${file}.${getExtensions(extensions)}`;
+};
+
+const getGlob = (directory, options) => {
+	if (options.files && !Array.isArray(options.files)) {
+		throw new TypeError(`Expected \`files\` to be of type \`Array\` but received type \`${typeof options.files}\``);
+	}
+
+	if (options.extensions && !Array.isArray(options.extensions)) {
+		throw new TypeError(`Expected \`extensions\` to be of type \`Array\` but received type \`${typeof options.extensions}\``);
+	}
+
+	if (options.files && options.extensions) {
+		return options.files.map(x => path.posix.join(directory, addExtensions(x, options.extensions)));
+	}
+
+	if (options.files) {
+		return options.files.map(x => path.posix.join(directory, `**/${x}`));
+	}
+
+	if (options.extensions) {
+		return [path.posix.join(directory, `**/*.${getExtensions(options.extensions)}`)];
+	}
+
+	return [path.posix.join(directory, '**')];
+};
+
+module.exports = async (input, options) => {
+	options = {
+		cwd: process.cwd(),
+		...options
+	};
+
+	if (typeof options.cwd !== 'string') {
+		throw new TypeError(`Expected \`cwd\` to be of type \`string\` but received type \`${typeof options.cwd}\``);
+	}
+
+	const globs = await Promise.all([].concat(input).map(async x => {
+		const isDirectory = await pathType.isDirectory(getPath(x, options.cwd));
+		return isDirectory ? getGlob(x, options) : x;
+	}));
+
+	return [].concat.apply([], globs); // eslint-disable-line prefer-spread
+};
+
+module.exports.sync = (input, options) => {
+	options = {
+		cwd: process.cwd(),
+		...options
+	};
+
+	if (typeof options.cwd !== 'string') {
+		throw new TypeError(`Expected \`cwd\` to be of type \`string\` but received type \`${typeof options.cwd}\``);
+	}
+
+	const globs = [].concat(input).map(x => pathType.isDirectorySync(getPath(x, options.cwd)) ? getGlob(x, options) : x);
+
+	return [].concat.apply([], globs); // eslint-disable-line prefer-spread
+};
+
+
+/***/ }),
+/* 362 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const {promisify} = __webpack_require__(111);
+const fs = __webpack_require__(133);
+
+async function isType(fsStatType, statsMethodName, filePath) {
+	if (typeof filePath !== 'string') {
+		throw new TypeError(`Expected a string, got ${typeof filePath}`);
+	}
+
+	try {
+		const stats = await promisify(fs[fsStatType])(filePath);
+		return stats[statsMethodName]();
+	} catch (error) {
+		if (error.code === 'ENOENT') {
+			return false;
+		}
+
+		throw error;
+	}
+}
+
+function isTypeSync(fsStatType, statsMethodName, filePath) {
+	if (typeof filePath !== 'string') {
+		throw new TypeError(`Expected a string, got ${typeof filePath}`);
+	}
+
+	try {
+		return fs[fsStatType](filePath)[statsMethodName]();
+	} catch (error) {
+		if (error.code === 'ENOENT') {
+			return false;
+		}
+
+		throw error;
+	}
+}
+
+exports.isFile = isType.bind(null, 'stat', 'isFile');
+exports.isDirectory = isType.bind(null, 'stat', 'isDirectory');
+exports.isSymlink = isType.bind(null, 'lstat', 'isSymbolicLink');
+exports.isFileSync = isTypeSync.bind(null, 'statSync', 'isFile');
+exports.isDirectorySync = isTypeSync.bind(null, 'statSync', 'isDirectory');
+exports.isSymlinkSync = isTypeSync.bind(null, 'lstatSync', 'isSymbolicLink');
+
+
+/***/ }),
+/* 363 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const {promisify} = __webpack_require__(111);
+const fs = __webpack_require__(133);
+const path = __webpack_require__(4);
+const fastGlob = __webpack_require__(292);
+const gitIgnore = __webpack_require__(364);
+const slash = __webpack_require__(365);
+
+const DEFAULT_IGNORE = [
+	'**/node_modules/**',
+	'**/flow-typed/**',
+	'**/coverage/**',
+	'**/.git'
+];
+
+const readFileP = promisify(fs.readFile);
+
+const mapGitIgnorePatternTo = base => ignore => {
+	if (ignore.startsWith('!')) {
+		return '!' + path.posix.join(base, ignore.slice(1));
+	}
+
+	return path.posix.join(base, ignore);
+};
+
+const parseGitIgnore = (content, options) => {
+	const base = slash(path.relative(options.cwd, path.dirname(options.fileName)));
+
+	return content
+		.split(/\r?\n/)
+		.filter(Boolean)
+		.filter(line => !line.startsWith('#'))
+		.map(mapGitIgnorePatternTo(base));
+};
+
+const reduceIgnore = files => {
+	return files.reduce((ignores, file) => {
+		ignores.add(parseGitIgnore(file.content, {
+			cwd: file.cwd,
+			fileName: file.filePath
+		}));
+		return ignores;
+	}, gitIgnore());
+};
+
+const ensureAbsolutePathForCwd = (cwd, p) => {
+	if (path.isAbsolute(p)) {
+		if (p.startsWith(cwd)) {
+			return p;
+		}
+
+		throw new Error(`Path ${p} is not in cwd ${cwd}`);
+	}
+
+	return path.join(cwd, p);
+};
+
+const getIsIgnoredPredecate = (ignores, cwd) => {
+	return p => ignores.ignores(slash(path.relative(cwd, ensureAbsolutePathForCwd(cwd, p))));
+};
+
+const getFile = async (file, cwd) => {
+	const filePath = path.join(cwd, file);
+	const content = await readFileP(filePath, 'utf8');
+
+	return {
+		cwd,
+		filePath,
+		content
+	};
+};
+
+const getFileSync = (file, cwd) => {
+	const filePath = path.join(cwd, file);
+	const content = fs.readFileSync(filePath, 'utf8');
+
+	return {
+		cwd,
+		filePath,
+		content
+	};
+};
+
+const normalizeOptions = ({
+	ignore = [],
+	cwd = slash(process.cwd())
+} = {}) => {
+	return {ignore, cwd};
+};
+
+module.exports = async options => {
+	options = normalizeOptions(options);
+
+	const paths = await fastGlob('**/.gitignore', {
+		ignore: DEFAULT_IGNORE.concat(options.ignore),
+		cwd: options.cwd
+	});
+
+	const files = await Promise.all(paths.map(file => getFile(file, options.cwd)));
+	const ignores = reduceIgnore(files);
+
+	return getIsIgnoredPredecate(ignores, options.cwd);
+};
+
+module.exports.sync = options => {
+	options = normalizeOptions(options);
+
+	const paths = fastGlob.sync('**/.gitignore', {
+		ignore: DEFAULT_IGNORE.concat(options.ignore),
+		cwd: options.cwd
+	});
+
+	const files = paths.map(file => getFileSync(file, options.cwd));
+	const ignores = reduceIgnore(files);
+
+	return getIsIgnoredPredecate(ignores, options.cwd);
+};
 
 
 /***/ }),
-/* 342 */
+/* 364 */
 /***/ (function(module, exports) {
 
-module.exports = runParallel
+// A simple implementation of make-array
+function makeArray (subject) {
+  return Array.isArray(subject)
+    ? subject
+    : [subject]
+}
 
-function runParallel (tasks, cb) {
-  var results, pending, keys
-  var isSync = true
+const EMPTY = ''
+const SPACE = ' '
+const ESCAPE = '\\'
+const REGEX_TEST_BLANK_LINE = /^\s+$/
+const REGEX_REPLACE_LEADING_EXCAPED_EXCLAMATION = /^\\!/
+const REGEX_REPLACE_LEADING_EXCAPED_HASH = /^\\#/
+const REGEX_SPLITALL_CRLF = /\r?\n/g
+// /foo,
+// ./foo,
+// ../foo,
+// .
+// ..
+const REGEX_TEST_INVALID_PATH = /^\.*\/|^\.+$/
 
-  if (Array.isArray(tasks)) {
-    results = []
-    pending = tasks.length
-  } else {
-    keys = Object.keys(tasks)
-    results = {}
-    pending = keys.length
-  }
+const SLASH = '/'
+const KEY_IGNORE = typeof Symbol !== 'undefined'
+  ? Symbol.for('node-ignore')
+  /* istanbul ignore next */
+  : 'node-ignore'
 
-  function done (err) {
-    function end () {
-      if (cb) cb(err, results)
-      cb = null
-    }
-    if (isSync) process.nextTick(end)
-    else end()
-  }
+const define = (object, key, value) =>
+  Object.defineProperty(object, key, {value})
 
-  function each (i, err, result) {
-    results[i] = result
-    if (--pending === 0 || err) {
-      done(err)
-    }
-  }
+const REGEX_REGEXP_RANGE = /([0-z])-([0-z])/g
 
-  if (!pending) {
-    // empty
-    done(null)
-  } else if (keys) {
-    // object
-    keys.forEach(function (key) {
-      tasks[key](function (err, result) { each(key, err, result) })
-    })
-  } else {
-    // array
-    tasks.forEach(function (task, i) {
-      task(function (err, result) { each(i, err, result) })
-    })
-  }
+// Sanitize the range of a regular expression
+// The cases are complicated, see test cases for details
+const sanitizeRange = range => range.replace(
+  REGEX_REGEXP_RANGE,
+  (match, from, to) => from.charCodeAt(0) <= to.charCodeAt(0)
+    ? match
+    // Invalid range (out of order) which is ok for gitignore rules but
+    //   fatal for JavaScript regular expression, so eliminate it.
+    : EMPTY
+)
 
-  isSync = false
+// See fixtures #59
+const cleanRangeBackSlash = slashes => {
+  const {length} = slashes
+  return slashes.slice(0, length - length % 2)
 }
 
+// > If the pattern ends with a slash,
+// > it is removed for the purpose of the following description,
+// > but it would only find a match with a directory.
+// > In other words, foo/ will match a directory foo and paths underneath it,
+// > but will not match a regular file or a symbolic link foo
+// >  (this is consistent with the way how pathspec works in general in Git).
+// '`foo/`' will not match regular file '`foo`' or symbolic link '`foo`'
+// -> ignore-rules will not deal with it, because it costs extra `fs.stat` call
+//      you could use option `mark: true` with `glob`
 
-/***/ }),
-/* 343 */
-/***/ (function(module, exports, __webpack_require__) {
+// '`foo/`' should not continue with the '`..`'
+const REPLACERS = [
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const NODE_PROCESS_VERSION_PARTS = process.versions.node.split('.');
-const MAJOR_VERSION = parseInt(NODE_PROCESS_VERSION_PARTS[0], 10);
-const MINOR_VERSION = parseInt(NODE_PROCESS_VERSION_PARTS[1], 10);
-const SUPPORTED_MAJOR_VERSION = 10;
-const SUPPORTED_MINOR_VERSION = 10;
-const IS_MATCHED_BY_MAJOR = MAJOR_VERSION > SUPPORTED_MAJOR_VERSION;
-const IS_MATCHED_BY_MAJOR_AND_MINOR = MAJOR_VERSION === SUPPORTED_MAJOR_VERSION && MINOR_VERSION >= SUPPORTED_MINOR_VERSION;
-/**
- * IS `true` for Node.js 10.10 and greater.
- */
-exports.IS_SUPPORT_READDIR_WITH_FILE_TYPES = IS_MATCHED_BY_MAJOR || IS_MATCHED_BY_MAJOR_AND_MINOR;
+  // > Trailing spaces are ignored unless they are quoted with backslash ("\")
+  [
+    // (a\ ) -> (a )
+    // (a  ) -> (a)
+    // (a \ ) -> (a  )
+    /\\?\s+$/,
+    match => match.indexOf('\\') === 0
+      ? SPACE
+      : EMPTY
+  ],
 
+  // replace (\ ) with ' '
+  [
+    /\\\s/g,
+    () => SPACE
+  ],
 
-/***/ }),
-/* 344 */
-/***/ (function(module, exports, __webpack_require__) {
+  // Escape metacharacters
+  // which is written down by users but means special for regular expressions.
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs = __webpack_require__(345);
-exports.fs = fs;
+  // > There are 12 characters with special meanings:
+  // > - the backslash \,
+  // > - the caret ^,
+  // > - the dollar sign $,
+  // > - the period or dot .,
+  // > - the vertical bar or pipe symbol |,
+  // > - the question mark ?,
+  // > - the asterisk or star *,
+  // > - the plus sign +,
+  // > - the opening parenthesis (,
+  // > - the closing parenthesis ),
+  // > - and the opening square bracket [,
+  // > - the opening curly brace {,
+  // > These special characters are often called "metacharacters".
+  [
+    /[\\$.|*+(){^]/g,
+    match => `\\${match}`
+  ],
 
+  [
+    // > a question mark (?) matches a single character
+    /(?!\\)\?/g,
+    () => '[^/]'
+  ],
 
-/***/ }),
-/* 345 */
-/***/ (function(module, exports, __webpack_require__) {
+  // leading slash
+  [
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-class DirentFromStats {
-    constructor(name, stats) {
-        this.name = name;
-        this.isBlockDevice = stats.isBlockDevice.bind(stats);
-        this.isCharacterDevice = stats.isCharacterDevice.bind(stats);
-        this.isDirectory = stats.isDirectory.bind(stats);
-        this.isFIFO = stats.isFIFO.bind(stats);
-        this.isFile = stats.isFile.bind(stats);
-        this.isSocket = stats.isSocket.bind(stats);
-        this.isSymbolicLink = stats.isSymbolicLink.bind(stats);
-    }
-}
-function createDirentFromStats(name, stats) {
-    return new DirentFromStats(name, stats);
-}
-exports.createDirentFromStats = createDirentFromStats;
+    // > A leading slash matches the beginning of the pathname.
+    // > For example, "/*.c" matches "cat-file.c" but not "mozilla-sha1/sha1.c".
+    // A leading slash matches the beginning of the pathname
+    /^\//,
+    () => '^'
+  ],
 
+  // replace special metacharacter slash after the leading slash
+  [
+    /\//g,
+    () => '\\/'
+  ],
 
-/***/ }),
-/* 346 */
-/***/ (function(module, exports, __webpack_require__) {
+  [
+    // > A leading "**" followed by a slash means match in all directories.
+    // > For example, "**/foo" matches file or directory "foo" anywhere,
+    // > the same as pattern "foo".
+    // > "**/foo/bar" matches file or directory "bar" anywhere that is directly
+    // >   under directory "foo".
+    // Notice that the '*'s have been replaced as '\\*'
+    /^\^*\\\*\\\*\\\//,
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const fsStat = __webpack_require__(332);
-const constants_1 = __webpack_require__(343);
-const utils = __webpack_require__(344);
-function read(directory, settings) {
-    if (!settings.stats && constants_1.IS_SUPPORT_READDIR_WITH_FILE_TYPES) {
-        return readdirWithFileTypes(directory, settings);
-    }
-    return readdir(directory, settings);
-}
-exports.read = read;
-function readdirWithFileTypes(directory, settings) {
-    const dirents = settings.fs.readdirSync(directory, { withFileTypes: true });
-    return dirents.map((dirent) => {
-        const entry = {
-            dirent,
-            name: dirent.name,
-            path: `${directory}${settings.pathSegmentSeparator}${dirent.name}`
-        };
-        if (entry.dirent.isSymbolicLink() && settings.followSymbolicLinks) {
-            try {
-                const stats = settings.fs.statSync(entry.path);
-                entry.dirent = utils.fs.createDirentFromStats(entry.name, stats);
-            }
-            catch (error) {
-                if (settings.throwErrorOnBrokenSymbolicLink) {
-                    throw error;
-                }
-            }
-        }
-        return entry;
-    });
-}
-exports.readdirWithFileTypes = readdirWithFileTypes;
-function readdir(directory, settings) {
-    const names = settings.fs.readdirSync(directory);
-    return names.map((name) => {
-        const entryPath = `${directory}${settings.pathSegmentSeparator}${name}`;
-        const stats = fsStat.statSync(entryPath, settings.fsStatSettings);
-        const entry = {
-            name,
-            path: entryPath,
-            dirent: utils.fs.createDirentFromStats(name, stats)
-        };
-        if (settings.stats) {
-            entry.stats = stats;
-        }
-        return entry;
-    });
-}
-exports.readdir = readdir;
+    // '**/foo' <-> 'foo'
+    () => '^(?:.*\\/)?'
+  ],
 
+  // starting
+  [
+    // there will be no leading '/'
+    //   (which has been replaced by section "leading slash")
+    // If starts with '**', adding a '^' to the regular expression also works
+    /^(?=[^^])/,
+    function startingReplacer () {
+      // If has a slash `/` at the beginning or middle
+      return !/\/(?!$)/.test(this)
+        // > Prior to 2.22.1
+        // > If the pattern does not contain a slash /,
+        // >   Git treats it as a shell glob pattern
+        // Actually, if there is only a trailing slash,
+        //   git also treats it as a shell glob pattern
 
-/***/ }),
-/* 347 */
-/***/ (function(module, exports, __webpack_require__) {
+        // After 2.22.1 (compatible but clearer)
+        // > If there is a separator at the beginning or middle (or both)
+        // > of the pattern, then the pattern is relative to the directory
+        // > level of the particular .gitignore file itself.
+        // > Otherwise the pattern may also match at any level below
+        // > the .gitignore level.
+        ? '(?:^|\\/)'
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = __webpack_require__(4);
-const fsStat = __webpack_require__(332);
-const fs = __webpack_require__(348);
-class Settings {
-    constructor(_options = {}) {
-        this._options = _options;
-        this.followSymbolicLinks = this._getValue(this._options.followSymbolicLinks, false);
-        this.fs = fs.createFileSystemAdapter(this._options.fs);
-        this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path.sep);
-        this.stats = this._getValue(this._options.stats, false);
-        this.throwErrorOnBrokenSymbolicLink = this._getValue(this._options.throwErrorOnBrokenSymbolicLink, true);
-        this.fsStatSettings = new fsStat.Settings({
-            followSymbolicLink: this.followSymbolicLinks,
-            fs: this.fs,
-            throwErrorOnBrokenSymbolicLink: this.throwErrorOnBrokenSymbolicLink
-        });
-    }
-    _getValue(option, value) {
-        return option === undefined ? value : option;
-    }
-}
-exports.default = Settings;
+        // > Otherwise, Git treats the pattern as a shell glob suitable for
+        // >   consumption by fnmatch(3)
+        : '^'
+    }
+  ],
 
+  // two globstars
+  [
+    // Use lookahead assertions so that we could match more than one `'/**'`
+    /\\\/\\\*\\\*(?=\\\/|$)/g,
 
-/***/ }),
-/* 348 */
-/***/ (function(module, exports, __webpack_require__) {
+    // Zero, one or several directories
+    // should not use '*', or it will be replaced by the next replacer
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs = __webpack_require__(133);
-exports.FILE_SYSTEM_ADAPTER = {
-    lstat: fs.lstat,
-    stat: fs.stat,
-    lstatSync: fs.lstatSync,
-    statSync: fs.statSync,
-    readdir: fs.readdir,
-    readdirSync: fs.readdirSync
-};
-function createFileSystemAdapter(fsMethods) {
-    if (fsMethods === undefined) {
-        return exports.FILE_SYSTEM_ADAPTER;
-    }
-    return Object.assign(Object.assign({}, exports.FILE_SYSTEM_ADAPTER), fsMethods);
-}
-exports.createFileSystemAdapter = createFileSystemAdapter;
+    // Check if it is not the last `'/**'`
+    (_, index, str) => index + 6 < str.length
 
+      // case: /**/
+      // > A slash followed by two consecutive asterisks then a slash matches
+      // >   zero or more directories.
+      // > For example, "a/**/b" matches "a/b", "a/x/b", "a/x/y/b" and so on.
+      // '/**/'
+      ? '(?:\\/[^\\/]+)*'
 
-/***/ }),
-/* 349 */
-/***/ (function(module, exports, __webpack_require__) {
+      // case: /**
+      // > A trailing `"/**"` matches everything inside.
 
-"use strict";
+      // #21: everything inside but it should not include the current folder
+      : '\\/.+'
+  ],
 
+  // intermediate wildcards
+  [
+    // Never replace escaped '*'
+    // ignore rule '\*' will match the path '*'
 
-var reusify = __webpack_require__(350)
+    // 'abc.*/' -> go
+    // 'abc.*'  -> skip this rule
+    /(^|[^\\]+)\\\*(?=.+)/g,
 
-function fastqueue (context, worker, concurrency) {
-  if (typeof context === 'function') {
-    concurrency = worker
-    worker = context
-    context = null
-  }
+    // '*.js' matches '.js'
+    // '*.js' doesn't match 'abc'
+    (_, p1) => `${p1}[^\\/]*`
+  ],
 
-  var cache = reusify(Task)
-  var queueHead = null
-  var queueTail = null
-  var _running = 0
+  [
+    // unescape, revert step 3 except for back slash
+    // For example, if a user escape a '\\*',
+    // after step 3, the result will be '\\\\\\*'
+    /\\\\\\(?=[$.|*+(){^])/g,
+    () => ESCAPE
+  ],
 
-  var self = {
-    push: push,
-    drain: noop,
-    saturated: noop,
-    pause: pause,
-    paused: false,
-    concurrency: concurrency,
-    running: running,
-    resume: resume,
-    idle: idle,
-    length: length,
-    unshift: unshift,
-    empty: noop,
-    kill: kill,
-    killAndDrain: killAndDrain
+  [
+    // '\\\\' -> '\\'
+    /\\\\/g,
+    () => ESCAPE
+  ],
+
+  [
+    // > The range notation, e.g. [a-zA-Z],
+    // > can be used to match one of the characters in a range.
+
+    // `\` is escaped by step 3
+    /(\\)?\[([^\]/]*?)(\\*)($|\])/g,
+    (match, leadEscape, range, endEscape, close) => leadEscape === ESCAPE
+      // '\\[bar]' -> '\\\\[bar\\]'
+      ? `\\[${range}${cleanRangeBackSlash(endEscape)}${close}`
+      : close === ']'
+        ? endEscape.length % 2 === 0
+          // A normal case, and it is a range notation
+          // '[bar]'
+          // '[bar\\\\]'
+          ? `[${sanitizeRange(range)}${endEscape}]`
+          // Invalid range notaton
+          // '[bar\\]' -> '[bar\\\\]'
+          : '[]'
+        : '[]'
+  ],
+
+  // ending
+  [
+    // 'js' will not match 'js.'
+    // 'ab' will not match 'abc'
+    /(?:[^*])$/,
+
+    // WTF!
+    // https://git-scm.com/docs/gitignore
+    // changes in [2.22.1](https://git-scm.com/docs/gitignore/2.22.1)
+    // which re-fixes #24, #38
+
+    // > If there is a separator at the end of the pattern then the pattern
+    // > will only match directories, otherwise the pattern can match both
+    // > files and directories.
+
+    // 'js*' will not match 'a.js'
+    // 'js/' will not match 'a.js'
+    // 'js' will match 'a.js' and 'a.js/'
+    match => /\/$/.test(match)
+      // foo/ will not match 'foo'
+      ? `${match}$`
+      // foo matches 'foo' and 'foo/'
+      : `${match}(?=$|\\/$)`
+  ],
+
+  // trailing wildcard
+  [
+    /(\^|\\\/)?\\\*$/,
+    (_, p1) => {
+      const prefix = p1
+        // '\^':
+        // '/*' does not match EMPTY
+        // '/*' does not match everything
+
+        // '\\\/':
+        // 'abc/*' does not match 'abc/'
+        ? `${p1}[^/]+`
+
+        // 'a*' matches 'a'
+        // 'a*' matches 'aa'
+        : '[^/]*'
+
+      return `${prefix}(?=$|\\/$)`
+    }
+  ],
+]
+
+// A simple cache, because an ignore rule only has only one certain meaning
+const regexCache = Object.create(null)
+
+// @param {pattern}
+const makeRegex = (pattern, negative, ignorecase) => {
+  const r = regexCache[pattern]
+  if (r) {
+    return r
   }
 
-  return self
+  // const replacers = negative
+  //   ? NEGATIVE_REPLACERS
+  //   : POSITIVE_REPLACERS
+
+  const source = REPLACERS.reduce(
+    (prev, current) => prev.replace(current[0], current[1].bind(pattern)),
+    pattern
+  )
+
+  return regexCache[pattern] = ignorecase
+    ? new RegExp(source, 'i')
+    : new RegExp(source)
+}
 
-  function running () {
-    return _running
-  }
+const isString = subject => typeof subject === 'string'
 
-  function pause () {
-    self.paused = true
-  }
+// > A blank line matches no files, so it can serve as a separator for readability.
+const checkPattern = pattern => pattern
+  && isString(pattern)
+  && !REGEX_TEST_BLANK_LINE.test(pattern)
 
-  function length () {
-    var current = queueHead
-    var counter = 0
+  // > A line starting with # serves as a comment.
+  && pattern.indexOf('#') !== 0
 
-    while (current) {
-      current = current.next
-      counter++
-    }
+const splitPattern = pattern => pattern.split(REGEX_SPLITALL_CRLF)
 
-    return counter
+class IgnoreRule {
+  constructor (
+    origin,
+    pattern,
+    negative,
+    regex
+  ) {
+    this.origin = origin
+    this.pattern = pattern
+    this.negative = negative
+    this.regex = regex
   }
+}
 
-  function resume () {
-    if (!self.paused) return
-    self.paused = false
-    for (var i = 0; i < self.concurrency; i++) {
-      _running++
-      release()
-    }
-  }
+const createRule = (pattern, ignorecase) => {
+  const origin = pattern
+  let negative = false
 
-  function idle () {
-    return _running === 0 && self.length() === 0
+  // > An optional prefix "!" which negates the pattern;
+  if (pattern.indexOf('!') === 0) {
+    negative = true
+    pattern = pattern.substr(1)
   }
 
-  function push (value, done) {
-    var current = cache.get()
-
-    current.context = context
-    current.release = release
-    current.value = value
-    current.callback = done || noop
+  pattern = pattern
+  // > Put a backslash ("\") in front of the first "!" for patterns that
+  // >   begin with a literal "!", for example, `"\!important!.txt"`.
+  .replace(REGEX_REPLACE_LEADING_EXCAPED_EXCLAMATION, '!')
+  // > Put a backslash ("\") in front of the first hash for patterns that
+  // >   begin with a hash.
+  .replace(REGEX_REPLACE_LEADING_EXCAPED_HASH, '#')
 
-    if (_running === self.concurrency || self.paused) {
-      if (queueTail) {
-        queueTail.next = current
-        queueTail = current
-      } else {
-        queueHead = current
-        queueTail = current
-        self.saturated()
-      }
-    } else {
-      _running++
-      worker.call(context, current.value, current.worked)
-    }
-  }
+  const regex = makeRegex(pattern, negative, ignorecase)
 
-  function unshift (value, done) {
-    var current = cache.get()
+  return new IgnoreRule(
+    origin,
+    pattern,
+    negative,
+    regex
+  )
+}
 
-    current.context = context
-    current.release = release
-    current.value = value
-    current.callback = done || noop
+const throwError = (message, Ctor) => {
+  throw new Ctor(message)
+}
 
-    if (_running === self.concurrency || self.paused) {
-      if (queueHead) {
-        current.next = queueHead
-        queueHead = current
-      } else {
-        queueHead = current
-        queueTail = current
-        self.saturated()
-      }
-    } else {
-      _running++
-      worker.call(context, current.value, current.worked)
-    }
+const checkPath = (path, originalPath, doThrow) => {
+  if (!isString(path)) {
+    return doThrow(
+      `path must be a string, but got \`${originalPath}\``,
+      TypeError
+    )
   }
 
-  function release (holder) {
-    if (holder) {
-      cache.release(holder)
-    }
-    var next = queueHead
-    if (next) {
-      if (!self.paused) {
-        if (queueTail === queueHead) {
-          queueTail = null
-        }
-        queueHead = next.next
-        next.next = null
-        worker.call(context, next.value, next.worked)
-        if (queueTail === null) {
-          self.empty()
-        }
-      } else {
-        _running--
-      }
-    } else if (--_running === 0) {
-      self.drain()
-    }
+  // We don't know if we should ignore EMPTY, so throw
+  if (!path) {
+    return doThrow(`path must not be empty`, TypeError)
   }
 
-  function kill () {
-    queueHead = null
-    queueTail = null
-    self.drain = noop
+  // Check if it is a relative path
+  if (checkPath.isNotRelative(path)) {
+    const r = '`path.relative()`d'
+    return doThrow(
+      `path should be a ${r} string, but got "${originalPath}"`,
+      RangeError
+    )
   }
 
-  function killAndDrain () {
-    queueHead = null
-    queueTail = null
-    self.drain()
-    self.drain = noop
-  }
+  return true
 }
 
-function noop () {}
-
-function Task () {
-  this.value = null
-  this.callback = noop
-  this.next = null
-  this.release = noop
-  this.context = null
+const isNotRelative = path => REGEX_TEST_INVALID_PATH.test(path)
 
-  var self = this
+checkPath.isNotRelative = isNotRelative
+checkPath.convert = p => p
 
-  this.worked = function worked (err, result) {
-    var callback = self.callback
-    self.value = null
-    self.callback = noop
-    callback.call(self.context, err, result)
-    self.release(self)
+class Ignore {
+  constructor ({
+    ignorecase = true
+  } = {}) {
+    this._rules = []
+    this._ignorecase = ignorecase
+    define(this, KEY_IGNORE, true)
+    this._initCache()
   }
-}
-
-module.exports = fastqueue
 
+  _initCache () {
+    this._ignoreCache = Object.create(null)
+    this._testCache = Object.create(null)
+  }
 
-/***/ }),
-/* 350 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+  _addPattern (pattern) {
+    // #32
+    if (pattern && pattern[KEY_IGNORE]) {
+      this._rules = this._rules.concat(pattern._rules)
+      this._added = true
+      return
+    }
 
+    if (checkPattern(pattern)) {
+      const rule = createRule(pattern, this._ignorecase)
+      this._added = true
+      this._rules.push(rule)
+    }
+  }
 
-function reusify (Constructor) {
-  var head = new Constructor()
-  var tail = head
+  // @param {Array<string> | string | Ignore} pattern
+  add (pattern) {
+    this._added = false
 
-  function get () {
-    var current = head
+    makeArray(
+      isString(pattern)
+        ? splitPattern(pattern)
+        : pattern
+    ).forEach(this._addPattern, this)
 
-    if (current.next) {
-      head = current.next
-    } else {
-      head = new Constructor()
-      tail = head
+    // Some rules have just added to the ignore,
+    // making the behavior changed.
+    if (this._added) {
+      this._initCache()
     }
 
-    current.next = null
-
-    return current
+    return this
   }
 
-  function release (obj) {
-    tail.next = obj
-    tail = obj
+  // legacy
+  addPattern (pattern) {
+    return this.add(pattern)
   }
 
-  return {
-    get: get,
-    release: release
-  }
-}
+  //          |           ignored : unignored
+  // negative |   0:0   |   0:1   |   1:0   |   1:1
+  // -------- | ------- | ------- | ------- | --------
+  //     0    |  TEST   |  TEST   |  SKIP   |    X
+  //     1    |  TESTIF |  SKIP   |  TEST   |    X
 
-module.exports = reusify
+  // - SKIP: always skip
+  // - TEST: always test
+  // - TESTIF: only test if checkUnignored
+  // - X: that never happen
 
+  // @param {boolean} whether should check if the path is unignored,
+  //   setting `checkUnignored` to `false` could reduce additional
+  //   path matching.
 
-/***/ }),
-/* 351 */
-/***/ (function(module, exports, __webpack_require__) {
+  // @returns {TestResult} true if a file is ignored
+  _testOne (path, checkUnignored) {
+    let ignored = false
+    let unignored = false
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-function isFatalError(settings, error) {
-    if (settings.errorFilter === null) {
-        return true;
-    }
-    return !settings.errorFilter(error);
-}
-exports.isFatalError = isFatalError;
-function isAppliedFilter(filter, value) {
-    return filter === null || filter(value);
-}
-exports.isAppliedFilter = isAppliedFilter;
-function replacePathSegmentSeparator(filepath, separator) {
-    return filepath.split(/[\\/]/).join(separator);
-}
-exports.replacePathSegmentSeparator = replacePathSegmentSeparator;
-function joinPathSegments(a, b, separator) {
-    if (a === '') {
-        return b;
-    }
-    return a + separator + b;
-}
-exports.joinPathSegments = joinPathSegments;
+    this._rules.forEach(rule => {
+      const {negative} = rule
+      if (
+        unignored === negative && ignored !== unignored
+        || negative && !ignored && !unignored && !checkUnignored
+      ) {
+        return
+      }
 
+      const matched = rule.regex.test(path)
 
-/***/ }),
-/* 352 */
-/***/ (function(module, exports, __webpack_require__) {
+      if (matched) {
+        ignored = !negative
+        unignored = negative
+      }
+    })
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const common = __webpack_require__(351);
-class Reader {
-    constructor(_root, _settings) {
-        this._root = _root;
-        this._settings = _settings;
-        this._root = common.replacePathSegmentSeparator(_root, _settings.pathSegmentSeparator);
-    }
-}
-exports.default = Reader;
+    return {
+      ignored,
+      unignored
+    }
+  }
 
+  // @returns {TestResult}
+  _test (originalPath, cache, checkUnignored, slices) {
+    const path = originalPath
+      // Supports nullable path
+      && checkPath.convert(originalPath)
 
-/***/ }),
-/* 353 */
-/***/ (function(module, exports, __webpack_require__) {
+    checkPath(path, originalPath, throwError)
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const stream_1 = __webpack_require__(137);
-const async_1 = __webpack_require__(339);
-class StreamProvider {
-    constructor(_root, _settings) {
-        this._root = _root;
-        this._settings = _settings;
-        this._reader = new async_1.default(this._root, this._settings);
-        this._stream = new stream_1.Readable({
-            objectMode: true,
-            read: () => { },
-            destroy: this._reader.destroy.bind(this._reader)
-        });
-    }
-    read() {
-        this._reader.onError((error) => {
-            this._stream.emit('error', error);
-        });
-        this._reader.onEntry((entry) => {
-            this._stream.push(entry);
-        });
-        this._reader.onEnd(() => {
-            this._stream.push(null);
-        });
-        this._reader.read();
-        return this._stream;
-    }
-}
-exports.default = StreamProvider;
+    return this._t(path, cache, checkUnignored, slices)
+  }
 
+  _t (path, cache, checkUnignored, slices) {
+    if (path in cache) {
+      return cache[path]
+    }
 
-/***/ }),
-/* 354 */
-/***/ (function(module, exports, __webpack_require__) {
+    if (!slices) {
+      // path/to/a.js
+      // ['path', 'to', 'a.js']
+      slices = path.split(SLASH)
+    }
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const sync_1 = __webpack_require__(355);
-class SyncProvider {
-    constructor(_root, _settings) {
-        this._root = _root;
-        this._settings = _settings;
-        this._reader = new sync_1.default(this._root, this._settings);
-    }
-    read() {
-        return this._reader.read();
-    }
-}
-exports.default = SyncProvider;
+    slices.pop()
 
+    // If the path has no parent directory, just test it
+    if (!slices.length) {
+      return cache[path] = this._testOne(path, checkUnignored)
+    }
 
-/***/ }),
-/* 355 */
-/***/ (function(module, exports, __webpack_require__) {
+    const parent = this._t(
+      slices.join(SLASH) + SLASH,
+      cache,
+      checkUnignored,
+      slices
+    )
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const fsScandir = __webpack_require__(340);
-const common = __webpack_require__(351);
-const reader_1 = __webpack_require__(352);
-class SyncReader extends reader_1.default {
-    constructor() {
-        super(...arguments);
-        this._scandir = fsScandir.scandirSync;
-        this._storage = new Set();
-        this._queue = new Set();
-    }
-    read() {
-        this._pushToQueue(this._root, this._settings.basePath);
-        this._handleQueue();
-        return [...this._storage];
-    }
-    _pushToQueue(directory, base) {
-        this._queue.add({ directory, base });
-    }
-    _handleQueue() {
-        for (const item of this._queue.values()) {
-            this._handleDirectory(item.directory, item.base);
-        }
-    }
-    _handleDirectory(directory, base) {
-        try {
-            const entries = this._scandir(directory, this._settings.fsScandirSettings);
-            for (const entry of entries) {
-                this._handleEntry(entry, base);
-            }
-        }
-        catch (error) {
-            this._handleError(error);
-        }
-    }
-    _handleError(error) {
-        if (!common.isFatalError(this._settings, error)) {
-            return;
-        }
-        throw error;
-    }
-    _handleEntry(entry, base) {
-        const fullpath = entry.path;
-        if (base !== undefined) {
-            entry.path = common.joinPathSegments(base, entry.name, this._settings.pathSegmentSeparator);
-        }
-        if (common.isAppliedFilter(this._settings.entryFilter, entry)) {
-            this._pushToStorage(entry);
-        }
-        if (entry.dirent.isDirectory() && common.isAppliedFilter(this._settings.deepFilter, entry)) {
-            this._pushToQueue(fullpath, entry.path);
-        }
-    }
-    _pushToStorage(entry) {
-        this._storage.add(entry);
-    }
-}
-exports.default = SyncReader;
+    // If the path contains a parent directory, check the parent first
+    return cache[path] = parent.ignored
+      // > It is not possible to re-include a file if a parent directory of
+      // >   that file is excluded.
+      ? parent
+      : this._testOne(path, checkUnignored)
+  }
 
+  ignores (path) {
+    return this._test(path, this._ignoreCache, false).ignored
+  }
 
-/***/ }),
-/* 356 */
-/***/ (function(module, exports, __webpack_require__) {
+  createFilter () {
+    return path => !this.ignores(path)
+  }
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = __webpack_require__(4);
-const fsScandir = __webpack_require__(340);
-class Settings {
-    constructor(_options = {}) {
-        this._options = _options;
-        this.basePath = this._getValue(this._options.basePath, undefined);
-        this.concurrency = this._getValue(this._options.concurrency, Infinity);
-        this.deepFilter = this._getValue(this._options.deepFilter, null);
-        this.entryFilter = this._getValue(this._options.entryFilter, null);
-        this.errorFilter = this._getValue(this._options.errorFilter, null);
-        this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path.sep);
-        this.fsScandirSettings = new fsScandir.Settings({
-            followSymbolicLinks: this._options.followSymbolicLinks,
-            fs: this._options.fs,
-            pathSegmentSeparator: this._options.pathSegmentSeparator,
-            stats: this._options.stats,
-            throwErrorOnBrokenSymbolicLink: this._options.throwErrorOnBrokenSymbolicLink
-        });
-    }
-    _getValue(option, value) {
-        return option === undefined ? value : option;
-    }
-}
-exports.default = Settings;
+  filter (paths) {
+    return makeArray(paths).filter(this.createFilter())
+  }
+
+  // @returns {TestResult}
+  test (path) {
+    return this._test(path, this._testCache, true)
+  }
+}
 
+const factory = options => new Ignore(options)
 
-/***/ }),
-/* 357 */
-/***/ (function(module, exports, __webpack_require__) {
+const returnFalse = () => false
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = __webpack_require__(4);
-const fsStat = __webpack_require__(332);
-const utils = __webpack_require__(302);
-class Reader {
-    constructor(_settings) {
-        this._settings = _settings;
-        this._fsStatSettings = new fsStat.Settings({
-            followSymbolicLink: this._settings.followSymbolicLinks,
-            fs: this._settings.fs,
-            throwErrorOnBrokenSymbolicLink: this._settings.followSymbolicLinks
-        });
-    }
-    _getFullEntryPath(filepath) {
-        return path.resolve(this._settings.cwd, filepath);
-    }
-    _makeEntry(stats, pattern) {
-        const entry = {
-            name: pattern,
-            path: pattern,
-            dirent: utils.fs.createDirentFromStats(pattern, stats)
-        };
-        if (this._settings.stats) {
-            entry.stats = stats;
-        }
-        return entry;
-    }
-    _isFatalError(error) {
-        return !utils.errno.isEnoentCodeError(error) && !this._settings.suppressErrors;
-    }
-}
-exports.default = Reader;
+const isPathValid = path =>
+  checkPath(path && checkPath.convert(path), path, returnFalse)
 
+factory.isPathValid = isPathValid
 
-/***/ }),
-/* 358 */
-/***/ (function(module, exports, __webpack_require__) {
+// Fixes typescript
+factory.default = factory
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = __webpack_require__(4);
-const deep_1 = __webpack_require__(359);
-const entry_1 = __webpack_require__(362);
-const error_1 = __webpack_require__(363);
-const entry_2 = __webpack_require__(364);
-class Provider {
-    constructor(_settings) {
-        this._settings = _settings;
-        this.errorFilter = new error_1.default(this._settings);
-        this.entryFilter = new entry_1.default(this._settings, this._getMicromatchOptions());
-        this.deepFilter = new deep_1.default(this._settings, this._getMicromatchOptions());
-        this.entryTransformer = new entry_2.default(this._settings);
-    }
-    _getRootDirectory(task) {
-        return path.resolve(this._settings.cwd, task.base);
-    }
-    _getReaderOptions(task) {
-        const basePath = task.base === '.' ? '' : task.base;
-        return {
-            basePath,
-            pathSegmentSeparator: '/',
-            concurrency: this._settings.concurrency,
-            deepFilter: this.deepFilter.getFilter(basePath, task.positive, task.negative),
-            entryFilter: this.entryFilter.getFilter(task.positive, task.negative),
-            errorFilter: this.errorFilter.getFilter(),
-            followSymbolicLinks: this._settings.followSymbolicLinks,
-            fs: this._settings.fs,
-            stats: this._settings.stats,
-            throwErrorOnBrokenSymbolicLink: this._settings.throwErrorOnBrokenSymbolicLink,
-            transform: this.entryTransformer.getTransformer()
-        };
-    }
-    _getMicromatchOptions() {
-        return {
-            dot: this._settings.dot,
-            matchBase: this._settings.baseNameMatch,
-            nobrace: !this._settings.braceExpansion,
-            nocase: !this._settings.caseSensitiveMatch,
-            noext: !this._settings.extglob,
-            noglobstar: !this._settings.globstar,
-            posix: true,
-            strictSlashes: false
-        };
-    }
-}
-exports.default = Provider;
+module.exports = factory
 
+// Windows
+// --------------------------------------------------------------
+/* istanbul ignore if  */
+if (
+  // Detect `process` so that it can run in browsers.
+  typeof process !== 'undefined'
+  && (
+    process.env && process.env.IGNORE_TEST_WIN32
+    || process.platform === 'win32'
+  )
+) {
+  /* eslint no-control-regex: "off" */
+  const makePosix = str => /^\\\\\?\\/.test(str)
+  || /["<>|\u0000-\u001F]+/u.test(str)
+    ? str
+    : str.replace(/\\/g, '/')
 
-/***/ }),
-/* 359 */
-/***/ (function(module, exports, __webpack_require__) {
+  checkPath.convert = makePosix
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(302);
-const partial_1 = __webpack_require__(360);
-class DeepFilter {
-    constructor(_settings, _micromatchOptions) {
-        this._settings = _settings;
-        this._micromatchOptions = _micromatchOptions;
-    }
-    getFilter(basePath, positive, negative) {
-        const matcher = this._getMatcher(positive);
-        const negativeRe = this._getNegativePatternsRe(negative);
-        return (entry) => this._filter(basePath, entry, matcher, negativeRe);
-    }
-    _getMatcher(patterns) {
-        return new partial_1.default(patterns, this._settings, this._micromatchOptions);
-    }
-    _getNegativePatternsRe(patterns) {
-        const affectDepthOfReadingPatterns = patterns.filter(utils.pattern.isAffectDepthOfReadingPattern);
-        return utils.pattern.convertPatternsToRe(affectDepthOfReadingPatterns, this._micromatchOptions);
-    }
-    _filter(basePath, entry, matcher, negativeRe) {
-        const depth = this._getEntryLevel(basePath, entry.path);
-        if (this._isSkippedByDeep(depth)) {
-            return false;
-        }
-        if (this._isSkippedSymbolicLink(entry)) {
-            return false;
-        }
-        const filepath = utils.path.removeLeadingDotSegment(entry.path);
-        if (this._isSkippedByPositivePatterns(filepath, matcher)) {
-            return false;
-        }
-        return this._isSkippedByNegativePatterns(filepath, negativeRe);
-    }
-    _isSkippedByDeep(entryDepth) {
-        return entryDepth >= this._settings.deep;
-    }
-    _isSkippedSymbolicLink(entry) {
-        return !this._settings.followSymbolicLinks && entry.dirent.isSymbolicLink();
-    }
-    _getEntryLevel(basePath, entryPath) {
-        const basePathDepth = basePath.split('/').length;
-        const entryPathDepth = entryPath.split('/').length;
-        return entryPathDepth - (basePath === '' ? 0 : basePathDepth);
-    }
-    _isSkippedByPositivePatterns(entryPath, matcher) {
-        return !this._settings.baseNameMatch && !matcher.match(entryPath);
-    }
-    _isSkippedByNegativePatterns(entryPath, negativeRe) {
-        return !utils.pattern.matchAny(entryPath, negativeRe);
-    }
-}
-exports.default = DeepFilter;
+  // 'C:\\foo'     <- 'C:\\foo' has been converted to 'C:/'
+  // 'd:\\foo'
+  const REGIX_IS_WINDOWS_PATH_ABSOLUTE = /^[a-z]:\//i
+  checkPath.isNotRelative = path =>
+    REGIX_IS_WINDOWS_PATH_ABSOLUTE.test(path)
+    || isNotRelative(path)
+}
 
 
 /***/ }),
-/* 360 */
+/* 365 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const matcher_1 = __webpack_require__(361);
-class PartialMatcher extends matcher_1.default {
-    match(filepath) {
-        const parts = filepath.split('/');
-        const levels = parts.length;
-        const patterns = this._storage.filter((info) => !info.complete || info.segments.length > levels);
-        for (const pattern of patterns) {
-            const section = pattern.sections[0];
-            /**
-             * In this case, the pattern has a globstar and we must read all directories unconditionally,
-             * but only if the level has reached the end of the first group.
-             *
-             * fixtures/{a,b}/**
-             *  ^ true/false  ^ always true
-            */
-            if (!pattern.complete && levels > section.length) {
-                return true;
-            }
-            const match = parts.every((part, index) => {
-                const segment = pattern.segments[index];
-                if (segment.dynamic && segment.patternRe.test(part)) {
-                    return true;
-                }
-                if (!segment.dynamic && segment.pattern === part) {
-                    return true;
-                }
-                return false;
-            });
-            if (match) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
-exports.default = PartialMatcher;
 
+module.exports = path => {
+	const isExtendedLengthPath = /^\\\\\?\\/.test(path);
+	const hasNonAscii = /[^\u0000-\u0080]+/.test(path); // eslint-disable-line no-control-regex
 
-/***/ }),
-/* 361 */
-/***/ (function(module, exports, __webpack_require__) {
+	if (isExtendedLengthPath || hasNonAscii) {
+		return path;
+	}
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(302);
-class Matcher {
-    constructor(_patterns, _settings, _micromatchOptions) {
-        this._patterns = _patterns;
-        this._settings = _settings;
-        this._micromatchOptions = _micromatchOptions;
-        this._storage = [];
-        this._fillStorage();
-    }
-    _fillStorage() {
-        /**
-         * The original pattern may include `{,*,**,a/*}`, which will lead to problems with matching (unresolved level).
-         * So, before expand patterns with brace expansion into separated patterns.
-         */
-        const patterns = utils.pattern.expandPatternsWithBraceExpansion(this._patterns);
-        for (const pattern of patterns) {
-            const segments = this._getPatternSegments(pattern);
-            const sections = this._splitSegmentsIntoSections(segments);
-            this._storage.push({
-                complete: sections.length <= 1,
-                pattern,
-                segments,
-                sections
-            });
-        }
-    }
-    _getPatternSegments(pattern) {
-        const parts = utils.pattern.getPatternParts(pattern, this._micromatchOptions);
-        return parts.map((part) => {
-            const dynamic = utils.pattern.isDynamicPattern(part, this._settings);
-            if (!dynamic) {
-                return {
-                    dynamic: false,
-                    pattern: part
-                };
-            }
-            return {
-                dynamic: true,
-                pattern: part,
-                patternRe: utils.pattern.makeRe(part, this._micromatchOptions)
-            };
-        });
-    }
-    _splitSegmentsIntoSections(segments) {
-        return utils.array.splitWhen(segments, (segment) => segment.dynamic && utils.pattern.hasGlobStar(segment.pattern));
-    }
-}
-exports.default = Matcher;
+	return path.replace(/\\/g, '/');
+};
 
 
 /***/ }),
-/* 362 */
+/* 366 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(302);
-class EntryFilter {
-    constructor(_settings, _micromatchOptions) {
-        this._settings = _settings;
-        this._micromatchOptions = _micromatchOptions;
-        this.index = new Map();
-    }
-    getFilter(positive, negative) {
-        const positiveRe = utils.pattern.convertPatternsToRe(positive, this._micromatchOptions);
-        const negativeRe = utils.pattern.convertPatternsToRe(negative, this._micromatchOptions);
-        return (entry) => this._filter(entry, positiveRe, negativeRe);
-    }
-    _filter(entry, positiveRe, negativeRe) {
-        if (this._settings.unique) {
-            if (this._isDuplicateEntry(entry)) {
-                return false;
-            }
-            this._createIndexRecord(entry);
-        }
-        if (this._onlyFileFilter(entry) || this._onlyDirectoryFilter(entry)) {
-            return false;
-        }
-        if (this._isSkippedByAbsoluteNegativePatterns(entry, negativeRe)) {
-            return false;
-        }
-        const filepath = this._settings.baseNameMatch ? entry.name : entry.path;
-        return this._isMatchToPatterns(filepath, positiveRe) && !this._isMatchToPatterns(entry.path, negativeRe);
-    }
-    _isDuplicateEntry(entry) {
-        return this.index.has(entry.path);
-    }
-    _createIndexRecord(entry) {
-        this.index.set(entry.path, undefined);
-    }
-    _onlyFileFilter(entry) {
-        return this._settings.onlyFiles && !entry.dirent.isFile();
-    }
-    _onlyDirectoryFilter(entry) {
-        return this._settings.onlyDirectories && !entry.dirent.isDirectory();
-    }
-    _isSkippedByAbsoluteNegativePatterns(entry, negativeRe) {
-        if (!this._settings.absolute) {
-            return false;
-        }
-        const fullpath = utils.path.makeAbsolute(this._settings.cwd, entry.path);
-        return this._isMatchToPatterns(fullpath, negativeRe);
-    }
-    _isMatchToPatterns(entryPath, patternsRe) {
-        const filepath = utils.path.removeLeadingDotSegment(entryPath);
-        return utils.pattern.matchAny(filepath, patternsRe);
-    }
-}
-exports.default = EntryFilter;
 
+const {Transform} = __webpack_require__(137);
 
-/***/ }),
-/* 363 */
-/***/ (function(module, exports, __webpack_require__) {
+class ObjectTransform extends Transform {
+	constructor() {
+		super({
+			objectMode: true
+		});
+	}
+}
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(302);
-class ErrorFilter {
-    constructor(_settings) {
-        this._settings = _settings;
-    }
-    getFilter() {
-        return (error) => this._isNonFatalError(error);
-    }
-    _isNonFatalError(error) {
-        return utils.errno.isEnoentCodeError(error) || this._settings.suppressErrors;
-    }
-}
-exports.default = ErrorFilter;
+class FilterStream extends ObjectTransform {
+	constructor(filter) {
+		super();
+		this._filter = filter;
+	}
 
+	_transform(data, encoding, callback) {
+		if (this._filter(data)) {
+			this.push(data);
+		}
 
-/***/ }),
-/* 364 */
-/***/ (function(module, exports, __webpack_require__) {
+		callback();
+	}
+}
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(302);
-class EntryTransformer {
-    constructor(_settings) {
-        this._settings = _settings;
-    }
-    getTransformer() {
-        return (entry) => this._transform(entry);
-    }
-    _transform(entry) {
-        let filepath = entry.path;
-        if (this._settings.absolute) {
-            filepath = utils.path.makeAbsolute(this._settings.cwd, filepath);
-            filepath = utils.path.unixify(filepath);
-        }
-        if (this._settings.markDirectories && entry.dirent.isDirectory()) {
-            filepath += '/';
-        }
-        if (!this._settings.objectMode) {
-            return filepath;
-        }
-        return Object.assign(Object.assign({}, entry), { path: filepath });
-    }
-}
-exports.default = EntryTransformer;
+class UniqueStream extends ObjectTransform {
+	constructor() {
+		super();
+		this._pushed = new Set();
+	}
 
+	_transform(data, encoding, callback) {
+		if (!this._pushed.has(data)) {
+			this.push(data);
+			this._pushed.add(data);
+		}
 
-/***/ }),
-/* 365 */
-/***/ (function(module, exports, __webpack_require__) {
+		callback();
+	}
+}
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const stream_1 = __webpack_require__(137);
-const stream_2 = __webpack_require__(331);
-const provider_1 = __webpack_require__(358);
-class ProviderStream extends provider_1.default {
-    constructor() {
-        super(...arguments);
-        this._reader = new stream_2.default(this._settings);
-    }
-    read(task) {
-        const root = this._getRootDirectory(task);
-        const options = this._getReaderOptions(task);
-        const source = this.api(root, task, options);
-        const destination = new stream_1.Readable({ objectMode: true, read: () => { } });
-        source
-            .once('error', (error) => destination.emit('error', error))
-            .on('data', (entry) => destination.emit('data', options.transform(entry)))
-            .once('end', () => destination.emit('end'));
-        destination
-            .once('close', () => source.destroy());
-        return destination;
-    }
-    api(root, task, options) {
-        if (task.dynamic) {
-            return this._reader.dynamic(root, options);
-        }
-        return this._reader.static(task.patterns, options);
-    }
-}
-exports.default = ProviderStream;
+module.exports = {
+	FilterStream,
+	UniqueStream
+};
 
 
 /***/ }),
-/* 366 */
+/* 367 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const sync_1 = __webpack_require__(367);
-const provider_1 = __webpack_require__(358);
-class ProviderSync extends provider_1.default {
-    constructor() {
-        super(...arguments);
-        this._reader = new sync_1.default(this._settings);
-    }
-    read(task) {
-        const root = this._getRootDirectory(task);
-        const options = this._getReaderOptions(task);
-        const entries = this.api(root, task, options);
-        return entries.map(options.transform);
-    }
-    api(root, task, options) {
-        if (task.dynamic) {
-            return this._reader.dynamic(root, options);
-        }
-        return this._reader.static(task.patterns, options);
-    }
-}
-exports.default = ProviderSync;
+/*!
+ * is-glob <https://github.com/jonschlinkert/is-glob>
+ *
+ * Copyright (c) 2014-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
+
+var isExtglob = __webpack_require__(302);
+var chars = { '{': '}', '(': ')', '[': ']'};
+var strictRegex = /\\(.)|(^!|\*|[\].+)]\?|\[[^\\\]]+\]|\{[^\\}]+\}|\(\?[:!=][^\\)]+\)|\([^|]+\|[^\\)]+\))/;
+var relaxedRegex = /\\(.)|(^!|[*?{}()[\]]|\(\?)/;
+
+module.exports = function isGlob(str, options) {
+  if (typeof str !== 'string' || str === '') {
+    return false;
+  }
+
+  if (isExtglob(str)) {
+    return true;
+  }
+
+  var regex = strictRegex;
+  var match;
+
+  // optionally relax regex
+  if (options && options.strict === false) {
+    regex = relaxedRegex;
+  }
+
+  while ((match = regex.exec(str))) {
+    if (match[2]) return true;
+    var idx = match.index + match[0].length;
+
+    // if an open bracket/brace/paren is escaped,
+    // set the index to the next closing character
+    var open = match[1];
+    var close = open ? chars[open] : null;
+    if (open && close) {
+      var n = str.indexOf(close, idx);
+      if (n !== -1) {
+        idx = n + 1;
+      }
+    }
+
+    str = str.slice(idx);
+  }
+  return false;
+};
 
 
 /***/ }),
-/* 367 */
+/* 368 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const fsStat = __webpack_require__(332);
-const fsWalk = __webpack_require__(337);
-const reader_1 = __webpack_require__(357);
-class ReaderSync extends reader_1.default {
-    constructor() {
-        super(...arguments);
-        this._walkSync = fsWalk.walkSync;
-        this._statSync = fsStat.statSync;
-    }
-    dynamic(root, options) {
-        return this._walkSync(root, options);
-    }
-    static(patterns, options) {
-        const entries = [];
-        for (const pattern of patterns) {
-            const filepath = this._getFullEntryPath(pattern);
-            const entry = this._getEntry(filepath, pattern, options);
-            if (entry === null || !options.entryFilter(entry)) {
-                continue;
-            }
-            entries.push(entry);
-        }
-        return entries;
-    }
-    _getEntry(filepath, pattern, options) {
-        try {
-            const stats = this._getStat(filepath);
-            return this._makeEntry(stats, pattern);
-        }
-        catch (error) {
-            if (options.errorFilter(error)) {
-                return null;
-            }
-            throw error;
-        }
-    }
-    _getStat(filepath) {
-        return this._statSync(filepath, this._fsStatSettings);
-    }
-}
-exports.default = ReaderSync;
 
+const path = __webpack_require__(4);
 
-/***/ }),
-/* 368 */
-/***/ (function(module, exports, __webpack_require__) {
+module.exports = path_ => {
+	let cwd = process.cwd();
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs = __webpack_require__(133);
-const os = __webpack_require__(120);
-const CPU_COUNT = os.cpus().length;
-exports.DEFAULT_FILE_SYSTEM_ADAPTER = {
-    lstat: fs.lstat,
-    lstatSync: fs.lstatSync,
-    stat: fs.stat,
-    statSync: fs.statSync,
-    readdir: fs.readdir,
-    readdirSync: fs.readdirSync
-};
-class Settings {
-    constructor(_options = {}) {
-        this._options = _options;
-        this.absolute = this._getValue(this._options.absolute, false);
-        this.baseNameMatch = this._getValue(this._options.baseNameMatch, false);
-        this.braceExpansion = this._getValue(this._options.braceExpansion, true);
-        this.caseSensitiveMatch = this._getValue(this._options.caseSensitiveMatch, true);
-        this.concurrency = this._getValue(this._options.concurrency, CPU_COUNT);
-        this.cwd = this._getValue(this._options.cwd, process.cwd());
-        this.deep = this._getValue(this._options.deep, Infinity);
-        this.dot = this._getValue(this._options.dot, false);
-        this.extglob = this._getValue(this._options.extglob, true);
-        this.followSymbolicLinks = this._getValue(this._options.followSymbolicLinks, true);
-        this.fs = this._getFileSystemMethods(this._options.fs);
-        this.globstar = this._getValue(this._options.globstar, true);
-        this.ignore = this._getValue(this._options.ignore, []);
-        this.markDirectories = this._getValue(this._options.markDirectories, false);
-        this.objectMode = this._getValue(this._options.objectMode, false);
-        this.onlyDirectories = this._getValue(this._options.onlyDirectories, false);
-        this.onlyFiles = this._getValue(this._options.onlyFiles, true);
-        this.stats = this._getValue(this._options.stats, false);
-        this.suppressErrors = this._getValue(this._options.suppressErrors, false);
-        this.throwErrorOnBrokenSymbolicLink = this._getValue(this._options.throwErrorOnBrokenSymbolicLink, false);
-        this.unique = this._getValue(this._options.unique, true);
-        if (this.onlyDirectories) {
-            this.onlyFiles = false;
-        }
-        if (this.stats) {
-            this.objectMode = true;
-        }
-    }
-    _getValue(option, value) {
-        return option === undefined ? value : option;
-    }
-    _getFileSystemMethods(methods = {}) {
-        return Object.assign(Object.assign({}, exports.DEFAULT_FILE_SYSTEM_ADAPTER), methods);
-    }
-}
-exports.default = Settings;
+	path_ = path.resolve(path_);
+
+	if (process.platform === 'win32') {
+		cwd = cwd.toLowerCase();
+		path_ = path_.toLowerCase();
+	}
+
+	return path_ === cwd;
+};
 
 
 /***/ }),
@@ -48016,129 +47504,391 @@ exports.default = Settings;
 "use strict";
 
 const path = __webpack_require__(4);
-const pathType = __webpack_require__(370);
 
-const getExtensions = extensions => extensions.length > 1 ? `{${extensions.join(',')}}` : extensions[0];
+module.exports = (childPath, parentPath) => {
+	childPath = path.resolve(childPath);
+	parentPath = path.resolve(parentPath);
 
-const getPath = (filepath, cwd) => {
-	const pth = filepath[0] === '!' ? filepath.slice(1) : filepath;
-	return path.isAbsolute(pth) ? pth : path.join(cwd, pth);
-};
+	if (process.platform === 'win32') {
+		childPath = childPath.toLowerCase();
+		parentPath = parentPath.toLowerCase();
+	}
 
-const addExtensions = (file, extensions) => {
-	if (path.extname(file)) {
-		return `**/${file}`;
+	if (childPath === parentPath) {
+		return false;
 	}
 
-	return `**/${file}.${getExtensions(extensions)}`;
+	childPath += path.sep;
+	parentPath += path.sep;
+
+	return childPath.startsWith(parentPath);
 };
 
-const getGlob = (directory, options) => {
-	if (options.files && !Array.isArray(options.files)) {
-		throw new TypeError(`Expected \`files\` to be of type \`Array\` but received type \`${typeof options.files}\``);
-	}
 
-	if (options.extensions && !Array.isArray(options.extensions)) {
-		throw new TypeError(`Expected \`extensions\` to be of type \`Array\` but received type \`${typeof options.extensions}\``);
-	}
+/***/ }),
+/* 370 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	if (options.files && options.extensions) {
-		return options.files.map(x => path.posix.join(directory, addExtensions(x, options.extensions)));
-	}
+const assert = __webpack_require__(139)
+const path = __webpack_require__(4)
+const fs = __webpack_require__(133)
+let glob = undefined
+try {
+  glob = __webpack_require__(146)
+} catch (_err) {
+  // treat glob as optional.
+}
 
-	if (options.files) {
-		return options.files.map(x => path.posix.join(directory, `**/${x}`));
-	}
+const defaultGlobOpts = {
+  nosort: true,
+  silent: true
+}
 
-	if (options.extensions) {
-		return [path.posix.join(directory, `**/*.${getExtensions(options.extensions)}`)];
-	}
+// for EMFILE handling
+let timeout = 0
 
-	return [path.posix.join(directory, '**')];
-};
+const isWindows = (process.platform === "win32")
 
-module.exports = async (input, options) => {
-	options = {
-		cwd: process.cwd(),
-		...options
-	};
+const defaults = options => {
+  const methods = [
+    'unlink',
+    'chmod',
+    'stat',
+    'lstat',
+    'rmdir',
+    'readdir'
+  ]
+  methods.forEach(m => {
+    options[m] = options[m] || fs[m]
+    m = m + 'Sync'
+    options[m] = options[m] || fs[m]
+  })
 
-	if (typeof options.cwd !== 'string') {
-		throw new TypeError(`Expected \`cwd\` to be of type \`string\` but received type \`${typeof options.cwd}\``);
-	}
+  options.maxBusyTries = options.maxBusyTries || 3
+  options.emfileWait = options.emfileWait || 1000
+  if (options.glob === false) {
+    options.disableGlob = true
+  }
+  if (options.disableGlob !== true && glob === undefined) {
+    throw Error('glob dependency not found, set `options.disableGlob = true` if intentional')
+  }
+  options.disableGlob = options.disableGlob || false
+  options.glob = options.glob || defaultGlobOpts
+}
 
-	const globs = await Promise.all([].concat(input).map(async x => {
-		const isDirectory = await pathType.isDirectory(getPath(x, options.cwd));
-		return isDirectory ? getGlob(x, options) : x;
-	}));
+const rimraf = (p, options, cb) => {
+  if (typeof options === 'function') {
+    cb = options
+    options = {}
+  }
 
-	return [].concat.apply([], globs); // eslint-disable-line prefer-spread
-};
+  assert(p, 'rimraf: missing path')
+  assert.equal(typeof p, 'string', 'rimraf: path should be a string')
+  assert.equal(typeof cb, 'function', 'rimraf: callback function required')
+  assert(options, 'rimraf: invalid options argument provided')
+  assert.equal(typeof options, 'object', 'rimraf: options should be object')
 
-module.exports.sync = (input, options) => {
-	options = {
-		cwd: process.cwd(),
-		...options
-	};
+  defaults(options)
 
-	if (typeof options.cwd !== 'string') {
-		throw new TypeError(`Expected \`cwd\` to be of type \`string\` but received type \`${typeof options.cwd}\``);
-	}
+  let busyTries = 0
+  let errState = null
+  let n = 0
 
-	const globs = [].concat(input).map(x => pathType.isDirectorySync(getPath(x, options.cwd)) ? getGlob(x, options) : x);
+  const next = (er) => {
+    errState = errState || er
+    if (--n === 0)
+      cb(errState)
+  }
 
-	return [].concat.apply([], globs); // eslint-disable-line prefer-spread
-};
+  const afterGlob = (er, results) => {
+    if (er)
+      return cb(er)
 
+    n = results.length
+    if (n === 0)
+      return cb()
 
-/***/ }),
-/* 370 */
-/***/ (function(module, exports, __webpack_require__) {
+    results.forEach(p => {
+      const CB = (er) => {
+        if (er) {
+          if ((er.code === "EBUSY" || er.code === "ENOTEMPTY" || er.code === "EPERM") &&
+              busyTries < options.maxBusyTries) {
+            busyTries ++
+            // try again, with the same exact callback as this one.
+            return setTimeout(() => rimraf_(p, options, CB), busyTries * 100)
+          }
 
-"use strict";
+          // this one won't happen if graceful-fs is used.
+          if (er.code === "EMFILE" && timeout < options.emfileWait) {
+            return setTimeout(() => rimraf_(p, options, CB), timeout ++)
+          }
 
-const {promisify} = __webpack_require__(111);
-const fs = __webpack_require__(133);
+          // already gone
+          if (er.code === "ENOENT") er = null
+        }
 
-async function isType(fsStatType, statsMethodName, filePath) {
-	if (typeof filePath !== 'string') {
-		throw new TypeError(`Expected a string, got ${typeof filePath}`);
-	}
+        timeout = 0
+        next(er)
+      }
+      rimraf_(p, options, CB)
+    })
+  }
 
-	try {
-		const stats = await promisify(fs[fsStatType])(filePath);
-		return stats[statsMethodName]();
-	} catch (error) {
-		if (error.code === 'ENOENT') {
-			return false;
-		}
+  if (options.disableGlob || !glob.hasMagic(p))
+    return afterGlob(null, [p])
 
-		throw error;
-	}
+  options.lstat(p, (er, stat) => {
+    if (!er)
+      return afterGlob(null, [p])
+
+    glob(p, options.glob, afterGlob)
+  })
+
+}
+
+// Two possible strategies.
+// 1. Assume it's a file.  unlink it, then do the dir stuff on EPERM or EISDIR
+// 2. Assume it's a directory.  readdir, then do the file stuff on ENOTDIR
+//
+// Both result in an extra syscall when you guess wrong.  However, there
+// are likely far more normal files in the world than directories.  This
+// is based on the assumption that a the average number of files per
+// directory is >= 1.
+//
+// If anyone ever complains about this, then I guess the strategy could
+// be made configurable somehow.  But until then, YAGNI.
+const rimraf_ = (p, options, cb) => {
+  assert(p)
+  assert(options)
+  assert(typeof cb === 'function')
+
+  // sunos lets the root user unlink directories, which is... weird.
+  // so we have to lstat here and make sure it's not a dir.
+  options.lstat(p, (er, st) => {
+    if (er && er.code === "ENOENT")
+      return cb(null)
+
+    // Windows can EPERM on stat.  Life is suffering.
+    if (er && er.code === "EPERM" && isWindows)
+      fixWinEPERM(p, options, er, cb)
+
+    if (st && st.isDirectory())
+      return rmdir(p, options, er, cb)
+
+    options.unlink(p, er => {
+      if (er) {
+        if (er.code === "ENOENT")
+          return cb(null)
+        if (er.code === "EPERM")
+          return (isWindows)
+            ? fixWinEPERM(p, options, er, cb)
+            : rmdir(p, options, er, cb)
+        if (er.code === "EISDIR")
+          return rmdir(p, options, er, cb)
+      }
+      return cb(er)
+    })
+  })
+}
+
+const fixWinEPERM = (p, options, er, cb) => {
+  assert(p)
+  assert(options)
+  assert(typeof cb === 'function')
+
+  options.chmod(p, 0o666, er2 => {
+    if (er2)
+      cb(er2.code === "ENOENT" ? null : er)
+    else
+      options.stat(p, (er3, stats) => {
+        if (er3)
+          cb(er3.code === "ENOENT" ? null : er)
+        else if (stats.isDirectory())
+          rmdir(p, options, er, cb)
+        else
+          options.unlink(p, cb)
+      })
+  })
+}
+
+const fixWinEPERMSync = (p, options, er) => {
+  assert(p)
+  assert(options)
+
+  try {
+    options.chmodSync(p, 0o666)
+  } catch (er2) {
+    if (er2.code === "ENOENT")
+      return
+    else
+      throw er
+  }
+
+  let stats
+  try {
+    stats = options.statSync(p)
+  } catch (er3) {
+    if (er3.code === "ENOENT")
+      return
+    else
+      throw er
+  }
+
+  if (stats.isDirectory())
+    rmdirSync(p, options, er)
+  else
+    options.unlinkSync(p)
+}
+
+const rmdir = (p, options, originalEr, cb) => {
+  assert(p)
+  assert(options)
+  assert(typeof cb === 'function')
+
+  // try to rmdir first, and only readdir on ENOTEMPTY or EEXIST (SunOS)
+  // if we guessed wrong, and it's not a directory, then
+  // raise the original error.
+  options.rmdir(p, er => {
+    if (er && (er.code === "ENOTEMPTY" || er.code === "EEXIST" || er.code === "EPERM"))
+      rmkids(p, options, cb)
+    else if (er && er.code === "ENOTDIR")
+      cb(originalEr)
+    else
+      cb(er)
+  })
+}
+
+const rmkids = (p, options, cb) => {
+  assert(p)
+  assert(options)
+  assert(typeof cb === 'function')
+
+  options.readdir(p, (er, files) => {
+    if (er)
+      return cb(er)
+    let n = files.length
+    if (n === 0)
+      return options.rmdir(p, cb)
+    let errState
+    files.forEach(f => {
+      rimraf(path.join(p, f), options, er => {
+        if (errState)
+          return
+        if (er)
+          return cb(errState = er)
+        if (--n === 0)
+          options.rmdir(p, cb)
+      })
+    })
+  })
+}
+
+// this looks simpler, and is strictly *faster*, but will
+// tie up the JavaScript thread and fail on excessively
+// deep directory trees.
+const rimrafSync = (p, options) => {
+  options = options || {}
+  defaults(options)
+
+  assert(p, 'rimraf: missing path')
+  assert.equal(typeof p, 'string', 'rimraf: path should be a string')
+  assert(options, 'rimraf: missing options')
+  assert.equal(typeof options, 'object', 'rimraf: options should be object')
+
+  let results
+
+  if (options.disableGlob || !glob.hasMagic(p)) {
+    results = [p]
+  } else {
+    try {
+      options.lstatSync(p)
+      results = [p]
+    } catch (er) {
+      results = glob.sync(p, options.glob)
+    }
+  }
+
+  if (!results.length)
+    return
+
+  for (let i = 0; i < results.length; i++) {
+    const p = results[i]
+
+    let st
+    try {
+      st = options.lstatSync(p)
+    } catch (er) {
+      if (er.code === "ENOENT")
+        return
+
+      // Windows can EPERM on stat.  Life is suffering.
+      if (er.code === "EPERM" && isWindows)
+        fixWinEPERMSync(p, options, er)
+    }
+
+    try {
+      // sunos lets the root user unlink directories, which is... weird.
+      if (st && st.isDirectory())
+        rmdirSync(p, options, null)
+      else
+        options.unlinkSync(p)
+    } catch (er) {
+      if (er.code === "ENOENT")
+        return
+      if (er.code === "EPERM")
+        return isWindows ? fixWinEPERMSync(p, options, er) : rmdirSync(p, options, er)
+      if (er.code !== "EISDIR")
+        throw er
+
+      rmdirSync(p, options, er)
+    }
+  }
+}
+
+const rmdirSync = (p, options, originalEr) => {
+  assert(p)
+  assert(options)
+
+  try {
+    options.rmdirSync(p)
+  } catch (er) {
+    if (er.code === "ENOENT")
+      return
+    if (er.code === "ENOTDIR")
+      throw originalEr
+    if (er.code === "ENOTEMPTY" || er.code === "EEXIST" || er.code === "EPERM")
+      rmkidsSync(p, options)
+  }
 }
 
-function isTypeSync(fsStatType, statsMethodName, filePath) {
-	if (typeof filePath !== 'string') {
-		throw new TypeError(`Expected a string, got ${typeof filePath}`);
-	}
-
-	try {
-		return fs[fsStatType](filePath)[statsMethodName]();
-	} catch (error) {
-		if (error.code === 'ENOENT') {
-			return false;
-		}
+const rmkidsSync = (p, options) => {
+  assert(p)
+  assert(options)
+  options.readdirSync(p).forEach(f => rimrafSync(path.join(p, f), options))
 
-		throw error;
-	}
+  // We only end up here once we got ENOTEMPTY at least once, and
+  // at this point, we are guaranteed to have removed all the kids.
+  // So, we know that it won't be ENOENT or ENOTDIR or anything else.
+  // try really hard to delete stuff on windows, because it has a
+  // PROFOUNDLY annoying habit of not closing handles promptly when
+  // files are deleted, resulting in spurious ENOTEMPTY errors.
+  const retries = isWindows ? 100 : 1
+  let i = 0
+  do {
+    let threw = true
+    try {
+      const ret = options.rmdirSync(p, options)
+      threw = false
+      return ret
+    } finally {
+      if (++i < retries && threw)
+        continue
+    }
+  } while (true)
 }
 
-exports.isFile = isType.bind(null, 'stat', 'isFile');
-exports.isDirectory = isType.bind(null, 'stat', 'isDirectory');
-exports.isSymlink = isType.bind(null, 'lstat', 'isSymbolicLink');
-exports.isFileSync = isTypeSync.bind(null, 'statSync', 'isFile');
-exports.isDirectorySync = isTypeSync.bind(null, 'statSync', 'isDirectory');
-exports.isSymlinkSync = isTypeSync.bind(null, 'lstatSync', 'isSymbolicLink');
+module.exports = rimraf
+rimraf.sync = rimrafSync
 
 
 /***/ }),
@@ -48147,2064 +47897,2169 @@ exports.isSymlinkSync = isTypeSync.bind(null, 'lstatSync', 'isSymbolicLink');
 
 "use strict";
 
-const {promisify} = __webpack_require__(111);
-const fs = __webpack_require__(133);
-const path = __webpack_require__(4);
-const fastGlob = __webpack_require__(300);
-const gitIgnore = __webpack_require__(372);
-const slash = __webpack_require__(373);
-
-const DEFAULT_IGNORE = [
-	'**/node_modules/**',
-	'**/flow-typed/**',
-	'**/coverage/**',
-	'**/.git'
-];
+const AggregateError = __webpack_require__(372);
 
-const readFileP = promisify(fs.readFile);
+module.exports = async (
+	iterable,
+	mapper,
+	{
+		concurrency = Infinity,
+		stopOnError = true
+	} = {}
+) => {
+	return new Promise((resolve, reject) => {
+		if (typeof mapper !== 'function') {
+			throw new TypeError('Mapper function is required');
+		}
 
-const mapGitIgnorePatternTo = base => ignore => {
-	if (ignore.startsWith('!')) {
-		return '!' + path.posix.join(base, ignore.slice(1));
-	}
+		if (!(typeof concurrency === 'number' && concurrency >= 1)) {
+			throw new TypeError(`Expected \`concurrency\` to be a number from 1 and up, got \`${concurrency}\` (${typeof concurrency})`);
+		}
 
-	return path.posix.join(base, ignore);
-};
+		const ret = [];
+		const errors = [];
+		const iterator = iterable[Symbol.iterator]();
+		let isRejected = false;
+		let isIterableDone = false;
+		let resolvingCount = 0;
+		let currentIndex = 0;
 
-const parseGitIgnore = (content, options) => {
-	const base = slash(path.relative(options.cwd, path.dirname(options.fileName)));
+		const next = () => {
+			if (isRejected) {
+				return;
+			}
 
-	return content
-		.split(/\r?\n/)
-		.filter(Boolean)
-		.filter(line => !line.startsWith('#'))
-		.map(mapGitIgnorePatternTo(base));
-};
+			const nextItem = iterator.next();
+			const i = currentIndex;
+			currentIndex++;
 
-const reduceIgnore = files => {
-	return files.reduce((ignores, file) => {
-		ignores.add(parseGitIgnore(file.content, {
-			cwd: file.cwd,
-			fileName: file.filePath
-		}));
-		return ignores;
-	}, gitIgnore());
-};
+			if (nextItem.done) {
+				isIterableDone = true;
 
-const ensureAbsolutePathForCwd = (cwd, p) => {
-	if (path.isAbsolute(p)) {
-		if (p.startsWith(cwd)) {
-			return p;
-		}
+				if (resolvingCount === 0) {
+					if (!stopOnError && errors.length !== 0) {
+						reject(new AggregateError(errors));
+					} else {
+						resolve(ret);
+					}
+				}
 
-		throw new Error(`Path ${p} is not in cwd ${cwd}`);
-	}
+				return;
+			}
 
-	return path.join(cwd, p);
-};
+			resolvingCount++;
 
-const getIsIgnoredPredecate = (ignores, cwd) => {
-	return p => ignores.ignores(slash(path.relative(cwd, ensureAbsolutePathForCwd(cwd, p))));
-};
+			(async () => {
+				try {
+					const element = await nextItem.value;
+					ret[i] = await mapper(element, i);
+					resolvingCount--;
+					next();
+				} catch (error) {
+					if (stopOnError) {
+						isRejected = true;
+						reject(error);
+					} else {
+						errors.push(error);
+						resolvingCount--;
+						next();
+					}
+				}
+			})();
+		};
 
-const getFile = async (file, cwd) => {
-	const filePath = path.join(cwd, file);
-	const content = await readFileP(filePath, 'utf8');
+		for (let i = 0; i < concurrency; i++) {
+			next();
 
-	return {
-		cwd,
-		filePath,
-		content
-	};
+			if (isIterableDone) {
+				break;
+			}
+		}
+	});
 };
 
-const getFileSync = (file, cwd) => {
-	const filePath = path.join(cwd, file);
-	const content = fs.readFileSync(filePath, 'utf8');
-
-	return {
-		cwd,
-		filePath,
-		content
-	};
-};
 
-const normalizeOptions = ({
-	ignore = [],
-	cwd = slash(process.cwd())
-} = {}) => {
-	return {ignore, cwd};
-};
+/***/ }),
+/* 372 */
+/***/ (function(module, exports, __webpack_require__) {
 
-module.exports = async options => {
-	options = normalizeOptions(options);
+"use strict";
 
-	const paths = await fastGlob('**/.gitignore', {
-		ignore: DEFAULT_IGNORE.concat(options.ignore),
-		cwd: options.cwd
-	});
+const indentString = __webpack_require__(373);
+const cleanStack = __webpack_require__(374);
 
-	const files = await Promise.all(paths.map(file => getFile(file, options.cwd)));
-	const ignores = reduceIgnore(files);
+const cleanInternalStack = stack => stack.replace(/\s+at .*aggregate-error\/index.js:\d+:\d+\)?/g, '');
 
-	return getIsIgnoredPredecate(ignores, options.cwd);
-};
+class AggregateError extends Error {
+	constructor(errors) {
+		if (!Array.isArray(errors)) {
+			throw new TypeError(`Expected input to be an Array, got ${typeof errors}`);
+		}
 
-module.exports.sync = options => {
-	options = normalizeOptions(options);
+		errors = [...errors].map(error => {
+			if (error instanceof Error) {
+				return error;
+			}
 
-	const paths = fastGlob.sync('**/.gitignore', {
-		ignore: DEFAULT_IGNORE.concat(options.ignore),
-		cwd: options.cwd
-	});
+			if (error !== null && typeof error === 'object') {
+				// Handle plain error objects with message property and/or possibly other metadata
+				return Object.assign(new Error(error.message), error);
+			}
 
-	const files = paths.map(file => getFileSync(file, options.cwd));
-	const ignores = reduceIgnore(files);
+			return new Error(error);
+		});
 
-	return getIsIgnoredPredecate(ignores, options.cwd);
-};
+		let message = errors
+			.map(error => {
+				// The `stack` property is not standardized, so we can't assume it exists
+				return typeof error.stack === 'string' ? cleanInternalStack(cleanStack(error.stack)) : String(error);
+			})
+			.join('\n');
+		message = '\n' + indentString(message, 4);
+		super(message);
 
+		this.name = 'AggregateError';
 
-/***/ }),
-/* 372 */
-/***/ (function(module, exports) {
+		Object.defineProperty(this, '_errors', {value: errors});
+	}
 
-// A simple implementation of make-array
-function makeArray (subject) {
-  return Array.isArray(subject)
-    ? subject
-    : [subject]
+	* [Symbol.iterator]() {
+		for (const error of this._errors) {
+			yield error;
+		}
+	}
 }
 
-const EMPTY = ''
-const SPACE = ' '
-const ESCAPE = '\\'
-const REGEX_TEST_BLANK_LINE = /^\s+$/
-const REGEX_REPLACE_LEADING_EXCAPED_EXCLAMATION = /^\\!/
-const REGEX_REPLACE_LEADING_EXCAPED_HASH = /^\\#/
-const REGEX_SPLITALL_CRLF = /\r?\n/g
-// /foo,
-// ./foo,
-// ../foo,
-// .
-// ..
-const REGEX_TEST_INVALID_PATH = /^\.*\/|^\.+$/
-
-const SLASH = '/'
-const KEY_IGNORE = typeof Symbol !== 'undefined'
-  ? Symbol.for('node-ignore')
-  /* istanbul ignore next */
-  : 'node-ignore'
-
-const define = (object, key, value) =>
-  Object.defineProperty(object, key, {value})
-
-const REGEX_REGEXP_RANGE = /([0-z])-([0-z])/g
+module.exports = AggregateError;
 
-// Sanitize the range of a regular expression
-// The cases are complicated, see test cases for details
-const sanitizeRange = range => range.replace(
-  REGEX_REGEXP_RANGE,
-  (match, from, to) => from.charCodeAt(0) <= to.charCodeAt(0)
-    ? match
-    // Invalid range (out of order) which is ok for gitignore rules but
-    //   fatal for JavaScript regular expression, so eliminate it.
-    : EMPTY
-)
 
-// See fixtures #59
-const cleanRangeBackSlash = slashes => {
-  const {length} = slashes
-  return slashes.slice(0, length - length % 2)
-}
+/***/ }),
+/* 373 */
+/***/ (function(module, exports, __webpack_require__) {
 
-// > If the pattern ends with a slash,
-// > it is removed for the purpose of the following description,
-// > but it would only find a match with a directory.
-// > In other words, foo/ will match a directory foo and paths underneath it,
-// > but will not match a regular file or a symbolic link foo
-// >  (this is consistent with the way how pathspec works in general in Git).
-// '`foo/`' will not match regular file '`foo`' or symbolic link '`foo`'
-// -> ignore-rules will not deal with it, because it costs extra `fs.stat` call
-//      you could use option `mark: true` with `glob`
+"use strict";
 
-// '`foo/`' should not continue with the '`..`'
-const REPLACERS = [
 
-  // > Trailing spaces are ignored unless they are quoted with backslash ("\")
-  [
-    // (a\ ) -> (a )
-    // (a  ) -> (a)
-    // (a \ ) -> (a  )
-    /\\?\s+$/,
-    match => match.indexOf('\\') === 0
-      ? SPACE
-      : EMPTY
-  ],
+module.exports = (string, count = 1, options) => {
+	options = {
+		indent: ' ',
+		includeEmptyLines: false,
+		...options
+	};
 
-  // replace (\ ) with ' '
-  [
-    /\\\s/g,
-    () => SPACE
-  ],
+	if (typeof string !== 'string') {
+		throw new TypeError(
+			`Expected \`input\` to be a \`string\`, got \`${typeof string}\``
+		);
+	}
 
-  // Escape metacharacters
-  // which is written down by users but means special for regular expressions.
+	if (typeof count !== 'number') {
+		throw new TypeError(
+			`Expected \`count\` to be a \`number\`, got \`${typeof count}\``
+		);
+	}
 
-  // > There are 12 characters with special meanings:
-  // > - the backslash \,
-  // > - the caret ^,
-  // > - the dollar sign $,
-  // > - the period or dot .,
-  // > - the vertical bar or pipe symbol |,
-  // > - the question mark ?,
-  // > - the asterisk or star *,
-  // > - the plus sign +,
-  // > - the opening parenthesis (,
-  // > - the closing parenthesis ),
-  // > - and the opening square bracket [,
-  // > - the opening curly brace {,
-  // > These special characters are often called "metacharacters".
-  [
-    /[\\$.|*+(){^]/g,
-    match => `\\${match}`
-  ],
+	if (typeof options.indent !== 'string') {
+		throw new TypeError(
+			`Expected \`options.indent\` to be a \`string\`, got \`${typeof options.indent}\``
+		);
+	}
 
-  [
-    // > a question mark (?) matches a single character
-    /(?!\\)\?/g,
-    () => '[^/]'
-  ],
+	if (count === 0) {
+		return string;
+	}
 
-  // leading slash
-  [
+	const regex = options.includeEmptyLines ? /^/gm : /^(?!\s*$)/gm;
 
-    // > A leading slash matches the beginning of the pathname.
-    // > For example, "/*.c" matches "cat-file.c" but not "mozilla-sha1/sha1.c".
-    // A leading slash matches the beginning of the pathname
-    /^\//,
-    () => '^'
-  ],
+	return string.replace(regex, options.indent.repeat(count));
+};
 
-  // replace special metacharacter slash after the leading slash
-  [
-    /\//g,
-    () => '\\/'
-  ],
 
-  [
-    // > A leading "**" followed by a slash means match in all directories.
-    // > For example, "**/foo" matches file or directory "foo" anywhere,
-    // > the same as pattern "foo".
-    // > "**/foo/bar" matches file or directory "bar" anywhere that is directly
-    // >   under directory "foo".
-    // Notice that the '*'s have been replaced as '\\*'
-    /^\^*\\\*\\\*\\\//,
+/***/ }),
+/* 374 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    // '**/foo' <-> 'foo'
-    () => '^(?:.*\\/)?'
-  ],
+"use strict";
 
-  // starting
-  [
-    // there will be no leading '/'
-    //   (which has been replaced by section "leading slash")
-    // If starts with '**', adding a '^' to the regular expression also works
-    /^(?=[^^])/,
-    function startingReplacer () {
-      // If has a slash `/` at the beginning or middle
-      return !/\/(?!$)/.test(this)
-        // > Prior to 2.22.1
-        // > If the pattern does not contain a slash /,
-        // >   Git treats it as a shell glob pattern
-        // Actually, if there is only a trailing slash,
-        //   git also treats it as a shell glob pattern
+const os = __webpack_require__(120);
 
-        // After 2.22.1 (compatible but clearer)
-        // > If there is a separator at the beginning or middle (or both)
-        // > of the pattern, then the pattern is relative to the directory
-        // > level of the particular .gitignore file itself.
-        // > Otherwise the pattern may also match at any level below
-        // > the .gitignore level.
-        ? '(?:^|\\/)'
+const extractPathRegex = /\s+at.*(?:\(|\s)(.*)\)?/;
+const pathRegex = /^(?:(?:(?:node|(?:internal\/[\w/]*|.*node_modules\/(?:babel-polyfill|pirates)\/.*)?\w+)\.js:\d+:\d+)|native)/;
+const homeDir = typeof os.homedir === 'undefined' ? '' : os.homedir();
 
-        // > Otherwise, Git treats the pattern as a shell glob suitable for
-        // >   consumption by fnmatch(3)
-        : '^'
-    }
-  ],
+module.exports = (stack, options) => {
+	options = Object.assign({pretty: false}, options);
 
-  // two globstars
-  [
-    // Use lookahead assertions so that we could match more than one `'/**'`
-    /\\\/\\\*\\\*(?=\\\/|$)/g,
+	return stack.replace(/\\/g, '/')
+		.split('\n')
+		.filter(line => {
+			const pathMatches = line.match(extractPathRegex);
+			if (pathMatches === null || !pathMatches[1]) {
+				return true;
+			}
 
-    // Zero, one or several directories
-    // should not use '*', or it will be replaced by the next replacer
+			const match = pathMatches[1];
 
-    // Check if it is not the last `'/**'`
-    (_, index, str) => index + 6 < str.length
+			// Electron
+			if (
+				match.includes('.app/Contents/Resources/electron.asar') ||
+				match.includes('.app/Contents/Resources/default_app.asar')
+			) {
+				return false;
+			}
 
-      // case: /**/
-      // > A slash followed by two consecutive asterisks then a slash matches
-      // >   zero or more directories.
-      // > For example, "a/**/b" matches "a/b", "a/x/b", "a/x/y/b" and so on.
-      // '/**/'
-      ? '(?:\\/[^\\/]+)*'
+			return !pathRegex.test(match);
+		})
+		.filter(line => line.trim() !== '')
+		.map(line => {
+			if (options.pretty) {
+				return line.replace(extractPathRegex, (m, p1) => m.replace(p1, p1.replace(homeDir, '~')));
+			}
 
-      // case: /**
-      // > A trailing `"/**"` matches everything inside.
+			return line;
+		})
+		.join('\n');
+};
 
-      // #21: everything inside but it should not include the current folder
-      : '\\/.+'
-  ],
 
-  // intermediate wildcards
-  [
-    // Never replace escaped '*'
-    // ignore rule '\*' will match the path '*'
+/***/ }),
+/* 375 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    // 'abc.*/' -> go
-    // 'abc.*'  -> skip this rule
-    /(^|[^\\]+)\\\*(?=.+)/g,
+"use strict";
 
-    // '*.js' matches '.js'
-    // '*.js' doesn't match 'abc'
-    (_, p1) => `${p1}[^\\/]*`
-  ],
+const chalk = __webpack_require__(376);
+const cliCursor = __webpack_require__(385);
+const cliSpinners = __webpack_require__(389);
+const logSymbols = __webpack_require__(391);
 
-  [
-    // unescape, revert step 3 except for back slash
-    // For example, if a user escape a '\\*',
-    // after step 3, the result will be '\\\\\\*'
-    /\\\\\\(?=[$.|*+(){^])/g,
-    () => ESCAPE
-  ],
+class Ora {
+	constructor(options) {
+		if (typeof options === 'string') {
+			options = {
+				text: options
+			};
+		}
 
-  [
-    // '\\\\' -> '\\'
-    /\\\\/g,
-    () => ESCAPE
-  ],
+		this.options = Object.assign({
+			text: '',
+			color: 'cyan',
+			stream: process.stderr
+		}, options);
 
-  [
-    // > The range notation, e.g. [a-zA-Z],
-    // > can be used to match one of the characters in a range.
+		const sp = this.options.spinner;
+		this.spinner = typeof sp === 'object' ? sp : (process.platform === 'win32' ? cliSpinners.line : (cliSpinners[sp] || cliSpinners.dots)); // eslint-disable-line no-nested-ternary
 
-    // `\` is escaped by step 3
-    /(\\)?\[([^\]/]*?)(\\*)($|\])/g,
-    (match, leadEscape, range, endEscape, close) => leadEscape === ESCAPE
-      // '\\[bar]' -> '\\\\[bar\\]'
-      ? `\\[${range}${cleanRangeBackSlash(endEscape)}${close}`
-      : close === ']'
-        ? endEscape.length % 2 === 0
-          // A normal case, and it is a range notation
-          // '[bar]'
-          // '[bar\\\\]'
-          ? `[${sanitizeRange(range)}${endEscape}]`
-          // Invalid range notaton
-          // '[bar\\]' -> '[bar\\\\]'
-          : '[]'
-        : '[]'
-  ],
+		if (this.spinner.frames === undefined) {
+			throw new Error('Spinner must define `frames`');
+		}
 
-  // ending
-  [
-    // 'js' will not match 'js.'
-    // 'ab' will not match 'abc'
-    /(?:[^*])$/,
+		this.text = this.options.text;
+		this.color = this.options.color;
+		this.interval = this.options.interval || this.spinner.interval || 100;
+		this.stream = this.options.stream;
+		this.id = null;
+		this.frameIndex = 0;
+		this.enabled = typeof this.options.enabled === 'boolean' ? this.options.enabled : ((this.stream && this.stream.isTTY) && !process.env.CI);
+	}
+	frame() {
+		const frames = this.spinner.frames;
+		let frame = frames[this.frameIndex];
 
-    // WTF!
-    // https://git-scm.com/docs/gitignore
-    // changes in [2.22.1](https://git-scm.com/docs/gitignore/2.22.1)
-    // which re-fixes #24, #38
+		if (this.color) {
+			frame = chalk[this.color](frame);
+		}
 
-    // > If there is a separator at the end of the pattern then the pattern
-    // > will only match directories, otherwise the pattern can match both
-    // > files and directories.
+		this.frameIndex = ++this.frameIndex % frames.length;
 
-    // 'js*' will not match 'a.js'
-    // 'js/' will not match 'a.js'
-    // 'js' will match 'a.js' and 'a.js/'
-    match => /\/$/.test(match)
-      // foo/ will not match 'foo'
-      ? `${match}$`
-      // foo matches 'foo' and 'foo/'
-      : `${match}(?=$|\\/$)`
-  ],
+		return frame + ' ' + this.text;
+	}
+	clear() {
+		if (!this.enabled) {
+			return this;
+		}
 
-  // trailing wildcard
-  [
-    /(\^|\\\/)?\\\*$/,
-    (_, p1) => {
-      const prefix = p1
-        // '\^':
-        // '/*' does not match EMPTY
-        // '/*' does not match everything
+		this.stream.clearLine();
+		this.stream.cursorTo(0);
 
-        // '\\\/':
-        // 'abc/*' does not match 'abc/'
-        ? `${p1}[^/]+`
+		return this;
+	}
+	render() {
+		this.clear();
+		this.stream.write(this.frame());
 
-        // 'a*' matches 'a'
-        // 'a*' matches 'aa'
-        : '[^/]*'
+		return this;
+	}
+	start(text) {
+		if (text) {
+			this.text = text;
+		}
 
-      return `${prefix}(?=$|\\/$)`
-    }
-  ],
-]
+		if (!this.enabled || this.id) {
+			return this;
+		}
 
-// A simple cache, because an ignore rule only has only one certain meaning
-const regexCache = Object.create(null)
+		cliCursor.hide(this.stream);
+		this.render();
+		this.id = setInterval(this.render.bind(this), this.interval);
 
-// @param {pattern}
-const makeRegex = (pattern, negative, ignorecase) => {
-  const r = regexCache[pattern]
-  if (r) {
-    return r
-  }
+		return this;
+	}
+	stop() {
+		if (!this.enabled) {
+			return this;
+		}
 
-  // const replacers = negative
-  //   ? NEGATIVE_REPLACERS
-  //   : POSITIVE_REPLACERS
+		clearInterval(this.id);
+		this.id = null;
+		this.frameIndex = 0;
+		this.clear();
+		cliCursor.show(this.stream);
 
-  const source = REPLACERS.reduce(
-    (prev, current) => prev.replace(current[0], current[1].bind(pattern)),
-    pattern
-  )
+		return this;
+	}
+	succeed(text) {
+		return this.stopAndPersist({symbol: logSymbols.success, text});
+	}
+	fail(text) {
+		return this.stopAndPersist({symbol: logSymbols.error, text});
+	}
+	warn(text) {
+		return this.stopAndPersist({symbol: logSymbols.warning, text});
+	}
+	info(text) {
+		return this.stopAndPersist({symbol: logSymbols.info, text});
+	}
+	stopAndPersist(options) {
+		if (!this.enabled) {
+			return this;
+		}
 
-  return regexCache[pattern] = ignorecase
-    ? new RegExp(source, 'i')
-    : new RegExp(source)
-}
+		// Legacy argument
+		// TODO: Deprecate sometime in the future
+		if (typeof options === 'string') {
+			options = {
+				symbol: options
+			};
+		}
 
-const isString = subject => typeof subject === 'string'
+		options = options || {};
 
-// > A blank line matches no files, so it can serve as a separator for readability.
-const checkPattern = pattern => pattern
-  && isString(pattern)
-  && !REGEX_TEST_BLANK_LINE.test(pattern)
+		this.stop();
+		this.stream.write(`${options.symbol || ' '} ${options.text || this.text}\n`);
 
-  // > A line starting with # serves as a comment.
-  && pattern.indexOf('#') !== 0
+		return this;
+	}
+}
 
-const splitPattern = pattern => pattern.split(REGEX_SPLITALL_CRLF)
+module.exports = function (opts) {
+	return new Ora(opts);
+};
 
-class IgnoreRule {
-  constructor (
-    origin,
-    pattern,
-    negative,
-    regex
-  ) {
-    this.origin = origin
-    this.pattern = pattern
-    this.negative = negative
-    this.regex = regex
-  }
-}
+module.exports.promise = (action, options) => {
+	if (typeof action.then !== 'function') {
+		throw new TypeError('Parameter `action` must be a Promise');
+	}
 
-const createRule = (pattern, ignorecase) => {
-  const origin = pattern
-  let negative = false
+	const spinner = new Ora(options);
+	spinner.start();
 
-  // > An optional prefix "!" which negates the pattern;
-  if (pattern.indexOf('!') === 0) {
-    negative = true
-    pattern = pattern.substr(1)
-  }
+	action.then(
+		() => {
+			spinner.succeed();
+		},
+		() => {
+			spinner.fail();
+		}
+	);
 
-  pattern = pattern
-  // > Put a backslash ("\") in front of the first "!" for patterns that
-  // >   begin with a literal "!", for example, `"\!important!.txt"`.
-  .replace(REGEX_REPLACE_LEADING_EXCAPED_EXCLAMATION, '!')
-  // > Put a backslash ("\") in front of the first hash for patterns that
-  // >   begin with a hash.
-  .replace(REGEX_REPLACE_LEADING_EXCAPED_HASH, '#')
+	return spinner;
+};
 
-  const regex = makeRegex(pattern, negative, ignorecase)
 
-  return new IgnoreRule(
-    origin,
-    pattern,
-    negative,
-    regex
-  )
-}
+/***/ }),
+/* 376 */
+/***/ (function(module, exports, __webpack_require__) {
 
-const throwError = (message, Ctor) => {
-  throw new Ctor(message)
-}
+"use strict";
 
-const checkPath = (path, originalPath, doThrow) => {
-  if (!isString(path)) {
-    return doThrow(
-      `path must be a string, but got \`${originalPath}\``,
-      TypeError
-    )
-  }
+const escapeStringRegexp = __webpack_require__(178);
+const ansiStyles = __webpack_require__(377);
+const stdoutColor = __webpack_require__(382).stdout;
 
-  // We don't know if we should ignore EMPTY, so throw
-  if (!path) {
-    return doThrow(`path must not be empty`, TypeError)
-  }
+const template = __webpack_require__(384);
 
-  // Check if it is a relative path
-  if (checkPath.isNotRelative(path)) {
-    const r = '`path.relative()`d'
-    return doThrow(
-      `path should be a ${r} string, but got "${originalPath}"`,
-      RangeError
-    )
-  }
+const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm');
 
-  return true
-}
+// `supportsColor.level` → `ansiStyles.color[name]` mapping
+const levelMapping = ['ansi', 'ansi', 'ansi256', 'ansi16m'];
 
-const isNotRelative = path => REGEX_TEST_INVALID_PATH.test(path)
+// `color-convert` models to exclude from the Chalk API due to conflicts and such
+const skipModels = new Set(['gray']);
 
-checkPath.isNotRelative = isNotRelative
-checkPath.convert = p => p
+const styles = Object.create(null);
 
-class Ignore {
-  constructor ({
-    ignorecase = true
-  } = {}) {
-    this._rules = []
-    this._ignorecase = ignorecase
-    define(this, KEY_IGNORE, true)
-    this._initCache()
-  }
+function applyOptions(obj, options) {
+	options = options || {};
 
-  _initCache () {
-    this._ignoreCache = Object.create(null)
-    this._testCache = Object.create(null)
-  }
+	// Detect level if not set manually
+	const scLevel = stdoutColor ? stdoutColor.level : 0;
+	obj.level = options.level === undefined ? scLevel : options.level;
+	obj.enabled = 'enabled' in options ? options.enabled : obj.level > 0;
+}
 
-  _addPattern (pattern) {
-    // #32
-    if (pattern && pattern[KEY_IGNORE]) {
-      this._rules = this._rules.concat(pattern._rules)
-      this._added = true
-      return
-    }
+function Chalk(options) {
+	// We check for this.template here since calling `chalk.constructor()`
+	// by itself will have a `this` of a previously constructed chalk object
+	if (!this || !(this instanceof Chalk) || this.template) {
+		const chalk = {};
+		applyOptions(chalk, options);
 
-    if (checkPattern(pattern)) {
-      const rule = createRule(pattern, this._ignorecase)
-      this._added = true
-      this._rules.push(rule)
-    }
-  }
+		chalk.template = function () {
+			const args = [].slice.call(arguments);
+			return chalkTag.apply(null, [chalk.template].concat(args));
+		};
 
-  // @param {Array<string> | string | Ignore} pattern
-  add (pattern) {
-    this._added = false
+		Object.setPrototypeOf(chalk, Chalk.prototype);
+		Object.setPrototypeOf(chalk.template, chalk);
 
-    makeArray(
-      isString(pattern)
-        ? splitPattern(pattern)
-        : pattern
-    ).forEach(this._addPattern, this)
+		chalk.template.constructor = Chalk;
 
-    // Some rules have just added to the ignore,
-    // making the behavior changed.
-    if (this._added) {
-      this._initCache()
-    }
+		return chalk.template;
+	}
 
-    return this
-  }
+	applyOptions(this, options);
+}
 
-  // legacy
-  addPattern (pattern) {
-    return this.add(pattern)
-  }
+// Use bright blue on Windows as the normal blue color is illegible
+if (isSimpleWindowsTerm) {
+	ansiStyles.blue.open = '\u001B[94m';
+}
 
-  //          |           ignored : unignored
-  // negative |   0:0   |   0:1   |   1:0   |   1:1
-  // -------- | ------- | ------- | ------- | --------
-  //     0    |  TEST   |  TEST   |  SKIP   |    X
-  //     1    |  TESTIF |  SKIP   |  TEST   |    X
+for (const key of Object.keys(ansiStyles)) {
+	ansiStyles[key].closeRe = new RegExp(escapeStringRegexp(ansiStyles[key].close), 'g');
 
-  // - SKIP: always skip
-  // - TEST: always test
-  // - TESTIF: only test if checkUnignored
-  // - X: that never happen
+	styles[key] = {
+		get() {
+			const codes = ansiStyles[key];
+			return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, key);
+		}
+	};
+}
 
-  // @param {boolean} whether should check if the path is unignored,
-  //   setting `checkUnignored` to `false` could reduce additional
-  //   path matching.
+styles.visible = {
+	get() {
+		return build.call(this, this._styles || [], true, 'visible');
+	}
+};
 
-  // @returns {TestResult} true if a file is ignored
-  _testOne (path, checkUnignored) {
-    let ignored = false
-    let unignored = false
+ansiStyles.color.closeRe = new RegExp(escapeStringRegexp(ansiStyles.color.close), 'g');
+for (const model of Object.keys(ansiStyles.color.ansi)) {
+	if (skipModels.has(model)) {
+		continue;
+	}
 
-    this._rules.forEach(rule => {
-      const {negative} = rule
-      if (
-        unignored === negative && ignored !== unignored
-        || negative && !ignored && !unignored && !checkUnignored
-      ) {
-        return
-      }
+	styles[model] = {
+		get() {
+			const level = this.level;
+			return function () {
+				const open = ansiStyles.color[levelMapping[level]][model].apply(null, arguments);
+				const codes = {
+					open,
+					close: ansiStyles.color.close,
+					closeRe: ansiStyles.color.closeRe
+				};
+				return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, model);
+			};
+		}
+	};
+}
 
-      const matched = rule.regex.test(path)
+ansiStyles.bgColor.closeRe = new RegExp(escapeStringRegexp(ansiStyles.bgColor.close), 'g');
+for (const model of Object.keys(ansiStyles.bgColor.ansi)) {
+	if (skipModels.has(model)) {
+		continue;
+	}
 
-      if (matched) {
-        ignored = !negative
-        unignored = negative
-      }
-    })
+	const bgModel = 'bg' + model[0].toUpperCase() + model.slice(1);
+	styles[bgModel] = {
+		get() {
+			const level = this.level;
+			return function () {
+				const open = ansiStyles.bgColor[levelMapping[level]][model].apply(null, arguments);
+				const codes = {
+					open,
+					close: ansiStyles.bgColor.close,
+					closeRe: ansiStyles.bgColor.closeRe
+				};
+				return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, model);
+			};
+		}
+	};
+}
 
-    return {
-      ignored,
-      unignored
-    }
-  }
+const proto = Object.defineProperties(() => {}, styles);
 
-  // @returns {TestResult}
-  _test (originalPath, cache, checkUnignored, slices) {
-    const path = originalPath
-      // Supports nullable path
-      && checkPath.convert(originalPath)
+function build(_styles, _empty, key) {
+	const builder = function () {
+		return applyStyle.apply(builder, arguments);
+	};
 
-    checkPath(path, originalPath, throwError)
+	builder._styles = _styles;
+	builder._empty = _empty;
 
-    return this._t(path, cache, checkUnignored, slices)
-  }
+	const self = this;
 
-  _t (path, cache, checkUnignored, slices) {
-    if (path in cache) {
-      return cache[path]
-    }
+	Object.defineProperty(builder, 'level', {
+		enumerable: true,
+		get() {
+			return self.level;
+		},
+		set(level) {
+			self.level = level;
+		}
+	});
 
-    if (!slices) {
-      // path/to/a.js
-      // ['path', 'to', 'a.js']
-      slices = path.split(SLASH)
-    }
+	Object.defineProperty(builder, 'enabled', {
+		enumerable: true,
+		get() {
+			return self.enabled;
+		},
+		set(enabled) {
+			self.enabled = enabled;
+		}
+	});
 
-    slices.pop()
+	// See below for fix regarding invisible grey/dim combination on Windows
+	builder.hasGrey = this.hasGrey || key === 'gray' || key === 'grey';
 
-    // If the path has no parent directory, just test it
-    if (!slices.length) {
-      return cache[path] = this._testOne(path, checkUnignored)
-    }
+	// `__proto__` is used because we must return a function, but there is
+	// no way to create a function with a different prototype
+	builder.__proto__ = proto; // eslint-disable-line no-proto
 
-    const parent = this._t(
-      slices.join(SLASH) + SLASH,
-      cache,
-      checkUnignored,
-      slices
-    )
+	return builder;
+}
 
-    // If the path contains a parent directory, check the parent first
-    return cache[path] = parent.ignored
-      // > It is not possible to re-include a file if a parent directory of
-      // >   that file is excluded.
-      ? parent
-      : this._testOne(path, checkUnignored)
-  }
+function applyStyle() {
+	// Support varags, but simply cast to string in case there's only one arg
+	const args = arguments;
+	const argsLen = args.length;
+	let str = String(arguments[0]);
 
-  ignores (path) {
-    return this._test(path, this._ignoreCache, false).ignored
-  }
+	if (argsLen === 0) {
+		return '';
+	}
+
+	if (argsLen > 1) {
+		// Don't slice `arguments`, it prevents V8 optimizations
+		for (let a = 1; a < argsLen; a++) {
+			str += ' ' + args[a];
+		}
+	}
 
-  createFilter () {
-    return path => !this.ignores(path)
-  }
+	if (!this.enabled || this.level <= 0 || !str) {
+		return this._empty ? '' : str;
+	}
 
-  filter (paths) {
-    return makeArray(paths).filter(this.createFilter())
-  }
+	// Turns out that on Windows dimmed gray text becomes invisible in cmd.exe,
+	// see https://github.com/chalk/chalk/issues/58
+	// If we're on Windows and we're dealing with a gray color, temporarily make 'dim' a noop.
+	const originalDim = ansiStyles.dim.open;
+	if (isSimpleWindowsTerm && this.hasGrey) {
+		ansiStyles.dim.open = '';
+	}
 
-  // @returns {TestResult}
-  test (path) {
-    return this._test(path, this._testCache, true)
-  }
-}
+	for (const code of this._styles.slice().reverse()) {
+		// Replace any instances already present with a re-opening code
+		// otherwise only the part of the string until said closing code
+		// will be colored, and the rest will simply be 'plain'.
+		str = code.open + str.replace(code.closeRe, code.open) + code.close;
 
-const factory = options => new Ignore(options)
+		// Close the styling before a linebreak and reopen
+		// after next line to fix a bleed issue on macOS
+		// https://github.com/chalk/chalk/pull/92
+		str = str.replace(/\r?\n/g, `${code.close}$&${code.open}`);
+	}
 
-const returnFalse = () => false
+	// Reset the original `dim` if we changed it to work around the Windows dimmed gray issue
+	ansiStyles.dim.open = originalDim;
 
-const isPathValid = path =>
-  checkPath(path && checkPath.convert(path), path, returnFalse)
+	return str;
+}
 
-factory.isPathValid = isPathValid
+function chalkTag(chalk, strings) {
+	if (!Array.isArray(strings)) {
+		// If chalk() was called by itself or with a string,
+		// return the string itself as a string.
+		return [].slice.call(arguments, 1).join(' ');
+	}
 
-// Fixes typescript
-factory.default = factory
+	const args = [].slice.call(arguments, 2);
+	const parts = [strings.raw[0]];
 
-module.exports = factory
+	for (let i = 1; i < strings.length; i++) {
+		parts.push(String(args[i - 1]).replace(/[{}\\]/g, '\\$&'));
+		parts.push(String(strings.raw[i]));
+	}
 
-// Windows
-// --------------------------------------------------------------
-/* istanbul ignore if  */
-if (
-  // Detect `process` so that it can run in browsers.
-  typeof process !== 'undefined'
-  && (
-    process.env && process.env.IGNORE_TEST_WIN32
-    || process.platform === 'win32'
-  )
-) {
-  /* eslint no-control-regex: "off" */
-  const makePosix = str => /^\\\\\?\\/.test(str)
-  || /["<>|\u0000-\u001F]+/u.test(str)
-    ? str
-    : str.replace(/\\/g, '/')
+	return template(chalk, parts.join(''));
+}
 
-  checkPath.convert = makePosix
+Object.defineProperties(Chalk.prototype, styles);
 
-  // 'C:\\foo'     <- 'C:\\foo' has been converted to 'C:/'
-  // 'd:\\foo'
-  const REGIX_IS_WINDOWS_PATH_ABSOLUTE = /^[a-z]:\//i
-  checkPath.isNotRelative = path =>
-    REGIX_IS_WINDOWS_PATH_ABSOLUTE.test(path)
-    || isNotRelative(path)
-}
+module.exports = Chalk(); // eslint-disable-line new-cap
+module.exports.supportsColor = stdoutColor;
+module.exports.default = module.exports; // For TypeScript
 
 
 /***/ }),
-/* 373 */
+/* 377 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
+/* WEBPACK VAR INJECTION */(function(module) {
+const colorConvert = __webpack_require__(378);
 
-module.exports = path => {
-	const isExtendedLengthPath = /^\\\\\?\\/.test(path);
-	const hasNonAscii = /[^\u0000-\u0080]+/.test(path); // eslint-disable-line no-control-regex
-
-	if (isExtendedLengthPath || hasNonAscii) {
-		return path;
-	}
+const wrapAnsi16 = (fn, offset) => function () {
+	const code = fn.apply(colorConvert, arguments);
+	return `\u001B[${code + offset}m`;
+};
 
-	return path.replace(/\\/g, '/');
+const wrapAnsi256 = (fn, offset) => function () {
+	const code = fn.apply(colorConvert, arguments);
+	return `\u001B[${38 + offset};5;${code}m`;
 };
 
+const wrapAnsi16m = (fn, offset) => function () {
+	const rgb = fn.apply(colorConvert, arguments);
+	return `\u001B[${38 + offset};2;${rgb[0]};${rgb[1]};${rgb[2]}m`;
+};
 
-/***/ }),
-/* 374 */
-/***/ (function(module, exports, __webpack_require__) {
+function assembleStyles() {
+	const codes = new Map();
+	const styles = {
+		modifier: {
+			reset: [0, 0],
+			// 21 isn't widely supported and 22 does the same thing
+			bold: [1, 22],
+			dim: [2, 22],
+			italic: [3, 23],
+			underline: [4, 24],
+			inverse: [7, 27],
+			hidden: [8, 28],
+			strikethrough: [9, 29]
+		},
+		color: {
+			black: [30, 39],
+			red: [31, 39],
+			green: [32, 39],
+			yellow: [33, 39],
+			blue: [34, 39],
+			magenta: [35, 39],
+			cyan: [36, 39],
+			white: [37, 39],
+			gray: [90, 39],
 
-"use strict";
+			// Bright color
+			redBright: [91, 39],
+			greenBright: [92, 39],
+			yellowBright: [93, 39],
+			blueBright: [94, 39],
+			magentaBright: [95, 39],
+			cyanBright: [96, 39],
+			whiteBright: [97, 39]
+		},
+		bgColor: {
+			bgBlack: [40, 49],
+			bgRed: [41, 49],
+			bgGreen: [42, 49],
+			bgYellow: [43, 49],
+			bgBlue: [44, 49],
+			bgMagenta: [45, 49],
+			bgCyan: [46, 49],
+			bgWhite: [47, 49],
 
-const {Transform} = __webpack_require__(137);
+			// Bright color
+			bgBlackBright: [100, 49],
+			bgRedBright: [101, 49],
+			bgGreenBright: [102, 49],
+			bgYellowBright: [103, 49],
+			bgBlueBright: [104, 49],
+			bgMagentaBright: [105, 49],
+			bgCyanBright: [106, 49],
+			bgWhiteBright: [107, 49]
+		}
+	};
 
-class ObjectTransform extends Transform {
-	constructor() {
-		super({
-			objectMode: true
-		});
-	}
-}
+	// Fix humans
+	styles.color.grey = styles.color.gray;
 
-class FilterStream extends ObjectTransform {
-	constructor(filter) {
-		super();
-		this._filter = filter;
-	}
+	for (const groupName of Object.keys(styles)) {
+		const group = styles[groupName];
 
-	_transform(data, encoding, callback) {
-		if (this._filter(data)) {
-			this.push(data);
-		}
+		for (const styleName of Object.keys(group)) {
+			const style = group[styleName];
 
-		callback();
-	}
-}
+			styles[styleName] = {
+				open: `\u001B[${style[0]}m`,
+				close: `\u001B[${style[1]}m`
+			};
 
-class UniqueStream extends ObjectTransform {
-	constructor() {
-		super();
-		this._pushed = new Set();
-	}
+			group[styleName] = styles[styleName];
 
-	_transform(data, encoding, callback) {
-		if (!this._pushed.has(data)) {
-			this.push(data);
-			this._pushed.add(data);
+			codes.set(style[0], style[1]);
 		}
 
-		callback();
+		Object.defineProperty(styles, groupName, {
+			value: group,
+			enumerable: false
+		});
+
+		Object.defineProperty(styles, 'codes', {
+			value: codes,
+			enumerable: false
+		});
 	}
-}
 
-module.exports = {
-	FilterStream,
-	UniqueStream
-};
+	const ansi2ansi = n => n;
+	const rgb2rgb = (r, g, b) => [r, g, b];
 
+	styles.color.close = '\u001B[39m';
+	styles.bgColor.close = '\u001B[49m';
 
-/***/ }),
-/* 375 */
-/***/ (function(module, exports, __webpack_require__) {
+	styles.color.ansi = {
+		ansi: wrapAnsi16(ansi2ansi, 0)
+	};
+	styles.color.ansi256 = {
+		ansi256: wrapAnsi256(ansi2ansi, 0)
+	};
+	styles.color.ansi16m = {
+		rgb: wrapAnsi16m(rgb2rgb, 0)
+	};
 
-/*!
- * is-glob <https://github.com/jonschlinkert/is-glob>
- *
- * Copyright (c) 2014-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+	styles.bgColor.ansi = {
+		ansi: wrapAnsi16(ansi2ansi, 10)
+	};
+	styles.bgColor.ansi256 = {
+		ansi256: wrapAnsi256(ansi2ansi, 10)
+	};
+	styles.bgColor.ansi16m = {
+		rgb: wrapAnsi16m(rgb2rgb, 10)
+	};
 
-var isExtglob = __webpack_require__(310);
-var chars = { '{': '}', '(': ')', '[': ']'};
-var strictRegex = /\\(.)|(^!|\*|[\].+)]\?|\[[^\\\]]+\]|\{[^\\}]+\}|\(\?[:!=][^\\)]+\)|\([^|]+\|[^\\)]+\))/;
-var relaxedRegex = /\\(.)|(^!|[*?{}()[\]]|\(\?)/;
+	for (let key of Object.keys(colorConvert)) {
+		if (typeof colorConvert[key] !== 'object') {
+			continue;
+		}
 
-module.exports = function isGlob(str, options) {
-  if (typeof str !== 'string' || str === '') {
-    return false;
-  }
+		const suite = colorConvert[key];
 
-  if (isExtglob(str)) {
-    return true;
-  }
+		if (key === 'ansi16') {
+			key = 'ansi';
+		}
 
-  var regex = strictRegex;
-  var match;
+		if ('ansi16' in suite) {
+			styles.color.ansi[key] = wrapAnsi16(suite.ansi16, 0);
+			styles.bgColor.ansi[key] = wrapAnsi16(suite.ansi16, 10);
+		}
 
-  // optionally relax regex
-  if (options && options.strict === false) {
-    regex = relaxedRegex;
-  }
+		if ('ansi256' in suite) {
+			styles.color.ansi256[key] = wrapAnsi256(suite.ansi256, 0);
+			styles.bgColor.ansi256[key] = wrapAnsi256(suite.ansi256, 10);
+		}
 
-  while ((match = regex.exec(str))) {
-    if (match[2]) return true;
-    var idx = match.index + match[0].length;
+		if ('rgb' in suite) {
+			styles.color.ansi16m[key] = wrapAnsi16m(suite.rgb, 0);
+			styles.bgColor.ansi16m[key] = wrapAnsi16m(suite.rgb, 10);
+		}
+	}
 
-    // if an open bracket/brace/paren is escaped,
-    // set the index to the next closing character
-    var open = match[1];
-    var close = open ? chars[open] : null;
-    if (open && close) {
-      var n = str.indexOf(close, idx);
-      if (n !== -1) {
-        idx = n + 1;
-      }
-    }
+	return styles;
+}
 
-    str = str.slice(idx);
-  }
-  return false;
-};
+// Make the export immutable
+Object.defineProperty(module, 'exports', {
+	enumerable: true,
+	get: assembleStyles
+});
 
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(114)(module)))
 
 /***/ }),
-/* 376 */
+/* 378 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+var conversions = __webpack_require__(379);
+var route = __webpack_require__(381);
 
-const path = __webpack_require__(4);
+var convert = {};
 
-module.exports = path_ => {
-	let cwd = process.cwd();
+var models = Object.keys(conversions);
 
-	path_ = path.resolve(path_);
+function wrapRaw(fn) {
+	var wrappedFn = function (args) {
+		if (args === undefined || args === null) {
+			return args;
+		}
 
-	if (process.platform === 'win32') {
-		cwd = cwd.toLowerCase();
-		path_ = path_.toLowerCase();
+		if (arguments.length > 1) {
+			args = Array.prototype.slice.call(arguments);
+		}
+
+		return fn(args);
+	};
+
+	// preserve .conversion property if there is one
+	if ('conversion' in fn) {
+		wrappedFn.conversion = fn.conversion;
 	}
 
-	return path_ === cwd;
-};
+	return wrappedFn;
+}
 
+function wrapRounded(fn) {
+	var wrappedFn = function (args) {
+		if (args === undefined || args === null) {
+			return args;
+		}
 
-/***/ }),
-/* 377 */
-/***/ (function(module, exports, __webpack_require__) {
+		if (arguments.length > 1) {
+			args = Array.prototype.slice.call(arguments);
+		}
 
-"use strict";
+		var result = fn(args);
 
-const path = __webpack_require__(4);
+		// we're assuming the result is an array here.
+		// see notice in conversions.js; don't use box types
+		// in conversion functions.
+		if (typeof result === 'object') {
+			for (var len = result.length, i = 0; i < len; i++) {
+				result[i] = Math.round(result[i]);
+			}
+		}
 
-module.exports = (childPath, parentPath) => {
-	childPath = path.resolve(childPath);
-	parentPath = path.resolve(parentPath);
+		return result;
+	};
 
-	if (process.platform === 'win32') {
-		childPath = childPath.toLowerCase();
-		parentPath = parentPath.toLowerCase();
+	// preserve .conversion property if there is one
+	if ('conversion' in fn) {
+		wrappedFn.conversion = fn.conversion;
 	}
 
-	if (childPath === parentPath) {
-		return false;
-	}
+	return wrappedFn;
+}
 
-	childPath += path.sep;
-	parentPath += path.sep;
+models.forEach(function (fromModel) {
+	convert[fromModel] = {};
 
-	return childPath.startsWith(parentPath);
-};
+	Object.defineProperty(convert[fromModel], 'channels', {value: conversions[fromModel].channels});
+	Object.defineProperty(convert[fromModel], 'labels', {value: conversions[fromModel].labels});
+
+	var routes = route(fromModel);
+	var routeModels = Object.keys(routes);
+
+	routeModels.forEach(function (toModel) {
+		var fn = routes[toModel];
+
+		convert[fromModel][toModel] = wrapRounded(fn);
+		convert[fromModel][toModel].raw = wrapRaw(fn);
+	});
+});
+
+module.exports = convert;
 
 
 /***/ }),
-/* 378 */
+/* 379 */
 /***/ (function(module, exports, __webpack_require__) {
 
-const assert = __webpack_require__(139)
-const path = __webpack_require__(4)
-const fs = __webpack_require__(133)
-let glob = undefined
-try {
-  glob = __webpack_require__(146)
-} catch (_err) {
-  // treat glob as optional.
-}
+/* MIT license */
+var cssKeywords = __webpack_require__(380);
 
-const defaultGlobOpts = {
-  nosort: true,
-  silent: true
+// NOTE: conversions should only return primitive values (i.e. arrays, or
+//       values that give correct `typeof` results).
+//       do not use box values types (i.e. Number(), String(), etc.)
+
+var reverseKeywords = {};
+for (var key in cssKeywords) {
+	if (cssKeywords.hasOwnProperty(key)) {
+		reverseKeywords[cssKeywords[key]] = key;
+	}
 }
 
-// for EMFILE handling
-let timeout = 0
+var convert = module.exports = {
+	rgb: {channels: 3, labels: 'rgb'},
+	hsl: {channels: 3, labels: 'hsl'},
+	hsv: {channels: 3, labels: 'hsv'},
+	hwb: {channels: 3, labels: 'hwb'},
+	cmyk: {channels: 4, labels: 'cmyk'},
+	xyz: {channels: 3, labels: 'xyz'},
+	lab: {channels: 3, labels: 'lab'},
+	lch: {channels: 3, labels: 'lch'},
+	hex: {channels: 1, labels: ['hex']},
+	keyword: {channels: 1, labels: ['keyword']},
+	ansi16: {channels: 1, labels: ['ansi16']},
+	ansi256: {channels: 1, labels: ['ansi256']},
+	hcg: {channels: 3, labels: ['h', 'c', 'g']},
+	apple: {channels: 3, labels: ['r16', 'g16', 'b16']},
+	gray: {channels: 1, labels: ['gray']}
+};
 
-const isWindows = (process.platform === "win32")
+// hide .channels and .labels properties
+for (var model in convert) {
+	if (convert.hasOwnProperty(model)) {
+		if (!('channels' in convert[model])) {
+			throw new Error('missing channels property: ' + model);
+		}
 
-const defaults = options => {
-  const methods = [
-    'unlink',
-    'chmod',
-    'stat',
-    'lstat',
-    'rmdir',
-    'readdir'
-  ]
-  methods.forEach(m => {
-    options[m] = options[m] || fs[m]
-    m = m + 'Sync'
-    options[m] = options[m] || fs[m]
-  })
+		if (!('labels' in convert[model])) {
+			throw new Error('missing channel labels property: ' + model);
+		}
 
-  options.maxBusyTries = options.maxBusyTries || 3
-  options.emfileWait = options.emfileWait || 1000
-  if (options.glob === false) {
-    options.disableGlob = true
-  }
-  if (options.disableGlob !== true && glob === undefined) {
-    throw Error('glob dependency not found, set `options.disableGlob = true` if intentional')
-  }
-  options.disableGlob = options.disableGlob || false
-  options.glob = options.glob || defaultGlobOpts
-}
+		if (convert[model].labels.length !== convert[model].channels) {
+			throw new Error('channel and label counts mismatch: ' + model);
+		}
 
-const rimraf = (p, options, cb) => {
-  if (typeof options === 'function') {
-    cb = options
-    options = {}
-  }
+		var channels = convert[model].channels;
+		var labels = convert[model].labels;
+		delete convert[model].channels;
+		delete convert[model].labels;
+		Object.defineProperty(convert[model], 'channels', {value: channels});
+		Object.defineProperty(convert[model], 'labels', {value: labels});
+	}
+}
 
-  assert(p, 'rimraf: missing path')
-  assert.equal(typeof p, 'string', 'rimraf: path should be a string')
-  assert.equal(typeof cb, 'function', 'rimraf: callback function required')
-  assert(options, 'rimraf: invalid options argument provided')
-  assert.equal(typeof options, 'object', 'rimraf: options should be object')
+convert.rgb.hsl = function (rgb) {
+	var r = rgb[0] / 255;
+	var g = rgb[1] / 255;
+	var b = rgb[2] / 255;
+	var min = Math.min(r, g, b);
+	var max = Math.max(r, g, b);
+	var delta = max - min;
+	var h;
+	var s;
+	var l;
 
-  defaults(options)
+	if (max === min) {
+		h = 0;
+	} else if (r === max) {
+		h = (g - b) / delta;
+	} else if (g === max) {
+		h = 2 + (b - r) / delta;
+	} else if (b === max) {
+		h = 4 + (r - g) / delta;
+	}
 
-  let busyTries = 0
-  let errState = null
-  let n = 0
+	h = Math.min(h * 60, 360);
 
-  const next = (er) => {
-    errState = errState || er
-    if (--n === 0)
-      cb(errState)
-  }
+	if (h < 0) {
+		h += 360;
+	}
 
-  const afterGlob = (er, results) => {
-    if (er)
-      return cb(er)
+	l = (min + max) / 2;
 
-    n = results.length
-    if (n === 0)
-      return cb()
+	if (max === min) {
+		s = 0;
+	} else if (l <= 0.5) {
+		s = delta / (max + min);
+	} else {
+		s = delta / (2 - max - min);
+	}
 
-    results.forEach(p => {
-      const CB = (er) => {
-        if (er) {
-          if ((er.code === "EBUSY" || er.code === "ENOTEMPTY" || er.code === "EPERM") &&
-              busyTries < options.maxBusyTries) {
-            busyTries ++
-            // try again, with the same exact callback as this one.
-            return setTimeout(() => rimraf_(p, options, CB), busyTries * 100)
-          }
+	return [h, s * 100, l * 100];
+};
 
-          // this one won't happen if graceful-fs is used.
-          if (er.code === "EMFILE" && timeout < options.emfileWait) {
-            return setTimeout(() => rimraf_(p, options, CB), timeout ++)
-          }
+convert.rgb.hsv = function (rgb) {
+	var rdif;
+	var gdif;
+	var bdif;
+	var h;
+	var s;
 
-          // already gone
-          if (er.code === "ENOENT") er = null
-        }
+	var r = rgb[0] / 255;
+	var g = rgb[1] / 255;
+	var b = rgb[2] / 255;
+	var v = Math.max(r, g, b);
+	var diff = v - Math.min(r, g, b);
+	var diffc = function (c) {
+		return (v - c) / 6 / diff + 1 / 2;
+	};
 
-        timeout = 0
-        next(er)
-      }
-      rimraf_(p, options, CB)
-    })
-  }
+	if (diff === 0) {
+		h = s = 0;
+	} else {
+		s = diff / v;
+		rdif = diffc(r);
+		gdif = diffc(g);
+		bdif = diffc(b);
 
-  if (options.disableGlob || !glob.hasMagic(p))
-    return afterGlob(null, [p])
+		if (r === v) {
+			h = bdif - gdif;
+		} else if (g === v) {
+			h = (1 / 3) + rdif - bdif;
+		} else if (b === v) {
+			h = (2 / 3) + gdif - rdif;
+		}
+		if (h < 0) {
+			h += 1;
+		} else if (h > 1) {
+			h -= 1;
+		}
+	}
 
-  options.lstat(p, (er, stat) => {
-    if (!er)
-      return afterGlob(null, [p])
+	return [
+		h * 360,
+		s * 100,
+		v * 100
+	];
+};
 
-    glob(p, options.glob, afterGlob)
-  })
+convert.rgb.hwb = function (rgb) {
+	var r = rgb[0];
+	var g = rgb[1];
+	var b = rgb[2];
+	var h = convert.rgb.hsl(rgb)[0];
+	var w = 1 / 255 * Math.min(r, Math.min(g, b));
 
-}
+	b = 1 - 1 / 255 * Math.max(r, Math.max(g, b));
 
-// Two possible strategies.
-// 1. Assume it's a file.  unlink it, then do the dir stuff on EPERM or EISDIR
-// 2. Assume it's a directory.  readdir, then do the file stuff on ENOTDIR
-//
-// Both result in an extra syscall when you guess wrong.  However, there
-// are likely far more normal files in the world than directories.  This
-// is based on the assumption that a the average number of files per
-// directory is >= 1.
-//
-// If anyone ever complains about this, then I guess the strategy could
-// be made configurable somehow.  But until then, YAGNI.
-const rimraf_ = (p, options, cb) => {
-  assert(p)
-  assert(options)
-  assert(typeof cb === 'function')
+	return [h, w * 100, b * 100];
+};
 
-  // sunos lets the root user unlink directories, which is... weird.
-  // so we have to lstat here and make sure it's not a dir.
-  options.lstat(p, (er, st) => {
-    if (er && er.code === "ENOENT")
-      return cb(null)
+convert.rgb.cmyk = function (rgb) {
+	var r = rgb[0] / 255;
+	var g = rgb[1] / 255;
+	var b = rgb[2] / 255;
+	var c;
+	var m;
+	var y;
+	var k;
 
-    // Windows can EPERM on stat.  Life is suffering.
-    if (er && er.code === "EPERM" && isWindows)
-      fixWinEPERM(p, options, er, cb)
+	k = Math.min(1 - r, 1 - g, 1 - b);
+	c = (1 - r - k) / (1 - k) || 0;
+	m = (1 - g - k) / (1 - k) || 0;
+	y = (1 - b - k) / (1 - k) || 0;
 
-    if (st && st.isDirectory())
-      return rmdir(p, options, er, cb)
+	return [c * 100, m * 100, y * 100, k * 100];
+};
 
-    options.unlink(p, er => {
-      if (er) {
-        if (er.code === "ENOENT")
-          return cb(null)
-        if (er.code === "EPERM")
-          return (isWindows)
-            ? fixWinEPERM(p, options, er, cb)
-            : rmdir(p, options, er, cb)
-        if (er.code === "EISDIR")
-          return rmdir(p, options, er, cb)
-      }
-      return cb(er)
-    })
-  })
+/**
+ * See https://en.m.wikipedia.org/wiki/Euclidean_distance#Squared_Euclidean_distance
+ * */
+function comparativeDistance(x, y) {
+	return (
+		Math.pow(x[0] - y[0], 2) +
+		Math.pow(x[1] - y[1], 2) +
+		Math.pow(x[2] - y[2], 2)
+	);
 }
 
-const fixWinEPERM = (p, options, er, cb) => {
-  assert(p)
-  assert(options)
-  assert(typeof cb === 'function')
-
-  options.chmod(p, 0o666, er2 => {
-    if (er2)
-      cb(er2.code === "ENOENT" ? null : er)
-    else
-      options.stat(p, (er3, stats) => {
-        if (er3)
-          cb(er3.code === "ENOENT" ? null : er)
-        else if (stats.isDirectory())
-          rmdir(p, options, er, cb)
-        else
-          options.unlink(p, cb)
-      })
-  })
-}
+convert.rgb.keyword = function (rgb) {
+	var reversed = reverseKeywords[rgb];
+	if (reversed) {
+		return reversed;
+	}
 
-const fixWinEPERMSync = (p, options, er) => {
-  assert(p)
-  assert(options)
+	var currentClosestDistance = Infinity;
+	var currentClosestKeyword;
 
-  try {
-    options.chmodSync(p, 0o666)
-  } catch (er2) {
-    if (er2.code === "ENOENT")
-      return
-    else
-      throw er
-  }
+	for (var keyword in cssKeywords) {
+		if (cssKeywords.hasOwnProperty(keyword)) {
+			var value = cssKeywords[keyword];
 
-  let stats
-  try {
-    stats = options.statSync(p)
-  } catch (er3) {
-    if (er3.code === "ENOENT")
-      return
-    else
-      throw er
-  }
+			// Compute comparative distance
+			var distance = comparativeDistance(rgb, value);
 
-  if (stats.isDirectory())
-    rmdirSync(p, options, er)
-  else
-    options.unlinkSync(p)
-}
+			// Check if its less, if so set as closest
+			if (distance < currentClosestDistance) {
+				currentClosestDistance = distance;
+				currentClosestKeyword = keyword;
+			}
+		}
+	}
 
-const rmdir = (p, options, originalEr, cb) => {
-  assert(p)
-  assert(options)
-  assert(typeof cb === 'function')
+	return currentClosestKeyword;
+};
 
-  // try to rmdir first, and only readdir on ENOTEMPTY or EEXIST (SunOS)
-  // if we guessed wrong, and it's not a directory, then
-  // raise the original error.
-  options.rmdir(p, er => {
-    if (er && (er.code === "ENOTEMPTY" || er.code === "EEXIST" || er.code === "EPERM"))
-      rmkids(p, options, cb)
-    else if (er && er.code === "ENOTDIR")
-      cb(originalEr)
-    else
-      cb(er)
-  })
-}
+convert.keyword.rgb = function (keyword) {
+	return cssKeywords[keyword];
+};
 
-const rmkids = (p, options, cb) => {
-  assert(p)
-  assert(options)
-  assert(typeof cb === 'function')
+convert.rgb.xyz = function (rgb) {
+	var r = rgb[0] / 255;
+	var g = rgb[1] / 255;
+	var b = rgb[2] / 255;
 
-  options.readdir(p, (er, files) => {
-    if (er)
-      return cb(er)
-    let n = files.length
-    if (n === 0)
-      return options.rmdir(p, cb)
-    let errState
-    files.forEach(f => {
-      rimraf(path.join(p, f), options, er => {
-        if (errState)
-          return
-        if (er)
-          return cb(errState = er)
-        if (--n === 0)
-          options.rmdir(p, cb)
-      })
-    })
-  })
-}
+	// assume sRGB
+	r = r > 0.04045 ? Math.pow(((r + 0.055) / 1.055), 2.4) : (r / 12.92);
+	g = g > 0.04045 ? Math.pow(((g + 0.055) / 1.055), 2.4) : (g / 12.92);
+	b = b > 0.04045 ? Math.pow(((b + 0.055) / 1.055), 2.4) : (b / 12.92);
 
-// this looks simpler, and is strictly *faster*, but will
-// tie up the JavaScript thread and fail on excessively
-// deep directory trees.
-const rimrafSync = (p, options) => {
-  options = options || {}
-  defaults(options)
+	var x = (r * 0.4124) + (g * 0.3576) + (b * 0.1805);
+	var y = (r * 0.2126) + (g * 0.7152) + (b * 0.0722);
+	var z = (r * 0.0193) + (g * 0.1192) + (b * 0.9505);
 
-  assert(p, 'rimraf: missing path')
-  assert.equal(typeof p, 'string', 'rimraf: path should be a string')
-  assert(options, 'rimraf: missing options')
-  assert.equal(typeof options, 'object', 'rimraf: options should be object')
+	return [x * 100, y * 100, z * 100];
+};
 
-  let results
+convert.rgb.lab = function (rgb) {
+	var xyz = convert.rgb.xyz(rgb);
+	var x = xyz[0];
+	var y = xyz[1];
+	var z = xyz[2];
+	var l;
+	var a;
+	var b;
 
-  if (options.disableGlob || !glob.hasMagic(p)) {
-    results = [p]
-  } else {
-    try {
-      options.lstatSync(p)
-      results = [p]
-    } catch (er) {
-      results = glob.sync(p, options.glob)
-    }
-  }
+	x /= 95.047;
+	y /= 100;
+	z /= 108.883;
 
-  if (!results.length)
-    return
+	x = x > 0.008856 ? Math.pow(x, 1 / 3) : (7.787 * x) + (16 / 116);
+	y = y > 0.008856 ? Math.pow(y, 1 / 3) : (7.787 * y) + (16 / 116);
+	z = z > 0.008856 ? Math.pow(z, 1 / 3) : (7.787 * z) + (16 / 116);
 
-  for (let i = 0; i < results.length; i++) {
-    const p = results[i]
+	l = (116 * y) - 16;
+	a = 500 * (x - y);
+	b = 200 * (y - z);
 
-    let st
-    try {
-      st = options.lstatSync(p)
-    } catch (er) {
-      if (er.code === "ENOENT")
-        return
+	return [l, a, b];
+};
 
-      // Windows can EPERM on stat.  Life is suffering.
-      if (er.code === "EPERM" && isWindows)
-        fixWinEPERMSync(p, options, er)
-    }
+convert.hsl.rgb = function (hsl) {
+	var h = hsl[0] / 360;
+	var s = hsl[1] / 100;
+	var l = hsl[2] / 100;
+	var t1;
+	var t2;
+	var t3;
+	var rgb;
+	var val;
 
-    try {
-      // sunos lets the root user unlink directories, which is... weird.
-      if (st && st.isDirectory())
-        rmdirSync(p, options, null)
-      else
-        options.unlinkSync(p)
-    } catch (er) {
-      if (er.code === "ENOENT")
-        return
-      if (er.code === "EPERM")
-        return isWindows ? fixWinEPERMSync(p, options, er) : rmdirSync(p, options, er)
-      if (er.code !== "EISDIR")
-        throw er
+	if (s === 0) {
+		val = l * 255;
+		return [val, val, val];
+	}
 
-      rmdirSync(p, options, er)
-    }
-  }
-}
+	if (l < 0.5) {
+		t2 = l * (1 + s);
+	} else {
+		t2 = l + s - l * s;
+	}
 
-const rmdirSync = (p, options, originalEr) => {
-  assert(p)
-  assert(options)
+	t1 = 2 * l - t2;
 
-  try {
-    options.rmdirSync(p)
-  } catch (er) {
-    if (er.code === "ENOENT")
-      return
-    if (er.code === "ENOTDIR")
-      throw originalEr
-    if (er.code === "ENOTEMPTY" || er.code === "EEXIST" || er.code === "EPERM")
-      rmkidsSync(p, options)
-  }
-}
+	rgb = [0, 0, 0];
+	for (var i = 0; i < 3; i++) {
+		t3 = h + 1 / 3 * -(i - 1);
+		if (t3 < 0) {
+			t3++;
+		}
+		if (t3 > 1) {
+			t3--;
+		}
 
-const rmkidsSync = (p, options) => {
-  assert(p)
-  assert(options)
-  options.readdirSync(p).forEach(f => rimrafSync(path.join(p, f), options))
+		if (6 * t3 < 1) {
+			val = t1 + (t2 - t1) * 6 * t3;
+		} else if (2 * t3 < 1) {
+			val = t2;
+		} else if (3 * t3 < 2) {
+			val = t1 + (t2 - t1) * (2 / 3 - t3) * 6;
+		} else {
+			val = t1;
+		}
 
-  // We only end up here once we got ENOTEMPTY at least once, and
-  // at this point, we are guaranteed to have removed all the kids.
-  // So, we know that it won't be ENOENT or ENOTDIR or anything else.
-  // try really hard to delete stuff on windows, because it has a
-  // PROFOUNDLY annoying habit of not closing handles promptly when
-  // files are deleted, resulting in spurious ENOTEMPTY errors.
-  const retries = isWindows ? 100 : 1
-  let i = 0
-  do {
-    let threw = true
-    try {
-      const ret = options.rmdirSync(p, options)
-      threw = false
-      return ret
-    } finally {
-      if (++i < retries && threw)
-        continue
-    }
-  } while (true)
-}
+		rgb[i] = val * 255;
+	}
 
-module.exports = rimraf
-rimraf.sync = rimrafSync
+	return rgb;
+};
 
+convert.hsl.hsv = function (hsl) {
+	var h = hsl[0];
+	var s = hsl[1] / 100;
+	var l = hsl[2] / 100;
+	var smin = s;
+	var lmin = Math.max(l, 0.01);
+	var sv;
+	var v;
 
-/***/ }),
-/* 379 */
-/***/ (function(module, exports, __webpack_require__) {
+	l *= 2;
+	s *= (l <= 1) ? l : 2 - l;
+	smin *= lmin <= 1 ? lmin : 2 - lmin;
+	v = (l + s) / 2;
+	sv = l === 0 ? (2 * smin) / (lmin + smin) : (2 * s) / (l + s);
 
-"use strict";
+	return [h, sv * 100, v * 100];
+};
 
-const AggregateError = __webpack_require__(380);
+convert.hsv.rgb = function (hsv) {
+	var h = hsv[0] / 60;
+	var s = hsv[1] / 100;
+	var v = hsv[2] / 100;
+	var hi = Math.floor(h) % 6;
 
-module.exports = async (
-	iterable,
-	mapper,
-	{
-		concurrency = Infinity,
-		stopOnError = true
-	} = {}
-) => {
-	return new Promise((resolve, reject) => {
-		if (typeof mapper !== 'function') {
-			throw new TypeError('Mapper function is required');
-		}
+	var f = h - Math.floor(h);
+	var p = 255 * v * (1 - s);
+	var q = 255 * v * (1 - (s * f));
+	var t = 255 * v * (1 - (s * (1 - f)));
+	v *= 255;
 
-		if (!(typeof concurrency === 'number' && concurrency >= 1)) {
-			throw new TypeError(`Expected \`concurrency\` to be a number from 1 and up, got \`${concurrency}\` (${typeof concurrency})`);
-		}
+	switch (hi) {
+		case 0:
+			return [v, t, p];
+		case 1:
+			return [q, v, p];
+		case 2:
+			return [p, v, t];
+		case 3:
+			return [p, q, v];
+		case 4:
+			return [t, p, v];
+		case 5:
+			return [v, p, q];
+	}
+};
 
-		const ret = [];
-		const errors = [];
-		const iterator = iterable[Symbol.iterator]();
-		let isRejected = false;
-		let isIterableDone = false;
-		let resolvingCount = 0;
-		let currentIndex = 0;
+convert.hsv.hsl = function (hsv) {
+	var h = hsv[0];
+	var s = hsv[1] / 100;
+	var v = hsv[2] / 100;
+	var vmin = Math.max(v, 0.01);
+	var lmin;
+	var sl;
+	var l;
 
-		const next = () => {
-			if (isRejected) {
-				return;
-			}
+	l = (2 - s) * v;
+	lmin = (2 - s) * vmin;
+	sl = s * vmin;
+	sl /= (lmin <= 1) ? lmin : 2 - lmin;
+	sl = sl || 0;
+	l /= 2;
 
-			const nextItem = iterator.next();
-			const i = currentIndex;
-			currentIndex++;
+	return [h, sl * 100, l * 100];
+};
 
-			if (nextItem.done) {
-				isIterableDone = true;
+// http://dev.w3.org/csswg/css-color/#hwb-to-rgb
+convert.hwb.rgb = function (hwb) {
+	var h = hwb[0] / 360;
+	var wh = hwb[1] / 100;
+	var bl = hwb[2] / 100;
+	var ratio = wh + bl;
+	var i;
+	var v;
+	var f;
+	var n;
 
-				if (resolvingCount === 0) {
-					if (!stopOnError && errors.length !== 0) {
-						reject(new AggregateError(errors));
-					} else {
-						resolve(ret);
-					}
-				}
+	// wh + bl cant be > 1
+	if (ratio > 1) {
+		wh /= ratio;
+		bl /= ratio;
+	}
 
-				return;
-			}
+	i = Math.floor(6 * h);
+	v = 1 - bl;
+	f = 6 * h - i;
 
-			resolvingCount++;
+	if ((i & 0x01) !== 0) {
+		f = 1 - f;
+	}
 
-			(async () => {
-				try {
-					const element = await nextItem.value;
-					ret[i] = await mapper(element, i);
-					resolvingCount--;
-					next();
-				} catch (error) {
-					if (stopOnError) {
-						isRejected = true;
-						reject(error);
-					} else {
-						errors.push(error);
-						resolvingCount--;
-						next();
-					}
-				}
-			})();
-		};
+	n = wh + f * (v - wh); // linear interpolation
 
-		for (let i = 0; i < concurrency; i++) {
-			next();
+	var r;
+	var g;
+	var b;
+	switch (i) {
+		default:
+		case 6:
+		case 0: r = v; g = n; b = wh; break;
+		case 1: r = n; g = v; b = wh; break;
+		case 2: r = wh; g = v; b = n; break;
+		case 3: r = wh; g = n; b = v; break;
+		case 4: r = n; g = wh; b = v; break;
+		case 5: r = v; g = wh; b = n; break;
+	}
 
-			if (isIterableDone) {
-				break;
-			}
-		}
-	});
+	return [r * 255, g * 255, b * 255];
 };
 
+convert.cmyk.rgb = function (cmyk) {
+	var c = cmyk[0] / 100;
+	var m = cmyk[1] / 100;
+	var y = cmyk[2] / 100;
+	var k = cmyk[3] / 100;
+	var r;
+	var g;
+	var b;
 
-/***/ }),
-/* 380 */
-/***/ (function(module, exports, __webpack_require__) {
+	r = 1 - Math.min(1, c * (1 - k) + k);
+	g = 1 - Math.min(1, m * (1 - k) + k);
+	b = 1 - Math.min(1, y * (1 - k) + k);
 
-"use strict";
+	return [r * 255, g * 255, b * 255];
+};
 
-const indentString = __webpack_require__(381);
-const cleanStack = __webpack_require__(382);
+convert.xyz.rgb = function (xyz) {
+	var x = xyz[0] / 100;
+	var y = xyz[1] / 100;
+	var z = xyz[2] / 100;
+	var r;
+	var g;
+	var b;
 
-const cleanInternalStack = stack => stack.replace(/\s+at .*aggregate-error\/index.js:\d+:\d+\)?/g, '');
+	r = (x * 3.2406) + (y * -1.5372) + (z * -0.4986);
+	g = (x * -0.9689) + (y * 1.8758) + (z * 0.0415);
+	b = (x * 0.0557) + (y * -0.2040) + (z * 1.0570);
 
-class AggregateError extends Error {
-	constructor(errors) {
-		if (!Array.isArray(errors)) {
-			throw new TypeError(`Expected input to be an Array, got ${typeof errors}`);
-		}
+	// assume sRGB
+	r = r > 0.0031308
+		? ((1.055 * Math.pow(r, 1.0 / 2.4)) - 0.055)
+		: r * 12.92;
 
-		errors = [...errors].map(error => {
-			if (error instanceof Error) {
-				return error;
-			}
+	g = g > 0.0031308
+		? ((1.055 * Math.pow(g, 1.0 / 2.4)) - 0.055)
+		: g * 12.92;
 
-			if (error !== null && typeof error === 'object') {
-				// Handle plain error objects with message property and/or possibly other metadata
-				return Object.assign(new Error(error.message), error);
-			}
+	b = b > 0.0031308
+		? ((1.055 * Math.pow(b, 1.0 / 2.4)) - 0.055)
+		: b * 12.92;
 
-			return new Error(error);
-		});
+	r = Math.min(Math.max(0, r), 1);
+	g = Math.min(Math.max(0, g), 1);
+	b = Math.min(Math.max(0, b), 1);
 
-		let message = errors
-			.map(error => {
-				// The `stack` property is not standardized, so we can't assume it exists
-				return typeof error.stack === 'string' ? cleanInternalStack(cleanStack(error.stack)) : String(error);
-			})
-			.join('\n');
-		message = '\n' + indentString(message, 4);
-		super(message);
+	return [r * 255, g * 255, b * 255];
+};
 
-		this.name = 'AggregateError';
+convert.xyz.lab = function (xyz) {
+	var x = xyz[0];
+	var y = xyz[1];
+	var z = xyz[2];
+	var l;
+	var a;
+	var b;
 
-		Object.defineProperty(this, '_errors', {value: errors});
-	}
+	x /= 95.047;
+	y /= 100;
+	z /= 108.883;
 
-	* [Symbol.iterator]() {
-		for (const error of this._errors) {
-			yield error;
-		}
-	}
-}
+	x = x > 0.008856 ? Math.pow(x, 1 / 3) : (7.787 * x) + (16 / 116);
+	y = y > 0.008856 ? Math.pow(y, 1 / 3) : (7.787 * y) + (16 / 116);
+	z = z > 0.008856 ? Math.pow(z, 1 / 3) : (7.787 * z) + (16 / 116);
 
-module.exports = AggregateError;
+	l = (116 * y) - 16;
+	a = 500 * (x - y);
+	b = 200 * (y - z);
 
+	return [l, a, b];
+};
 
-/***/ }),
-/* 381 */
-/***/ (function(module, exports, __webpack_require__) {
+convert.lab.xyz = function (lab) {
+	var l = lab[0];
+	var a = lab[1];
+	var b = lab[2];
+	var x;
+	var y;
+	var z;
 
-"use strict";
+	y = (l + 16) / 116;
+	x = a / 500 + y;
+	z = y - b / 200;
 
+	var y2 = Math.pow(y, 3);
+	var x2 = Math.pow(x, 3);
+	var z2 = Math.pow(z, 3);
+	y = y2 > 0.008856 ? y2 : (y - 16 / 116) / 7.787;
+	x = x2 > 0.008856 ? x2 : (x - 16 / 116) / 7.787;
+	z = z2 > 0.008856 ? z2 : (z - 16 / 116) / 7.787;
 
-module.exports = (string, count = 1, options) => {
-	options = {
-		indent: ' ',
-		includeEmptyLines: false,
-		...options
-	};
+	x *= 95.047;
+	y *= 100;
+	z *= 108.883;
 
-	if (typeof string !== 'string') {
-		throw new TypeError(
-			`Expected \`input\` to be a \`string\`, got \`${typeof string}\``
-		);
-	}
+	return [x, y, z];
+};
 
-	if (typeof count !== 'number') {
-		throw new TypeError(
-			`Expected \`count\` to be a \`number\`, got \`${typeof count}\``
-		);
-	}
+convert.lab.lch = function (lab) {
+	var l = lab[0];
+	var a = lab[1];
+	var b = lab[2];
+	var hr;
+	var h;
+	var c;
 
-	if (typeof options.indent !== 'string') {
-		throw new TypeError(
-			`Expected \`options.indent\` to be a \`string\`, got \`${typeof options.indent}\``
-		);
-	}
+	hr = Math.atan2(b, a);
+	h = hr * 360 / 2 / Math.PI;
 
-	if (count === 0) {
-		return string;
+	if (h < 0) {
+		h += 360;
 	}
 
-	const regex = options.includeEmptyLines ? /^/gm : /^(?!\s*$)/gm;
+	c = Math.sqrt(a * a + b * b);
 
-	return string.replace(regex, options.indent.repeat(count));
+	return [l, c, h];
 };
 
+convert.lch.lab = function (lch) {
+	var l = lch[0];
+	var c = lch[1];
+	var h = lch[2];
+	var a;
+	var b;
+	var hr;
 
-/***/ }),
-/* 382 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+	hr = h / 360 * 2 * Math.PI;
+	a = c * Math.cos(hr);
+	b = c * Math.sin(hr);
 
-const os = __webpack_require__(120);
+	return [l, a, b];
+};
 
-const extractPathRegex = /\s+at.*(?:\(|\s)(.*)\)?/;
-const pathRegex = /^(?:(?:(?:node|(?:internal\/[\w/]*|.*node_modules\/(?:babel-polyfill|pirates)\/.*)?\w+)\.js:\d+:\d+)|native)/;
-const homeDir = typeof os.homedir === 'undefined' ? '' : os.homedir();
+convert.rgb.ansi16 = function (args) {
+	var r = args[0];
+	var g = args[1];
+	var b = args[2];
+	var value = 1 in arguments ? arguments[1] : convert.rgb.hsv(args)[2]; // hsv -> ansi16 optimization
 
-module.exports = (stack, options) => {
-	options = Object.assign({pretty: false}, options);
+	value = Math.round(value / 50);
 
-	return stack.replace(/\\/g, '/')
-		.split('\n')
-		.filter(line => {
-			const pathMatches = line.match(extractPathRegex);
-			if (pathMatches === null || !pathMatches[1]) {
-				return true;
-			}
+	if (value === 0) {
+		return 30;
+	}
 
-			const match = pathMatches[1];
+	var ansi = 30
+		+ ((Math.round(b / 255) << 2)
+		| (Math.round(g / 255) << 1)
+		| Math.round(r / 255));
 
-			// Electron
-			if (
-				match.includes('.app/Contents/Resources/electron.asar') ||
-				match.includes('.app/Contents/Resources/default_app.asar')
-			) {
-				return false;
-			}
+	if (value === 2) {
+		ansi += 60;
+	}
 
-			return !pathRegex.test(match);
-		})
-		.filter(line => line.trim() !== '')
-		.map(line => {
-			if (options.pretty) {
-				return line.replace(extractPathRegex, (m, p1) => m.replace(p1, p1.replace(homeDir, '~')));
-			}
+	return ansi;
+};
 
-			return line;
-		})
-		.join('\n');
+convert.hsv.ansi16 = function (args) {
+	// optimization here; we already know the value and don't need to get
+	// it converted for us.
+	return convert.rgb.ansi16(convert.hsv.rgb(args), args[2]);
 };
 
+convert.rgb.ansi256 = function (args) {
+	var r = args[0];
+	var g = args[1];
+	var b = args[2];
 
-/***/ }),
-/* 383 */
-/***/ (function(module, exports, __webpack_require__) {
+	// we use the extended greyscale palette here, with the exception of
+	// black and white. normal palette only has 4 greyscale shades.
+	if (r === g && g === b) {
+		if (r < 8) {
+			return 16;
+		}
 
-"use strict";
+		if (r > 248) {
+			return 231;
+		}
 
-const chalk = __webpack_require__(384);
-const cliCursor = __webpack_require__(387);
-const cliSpinners = __webpack_require__(391);
-const logSymbols = __webpack_require__(393);
+		return Math.round(((r - 8) / 247) * 24) + 232;
+	}
 
-class Ora {
-	constructor(options) {
-		if (typeof options === 'string') {
-			options = {
-				text: options
-			};
-		}
+	var ansi = 16
+		+ (36 * Math.round(r / 255 * 5))
+		+ (6 * Math.round(g / 255 * 5))
+		+ Math.round(b / 255 * 5);
 
-		this.options = Object.assign({
-			text: '',
-			color: 'cyan',
-			stream: process.stderr
-		}, options);
+	return ansi;
+};
 
-		const sp = this.options.spinner;
-		this.spinner = typeof sp === 'object' ? sp : (process.platform === 'win32' ? cliSpinners.line : (cliSpinners[sp] || cliSpinners.dots)); // eslint-disable-line no-nested-ternary
+convert.ansi16.rgb = function (args) {
+	var color = args % 10;
 
-		if (this.spinner.frames === undefined) {
-			throw new Error('Spinner must define `frames`');
+	// handle greyscale
+	if (color === 0 || color === 7) {
+		if (args > 50) {
+			color += 3.5;
 		}
 
-		this.text = this.options.text;
-		this.color = this.options.color;
-		this.interval = this.options.interval || this.spinner.interval || 100;
-		this.stream = this.options.stream;
-		this.id = null;
-		this.frameIndex = 0;
-		this.enabled = typeof this.options.enabled === 'boolean' ? this.options.enabled : ((this.stream && this.stream.isTTY) && !process.env.CI);
+		color = color / 10.5 * 255;
+
+		return [color, color, color];
 	}
-	frame() {
-		const frames = this.spinner.frames;
-		let frame = frames[this.frameIndex];
 
-		if (this.color) {
-			frame = chalk[this.color](frame);
-		}
+	var mult = (~~(args > 50) + 1) * 0.5;
+	var r = ((color & 1) * mult) * 255;
+	var g = (((color >> 1) & 1) * mult) * 255;
+	var b = (((color >> 2) & 1) * mult) * 255;
 
-		this.frameIndex = ++this.frameIndex % frames.length;
+	return [r, g, b];
+};
 
-		return frame + ' ' + this.text;
+convert.ansi256.rgb = function (args) {
+	// handle greyscale
+	if (args >= 232) {
+		var c = (args - 232) * 10 + 8;
+		return [c, c, c];
 	}
-	clear() {
-		if (!this.enabled) {
-			return this;
-		}
 
-		this.stream.clearLine();
-		this.stream.cursorTo(0);
+	args -= 16;
 
-		return this;
-	}
-	render() {
-		this.clear();
-		this.stream.write(this.frame());
+	var rem;
+	var r = Math.floor(args / 36) / 5 * 255;
+	var g = Math.floor((rem = args % 36) / 6) / 5 * 255;
+	var b = (rem % 6) / 5 * 255;
 
-		return this;
-	}
-	start(text) {
-		if (text) {
-			this.text = text;
-		}
+	return [r, g, b];
+};
 
-		if (!this.enabled || this.id) {
-			return this;
-		}
+convert.rgb.hex = function (args) {
+	var integer = ((Math.round(args[0]) & 0xFF) << 16)
+		+ ((Math.round(args[1]) & 0xFF) << 8)
+		+ (Math.round(args[2]) & 0xFF);
 
-		cliCursor.hide(this.stream);
-		this.render();
-		this.id = setInterval(this.render.bind(this), this.interval);
+	var string = integer.toString(16).toUpperCase();
+	return '000000'.substring(string.length) + string;
+};
 
-		return this;
+convert.hex.rgb = function (args) {
+	var match = args.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);
+	if (!match) {
+		return [0, 0, 0];
 	}
-	stop() {
-		if (!this.enabled) {
-			return this;
-		}
 
-		clearInterval(this.id);
-		this.id = null;
-		this.frameIndex = 0;
-		this.clear();
-		cliCursor.show(this.stream);
+	var colorString = match[0];
 
-		return this;
-	}
-	succeed(text) {
-		return this.stopAndPersist({symbol: logSymbols.success, text});
-	}
-	fail(text) {
-		return this.stopAndPersist({symbol: logSymbols.error, text});
+	if (match[0].length === 3) {
+		colorString = colorString.split('').map(function (char) {
+			return char + char;
+		}).join('');
 	}
-	warn(text) {
-		return this.stopAndPersist({symbol: logSymbols.warning, text});
+
+	var integer = parseInt(colorString, 16);
+	var r = (integer >> 16) & 0xFF;
+	var g = (integer >> 8) & 0xFF;
+	var b = integer & 0xFF;
+
+	return [r, g, b];
+};
+
+convert.rgb.hcg = function (rgb) {
+	var r = rgb[0] / 255;
+	var g = rgb[1] / 255;
+	var b = rgb[2] / 255;
+	var max = Math.max(Math.max(r, g), b);
+	var min = Math.min(Math.min(r, g), b);
+	var chroma = (max - min);
+	var grayscale;
+	var hue;
+
+	if (chroma < 1) {
+		grayscale = min / (1 - chroma);
+	} else {
+		grayscale = 0;
 	}
-	info(text) {
-		return this.stopAndPersist({symbol: logSymbols.info, text});
+
+	if (chroma <= 0) {
+		hue = 0;
+	} else
+	if (max === r) {
+		hue = ((g - b) / chroma) % 6;
+	} else
+	if (max === g) {
+		hue = 2 + (b - r) / chroma;
+	} else {
+		hue = 4 + (r - g) / chroma + 4;
 	}
-	stopAndPersist(options) {
-		if (!this.enabled) {
-			return this;
-		}
 
-		// Legacy argument
-		// TODO: Deprecate sometime in the future
-		if (typeof options === 'string') {
-			options = {
-				symbol: options
-			};
-		}
+	hue /= 6;
+	hue %= 1;
+
+	return [hue * 360, chroma * 100, grayscale * 100];
+};
 
-		options = options || {};
+convert.hsl.hcg = function (hsl) {
+	var s = hsl[1] / 100;
+	var l = hsl[2] / 100;
+	var c = 1;
+	var f = 0;
 
-		this.stop();
-		this.stream.write(`${options.symbol || ' '} ${options.text || this.text}\n`);
+	if (l < 0.5) {
+		c = 2.0 * s * l;
+	} else {
+		c = 2.0 * s * (1.0 - l);
+	}
 
-		return this;
+	if (c < 1.0) {
+		f = (l - 0.5 * c) / (1.0 - c);
 	}
-}
 
-module.exports = function (opts) {
-	return new Ora(opts);
+	return [hsl[0], c * 100, f * 100];
 };
 
-module.exports.promise = (action, options) => {
-	if (typeof action.then !== 'function') {
-		throw new TypeError('Parameter `action` must be a Promise');
-	}
+convert.hsv.hcg = function (hsv) {
+	var s = hsv[1] / 100;
+	var v = hsv[2] / 100;
 
-	const spinner = new Ora(options);
-	spinner.start();
+	var c = s * v;
+	var f = 0;
 
-	action.then(
-		() => {
-			spinner.succeed();
-		},
-		() => {
-			spinner.fail();
-		}
-	);
+	if (c < 1.0) {
+		f = (v - c) / (1 - c);
+	}
 
-	return spinner;
+	return [hsv[0], c * 100, f * 100];
 };
 
+convert.hcg.rgb = function (hcg) {
+	var h = hcg[0] / 360;
+	var c = hcg[1] / 100;
+	var g = hcg[2] / 100;
 
-/***/ }),
-/* 384 */
-/***/ (function(module, exports, __webpack_require__) {
+	if (c === 0.0) {
+		return [g * 255, g * 255, g * 255];
+	}
 
-"use strict";
+	var pure = [0, 0, 0];
+	var hi = (h % 1) * 6;
+	var v = hi % 1;
+	var w = 1 - v;
+	var mg = 0;
 
-const escapeStringRegexp = __webpack_require__(178);
-const ansiStyles = __webpack_require__(385);
-const stdoutColor = __webpack_require__(184).stdout;
+	switch (Math.floor(hi)) {
+		case 0:
+			pure[0] = 1; pure[1] = v; pure[2] = 0; break;
+		case 1:
+			pure[0] = w; pure[1] = 1; pure[2] = 0; break;
+		case 2:
+			pure[0] = 0; pure[1] = 1; pure[2] = v; break;
+		case 3:
+			pure[0] = 0; pure[1] = w; pure[2] = 1; break;
+		case 4:
+			pure[0] = v; pure[1] = 0; pure[2] = 1; break;
+		default:
+			pure[0] = 1; pure[1] = 0; pure[2] = w;
+	}
 
-const template = __webpack_require__(386);
+	mg = (1.0 - c) * g;
 
-const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm');
+	return [
+		(c * pure[0] + mg) * 255,
+		(c * pure[1] + mg) * 255,
+		(c * pure[2] + mg) * 255
+	];
+};
 
-// `supportsColor.level` → `ansiStyles.color[name]` mapping
-const levelMapping = ['ansi', 'ansi', 'ansi256', 'ansi16m'];
+convert.hcg.hsv = function (hcg) {
+	var c = hcg[1] / 100;
+	var g = hcg[2] / 100;
 
-// `color-convert` models to exclude from the Chalk API due to conflicts and such
-const skipModels = new Set(['gray']);
+	var v = c + g * (1.0 - c);
+	var f = 0;
 
-const styles = Object.create(null);
+	if (v > 0.0) {
+		f = c / v;
+	}
 
-function applyOptions(obj, options) {
-	options = options || {};
+	return [hcg[0], f * 100, v * 100];
+};
 
-	// Detect level if not set manually
-	const scLevel = stdoutColor ? stdoutColor.level : 0;
-	obj.level = options.level === undefined ? scLevel : options.level;
-	obj.enabled = 'enabled' in options ? options.enabled : obj.level > 0;
-}
+convert.hcg.hsl = function (hcg) {
+	var c = hcg[1] / 100;
+	var g = hcg[2] / 100;
 
-function Chalk(options) {
-	// We check for this.template here since calling `chalk.constructor()`
-	// by itself will have a `this` of a previously constructed chalk object
-	if (!this || !(this instanceof Chalk) || this.template) {
-		const chalk = {};
-		applyOptions(chalk, options);
+	var l = g * (1.0 - c) + 0.5 * c;
+	var s = 0;
 
-		chalk.template = function () {
-			const args = [].slice.call(arguments);
-			return chalkTag.apply(null, [chalk.template].concat(args));
-		};
+	if (l > 0.0 && l < 0.5) {
+		s = c / (2 * l);
+	} else
+	if (l >= 0.5 && l < 1.0) {
+		s = c / (2 * (1 - l));
+	}
 
-		Object.setPrototypeOf(chalk, Chalk.prototype);
-		Object.setPrototypeOf(chalk.template, chalk);
+	return [hcg[0], s * 100, l * 100];
+};
 
-		chalk.template.constructor = Chalk;
+convert.hcg.hwb = function (hcg) {
+	var c = hcg[1] / 100;
+	var g = hcg[2] / 100;
+	var v = c + g * (1.0 - c);
+	return [hcg[0], (v - c) * 100, (1 - v) * 100];
+};
 
-		return chalk.template;
+convert.hwb.hcg = function (hwb) {
+	var w = hwb[1] / 100;
+	var b = hwb[2] / 100;
+	var v = 1 - b;
+	var c = v - w;
+	var g = 0;
+
+	if (c < 1) {
+		g = (v - c) / (1 - c);
 	}
 
-	applyOptions(this, options);
-}
+	return [hwb[0], c * 100, g * 100];
+};
 
-// Use bright blue on Windows as the normal blue color is illegible
-if (isSimpleWindowsTerm) {
-	ansiStyles.blue.open = '\u001B[94m';
-}
+convert.apple.rgb = function (apple) {
+	return [(apple[0] / 65535) * 255, (apple[1] / 65535) * 255, (apple[2] / 65535) * 255];
+};
 
-for (const key of Object.keys(ansiStyles)) {
-	ansiStyles[key].closeRe = new RegExp(escapeStringRegexp(ansiStyles[key].close), 'g');
+convert.rgb.apple = function (rgb) {
+	return [(rgb[0] / 255) * 65535, (rgb[1] / 255) * 65535, (rgb[2] / 255) * 65535];
+};
 
-	styles[key] = {
-		get() {
-			const codes = ansiStyles[key];
-			return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, key);
-		}
-	};
-}
+convert.gray.rgb = function (args) {
+	return [args[0] / 100 * 255, args[0] / 100 * 255, args[0] / 100 * 255];
+};
 
-styles.visible = {
-	get() {
-		return build.call(this, this._styles || [], true, 'visible');
-	}
+convert.gray.hsl = convert.gray.hsv = function (args) {
+	return [0, 0, args[0]];
 };
 
-ansiStyles.color.closeRe = new RegExp(escapeStringRegexp(ansiStyles.color.close), 'g');
-for (const model of Object.keys(ansiStyles.color.ansi)) {
-	if (skipModels.has(model)) {
-		continue;
-	}
+convert.gray.hwb = function (gray) {
+	return [0, 100, gray[0]];
+};
 
-	styles[model] = {
-		get() {
-			const level = this.level;
-			return function () {
-				const open = ansiStyles.color[levelMapping[level]][model].apply(null, arguments);
-				const codes = {
-					open,
-					close: ansiStyles.color.close,
-					closeRe: ansiStyles.color.closeRe
-				};
-				return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, model);
-			};
-		}
-	};
-}
+convert.gray.cmyk = function (gray) {
+	return [0, 0, 0, gray[0]];
+};
 
-ansiStyles.bgColor.closeRe = new RegExp(escapeStringRegexp(ansiStyles.bgColor.close), 'g');
-for (const model of Object.keys(ansiStyles.bgColor.ansi)) {
-	if (skipModels.has(model)) {
-		continue;
-	}
+convert.gray.lab = function (gray) {
+	return [gray[0], 0, 0];
+};
 
-	const bgModel = 'bg' + model[0].toUpperCase() + model.slice(1);
-	styles[bgModel] = {
-		get() {
-			const level = this.level;
-			return function () {
-				const open = ansiStyles.bgColor[levelMapping[level]][model].apply(null, arguments);
-				const codes = {
-					open,
-					close: ansiStyles.bgColor.close,
-					closeRe: ansiStyles.bgColor.closeRe
-				};
-				return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, model);
-			};
-		}
-	};
-}
+convert.gray.hex = function (gray) {
+	var val = Math.round(gray[0] / 100 * 255) & 0xFF;
+	var integer = (val << 16) + (val << 8) + val;
 
-const proto = Object.defineProperties(() => {}, styles);
+	var string = integer.toString(16).toUpperCase();
+	return '000000'.substring(string.length) + string;
+};
 
-function build(_styles, _empty, key) {
-	const builder = function () {
-		return applyStyle.apply(builder, arguments);
-	};
+convert.rgb.gray = function (rgb) {
+	var val = (rgb[0] + rgb[1] + rgb[2]) / 3;
+	return [val / 255 * 100];
+};
 
-	builder._styles = _styles;
-	builder._empty = _empty;
 
-	const self = this;
+/***/ }),
+/* 380 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	Object.defineProperty(builder, 'level', {
-		enumerable: true,
-		get() {
-			return self.level;
-		},
-		set(level) {
-			self.level = level;
-		}
-	});
+"use strict";
+
+
+module.exports = {
+	"aliceblue": [240, 248, 255],
+	"antiquewhite": [250, 235, 215],
+	"aqua": [0, 255, 255],
+	"aquamarine": [127, 255, 212],
+	"azure": [240, 255, 255],
+	"beige": [245, 245, 220],
+	"bisque": [255, 228, 196],
+	"black": [0, 0, 0],
+	"blanchedalmond": [255, 235, 205],
+	"blue": [0, 0, 255],
+	"blueviolet": [138, 43, 226],
+	"brown": [165, 42, 42],
+	"burlywood": [222, 184, 135],
+	"cadetblue": [95, 158, 160],
+	"chartreuse": [127, 255, 0],
+	"chocolate": [210, 105, 30],
+	"coral": [255, 127, 80],
+	"cornflowerblue": [100, 149, 237],
+	"cornsilk": [255, 248, 220],
+	"crimson": [220, 20, 60],
+	"cyan": [0, 255, 255],
+	"darkblue": [0, 0, 139],
+	"darkcyan": [0, 139, 139],
+	"darkgoldenrod": [184, 134, 11],
+	"darkgray": [169, 169, 169],
+	"darkgreen": [0, 100, 0],
+	"darkgrey": [169, 169, 169],
+	"darkkhaki": [189, 183, 107],
+	"darkmagenta": [139, 0, 139],
+	"darkolivegreen": [85, 107, 47],
+	"darkorange": [255, 140, 0],
+	"darkorchid": [153, 50, 204],
+	"darkred": [139, 0, 0],
+	"darksalmon": [233, 150, 122],
+	"darkseagreen": [143, 188, 143],
+	"darkslateblue": [72, 61, 139],
+	"darkslategray": [47, 79, 79],
+	"darkslategrey": [47, 79, 79],
+	"darkturquoise": [0, 206, 209],
+	"darkviolet": [148, 0, 211],
+	"deeppink": [255, 20, 147],
+	"deepskyblue": [0, 191, 255],
+	"dimgray": [105, 105, 105],
+	"dimgrey": [105, 105, 105],
+	"dodgerblue": [30, 144, 255],
+	"firebrick": [178, 34, 34],
+	"floralwhite": [255, 250, 240],
+	"forestgreen": [34, 139, 34],
+	"fuchsia": [255, 0, 255],
+	"gainsboro": [220, 220, 220],
+	"ghostwhite": [248, 248, 255],
+	"gold": [255, 215, 0],
+	"goldenrod": [218, 165, 32],
+	"gray": [128, 128, 128],
+	"green": [0, 128, 0],
+	"greenyellow": [173, 255, 47],
+	"grey": [128, 128, 128],
+	"honeydew": [240, 255, 240],
+	"hotpink": [255, 105, 180],
+	"indianred": [205, 92, 92],
+	"indigo": [75, 0, 130],
+	"ivory": [255, 255, 240],
+	"khaki": [240, 230, 140],
+	"lavender": [230, 230, 250],
+	"lavenderblush": [255, 240, 245],
+	"lawngreen": [124, 252, 0],
+	"lemonchiffon": [255, 250, 205],
+	"lightblue": [173, 216, 230],
+	"lightcoral": [240, 128, 128],
+	"lightcyan": [224, 255, 255],
+	"lightgoldenrodyellow": [250, 250, 210],
+	"lightgray": [211, 211, 211],
+	"lightgreen": [144, 238, 144],
+	"lightgrey": [211, 211, 211],
+	"lightpink": [255, 182, 193],
+	"lightsalmon": [255, 160, 122],
+	"lightseagreen": [32, 178, 170],
+	"lightskyblue": [135, 206, 250],
+	"lightslategray": [119, 136, 153],
+	"lightslategrey": [119, 136, 153],
+	"lightsteelblue": [176, 196, 222],
+	"lightyellow": [255, 255, 224],
+	"lime": [0, 255, 0],
+	"limegreen": [50, 205, 50],
+	"linen": [250, 240, 230],
+	"magenta": [255, 0, 255],
+	"maroon": [128, 0, 0],
+	"mediumaquamarine": [102, 205, 170],
+	"mediumblue": [0, 0, 205],
+	"mediumorchid": [186, 85, 211],
+	"mediumpurple": [147, 112, 219],
+	"mediumseagreen": [60, 179, 113],
+	"mediumslateblue": [123, 104, 238],
+	"mediumspringgreen": [0, 250, 154],
+	"mediumturquoise": [72, 209, 204],
+	"mediumvioletred": [199, 21, 133],
+	"midnightblue": [25, 25, 112],
+	"mintcream": [245, 255, 250],
+	"mistyrose": [255, 228, 225],
+	"moccasin": [255, 228, 181],
+	"navajowhite": [255, 222, 173],
+	"navy": [0, 0, 128],
+	"oldlace": [253, 245, 230],
+	"olive": [128, 128, 0],
+	"olivedrab": [107, 142, 35],
+	"orange": [255, 165, 0],
+	"orangered": [255, 69, 0],
+	"orchid": [218, 112, 214],
+	"palegoldenrod": [238, 232, 170],
+	"palegreen": [152, 251, 152],
+	"paleturquoise": [175, 238, 238],
+	"palevioletred": [219, 112, 147],
+	"papayawhip": [255, 239, 213],
+	"peachpuff": [255, 218, 185],
+	"peru": [205, 133, 63],
+	"pink": [255, 192, 203],
+	"plum": [221, 160, 221],
+	"powderblue": [176, 224, 230],
+	"purple": [128, 0, 128],
+	"rebeccapurple": [102, 51, 153],
+	"red": [255, 0, 0],
+	"rosybrown": [188, 143, 143],
+	"royalblue": [65, 105, 225],
+	"saddlebrown": [139, 69, 19],
+	"salmon": [250, 128, 114],
+	"sandybrown": [244, 164, 96],
+	"seagreen": [46, 139, 87],
+	"seashell": [255, 245, 238],
+	"sienna": [160, 82, 45],
+	"silver": [192, 192, 192],
+	"skyblue": [135, 206, 235],
+	"slateblue": [106, 90, 205],
+	"slategray": [112, 128, 144],
+	"slategrey": [112, 128, 144],
+	"snow": [255, 250, 250],
+	"springgreen": [0, 255, 127],
+	"steelblue": [70, 130, 180],
+	"tan": [210, 180, 140],
+	"teal": [0, 128, 128],
+	"thistle": [216, 191, 216],
+	"tomato": [255, 99, 71],
+	"turquoise": [64, 224, 208],
+	"violet": [238, 130, 238],
+	"wheat": [245, 222, 179],
+	"white": [255, 255, 255],
+	"whitesmoke": [245, 245, 245],
+	"yellow": [255, 255, 0],
+	"yellowgreen": [154, 205, 50]
+};
 
-	Object.defineProperty(builder, 'enabled', {
-		enumerable: true,
-		get() {
-			return self.enabled;
-		},
-		set(enabled) {
-			self.enabled = enabled;
-		}
-	});
 
-	// See below for fix regarding invisible grey/dim combination on Windows
-	builder.hasGrey = this.hasGrey || key === 'gray' || key === 'grey';
+/***/ }),
+/* 381 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	// `__proto__` is used because we must return a function, but there is
-	// no way to create a function with a different prototype
-	builder.__proto__ = proto; // eslint-disable-line no-proto
+var conversions = __webpack_require__(379);
 
-	return builder;
-}
+/*
+	this function routes a model to all other models.
 
-function applyStyle() {
-	// Support varags, but simply cast to string in case there's only one arg
-	const args = arguments;
-	const argsLen = args.length;
-	let str = String(arguments[0]);
+	all functions that are routed have a property `.conversion` attached
+	to the returned synthetic function. This property is an array
+	of strings, each with the steps in between the 'from' and 'to'
+	color models (inclusive).
 
-	if (argsLen === 0) {
-		return '';
-	}
+	conversions that are not possible simply are not included.
+*/
 
-	if (argsLen > 1) {
-		// Don't slice `arguments`, it prevents V8 optimizations
-		for (let a = 1; a < argsLen; a++) {
-			str += ' ' + args[a];
-		}
-	}
+function buildGraph() {
+	var graph = {};
+	// https://jsperf.com/object-keys-vs-for-in-with-closure/3
+	var models = Object.keys(conversions);
 
-	if (!this.enabled || this.level <= 0 || !str) {
-		return this._empty ? '' : str;
+	for (var len = models.length, i = 0; i < len; i++) {
+		graph[models[i]] = {
+			// http://jsperf.com/1-vs-infinity
+			// micro-opt, but this is simple.
+			distance: -1,
+			parent: null
+		};
 	}
 
-	// Turns out that on Windows dimmed gray text becomes invisible in cmd.exe,
-	// see https://github.com/chalk/chalk/issues/58
-	// If we're on Windows and we're dealing with a gray color, temporarily make 'dim' a noop.
-	const originalDim = ansiStyles.dim.open;
-	if (isSimpleWindowsTerm && this.hasGrey) {
-		ansiStyles.dim.open = '';
-	}
+	return graph;
+}
 
-	for (const code of this._styles.slice().reverse()) {
-		// Replace any instances already present with a re-opening code
-		// otherwise only the part of the string until said closing code
-		// will be colored, and the rest will simply be 'plain'.
-		str = code.open + str.replace(code.closeRe, code.open) + code.close;
+// https://en.wikipedia.org/wiki/Breadth-first_search
+function deriveBFS(fromModel) {
+	var graph = buildGraph();
+	var queue = [fromModel]; // unshift -> queue -> pop
 
-		// Close the styling before a linebreak and reopen
-		// after next line to fix a bleed issue on macOS
-		// https://github.com/chalk/chalk/pull/92
-		str = str.replace(/\r?\n/g, `${code.close}$&${code.open}`);
+	graph[fromModel].distance = 0;
+
+	while (queue.length) {
+		var current = queue.pop();
+		var adjacents = Object.keys(conversions[current]);
+
+		for (var len = adjacents.length, i = 0; i < len; i++) {
+			var adjacent = adjacents[i];
+			var node = graph[adjacent];
+
+			if (node.distance === -1) {
+				node.distance = graph[current].distance + 1;
+				node.parent = current;
+				queue.unshift(adjacent);
+			}
+		}
 	}
 
-	// Reset the original `dim` if we changed it to work around the Windows dimmed gray issue
-	ansiStyles.dim.open = originalDim;
-
-	return str;
+	return graph;
 }
 
-function chalkTag(chalk, strings) {
-	if (!Array.isArray(strings)) {
-		// If chalk() was called by itself or with a string,
-		// return the string itself as a string.
-		return [].slice.call(arguments, 1).join(' ');
-	}
+function link(from, to) {
+	return function (args) {
+		return to(from(args));
+	};
+}
 
-	const args = [].slice.call(arguments, 2);
-	const parts = [strings.raw[0]];
+function wrapConversion(toModel, graph) {
+	var path = [graph[toModel].parent, toModel];
+	var fn = conversions[graph[toModel].parent][toModel];
 
-	for (let i = 1; i < strings.length; i++) {
-		parts.push(String(args[i - 1]).replace(/[{}\\]/g, '\\$&'));
-		parts.push(String(strings.raw[i]));
+	var cur = graph[toModel].parent;
+	while (graph[cur].parent) {
+		path.unshift(graph[cur].parent);
+		fn = link(conversions[graph[cur].parent][cur], fn);
+		cur = graph[cur].parent;
 	}
 
-	return template(chalk, parts.join(''));
+	fn.conversion = path;
+	return fn;
 }
 
-Object.defineProperties(Chalk.prototype, styles);
+module.exports = function (fromModel) {
+	var graph = deriveBFS(fromModel);
+	var conversion = {};
+
+	var models = Object.keys(graph);
+	for (var len = models.length, i = 0; i < len; i++) {
+		var toModel = models[i];
+		var node = graph[toModel];
+
+		if (node.parent === null) {
+			// no possible conversion, or this node is the source model.
+			continue;
+		}
+
+		conversion[toModel] = wrapConversion(toModel, graph);
+	}
+
+	return conversion;
+};
 
-module.exports = Chalk(); // eslint-disable-line new-cap
-module.exports.supportsColor = stdoutColor;
-module.exports.default = module.exports; // For TypeScript
 
 
 /***/ }),
-/* 385 */
+/* 382 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(module) {
-const colorConvert = __webpack_require__(180);
-
-const wrapAnsi16 = (fn, offset) => function () {
-	const code = fn.apply(colorConvert, arguments);
-	return `\u001B[${code + offset}m`;
-};
 
-const wrapAnsi256 = (fn, offset) => function () {
-	const code = fn.apply(colorConvert, arguments);
-	return `\u001B[${38 + offset};5;${code}m`;
-};
+const os = __webpack_require__(120);
+const hasFlag = __webpack_require__(383);
 
-const wrapAnsi16m = (fn, offset) => function () {
-	const rgb = fn.apply(colorConvert, arguments);
-	return `\u001B[${38 + offset};2;${rgb[0]};${rgb[1]};${rgb[2]}m`;
-};
+const env = process.env;
 
-function assembleStyles() {
-	const codes = new Map();
-	const styles = {
-		modifier: {
-			reset: [0, 0],
-			// 21 isn't widely supported and 22 does the same thing
-			bold: [1, 22],
-			dim: [2, 22],
-			italic: [3, 23],
-			underline: [4, 24],
-			inverse: [7, 27],
-			hidden: [8, 28],
-			strikethrough: [9, 29]
-		},
-		color: {
-			black: [30, 39],
-			red: [31, 39],
-			green: [32, 39],
-			yellow: [33, 39],
-			blue: [34, 39],
-			magenta: [35, 39],
-			cyan: [36, 39],
-			white: [37, 39],
-			gray: [90, 39],
+let forceColor;
+if (hasFlag('no-color') ||
+	hasFlag('no-colors') ||
+	hasFlag('color=false')) {
+	forceColor = false;
+} else if (hasFlag('color') ||
+	hasFlag('colors') ||
+	hasFlag('color=true') ||
+	hasFlag('color=always')) {
+	forceColor = true;
+}
+if ('FORCE_COLOR' in env) {
+	forceColor = env.FORCE_COLOR.length === 0 || parseInt(env.FORCE_COLOR, 10) !== 0;
+}
 
-			// Bright color
-			redBright: [91, 39],
-			greenBright: [92, 39],
-			yellowBright: [93, 39],
-			blueBright: [94, 39],
-			magentaBright: [95, 39],
-			cyanBright: [96, 39],
-			whiteBright: [97, 39]
-		},
-		bgColor: {
-			bgBlack: [40, 49],
-			bgRed: [41, 49],
-			bgGreen: [42, 49],
-			bgYellow: [43, 49],
-			bgBlue: [44, 49],
-			bgMagenta: [45, 49],
-			bgCyan: [46, 49],
-			bgWhite: [47, 49],
+function translateLevel(level) {
+	if (level === 0) {
+		return false;
+	}
 
-			// Bright color
-			bgBlackBright: [100, 49],
-			bgRedBright: [101, 49],
-			bgGreenBright: [102, 49],
-			bgYellowBright: [103, 49],
-			bgBlueBright: [104, 49],
-			bgMagentaBright: [105, 49],
-			bgCyanBright: [106, 49],
-			bgWhiteBright: [107, 49]
-		}
+	return {
+		level,
+		hasBasic: true,
+		has256: level >= 2,
+		has16m: level >= 3
 	};
+}
 
-	// Fix humans
-	styles.color.grey = styles.color.gray;
+function supportsColor(stream) {
+	if (forceColor === false) {
+		return 0;
+	}
 
-	for (const groupName of Object.keys(styles)) {
-		const group = styles[groupName];
+	if (hasFlag('color=16m') ||
+		hasFlag('color=full') ||
+		hasFlag('color=truecolor')) {
+		return 3;
+	}
 
-		for (const styleName of Object.keys(group)) {
-			const style = group[styleName];
+	if (hasFlag('color=256')) {
+		return 2;
+	}
 
-			styles[styleName] = {
-				open: `\u001B[${style[0]}m`,
-				close: `\u001B[${style[1]}m`
-			};
+	if (stream && !stream.isTTY && forceColor !== true) {
+		return 0;
+	}
 
-			group[styleName] = styles[styleName];
+	const min = forceColor ? 1 : 0;
 
-			codes.set(style[0], style[1]);
+	if (process.platform === 'win32') {
+		// Node.js 7.5.0 is the first version of Node.js to include a patch to
+		// libuv that enables 256 color output on Windows. Anything earlier and it
+		// won't work. However, here we target Node.js 8 at minimum as it is an LTS
+		// release, and Node.js 7 is not. Windows 10 build 10586 is the first Windows
+		// release that supports 256 colors. Windows 10 build 14931 is the first release
+		// that supports 16m/TrueColor.
+		const osRelease = os.release().split('.');
+		if (
+			Number(process.versions.node.split('.')[0]) >= 8 &&
+			Number(osRelease[0]) >= 10 &&
+			Number(osRelease[2]) >= 10586
+		) {
+			return Number(osRelease[2]) >= 14931 ? 3 : 2;
 		}
 
-		Object.defineProperty(styles, groupName, {
-			value: group,
-			enumerable: false
-		});
-
-		Object.defineProperty(styles, 'codes', {
-			value: codes,
-			enumerable: false
-		});
+		return 1;
 	}
 
-	const ansi2ansi = n => n;
-	const rgb2rgb = (r, g, b) => [r, g, b];
-
-	styles.color.close = '\u001B[39m';
-	styles.bgColor.close = '\u001B[49m';
+	if ('CI' in env) {
+		if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
+			return 1;
+		}
 
-	styles.color.ansi = {
-		ansi: wrapAnsi16(ansi2ansi, 0)
-	};
-	styles.color.ansi256 = {
-		ansi256: wrapAnsi256(ansi2ansi, 0)
-	};
-	styles.color.ansi16m = {
-		rgb: wrapAnsi16m(rgb2rgb, 0)
-	};
+		return min;
+	}
 
-	styles.bgColor.ansi = {
-		ansi: wrapAnsi16(ansi2ansi, 10)
-	};
-	styles.bgColor.ansi256 = {
-		ansi256: wrapAnsi256(ansi2ansi, 10)
-	};
-	styles.bgColor.ansi16m = {
-		rgb: wrapAnsi16m(rgb2rgb, 10)
-	};
+	if ('TEAMCITY_VERSION' in env) {
+		return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
+	}
 
-	for (let key of Object.keys(colorConvert)) {
-		if (typeof colorConvert[key] !== 'object') {
-			continue;
-		}
+	if (env.COLORTERM === 'truecolor') {
+		return 3;
+	}
 
-		const suite = colorConvert[key];
+	if ('TERM_PROGRAM' in env) {
+		const version = parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
 
-		if (key === 'ansi16') {
-			key = 'ansi';
+		switch (env.TERM_PROGRAM) {
+			case 'iTerm.app':
+				return version >= 3 ? 3 : 2;
+			case 'Apple_Terminal':
+				return 2;
+			// No default
 		}
+	}
 
-		if ('ansi16' in suite) {
-			styles.color.ansi[key] = wrapAnsi16(suite.ansi16, 0);
-			styles.bgColor.ansi[key] = wrapAnsi16(suite.ansi16, 10);
-		}
+	if (/-256(color)?$/i.test(env.TERM)) {
+		return 2;
+	}
 
-		if ('ansi256' in suite) {
-			styles.color.ansi256[key] = wrapAnsi256(suite.ansi256, 0);
-			styles.bgColor.ansi256[key] = wrapAnsi256(suite.ansi256, 10);
-		}
+	if (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
+		return 1;
+	}
 
-		if ('rgb' in suite) {
-			styles.color.ansi16m[key] = wrapAnsi16m(suite.rgb, 0);
-			styles.bgColor.ansi16m[key] = wrapAnsi16m(suite.rgb, 10);
-		}
+	if ('COLORTERM' in env) {
+		return 1;
 	}
 
-	return styles;
+	if (env.TERM === 'dumb') {
+		return min;
+	}
+
+	return min;
 }
 
-// Make the export immutable
-Object.defineProperty(module, 'exports', {
-	enumerable: true,
-	get: assembleStyles
-});
+function getSupportLevel(stream) {
+	const level = supportsColor(stream);
+	return translateLevel(level);
+}
+
+module.exports = {
+	supportsColor: getSupportLevel,
+	stdout: getSupportLevel(process.stdout),
+	stderr: getSupportLevel(process.stderr)
+};
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(114)(module)))
 
 /***/ }),
-/* 386 */
+/* 383 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = (flag, argv) => {
+	argv = argv || process.argv;
+	const prefix = flag.startsWith('-') ? '' : (flag.length === 1 ? '-' : '--');
+	const pos = argv.indexOf(prefix + flag);
+	const terminatorPos = argv.indexOf('--');
+	return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos);
+};
+
+
+/***/ }),
+/* 384 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -50339,12 +50194,12 @@ module.exports = (chalk, tmp) => {
 
 
 /***/ }),
-/* 387 */
+/* 385 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const restoreCursor = __webpack_require__(388);
+const restoreCursor = __webpack_require__(386);
 
 let hidden = false;
 
@@ -50385,13 +50240,13 @@ exports.toggle = (force, stream) => {
 
 
 /***/ }),
-/* 388 */
+/* 386 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const onetime = __webpack_require__(389);
-const signalExit = __webpack_require__(225);
+const onetime = __webpack_require__(387);
+const signalExit = __webpack_require__(217);
 
 module.exports = onetime(() => {
 	signalExit(() => {
@@ -50401,12 +50256,12 @@ module.exports = onetime(() => {
 
 
 /***/ }),
-/* 389 */
+/* 387 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const mimicFn = __webpack_require__(390);
+const mimicFn = __webpack_require__(388);
 
 module.exports = (fn, opts) => {
 	// TODO: Remove this in v3
@@ -50447,7 +50302,7 @@ module.exports = (fn, opts) => {
 
 
 /***/ }),
-/* 390 */
+/* 388 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -50463,27 +50318,27 @@ module.exports = (to, from) => {
 
 
 /***/ }),
-/* 391 */
+/* 389 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-module.exports = __webpack_require__(392);
+module.exports = __webpack_require__(390);
 
 
 /***/ }),
-/* 392 */
+/* 390 */
 /***/ (function(module) {
 
 module.exports = JSON.parse("{\"dots\":{\"interval\":80,\"frames\":[\"⠋\",\"⠙\",\"⠹\",\"⠸\",\"⠼\",\"⠴\",\"⠦\",\"⠧\",\"⠇\",\"⠏\"]},\"dots2\":{\"interval\":80,\"frames\":[\"⣾\",\"⣽\",\"⣻\",\"⢿\",\"⡿\",\"⣟\",\"⣯\",\"⣷\"]},\"dots3\":{\"interval\":80,\"frames\":[\"⠋\",\"⠙\",\"⠚\",\"⠞\",\"⠖\",\"⠦\",\"⠴\",\"⠲\",\"⠳\",\"⠓\"]},\"dots4\":{\"interval\":80,\"frames\":[\"⠄\",\"⠆\",\"⠇\",\"⠋\",\"⠙\",\"⠸\",\"⠰\",\"⠠\",\"⠰\",\"⠸\",\"⠙\",\"⠋\",\"⠇\",\"⠆\"]},\"dots5\":{\"interval\":80,\"frames\":[\"⠋\",\"⠙\",\"⠚\",\"⠒\",\"⠂\",\"⠂\",\"⠒\",\"⠲\",\"⠴\",\"⠦\",\"⠖\",\"⠒\",\"⠐\",\"⠐\",\"⠒\",\"⠓\",\"⠋\"]},\"dots6\":{\"interval\":80,\"frames\":[\"⠁\",\"⠉\",\"⠙\",\"⠚\",\"⠒\",\"⠂\",\"⠂\",\"⠒\",\"⠲\",\"⠴\",\"⠤\",\"⠄\",\"⠄\",\"⠤\",\"⠴\",\"⠲\",\"⠒\",\"⠂\",\"⠂\",\"⠒\",\"⠚\",\"⠙\",\"⠉\",\"⠁\"]},\"dots7\":{\"interval\":80,\"frames\":[\"⠈\",\"⠉\",\"⠋\",\"⠓\",\"⠒\",\"⠐\",\"⠐\",\"⠒\",\"⠖\",\"⠦\",\"⠤\",\"⠠\",\"⠠\",\"⠤\",\"⠦\",\"⠖\",\"⠒\",\"⠐\",\"⠐\",\"⠒\",\"⠓\",\"⠋\",\"⠉\",\"⠈\"]},\"dots8\":{\"interval\":80,\"frames\":[\"⠁\",\"⠁\",\"⠉\",\"⠙\",\"⠚\",\"⠒\",\"⠂\",\"⠂\",\"⠒\",\"⠲\",\"⠴\",\"⠤\",\"⠄\",\"⠄\",\"⠤\",\"⠠\",\"⠠\",\"⠤\",\"⠦\",\"⠖\",\"⠒\",\"⠐\",\"⠐\",\"⠒\",\"⠓\",\"⠋\",\"⠉\",\"⠈\",\"⠈\"]},\"dots9\":{\"interval\":80,\"frames\":[\"⢹\",\"⢺\",\"⢼\",\"⣸\",\"⣇\",\"⡧\",\"⡗\",\"⡏\"]},\"dots10\":{\"interval\":80,\"frames\":[\"⢄\",\"⢂\",\"⢁\",\"⡁\",\"⡈\",\"⡐\",\"⡠\"]},\"dots11\":{\"interval\":100,\"frames\":[\"⠁\",\"⠂\",\"⠄\",\"⡀\",\"⢀\",\"⠠\",\"⠐\",\"⠈\"]},\"dots12\":{\"interval\":80,\"frames\":[\"⢀⠀\",\"⡀⠀\",\"⠄⠀\",\"⢂⠀\",\"⡂⠀\",\"⠅⠀\",\"⢃⠀\",\"⡃⠀\",\"⠍⠀\",\"⢋⠀\",\"⡋⠀\",\"⠍⠁\",\"⢋⠁\",\"⡋⠁\",\"⠍⠉\",\"⠋⠉\",\"⠋⠉\",\"⠉⠙\",\"⠉⠙\",\"⠉⠩\",\"⠈⢙\",\"⠈⡙\",\"⢈⠩\",\"⡀⢙\",\"⠄⡙\",\"⢂⠩\",\"⡂⢘\",\"⠅⡘\",\"⢃⠨\",\"⡃⢐\",\"⠍⡐\",\"⢋⠠\",\"⡋⢀\",\"⠍⡁\",\"⢋⠁\",\"⡋⠁\",\"⠍⠉\",\"⠋⠉\",\"⠋⠉\",\"⠉⠙\",\"⠉⠙\",\"⠉⠩\",\"⠈⢙\",\"⠈⡙\",\"⠈⠩\",\"⠀⢙\",\"⠀⡙\",\"⠀⠩\",\"⠀⢘\",\"⠀⡘\",\"⠀⠨\",\"⠀⢐\",\"⠀⡐\",\"⠀⠠\",\"⠀⢀\",\"⠀⡀\"]},\"line\":{\"interval\":130,\"frames\":[\"-\",\"\\\\\",\"|\",\"/\"]},\"line2\":{\"interval\":100,\"frames\":[\"⠂\",\"-\",\"–\",\"—\",\"–\",\"-\"]},\"pipe\":{\"interval\":100,\"frames\":[\"┤\",\"┘\",\"┴\",\"└\",\"├\",\"┌\",\"┬\",\"┐\"]},\"simpleDots\":{\"interval\":400,\"frames\":[\".  \",\".. \",\"...\",\"   \"]},\"simpleDotsScrolling\":{\"interval\":200,\"frames\":[\".  \",\".. \",\"...\",\" ..\",\"  .\",\"   \"]},\"star\":{\"interval\":70,\"frames\":[\"✶\",\"✸\",\"✹\",\"✺\",\"✹\",\"✷\"]},\"star2\":{\"interval\":80,\"frames\":[\"+\",\"x\",\"*\"]},\"flip\":{\"interval\":70,\"frames\":[\"_\",\"_\",\"_\",\"-\",\"`\",\"`\",\"'\",\"´\",\"-\",\"_\",\"_\",\"_\"]},\"hamburger\":{\"interval\":100,\"frames\":[\"☱\",\"☲\",\"☴\"]},\"growVertical\":{\"interval\":120,\"frames\":[\"▁\",\"▃\",\"▄\",\"▅\",\"▆\",\"▇\",\"▆\",\"▅\",\"▄\",\"▃\"]},\"growHorizontal\":{\"interval\":120,\"frames\":[\"▏\",\"▎\",\"▍\",\"▌\",\"▋\",\"▊\",\"▉\",\"▊\",\"▋\",\"▌\",\"▍\",\"▎\"]},\"balloon\":{\"interval\":140,\"frames\":[\" \",\".\",\"o\",\"O\",\"@\",\"*\",\" \"]},\"balloon2\":{\"interval\":120,\"frames\":[\".\",\"o\",\"O\",\"°\",\"O\",\"o\",\".\"]},\"noise\":{\"interval\":100,\"frames\":[\"▓\",\"▒\",\"░\"]},\"bounce\":{\"interval\":120,\"frames\":[\"⠁\",\"⠂\",\"⠄\",\"⠂\"]},\"boxBounce\":{\"interval\":120,\"frames\":[\"▖\",\"▘\",\"▝\",\"▗\"]},\"boxBounce2\":{\"interval\":100,\"frames\":[\"▌\",\"▀\",\"▐\",\"▄\"]},\"triangle\":{\"interval\":50,\"frames\":[\"◢\",\"◣\",\"◤\",\"◥\"]},\"arc\":{\"interval\":100,\"frames\":[\"◜\",\"◠\",\"◝\",\"◞\",\"◡\",\"◟\"]},\"circle\":{\"interval\":120,\"frames\":[\"◡\",\"⊙\",\"◠\"]},\"squareCorners\":{\"interval\":180,\"frames\":[\"◰\",\"◳\",\"◲\",\"◱\"]},\"circleQuarters\":{\"interval\":120,\"frames\":[\"◴\",\"◷\",\"◶\",\"◵\"]},\"circleHalves\":{\"interval\":50,\"frames\":[\"◐\",\"◓\",\"◑\",\"◒\"]},\"squish\":{\"interval\":100,\"frames\":[\"╫\",\"╪\"]},\"toggle\":{\"interval\":250,\"frames\":[\"⊶\",\"⊷\"]},\"toggle2\":{\"interval\":80,\"frames\":[\"▫\",\"▪\"]},\"toggle3\":{\"interval\":120,\"frames\":[\"□\",\"■\"]},\"toggle4\":{\"interval\":100,\"frames\":[\"■\",\"□\",\"▪\",\"▫\"]},\"toggle5\":{\"interval\":100,\"frames\":[\"▮\",\"▯\"]},\"toggle6\":{\"interval\":300,\"frames\":[\"ဝ\",\"၀\"]},\"toggle7\":{\"interval\":80,\"frames\":[\"⦾\",\"⦿\"]},\"toggle8\":{\"interval\":100,\"frames\":[\"◍\",\"◌\"]},\"toggle9\":{\"interval\":100,\"frames\":[\"◉\",\"◎\"]},\"toggle10\":{\"interval\":100,\"frames\":[\"㊂\",\"㊀\",\"㊁\"]},\"toggle11\":{\"interval\":50,\"frames\":[\"⧇\",\"⧆\"]},\"toggle12\":{\"interval\":120,\"frames\":[\"☗\",\"☖\"]},\"toggle13\":{\"interval\":80,\"frames\":[\"=\",\"*\",\"-\"]},\"arrow\":{\"interval\":100,\"frames\":[\"←\",\"↖\",\"↑\",\"↗\",\"→\",\"↘\",\"↓\",\"↙\"]},\"arrow2\":{\"interval\":80,\"frames\":[\"⬆️ \",\"↗️ \",\"➡️ \",\"↘️ \",\"⬇️ \",\"↙️ \",\"⬅️ \",\"↖️ \"]},\"arrow3\":{\"interval\":120,\"frames\":[\"▹▹▹▹▹\",\"▸▹▹▹▹\",\"▹▸▹▹▹\",\"▹▹▸▹▹\",\"▹▹▹▸▹\",\"▹▹▹▹▸\"]},\"bouncingBar\":{\"interval\":80,\"frames\":[\"[    ]\",\"[=   ]\",\"[==  ]\",\"[=== ]\",\"[ ===]\",\"[  ==]\",\"[   =]\",\"[    ]\",\"[   =]\",\"[  ==]\",\"[ ===]\",\"[====]\",\"[=== ]\",\"[==  ]\",\"[=   ]\"]},\"bouncingBall\":{\"interval\":80,\"frames\":[\"( ●    )\",\"(  ●   )\",\"(   ●  )\",\"(    ● )\",\"(     ●)\",\"(    ● )\",\"(   ●  )\",\"(  ●   )\",\"( ●    )\",\"(●     )\"]},\"smiley\":{\"interval\":200,\"frames\":[\"😄 \",\"😝 \"]},\"monkey\":{\"interval\":300,\"frames\":[\"🙈 \",\"🙈 \",\"🙉 \",\"🙊 \"]},\"hearts\":{\"interval\":100,\"frames\":[\"💛 \",\"💙 \",\"💜 \",\"💚 \",\"❤️ \"]},\"clock\":{\"interval\":100,\"frames\":[\"🕐 \",\"🕑 \",\"🕒 \",\"🕓 \",\"🕔 \",\"🕕 \",\"🕖 \",\"🕗 \",\"🕘 \",\"🕙 \",\"🕚 \"]},\"earth\":{\"interval\":180,\"frames\":[\"🌍 \",\"🌎 \",\"🌏 \"]},\"moon\":{\"interval\":80,\"frames\":[\"🌑 \",\"🌒 \",\"🌓 \",\"🌔 \",\"🌕 \",\"🌖 \",\"🌗 \",\"🌘 \"]},\"runner\":{\"interval\":140,\"frames\":[\"🚶 \",\"🏃 \"]},\"pong\":{\"interval\":80,\"frames\":[\"▐⠂       ▌\",\"▐⠈       ▌\",\"▐ ⠂      ▌\",\"▐ ⠠      ▌\",\"▐  ⡀     ▌\",\"▐  ⠠     ▌\",\"▐   ⠂    ▌\",\"▐   ⠈    ▌\",\"▐    ⠂   ▌\",\"▐    ⠠   ▌\",\"▐     ⡀  ▌\",\"▐     ⠠  ▌\",\"▐      ⠂ ▌\",\"▐      ⠈ ▌\",\"▐       ⠂▌\",\"▐       ⠠▌\",\"▐       ⡀▌\",\"▐      ⠠ ▌\",\"▐      ⠂ ▌\",\"▐     ⠈  ▌\",\"▐     ⠂  ▌\",\"▐    ⠠   ▌\",\"▐    ⡀   ▌\",\"▐   ⠠    ▌\",\"▐   ⠂    ▌\",\"▐  ⠈     ▌\",\"▐  ⠂     ▌\",\"▐ ⠠      ▌\",\"▐ ⡀      ▌\",\"▐⠠       ▌\"]},\"shark\":{\"interval\":120,\"frames\":[\"▐|\\\\____________▌\",\"▐_|\\\\___________▌\",\"▐__|\\\\__________▌\",\"▐___|\\\\_________▌\",\"▐____|\\\\________▌\",\"▐_____|\\\\_______▌\",\"▐______|\\\\______▌\",\"▐_______|\\\\_____▌\",\"▐________|\\\\____▌\",\"▐_________|\\\\___▌\",\"▐__________|\\\\__▌\",\"▐___________|\\\\_▌\",\"▐____________|\\\\▌\",\"▐____________/|▌\",\"▐___________/|_▌\",\"▐__________/|__▌\",\"▐_________/|___▌\",\"▐________/|____▌\",\"▐_______/|_____▌\",\"▐______/|______▌\",\"▐_____/|_______▌\",\"▐____/|________▌\",\"▐___/|_________▌\",\"▐__/|__________▌\",\"▐_/|___________▌\",\"▐/|____________▌\"]},\"dqpb\":{\"interval\":100,\"frames\":[\"d\",\"q\",\"p\",\"b\"]},\"weather\":{\"interval\":100,\"frames\":[\"☀️ \",\"☀️ \",\"☀️ \",\"🌤 \",\"⛅️ \",\"🌥 \",\"☁️ \",\"🌧 \",\"🌨 \",\"🌧 \",\"🌨 \",\"🌧 \",\"🌨 \",\"⛈ \",\"🌨 \",\"🌧 \",\"🌨 \",\"☁️ \",\"🌥 \",\"⛅️ \",\"🌤 \",\"☀️ \",\"☀️ \"]},\"christmas\":{\"interval\":400,\"frames\":[\"🌲\",\"🎄\"]}}");
 
 /***/ }),
-/* 393 */
+/* 391 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const chalk = __webpack_require__(394);
+const chalk = __webpack_require__(392);
 
 const isSupported = process.platform !== 'win32' || process.env.CI || process.env.TERM === 'xterm-256color';
 
@@ -50505,16 +50360,16 @@ module.exports = isSupported ? main : fallbacks;
 
 
 /***/ }),
-/* 394 */
+/* 392 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const escapeStringRegexp = __webpack_require__(178);
-const ansiStyles = __webpack_require__(395);
+const ansiStyles = __webpack_require__(393);
 const stdoutColor = __webpack_require__(184).stdout;
 
-const template = __webpack_require__(396);
+const template = __webpack_require__(394);
 
 const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm');
 
@@ -50740,7 +50595,7 @@ module.exports.default = module.exports; // For TypeScript
 
 
 /***/ }),
-/* 395 */
+/* 393 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -50913,7 +50768,7 @@ Object.defineProperty(module, 'exports', {
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(114)(module)))
 
 /***/ }),
-/* 396 */
+/* 394 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -51048,7 +50903,7 @@ module.exports = (chalk, tmp) => {
 
 
 /***/ }),
-/* 397 */
+/* 395 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -51109,7 +50964,7 @@ const RunCommand = {
 };
 
 /***/ }),
-/* 398 */
+/* 396 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -51119,7 +50974,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(143);
 /* harmony import */ var _utils_parallelize__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(144);
 /* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(145);
-/* harmony import */ var _utils_watch__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(399);
+/* harmony import */ var _utils_watch__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(397);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -51204,14 +51059,14 @@ const WatchCommand = {
 };
 
 /***/ }),
-/* 399 */
+/* 397 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "waitUntilWatchIsReady", function() { return waitUntilWatchIsReady; });
 /* harmony import */ var rxjs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
-/* harmony import */ var rxjs_operators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(400);
+/* harmony import */ var rxjs_operators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(398);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -51278,141 +51133,141 @@ function waitUntilWatchIsReady(stream, opts = {}) {
 }
 
 /***/ }),
-/* 400 */
+/* 398 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _internal_operators_audit__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(401);
+/* harmony import */ var _internal_operators_audit__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(399);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "audit", function() { return _internal_operators_audit__WEBPACK_IMPORTED_MODULE_0__["audit"]; });
 
-/* harmony import */ var _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(402);
+/* harmony import */ var _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(400);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "auditTime", function() { return _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_1__["auditTime"]; });
 
-/* harmony import */ var _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(403);
+/* harmony import */ var _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(401);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buffer", function() { return _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_2__["buffer"]; });
 
-/* harmony import */ var _internal_operators_bufferCount__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(404);
+/* harmony import */ var _internal_operators_bufferCount__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(402);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferCount", function() { return _internal_operators_bufferCount__WEBPACK_IMPORTED_MODULE_3__["bufferCount"]; });
 
-/* harmony import */ var _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(405);
+/* harmony import */ var _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(403);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferTime", function() { return _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_4__["bufferTime"]; });
 
-/* harmony import */ var _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(406);
+/* harmony import */ var _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(404);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferToggle", function() { return _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_5__["bufferToggle"]; });
 
-/* harmony import */ var _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(407);
+/* harmony import */ var _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(405);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferWhen", function() { return _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_6__["bufferWhen"]; });
 
-/* harmony import */ var _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(408);
+/* harmony import */ var _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(406);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "catchError", function() { return _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_7__["catchError"]; });
 
-/* harmony import */ var _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(409);
+/* harmony import */ var _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(407);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineAll", function() { return _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_8__["combineAll"]; });
 
-/* harmony import */ var _internal_operators_combineLatest__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(410);
+/* harmony import */ var _internal_operators_combineLatest__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(408);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return _internal_operators_combineLatest__WEBPACK_IMPORTED_MODULE_9__["combineLatest"]; });
 
-/* harmony import */ var _internal_operators_concat__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(411);
+/* harmony import */ var _internal_operators_concat__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(409);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return _internal_operators_concat__WEBPACK_IMPORTED_MODULE_10__["concat"]; });
 
 /* harmony import */ var _internal_operators_concatAll__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(80);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatAll", function() { return _internal_operators_concatAll__WEBPACK_IMPORTED_MODULE_11__["concatAll"]; });
 
-/* harmony import */ var _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(412);
+/* harmony import */ var _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(410);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatMap", function() { return _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_12__["concatMap"]; });
 
-/* harmony import */ var _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(413);
+/* harmony import */ var _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(411);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatMapTo", function() { return _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_13__["concatMapTo"]; });
 
-/* harmony import */ var _internal_operators_count__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(414);
+/* harmony import */ var _internal_operators_count__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(412);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "count", function() { return _internal_operators_count__WEBPACK_IMPORTED_MODULE_14__["count"]; });
 
-/* harmony import */ var _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(415);
+/* harmony import */ var _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(413);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "debounce", function() { return _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_15__["debounce"]; });
 
-/* harmony import */ var _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(416);
+/* harmony import */ var _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(414);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "debounceTime", function() { return _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_16__["debounceTime"]; });
 
-/* harmony import */ var _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(417);
+/* harmony import */ var _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(415);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "defaultIfEmpty", function() { return _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_17__["defaultIfEmpty"]; });
 
-/* harmony import */ var _internal_operators_delay__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(418);
+/* harmony import */ var _internal_operators_delay__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(416);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "delay", function() { return _internal_operators_delay__WEBPACK_IMPORTED_MODULE_18__["delay"]; });
 
-/* harmony import */ var _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(420);
+/* harmony import */ var _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(418);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "delayWhen", function() { return _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_19__["delayWhen"]; });
 
-/* harmony import */ var _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(421);
+/* harmony import */ var _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(419);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "dematerialize", function() { return _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_20__["dematerialize"]; });
 
-/* harmony import */ var _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(422);
+/* harmony import */ var _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(420);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinct", function() { return _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_21__["distinct"]; });
 
-/* harmony import */ var _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(423);
+/* harmony import */ var _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(421);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinctUntilChanged", function() { return _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_22__["distinctUntilChanged"]; });
 
-/* harmony import */ var _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(424);
+/* harmony import */ var _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(422);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinctUntilKeyChanged", function() { return _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_23__["distinctUntilKeyChanged"]; });
 
-/* harmony import */ var _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(425);
+/* harmony import */ var _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(423);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "elementAt", function() { return _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_24__["elementAt"]; });
 
-/* harmony import */ var _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(428);
+/* harmony import */ var _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(426);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "endWith", function() { return _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_25__["endWith"]; });
 
-/* harmony import */ var _internal_operators_every__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(429);
+/* harmony import */ var _internal_operators_every__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(427);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "every", function() { return _internal_operators_every__WEBPACK_IMPORTED_MODULE_26__["every"]; });
 
-/* harmony import */ var _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(430);
+/* harmony import */ var _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(428);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaust", function() { return _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_27__["exhaust"]; });
 
-/* harmony import */ var _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(431);
+/* harmony import */ var _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(429);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaustMap", function() { return _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_28__["exhaustMap"]; });
 
-/* harmony import */ var _internal_operators_expand__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(432);
+/* harmony import */ var _internal_operators_expand__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(430);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "expand", function() { return _internal_operators_expand__WEBPACK_IMPORTED_MODULE_29__["expand"]; });
 
 /* harmony import */ var _internal_operators_filter__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(104);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "filter", function() { return _internal_operators_filter__WEBPACK_IMPORTED_MODULE_30__["filter"]; });
 
-/* harmony import */ var _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(433);
+/* harmony import */ var _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(431);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "finalize", function() { return _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_31__["finalize"]; });
 
-/* harmony import */ var _internal_operators_find__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(434);
+/* harmony import */ var _internal_operators_find__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(432);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "find", function() { return _internal_operators_find__WEBPACK_IMPORTED_MODULE_32__["find"]; });
 
-/* harmony import */ var _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(435);
+/* harmony import */ var _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(433);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "findIndex", function() { return _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_33__["findIndex"]; });
 
-/* harmony import */ var _internal_operators_first__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(436);
+/* harmony import */ var _internal_operators_first__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(434);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "first", function() { return _internal_operators_first__WEBPACK_IMPORTED_MODULE_34__["first"]; });
 
 /* harmony import */ var _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(31);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "groupBy", function() { return _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_35__["groupBy"]; });
 
-/* harmony import */ var _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(437);
+/* harmony import */ var _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(435);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ignoreElements", function() { return _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_36__["ignoreElements"]; });
 
-/* harmony import */ var _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(438);
+/* harmony import */ var _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(436);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isEmpty", function() { return _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_37__["isEmpty"]; });
 
-/* harmony import */ var _internal_operators_last__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(439);
+/* harmony import */ var _internal_operators_last__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(437);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "last", function() { return _internal_operators_last__WEBPACK_IMPORTED_MODULE_38__["last"]; });
 
 /* harmony import */ var _internal_operators_map__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(66);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "map", function() { return _internal_operators_map__WEBPACK_IMPORTED_MODULE_39__["map"]; });
 
-/* harmony import */ var _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(441);
+/* harmony import */ var _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(439);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mapTo", function() { return _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_40__["mapTo"]; });
 
-/* harmony import */ var _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(442);
+/* harmony import */ var _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(440);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "materialize", function() { return _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_41__["materialize"]; });
 
-/* harmony import */ var _internal_operators_max__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(443);
+/* harmony import */ var _internal_operators_max__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(441);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "max", function() { return _internal_operators_max__WEBPACK_IMPORTED_MODULE_42__["max"]; });
 
-/* harmony import */ var _internal_operators_merge__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(446);
+/* harmony import */ var _internal_operators_merge__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(444);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return _internal_operators_merge__WEBPACK_IMPORTED_MODULE_43__["merge"]; });
 
 /* harmony import */ var _internal_operators_mergeAll__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(81);
@@ -51423,175 +51278,175 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "flatMap", function() { return _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_45__["mergeMap"]; });
 
-/* harmony import */ var _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(447);
+/* harmony import */ var _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(445);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeMapTo", function() { return _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_46__["mergeMapTo"]; });
 
-/* harmony import */ var _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(448);
+/* harmony import */ var _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(446);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeScan", function() { return _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_47__["mergeScan"]; });
 
-/* harmony import */ var _internal_operators_min__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(449);
+/* harmony import */ var _internal_operators_min__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(447);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "min", function() { return _internal_operators_min__WEBPACK_IMPORTED_MODULE_48__["min"]; });
 
-/* harmony import */ var _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(450);
+/* harmony import */ var _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(448);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "multicast", function() { return _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_49__["multicast"]; });
 
 /* harmony import */ var _internal_operators_observeOn__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(41);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "observeOn", function() { return _internal_operators_observeOn__WEBPACK_IMPORTED_MODULE_50__["observeOn"]; });
 
-/* harmony import */ var _internal_operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(451);
+/* harmony import */ var _internal_operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(449);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return _internal_operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_51__["onErrorResumeNext"]; });
 
-/* harmony import */ var _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__(452);
+/* harmony import */ var _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__(450);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pairwise", function() { return _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_52__["pairwise"]; });
 
-/* harmony import */ var _internal_operators_partition__WEBPACK_IMPORTED_MODULE_53__ = __webpack_require__(453);
+/* harmony import */ var _internal_operators_partition__WEBPACK_IMPORTED_MODULE_53__ = __webpack_require__(451);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return _internal_operators_partition__WEBPACK_IMPORTED_MODULE_53__["partition"]; });
 
-/* harmony import */ var _internal_operators_pluck__WEBPACK_IMPORTED_MODULE_54__ = __webpack_require__(454);
+/* harmony import */ var _internal_operators_pluck__WEBPACK_IMPORTED_MODULE_54__ = __webpack_require__(452);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pluck", function() { return _internal_operators_pluck__WEBPACK_IMPORTED_MODULE_54__["pluck"]; });
 
-/* harmony import */ var _internal_operators_publish__WEBPACK_IMPORTED_MODULE_55__ = __webpack_require__(455);
+/* harmony import */ var _internal_operators_publish__WEBPACK_IMPORTED_MODULE_55__ = __webpack_require__(453);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publish", function() { return _internal_operators_publish__WEBPACK_IMPORTED_MODULE_55__["publish"]; });
 
-/* harmony import */ var _internal_operators_publishBehavior__WEBPACK_IMPORTED_MODULE_56__ = __webpack_require__(456);
+/* harmony import */ var _internal_operators_publishBehavior__WEBPACK_IMPORTED_MODULE_56__ = __webpack_require__(454);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishBehavior", function() { return _internal_operators_publishBehavior__WEBPACK_IMPORTED_MODULE_56__["publishBehavior"]; });
 
-/* harmony import */ var _internal_operators_publishLast__WEBPACK_IMPORTED_MODULE_57__ = __webpack_require__(457);
+/* harmony import */ var _internal_operators_publishLast__WEBPACK_IMPORTED_MODULE_57__ = __webpack_require__(455);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishLast", function() { return _internal_operators_publishLast__WEBPACK_IMPORTED_MODULE_57__["publishLast"]; });
 
-/* harmony import */ var _internal_operators_publishReplay__WEBPACK_IMPORTED_MODULE_58__ = __webpack_require__(458);
+/* harmony import */ var _internal_operators_publishReplay__WEBPACK_IMPORTED_MODULE_58__ = __webpack_require__(456);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishReplay", function() { return _internal_operators_publishReplay__WEBPACK_IMPORTED_MODULE_58__["publishReplay"]; });
 
-/* harmony import */ var _internal_operators_race__WEBPACK_IMPORTED_MODULE_59__ = __webpack_require__(459);
+/* harmony import */ var _internal_operators_race__WEBPACK_IMPORTED_MODULE_59__ = __webpack_require__(457);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "race", function() { return _internal_operators_race__WEBPACK_IMPORTED_MODULE_59__["race"]; });
 
-/* harmony import */ var _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_60__ = __webpack_require__(444);
+/* harmony import */ var _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_60__ = __webpack_require__(442);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "reduce", function() { return _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_60__["reduce"]; });
 
-/* harmony import */ var _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_61__ = __webpack_require__(460);
+/* harmony import */ var _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_61__ = __webpack_require__(458);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "repeat", function() { return _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_61__["repeat"]; });
 
-/* harmony import */ var _internal_operators_repeatWhen__WEBPACK_IMPORTED_MODULE_62__ = __webpack_require__(461);
+/* harmony import */ var _internal_operators_repeatWhen__WEBPACK_IMPORTED_MODULE_62__ = __webpack_require__(459);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "repeatWhen", function() { return _internal_operators_repeatWhen__WEBPACK_IMPORTED_MODULE_62__["repeatWhen"]; });
 
-/* harmony import */ var _internal_operators_retry__WEBPACK_IMPORTED_MODULE_63__ = __webpack_require__(462);
+/* harmony import */ var _internal_operators_retry__WEBPACK_IMPORTED_MODULE_63__ = __webpack_require__(460);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "retry", function() { return _internal_operators_retry__WEBPACK_IMPORTED_MODULE_63__["retry"]; });
 
-/* harmony import */ var _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_64__ = __webpack_require__(463);
+/* harmony import */ var _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_64__ = __webpack_require__(461);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "retryWhen", function() { return _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_64__["retryWhen"]; });
 
 /* harmony import */ var _internal_operators_refCount__WEBPACK_IMPORTED_MODULE_65__ = __webpack_require__(30);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "refCount", function() { return _internal_operators_refCount__WEBPACK_IMPORTED_MODULE_65__["refCount"]; });
 
-/* harmony import */ var _internal_operators_sample__WEBPACK_IMPORTED_MODULE_66__ = __webpack_require__(464);
+/* harmony import */ var _internal_operators_sample__WEBPACK_IMPORTED_MODULE_66__ = __webpack_require__(462);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sample", function() { return _internal_operators_sample__WEBPACK_IMPORTED_MODULE_66__["sample"]; });
 
-/* harmony import */ var _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_67__ = __webpack_require__(465);
+/* harmony import */ var _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_67__ = __webpack_require__(463);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sampleTime", function() { return _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_67__["sampleTime"]; });
 
-/* harmony import */ var _internal_operators_scan__WEBPACK_IMPORTED_MODULE_68__ = __webpack_require__(445);
+/* harmony import */ var _internal_operators_scan__WEBPACK_IMPORTED_MODULE_68__ = __webpack_require__(443);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "scan", function() { return _internal_operators_scan__WEBPACK_IMPORTED_MODULE_68__["scan"]; });
 
-/* harmony import */ var _internal_operators_sequenceEqual__WEBPACK_IMPORTED_MODULE_69__ = __webpack_require__(466);
+/* harmony import */ var _internal_operators_sequenceEqual__WEBPACK_IMPORTED_MODULE_69__ = __webpack_require__(464);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sequenceEqual", function() { return _internal_operators_sequenceEqual__WEBPACK_IMPORTED_MODULE_69__["sequenceEqual"]; });
 
-/* harmony import */ var _internal_operators_share__WEBPACK_IMPORTED_MODULE_70__ = __webpack_require__(467);
+/* harmony import */ var _internal_operators_share__WEBPACK_IMPORTED_MODULE_70__ = __webpack_require__(465);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "share", function() { return _internal_operators_share__WEBPACK_IMPORTED_MODULE_70__["share"]; });
 
-/* harmony import */ var _internal_operators_shareReplay__WEBPACK_IMPORTED_MODULE_71__ = __webpack_require__(468);
+/* harmony import */ var _internal_operators_shareReplay__WEBPACK_IMPORTED_MODULE_71__ = __webpack_require__(466);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "shareReplay", function() { return _internal_operators_shareReplay__WEBPACK_IMPORTED_MODULE_71__["shareReplay"]; });
 
-/* harmony import */ var _internal_operators_single__WEBPACK_IMPORTED_MODULE_72__ = __webpack_require__(469);
+/* harmony import */ var _internal_operators_single__WEBPACK_IMPORTED_MODULE_72__ = __webpack_require__(467);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "single", function() { return _internal_operators_single__WEBPACK_IMPORTED_MODULE_72__["single"]; });
 
-/* harmony import */ var _internal_operators_skip__WEBPACK_IMPORTED_MODULE_73__ = __webpack_require__(470);
+/* harmony import */ var _internal_operators_skip__WEBPACK_IMPORTED_MODULE_73__ = __webpack_require__(468);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skip", function() { return _internal_operators_skip__WEBPACK_IMPORTED_MODULE_73__["skip"]; });
 
-/* harmony import */ var _internal_operators_skipLast__WEBPACK_IMPORTED_MODULE_74__ = __webpack_require__(471);
+/* harmony import */ var _internal_operators_skipLast__WEBPACK_IMPORTED_MODULE_74__ = __webpack_require__(469);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipLast", function() { return _internal_operators_skipLast__WEBPACK_IMPORTED_MODULE_74__["skipLast"]; });
 
-/* harmony import */ var _internal_operators_skipUntil__WEBPACK_IMPORTED_MODULE_75__ = __webpack_require__(472);
+/* harmony import */ var _internal_operators_skipUntil__WEBPACK_IMPORTED_MODULE_75__ = __webpack_require__(470);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipUntil", function() { return _internal_operators_skipUntil__WEBPACK_IMPORTED_MODULE_75__["skipUntil"]; });
 
-/* harmony import */ var _internal_operators_skipWhile__WEBPACK_IMPORTED_MODULE_76__ = __webpack_require__(473);
+/* harmony import */ var _internal_operators_skipWhile__WEBPACK_IMPORTED_MODULE_76__ = __webpack_require__(471);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipWhile", function() { return _internal_operators_skipWhile__WEBPACK_IMPORTED_MODULE_76__["skipWhile"]; });
 
-/* harmony import */ var _internal_operators_startWith__WEBPACK_IMPORTED_MODULE_77__ = __webpack_require__(474);
+/* harmony import */ var _internal_operators_startWith__WEBPACK_IMPORTED_MODULE_77__ = __webpack_require__(472);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "startWith", function() { return _internal_operators_startWith__WEBPACK_IMPORTED_MODULE_77__["startWith"]; });
 
-/* harmony import */ var _internal_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_78__ = __webpack_require__(475);
+/* harmony import */ var _internal_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_78__ = __webpack_require__(473);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "subscribeOn", function() { return _internal_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_78__["subscribeOn"]; });
 
-/* harmony import */ var _internal_operators_switchAll__WEBPACK_IMPORTED_MODULE_79__ = __webpack_require__(477);
+/* harmony import */ var _internal_operators_switchAll__WEBPACK_IMPORTED_MODULE_79__ = __webpack_require__(475);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchAll", function() { return _internal_operators_switchAll__WEBPACK_IMPORTED_MODULE_79__["switchAll"]; });
 
-/* harmony import */ var _internal_operators_switchMap__WEBPACK_IMPORTED_MODULE_80__ = __webpack_require__(478);
+/* harmony import */ var _internal_operators_switchMap__WEBPACK_IMPORTED_MODULE_80__ = __webpack_require__(476);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchMap", function() { return _internal_operators_switchMap__WEBPACK_IMPORTED_MODULE_80__["switchMap"]; });
 
-/* harmony import */ var _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_81__ = __webpack_require__(479);
+/* harmony import */ var _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_81__ = __webpack_require__(477);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchMapTo", function() { return _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_81__["switchMapTo"]; });
 
-/* harmony import */ var _internal_operators_take__WEBPACK_IMPORTED_MODULE_82__ = __webpack_require__(427);
+/* harmony import */ var _internal_operators_take__WEBPACK_IMPORTED_MODULE_82__ = __webpack_require__(425);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "take", function() { return _internal_operators_take__WEBPACK_IMPORTED_MODULE_82__["take"]; });
 
-/* harmony import */ var _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_83__ = __webpack_require__(440);
+/* harmony import */ var _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_83__ = __webpack_require__(438);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeLast", function() { return _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_83__["takeLast"]; });
 
-/* harmony import */ var _internal_operators_takeUntil__WEBPACK_IMPORTED_MODULE_84__ = __webpack_require__(480);
+/* harmony import */ var _internal_operators_takeUntil__WEBPACK_IMPORTED_MODULE_84__ = __webpack_require__(478);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeUntil", function() { return _internal_operators_takeUntil__WEBPACK_IMPORTED_MODULE_84__["takeUntil"]; });
 
-/* harmony import */ var _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_85__ = __webpack_require__(481);
+/* harmony import */ var _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_85__ = __webpack_require__(479);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeWhile", function() { return _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_85__["takeWhile"]; });
 
-/* harmony import */ var _internal_operators_tap__WEBPACK_IMPORTED_MODULE_86__ = __webpack_require__(482);
+/* harmony import */ var _internal_operators_tap__WEBPACK_IMPORTED_MODULE_86__ = __webpack_require__(480);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "tap", function() { return _internal_operators_tap__WEBPACK_IMPORTED_MODULE_86__["tap"]; });
 
-/* harmony import */ var _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_87__ = __webpack_require__(483);
+/* harmony import */ var _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_87__ = __webpack_require__(481);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throttle", function() { return _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_87__["throttle"]; });
 
-/* harmony import */ var _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_88__ = __webpack_require__(484);
+/* harmony import */ var _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_88__ = __webpack_require__(482);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throttleTime", function() { return _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_88__["throttleTime"]; });
 
-/* harmony import */ var _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_89__ = __webpack_require__(426);
+/* harmony import */ var _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_89__ = __webpack_require__(424);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throwIfEmpty", function() { return _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_89__["throwIfEmpty"]; });
 
-/* harmony import */ var _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_90__ = __webpack_require__(485);
+/* harmony import */ var _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_90__ = __webpack_require__(483);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeInterval", function() { return _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_90__["timeInterval"]; });
 
-/* harmony import */ var _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_91__ = __webpack_require__(486);
+/* harmony import */ var _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_91__ = __webpack_require__(484);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeout", function() { return _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_91__["timeout"]; });
 
-/* harmony import */ var _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_92__ = __webpack_require__(487);
+/* harmony import */ var _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_92__ = __webpack_require__(485);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeoutWith", function() { return _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_92__["timeoutWith"]; });
 
-/* harmony import */ var _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_93__ = __webpack_require__(488);
+/* harmony import */ var _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_93__ = __webpack_require__(486);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timestamp", function() { return _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_93__["timestamp"]; });
 
-/* harmony import */ var _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_94__ = __webpack_require__(489);
+/* harmony import */ var _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_94__ = __webpack_require__(487);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "toArray", function() { return _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_94__["toArray"]; });
 
-/* harmony import */ var _internal_operators_window__WEBPACK_IMPORTED_MODULE_95__ = __webpack_require__(490);
+/* harmony import */ var _internal_operators_window__WEBPACK_IMPORTED_MODULE_95__ = __webpack_require__(488);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "window", function() { return _internal_operators_window__WEBPACK_IMPORTED_MODULE_95__["window"]; });
 
-/* harmony import */ var _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_96__ = __webpack_require__(491);
+/* harmony import */ var _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_96__ = __webpack_require__(489);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowCount", function() { return _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_96__["windowCount"]; });
 
-/* harmony import */ var _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_97__ = __webpack_require__(492);
+/* harmony import */ var _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_97__ = __webpack_require__(490);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowTime", function() { return _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_97__["windowTime"]; });
 
-/* harmony import */ var _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_98__ = __webpack_require__(493);
+/* harmony import */ var _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_98__ = __webpack_require__(491);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowToggle", function() { return _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_98__["windowToggle"]; });
 
-/* harmony import */ var _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_99__ = __webpack_require__(494);
+/* harmony import */ var _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_99__ = __webpack_require__(492);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowWhen", function() { return _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_99__["windowWhen"]; });
 
-/* harmony import */ var _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_100__ = __webpack_require__(495);
+/* harmony import */ var _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_100__ = __webpack_require__(493);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "withLatestFrom", function() { return _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_100__["withLatestFrom"]; });
 
-/* harmony import */ var _internal_operators_zip__WEBPACK_IMPORTED_MODULE_101__ = __webpack_require__(496);
+/* harmony import */ var _internal_operators_zip__WEBPACK_IMPORTED_MODULE_101__ = __webpack_require__(494);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return _internal_operators_zip__WEBPACK_IMPORTED_MODULE_101__["zip"]; });
 
-/* harmony import */ var _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_102__ = __webpack_require__(497);
+/* harmony import */ var _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_102__ = __webpack_require__(495);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zipAll", function() { return _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_102__["zipAll"]; });
 
 /** PURE_IMPORTS_START  PURE_IMPORTS_END */
@@ -51703,7 +51558,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 /***/ }),
-/* 401 */
+/* 399 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -51784,14 +51639,14 @@ var AuditSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 402 */
+/* 400 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "auditTime", function() { return auditTime; });
 /* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(55);
-/* harmony import */ var _audit__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(401);
+/* harmony import */ var _audit__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(399);
 /* harmony import */ var _observable_timer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(107);
 /** PURE_IMPORTS_START _scheduler_async,_audit,_observable_timer PURE_IMPORTS_END */
 
@@ -51807,7 +51662,7 @@ function auditTime(duration, scheduler) {
 
 
 /***/ }),
-/* 403 */
+/* 401 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -51856,7 +51711,7 @@ var BufferSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 404 */
+/* 402 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -51957,7 +51812,7 @@ var BufferSkipCountSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 405 */
+/* 403 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -52118,7 +51973,7 @@ function dispatchBufferClose(arg) {
 
 
 /***/ }),
-/* 406 */
+/* 404 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -52238,7 +52093,7 @@ var BufferToggleSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 407 */
+/* 405 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -52333,7 +52188,7 @@ var BufferWhenSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 408 */
+/* 406 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -52397,7 +52252,7 @@ var CatchSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 409 */
+/* 407 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -52413,7 +52268,7 @@ function combineAll(project) {
 
 
 /***/ }),
-/* 410 */
+/* 408 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -52445,7 +52300,7 @@ function combineLatest() {
 
 
 /***/ }),
-/* 411 */
+/* 409 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -52465,7 +52320,7 @@ function concat() {
 
 
 /***/ }),
-/* 412 */
+/* 410 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -52481,13 +52336,13 @@ function concatMap(project, resultSelector) {
 
 
 /***/ }),
-/* 413 */
+/* 411 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "concatMapTo", function() { return concatMapTo; });
-/* harmony import */ var _concatMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(412);
+/* harmony import */ var _concatMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(410);
 /** PURE_IMPORTS_START _concatMap PURE_IMPORTS_END */
 
 function concatMapTo(innerObservable, resultSelector) {
@@ -52497,7 +52352,7 @@ function concatMapTo(innerObservable, resultSelector) {
 
 
 /***/ }),
-/* 414 */
+/* 412 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -52562,7 +52417,7 @@ var CountSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 415 */
+/* 413 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -52650,7 +52505,7 @@ var DebounceSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 416 */
+/* 414 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -52726,7 +52581,7 @@ function dispatchNext(subscriber) {
 
 
 /***/ }),
-/* 417 */
+/* 415 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -52776,7 +52631,7 @@ var DefaultIfEmptySubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 418 */
+/* 416 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -52784,7 +52639,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "delay", function() { return delay; });
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
 /* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(55);
-/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(419);
+/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(417);
 /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(11);
 /* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(42);
 /** PURE_IMPORTS_START tslib,_scheduler_async,_util_isDate,_Subscriber,_Notification PURE_IMPORTS_END */
@@ -52883,7 +52738,7 @@ var DelayMessage = /*@__PURE__*/ (function () {
 
 
 /***/ }),
-/* 419 */
+/* 417 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -52897,7 +52752,7 @@ function isDate(value) {
 
 
 /***/ }),
-/* 420 */
+/* 418 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -53043,7 +52898,7 @@ var SubscriptionDelaySubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 421 */
+/* 419 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -53081,7 +52936,7 @@ var DeMaterializeSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 422 */
+/* 420 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -53159,7 +53014,7 @@ var DistinctSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 423 */
+/* 421 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -53230,13 +53085,13 @@ var DistinctUntilChangedSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 424 */
+/* 422 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "distinctUntilKeyChanged", function() { return distinctUntilKeyChanged; });
-/* harmony import */ var _distinctUntilChanged__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(423);
+/* harmony import */ var _distinctUntilChanged__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(421);
 /** PURE_IMPORTS_START _distinctUntilChanged PURE_IMPORTS_END */
 
 function distinctUntilKeyChanged(key, compare) {
@@ -53246,7 +53101,7 @@ function distinctUntilKeyChanged(key, compare) {
 
 
 /***/ }),
-/* 425 */
+/* 423 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -53254,9 +53109,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "elementAt", function() { return elementAt; });
 /* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(62);
 /* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(104);
-/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(426);
-/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(417);
-/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(427);
+/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(424);
+/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(415);
+/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(425);
 /** PURE_IMPORTS_START _util_ArgumentOutOfRangeError,_filter,_throwIfEmpty,_defaultIfEmpty,_take PURE_IMPORTS_END */
 
 
@@ -53278,7 +53133,7 @@ function elementAt(index, defaultValue) {
 
 
 /***/ }),
-/* 426 */
+/* 424 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -53344,7 +53199,7 @@ function defaultErrorFactory() {
 
 
 /***/ }),
-/* 427 */
+/* 425 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -53406,7 +53261,7 @@ var TakeSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 428 */
+/* 426 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -53428,7 +53283,7 @@ function endWith() {
 
 
 /***/ }),
-/* 429 */
+/* 427 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -53490,7 +53345,7 @@ var EverySubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 430 */
+/* 428 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -53547,7 +53402,7 @@ var SwitchFirstSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 431 */
+/* 429 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -53647,7 +53502,7 @@ var ExhaustMapSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 432 */
+/* 430 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -53766,7 +53621,7 @@ var ExpandSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 433 */
+/* 431 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -53804,7 +53659,7 @@ var FinallySubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 434 */
+/* 432 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -53876,13 +53731,13 @@ var FindValueSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 435 */
+/* 433 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "findIndex", function() { return findIndex; });
-/* harmony import */ var _operators_find__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(434);
+/* harmony import */ var _operators_find__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(432);
 /** PURE_IMPORTS_START _operators_find PURE_IMPORTS_END */
 
 function findIndex(predicate, thisArg) {
@@ -53892,7 +53747,7 @@ function findIndex(predicate, thisArg) {
 
 
 /***/ }),
-/* 436 */
+/* 434 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -53900,9 +53755,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "first", function() { return first; });
 /* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(63);
 /* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(104);
-/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(427);
-/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(417);
-/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(426);
+/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(425);
+/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(415);
+/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(424);
 /* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(25);
 /** PURE_IMPORTS_START _util_EmptyError,_filter,_take,_defaultIfEmpty,_throwIfEmpty,_util_identity PURE_IMPORTS_END */
 
@@ -53919,7 +53774,7 @@ function first(predicate, defaultValue) {
 
 
 /***/ }),
-/* 437 */
+/* 435 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -53956,7 +53811,7 @@ var IgnoreElementsSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 438 */
+/* 436 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -54000,7 +53855,7 @@ var IsEmptySubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 439 */
+/* 437 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -54008,9 +53863,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "last", function() { return last; });
 /* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(63);
 /* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(104);
-/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(440);
-/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(426);
-/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(417);
+/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(438);
+/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(424);
+/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(415);
 /* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(25);
 /** PURE_IMPORTS_START _util_EmptyError,_filter,_takeLast,_throwIfEmpty,_defaultIfEmpty,_util_identity PURE_IMPORTS_END */
 
@@ -54027,7 +53882,7 @@ function last(predicate, defaultValue) {
 
 
 /***/ }),
-/* 440 */
+/* 438 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -54104,7 +53959,7 @@ var TakeLastSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 441 */
+/* 439 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -54143,7 +53998,7 @@ var MapToSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 442 */
+/* 440 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -54193,13 +54048,13 @@ var MaterializeSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 443 */
+/* 441 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "max", function() { return max; });
-/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(444);
+/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(442);
 /** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */
 
 function max(comparer) {
@@ -54212,15 +54067,15 @@ function max(comparer) {
 
 
 /***/ }),
-/* 444 */
+/* 442 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "reduce", function() { return reduce; });
-/* harmony import */ var _scan__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(445);
-/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(440);
-/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(417);
+/* harmony import */ var _scan__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(443);
+/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(438);
+/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(415);
 /* harmony import */ var _util_pipe__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(24);
 /** PURE_IMPORTS_START _scan,_takeLast,_defaultIfEmpty,_util_pipe PURE_IMPORTS_END */
 
@@ -54241,7 +54096,7 @@ function reduce(accumulator, seed) {
 
 
 /***/ }),
-/* 445 */
+/* 443 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -54323,7 +54178,7 @@ var ScanSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 446 */
+/* 444 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -54343,7 +54198,7 @@ function merge() {
 
 
 /***/ }),
-/* 447 */
+/* 445 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -54368,7 +54223,7 @@ function mergeMapTo(innerObservable, resultSelector, concurrent) {
 
 
 /***/ }),
-/* 448 */
+/* 446 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -54483,13 +54338,13 @@ var MergeScanSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 449 */
+/* 447 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "min", function() { return min; });
-/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(444);
+/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(442);
 /** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */
 
 function min(comparer) {
@@ -54502,7 +54357,7 @@ function min(comparer) {
 
 
 /***/ }),
-/* 450 */
+/* 448 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -54551,7 +54406,7 @@ var MulticastOperator = /*@__PURE__*/ (function () {
 
 
 /***/ }),
-/* 451 */
+/* 449 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -54645,7 +54500,7 @@ var OnErrorResumeNextSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 452 */
+/* 450 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -54693,7 +54548,7 @@ var PairwiseSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 453 */
+/* 451 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -54716,7 +54571,7 @@ function partition(predicate, thisArg) {
 
 
 /***/ }),
-/* 454 */
+/* 452 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -54756,14 +54611,14 @@ function plucker(props, length) {
 
 
 /***/ }),
-/* 455 */
+/* 453 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "publish", function() { return publish; });
 /* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(27);
-/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(450);
+/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(448);
 /** PURE_IMPORTS_START _Subject,_multicast PURE_IMPORTS_END */
 
 
@@ -54776,14 +54631,14 @@ function publish(selector) {
 
 
 /***/ }),
-/* 456 */
+/* 454 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "publishBehavior", function() { return publishBehavior; });
 /* harmony import */ var _BehaviorSubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(32);
-/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(450);
+/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(448);
 /** PURE_IMPORTS_START _BehaviorSubject,_multicast PURE_IMPORTS_END */
 
 
@@ -54794,14 +54649,14 @@ function publishBehavior(value) {
 
 
 /***/ }),
-/* 457 */
+/* 455 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "publishLast", function() { return publishLast; });
 /* harmony import */ var _AsyncSubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(50);
-/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(450);
+/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(448);
 /** PURE_IMPORTS_START _AsyncSubject,_multicast PURE_IMPORTS_END */
 
 
@@ -54812,14 +54667,14 @@ function publishLast() {
 
 
 /***/ }),
-/* 458 */
+/* 456 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "publishReplay", function() { return publishReplay; });
 /* harmony import */ var _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(33);
-/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(450);
+/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(448);
 /** PURE_IMPORTS_START _ReplaySubject,_multicast PURE_IMPORTS_END */
 
 
@@ -54835,7 +54690,7 @@ function publishReplay(bufferSize, windowTime, selectorOrScheduler, scheduler) {
 
 
 /***/ }),
-/* 459 */
+/* 457 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -54862,7 +54717,7 @@ function race() {
 
 
 /***/ }),
-/* 460 */
+/* 458 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -54927,7 +54782,7 @@ var RepeatSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 461 */
+/* 459 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -55023,7 +54878,7 @@ var RepeatWhenSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 462 */
+/* 460 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -55076,7 +54931,7 @@ var RetrySubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 463 */
+/* 461 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -55164,7 +55019,7 @@ var RetryWhenSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 464 */
+/* 462 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -55221,7 +55076,7 @@ var SampleSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 465 */
+/* 463 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -55281,7 +55136,7 @@ function dispatchNotification(state) {
 
 
 /***/ }),
-/* 466 */
+/* 464 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -55404,13 +55259,13 @@ var SequenceEqualCompareToSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 467 */
+/* 465 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "share", function() { return share; });
-/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(450);
+/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(448);
 /* harmony import */ var _refCount__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(30);
 /* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(27);
 /** PURE_IMPORTS_START _multicast,_refCount,_Subject PURE_IMPORTS_END */
@@ -55427,7 +55282,7 @@ function share() {
 
 
 /***/ }),
-/* 468 */
+/* 466 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -55492,7 +55347,7 @@ function shareReplayOperator(_a) {
 
 
 /***/ }),
-/* 469 */
+/* 467 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -55572,7 +55427,7 @@ var SingleSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 470 */
+/* 468 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -55614,7 +55469,7 @@ var SkipSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 471 */
+/* 469 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -55676,7 +55531,7 @@ var SkipLastSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 472 */
+/* 470 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -55737,7 +55592,7 @@ var SkipUntilSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 473 */
+/* 471 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -55793,7 +55648,7 @@ var SkipWhileSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 474 */
+/* 472 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -55822,13 +55677,13 @@ function startWith() {
 
 
 /***/ }),
-/* 475 */
+/* 473 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeOn", function() { return subscribeOn; });
-/* harmony import */ var _observable_SubscribeOnObservable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(476);
+/* harmony import */ var _observable_SubscribeOnObservable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(474);
 /** PURE_IMPORTS_START _observable_SubscribeOnObservable PURE_IMPORTS_END */
 
 function subscribeOn(scheduler, delay) {
@@ -55853,7 +55708,7 @@ var SubscribeOnOperator = /*@__PURE__*/ (function () {
 
 
 /***/ }),
-/* 476 */
+/* 474 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -55917,13 +55772,13 @@ var SubscribeOnObservable = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 477 */
+/* 475 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "switchAll", function() { return switchAll; });
-/* harmony import */ var _switchMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(478);
+/* harmony import */ var _switchMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(476);
 /* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(25);
 /** PURE_IMPORTS_START _switchMap,_util_identity PURE_IMPORTS_END */
 
@@ -55935,7 +55790,7 @@ function switchAll() {
 
 
 /***/ }),
-/* 478 */
+/* 476 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -56029,13 +55884,13 @@ var SwitchMapSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 479 */
+/* 477 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "switchMapTo", function() { return switchMapTo; });
-/* harmony import */ var _switchMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(478);
+/* harmony import */ var _switchMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(476);
 /** PURE_IMPORTS_START _switchMap PURE_IMPORTS_END */
 
 function switchMapTo(innerObservable, resultSelector) {
@@ -56045,7 +55900,7 @@ function switchMapTo(innerObservable, resultSelector) {
 
 
 /***/ }),
-/* 480 */
+/* 478 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -56095,7 +55950,7 @@ var TakeUntilSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 481 */
+/* 479 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -56163,7 +56018,7 @@ var TakeWhileSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 482 */
+/* 480 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -56251,7 +56106,7 @@ var TapSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 483 */
+/* 481 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -56355,7 +56210,7 @@ var ThrottleSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 484 */
+/* 482 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -56364,7 +56219,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
 /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(11);
 /* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(55);
-/* harmony import */ var _throttle__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(483);
+/* harmony import */ var _throttle__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(481);
 /** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async,_throttle PURE_IMPORTS_END */
 
 
@@ -56453,7 +56308,7 @@ function dispatchNext(arg) {
 
 
 /***/ }),
-/* 485 */
+/* 483 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -56461,7 +56316,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timeInterval", function() { return timeInterval; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TimeInterval", function() { return TimeInterval; });
 /* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(55);
-/* harmony import */ var _scan__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(445);
+/* harmony import */ var _scan__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(443);
 /* harmony import */ var _observable_defer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(90);
 /* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(66);
 /** PURE_IMPORTS_START _scheduler_async,_scan,_observable_defer,_map PURE_IMPORTS_END */
@@ -56497,7 +56352,7 @@ var TimeInterval = /*@__PURE__*/ (function () {
 
 
 /***/ }),
-/* 486 */
+/* 484 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -56505,7 +56360,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timeout", function() { return timeout; });
 /* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(55);
 /* harmony import */ var _util_TimeoutError__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(64);
-/* harmony import */ var _timeoutWith__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(487);
+/* harmony import */ var _timeoutWith__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(485);
 /* harmony import */ var _observable_throwError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(49);
 /** PURE_IMPORTS_START _scheduler_async,_util_TimeoutError,_timeoutWith,_observable_throwError PURE_IMPORTS_END */
 
@@ -56522,7 +56377,7 @@ function timeout(due, scheduler) {
 
 
 /***/ }),
-/* 487 */
+/* 485 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -56530,7 +56385,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timeoutWith", function() { return timeoutWith; });
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
 /* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(55);
-/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(419);
+/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(417);
 /* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(69);
 /* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(70);
 /** PURE_IMPORTS_START tslib,_scheduler_async,_util_isDate,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
@@ -56604,7 +56459,7 @@ var TimeoutWithSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 488 */
+/* 486 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -56634,13 +56489,13 @@ var Timestamp = /*@__PURE__*/ (function () {
 
 
 /***/ }),
-/* 489 */
+/* 487 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "toArray", function() { return toArray; });
-/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(444);
+/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(442);
 /** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */
 
 function toArrayReducer(arr, item, index) {
@@ -56657,7 +56512,7 @@ function toArray() {
 
 
 /***/ }),
-/* 490 */
+/* 488 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -56737,7 +56592,7 @@ var WindowSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 491 */
+/* 489 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -56827,7 +56682,7 @@ var WindowCountSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 492 */
+/* 490 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -56997,7 +56852,7 @@ function dispatchWindowClose(state) {
 
 
 /***/ }),
-/* 493 */
+/* 491 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -57140,7 +56995,7 @@ var WindowToggleSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 494 */
+/* 492 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -57237,7 +57092,7 @@ var WindowSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 495 */
+/* 493 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -57332,7 +57187,7 @@ var WithLatestFromSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 496 */
+/* 494 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -57354,7 +57209,7 @@ function zip() {
 
 
 /***/ }),
-/* 497 */
+/* 495 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -57370,7 +57225,7 @@ function zipAll(project) {
 
 
 /***/ }),
-/* 498 */
+/* 496 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -57379,8 +57234,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _utils_errors__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(162);
 /* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(143);
 /* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(145);
-/* harmony import */ var _utils_projects_tree__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(499);
-/* harmony import */ var _utils_kibana__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(500);
+/* harmony import */ var _utils_projects_tree__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(497);
+/* harmony import */ var _utils_kibana__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(498);
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -57462,13 +57317,13 @@ function toArray(value) {
 }
 
 /***/ }),
-/* 499 */
+/* 497 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "renderProjectsTree", function() { return renderProjectsTree; });
-/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(235);
+/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(227);
 /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
@@ -57615,7 +57470,7 @@ function addProjectToTree(tree, pathParts, project) {
 }
 
 /***/ }),
-/* 500 */
+/* 498 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -57623,12 +57478,12 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Kibana", function() { return Kibana; });
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(4);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var multimatch__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(501);
+/* harmony import */ var multimatch__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(499);
 /* harmony import */ var multimatch__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(multimatch__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var is_path_inside__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(377);
+/* harmony import */ var is_path_inside__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(369);
 /* harmony import */ var is_path_inside__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(is_path_inside__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var _projects__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(145);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(288);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(280);
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -57769,15 +57624,15 @@ class Kibana {
 }
 
 /***/ }),
-/* 501 */
+/* 499 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const minimatch = __webpack_require__(149);
-const arrayUnion = __webpack_require__(502);
-const arrayDiffer = __webpack_require__(503);
-const arrify = __webpack_require__(504);
+const arrayUnion = __webpack_require__(500);
+const arrayDiffer = __webpack_require__(501);
+const arrify = __webpack_require__(502);
 
 module.exports = (list, patterns, options = {}) => {
 	list = arrify(list);
@@ -57801,7 +57656,7 @@ module.exports = (list, patterns, options = {}) => {
 
 
 /***/ }),
-/* 502 */
+/* 500 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -57813,7 +57668,7 @@ module.exports = (...arguments_) => {
 
 
 /***/ }),
-/* 503 */
+/* 501 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -57828,7 +57683,7 @@ module.exports = arrayDiffer;
 
 
 /***/ }),
-/* 504 */
+/* 502 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -57858,12 +57713,12 @@ module.exports = arrify;
 
 
 /***/ }),
-/* 505 */
+/* 503 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _build_production_projects__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(506);
+/* harmony import */ var _build_production_projects__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(504);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buildProductionProjects", function() { return _build_production_projects__WEBPACK_IMPORTED_MODULE_0__["buildProductionProjects"]; });
 
 /*
@@ -57887,19 +57742,19 @@ __webpack_require__.r(__webpack_exports__);
 
 
 /***/ }),
-/* 506 */
+/* 504 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "buildProductionProjects", function() { return buildProductionProjects; });
-/* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(507);
+/* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(505);
 /* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(cpy__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(296);
+/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(288);
 /* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(del__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(288);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(280);
 /* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(130);
 /* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(143);
 /* harmony import */ var _utils_package_json__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(164);
@@ -58035,7 +57890,7 @@ async function copyToBuild(project, kibanaRoot, buildRoot) {
 }
 
 /***/ }),
-/* 507 */
+/* 505 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -58043,13 +57898,13 @@ async function copyToBuild(project, kibanaRoot, buildRoot) {
 const EventEmitter = __webpack_require__(155);
 const path = __webpack_require__(4);
 const os = __webpack_require__(120);
-const pAll = __webpack_require__(508);
-const arrify = __webpack_require__(510);
-const globby = __webpack_require__(511);
-const isGlob = __webpack_require__(721);
-const cpFile = __webpack_require__(722);
-const junk = __webpack_require__(734);
-const CpyError = __webpack_require__(735);
+const pAll = __webpack_require__(506);
+const arrify = __webpack_require__(508);
+const globby = __webpack_require__(509);
+const isGlob = __webpack_require__(719);
+const cpFile = __webpack_require__(720);
+const junk = __webpack_require__(732);
+const CpyError = __webpack_require__(733);
 
 const defaultOptions = {
 	ignoreJunk: true
@@ -58168,12 +58023,12 @@ module.exports = (source, destination, {
 
 
 /***/ }),
-/* 508 */
+/* 506 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const pMap = __webpack_require__(509);
+const pMap = __webpack_require__(507);
 
 module.exports = (iterable, options) => pMap(iterable, element => element(), options);
 // TODO: Remove this for the next major release
@@ -58181,7 +58036,7 @@ module.exports.default = module.exports;
 
 
 /***/ }),
-/* 509 */
+/* 507 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -58260,7 +58115,7 @@ module.exports.default = pMap;
 
 
 /***/ }),
-/* 510 */
+/* 508 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -58290,17 +58145,17 @@ module.exports = arrify;
 
 
 /***/ }),
-/* 511 */
+/* 509 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const fs = __webpack_require__(133);
-const arrayUnion = __webpack_require__(512);
+const arrayUnion = __webpack_require__(510);
 const glob = __webpack_require__(146);
-const fastGlob = __webpack_require__(514);
-const dirGlob = __webpack_require__(714);
-const gitignore = __webpack_require__(717);
+const fastGlob = __webpack_require__(512);
+const dirGlob = __webpack_require__(712);
+const gitignore = __webpack_require__(715);
 
 const DEFAULT_FILTER = () => false;
 
@@ -58445,12 +58300,12 @@ module.exports.gitignore = gitignore;
 
 
 /***/ }),
-/* 512 */
+/* 510 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-var arrayUniq = __webpack_require__(513);
+var arrayUniq = __webpack_require__(511);
 
 module.exports = function () {
 	return arrayUniq([].concat.apply([], arguments));
@@ -58458,7 +58313,7 @@ module.exports = function () {
 
 
 /***/ }),
-/* 513 */
+/* 511 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -58527,10 +58382,10 @@ if ('Set' in global) {
 
 
 /***/ }),
-/* 514 */
+/* 512 */
 /***/ (function(module, exports, __webpack_require__) {
 
-const pkg = __webpack_require__(515);
+const pkg = __webpack_require__(513);
 
 module.exports = pkg.async;
 module.exports.default = pkg.async;
@@ -58543,19 +58398,19 @@ module.exports.generateTasks = pkg.generateTasks;
 
 
 /***/ }),
-/* 515 */
+/* 513 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var optionsManager = __webpack_require__(516);
-var taskManager = __webpack_require__(517);
-var reader_async_1 = __webpack_require__(685);
-var reader_stream_1 = __webpack_require__(709);
-var reader_sync_1 = __webpack_require__(710);
-var arrayUtils = __webpack_require__(712);
-var streamUtils = __webpack_require__(713);
+var optionsManager = __webpack_require__(514);
+var taskManager = __webpack_require__(515);
+var reader_async_1 = __webpack_require__(683);
+var reader_stream_1 = __webpack_require__(707);
+var reader_sync_1 = __webpack_require__(708);
+var arrayUtils = __webpack_require__(710);
+var streamUtils = __webpack_require__(711);
 /**
  * Synchronous API.
  */
@@ -58621,7 +58476,7 @@ function isString(source) {
 
 
 /***/ }),
-/* 516 */
+/* 514 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -58659,13 +58514,13 @@ exports.prepare = prepare;
 
 
 /***/ }),
-/* 517 */
+/* 515 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var patternUtils = __webpack_require__(518);
+var patternUtils = __webpack_require__(516);
 /**
  * Generate tasks based on parent directory of each pattern.
  */
@@ -58756,16 +58611,16 @@ exports.convertPatternGroupToTask = convertPatternGroupToTask;
 
 
 /***/ }),
-/* 518 */
+/* 516 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var path = __webpack_require__(4);
-var globParent = __webpack_require__(519);
-var isGlob = __webpack_require__(522);
-var micromatch = __webpack_require__(523);
+var globParent = __webpack_require__(517);
+var isGlob = __webpack_require__(520);
+var micromatch = __webpack_require__(521);
 var GLOBSTAR = '**';
 /**
  * Return true for static pattern.
@@ -58911,15 +58766,15 @@ exports.matchAny = matchAny;
 
 
 /***/ }),
-/* 519 */
+/* 517 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 var path = __webpack_require__(4);
-var isglob = __webpack_require__(520);
-var pathDirname = __webpack_require__(521);
+var isglob = __webpack_require__(518);
+var pathDirname = __webpack_require__(519);
 var isWin32 = __webpack_require__(120).platform() === 'win32';
 
 module.exports = function globParent(str) {
@@ -58942,7 +58797,7 @@ module.exports = function globParent(str) {
 
 
 /***/ }),
-/* 520 */
+/* 518 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /*!
@@ -58952,7 +58807,7 @@ module.exports = function globParent(str) {
  * Licensed under the MIT License.
  */
 
-var isExtglob = __webpack_require__(310);
+var isExtglob = __webpack_require__(302);
 
 module.exports = function isGlob(str) {
   if (typeof str !== 'string' || str === '') {
@@ -58973,7 +58828,7 @@ module.exports = function isGlob(str) {
 
 
 /***/ }),
-/* 521 */
+/* 519 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -59123,7 +58978,7 @@ module.exports.win32 = win32;
 
 
 /***/ }),
-/* 522 */
+/* 520 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /*!
@@ -59133,7 +58988,7 @@ module.exports.win32 = win32;
  * Released under the MIT License.
  */
 
-var isExtglob = __webpack_require__(310);
+var isExtglob = __webpack_require__(302);
 var chars = { '{': '}', '(': ')', '[': ']'};
 
 module.exports = function isGlob(str, options) {
@@ -59175,7 +59030,7 @@ module.exports = function isGlob(str, options) {
 
 
 /***/ }),
-/* 523 */
+/* 521 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -59186,18 +59041,18 @@ module.exports = function isGlob(str, options) {
  */
 
 var util = __webpack_require__(111);
-var braces = __webpack_require__(524);
-var toRegex = __webpack_require__(637);
-var extend = __webpack_require__(645);
+var braces = __webpack_require__(522);
+var toRegex = __webpack_require__(635);
+var extend = __webpack_require__(643);
 
 /**
  * Local dependencies
  */
 
-var compilers = __webpack_require__(648);
-var parsers = __webpack_require__(681);
-var cache = __webpack_require__(682);
-var utils = __webpack_require__(683);
+var compilers = __webpack_require__(646);
+var parsers = __webpack_require__(679);
+var cache = __webpack_require__(680);
+var utils = __webpack_require__(681);
 var MAX_LENGTH = 1024 * 64;
 
 /**
@@ -60059,7 +59914,7 @@ module.exports = micromatch;
 
 
 /***/ }),
-/* 524 */
+/* 522 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -60069,18 +59924,18 @@ module.exports = micromatch;
  * Module dependencies
  */
 
-var toRegex = __webpack_require__(525);
-var unique = __webpack_require__(539);
-var extend = __webpack_require__(534);
+var toRegex = __webpack_require__(523);
+var unique = __webpack_require__(537);
+var extend = __webpack_require__(532);
 
 /**
  * Local dependencies
  */
 
-var compilers = __webpack_require__(540);
-var parsers = __webpack_require__(557);
-var Braces = __webpack_require__(567);
-var utils = __webpack_require__(541);
+var compilers = __webpack_require__(538);
+var parsers = __webpack_require__(555);
+var Braces = __webpack_require__(565);
+var utils = __webpack_require__(539);
 var MAX_LENGTH = 1024 * 64;
 var cache = {};
 
@@ -60384,15 +60239,15 @@ module.exports = braces;
 
 
 /***/ }),
-/* 525 */
+/* 523 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var define = __webpack_require__(526);
-var extend = __webpack_require__(534);
-var not = __webpack_require__(536);
+var define = __webpack_require__(524);
+var extend = __webpack_require__(532);
+var not = __webpack_require__(534);
 var MAX_LENGTH = 1024 * 64;
 
 /**
@@ -60539,7 +60394,7 @@ module.exports.makeRe = makeRe;
 
 
 /***/ }),
-/* 526 */
+/* 524 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -60552,7 +60407,7 @@ module.exports.makeRe = makeRe;
 
 
 
-var isDescriptor = __webpack_require__(527);
+var isDescriptor = __webpack_require__(525);
 
 module.exports = function defineProperty(obj, prop, val) {
   if (typeof obj !== 'object' && typeof obj !== 'function') {
@@ -60577,7 +60432,7 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 /***/ }),
-/* 527 */
+/* 525 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -60590,9 +60445,9 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 
-var typeOf = __webpack_require__(528);
-var isAccessor = __webpack_require__(529);
-var isData = __webpack_require__(532);
+var typeOf = __webpack_require__(526);
+var isAccessor = __webpack_require__(527);
+var isData = __webpack_require__(530);
 
 module.exports = function isDescriptor(obj, key) {
   if (typeOf(obj) !== 'object') {
@@ -60606,7 +60461,7 @@ module.exports = function isDescriptor(obj, key) {
 
 
 /***/ }),
-/* 528 */
+/* 526 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -60759,7 +60614,7 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 529 */
+/* 527 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -60772,7 +60627,7 @@ function isBuffer(val) {
 
 
 
-var typeOf = __webpack_require__(530);
+var typeOf = __webpack_require__(528);
 
 // accessor descriptor properties
 var accessor = {
@@ -60835,10 +60690,10 @@ module.exports = isAccessorDescriptor;
 
 
 /***/ }),
-/* 530 */
+/* 528 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var isBuffer = __webpack_require__(531);
+var isBuffer = __webpack_require__(529);
 var toString = Object.prototype.toString;
 
 /**
@@ -60957,7 +60812,7 @@ module.exports = function kindOf(val) {
 
 
 /***/ }),
-/* 531 */
+/* 529 */
 /***/ (function(module, exports) {
 
 /*!
@@ -60984,7 +60839,7 @@ function isSlowBuffer (obj) {
 
 
 /***/ }),
-/* 532 */
+/* 530 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -60997,7 +60852,7 @@ function isSlowBuffer (obj) {
 
 
 
-var typeOf = __webpack_require__(533);
+var typeOf = __webpack_require__(531);
 
 // data descriptor properties
 var data = {
@@ -61046,10 +60901,10 @@ module.exports = isDataDescriptor;
 
 
 /***/ }),
-/* 533 */
+/* 531 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var isBuffer = __webpack_require__(531);
+var isBuffer = __webpack_require__(529);
 var toString = Object.prototype.toString;
 
 /**
@@ -61168,13 +61023,13 @@ module.exports = function kindOf(val) {
 
 
 /***/ }),
-/* 534 */
+/* 532 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isObject = __webpack_require__(535);
+var isObject = __webpack_require__(533);
 
 module.exports = function extend(o/*, objects*/) {
   if (!isObject(o)) { o = {}; }
@@ -61208,7 +61063,7 @@ function hasOwn(obj, key) {
 
 
 /***/ }),
-/* 535 */
+/* 533 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -61228,13 +61083,13 @@ module.exports = function isExtendable(val) {
 
 
 /***/ }),
-/* 536 */
+/* 534 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var extend = __webpack_require__(537);
+var extend = __webpack_require__(535);
 
 /**
  * The main export is a function that takes a `pattern` string and an `options` object.
@@ -61301,13 +61156,13 @@ module.exports = toRegex;
 
 
 /***/ }),
-/* 537 */
+/* 535 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isObject = __webpack_require__(538);
+var isObject = __webpack_require__(536);
 
 module.exports = function extend(o/*, objects*/) {
   if (!isObject(o)) { o = {}; }
@@ -61341,7 +61196,7 @@ function hasOwn(obj, key) {
 
 
 /***/ }),
-/* 538 */
+/* 536 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -61361,7 +61216,7 @@ module.exports = function isExtendable(val) {
 
 
 /***/ }),
-/* 539 */
+/* 537 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -61411,13 +61266,13 @@ module.exports.immutable = function uniqueImmutable(arr) {
 
 
 /***/ }),
-/* 540 */
+/* 538 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(541);
+var utils = __webpack_require__(539);
 
 module.exports = function(braces, options) {
   braces.compiler
@@ -61700,25 +61555,25 @@ function hasQueue(node) {
 
 
 /***/ }),
-/* 541 */
+/* 539 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var splitString = __webpack_require__(542);
+var splitString = __webpack_require__(540);
 var utils = module.exports;
 
 /**
  * Module dependencies
  */
 
-utils.extend = __webpack_require__(534);
-utils.flatten = __webpack_require__(548);
-utils.isObject = __webpack_require__(546);
-utils.fillRange = __webpack_require__(549);
-utils.repeat = __webpack_require__(556);
-utils.unique = __webpack_require__(539);
+utils.extend = __webpack_require__(532);
+utils.flatten = __webpack_require__(546);
+utils.isObject = __webpack_require__(544);
+utils.fillRange = __webpack_require__(547);
+utils.repeat = __webpack_require__(554);
+utils.unique = __webpack_require__(537);
 
 utils.define = function(obj, key, val) {
   Object.defineProperty(obj, key, {
@@ -62050,7 +61905,7 @@ utils.escapeRegex = function(str) {
 
 
 /***/ }),
-/* 542 */
+/* 540 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -62063,7 +61918,7 @@ utils.escapeRegex = function(str) {
 
 
 
-var extend = __webpack_require__(543);
+var extend = __webpack_require__(541);
 
 module.exports = function(str, options, fn) {
   if (typeof str !== 'string') {
@@ -62228,14 +62083,14 @@ function keepEscaping(opts, str, idx) {
 
 
 /***/ }),
-/* 543 */
+/* 541 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isExtendable = __webpack_require__(544);
-var assignSymbols = __webpack_require__(547);
+var isExtendable = __webpack_require__(542);
+var assignSymbols = __webpack_require__(545);
 
 module.exports = Object.assign || function(obj/*, objects*/) {
   if (obj === null || typeof obj === 'undefined') {
@@ -62295,7 +62150,7 @@ function isEnum(obj, key) {
 
 
 /***/ }),
-/* 544 */
+/* 542 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -62308,7 +62163,7 @@ function isEnum(obj, key) {
 
 
 
-var isPlainObject = __webpack_require__(545);
+var isPlainObject = __webpack_require__(543);
 
 module.exports = function isExtendable(val) {
   return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
@@ -62316,7 +62171,7 @@ module.exports = function isExtendable(val) {
 
 
 /***/ }),
-/* 545 */
+/* 543 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -62329,7 +62184,7 @@ module.exports = function isExtendable(val) {
 
 
 
-var isObject = __webpack_require__(546);
+var isObject = __webpack_require__(544);
 
 function isObjectObject(o) {
   return isObject(o) === true
@@ -62360,7 +62215,7 @@ module.exports = function isPlainObject(o) {
 
 
 /***/ }),
-/* 546 */
+/* 544 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -62379,7 +62234,7 @@ module.exports = function isObject(val) {
 
 
 /***/ }),
-/* 547 */
+/* 545 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -62426,7 +62281,7 @@ module.exports = function(receiver, objects) {
 
 
 /***/ }),
-/* 548 */
+/* 546 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -62455,7 +62310,7 @@ function flat(arr, res) {
 
 
 /***/ }),
-/* 549 */
+/* 547 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -62469,10 +62324,10 @@ function flat(arr, res) {
 
 
 var util = __webpack_require__(111);
-var isNumber = __webpack_require__(550);
-var extend = __webpack_require__(552);
-var repeat = __webpack_require__(554);
-var toRegex = __webpack_require__(555);
+var isNumber = __webpack_require__(548);
+var extend = __webpack_require__(550);
+var repeat = __webpack_require__(552);
+var toRegex = __webpack_require__(553);
 
 /**
  * Return a range of numbers or letters.
@@ -62670,7 +62525,7 @@ module.exports = fillRange;
 
 
 /***/ }),
-/* 550 */
+/* 548 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -62683,7 +62538,7 @@ module.exports = fillRange;
 
 
 
-var typeOf = __webpack_require__(551);
+var typeOf = __webpack_require__(549);
 
 module.exports = function isNumber(num) {
   var type = typeOf(num);
@@ -62699,10 +62554,10 @@ module.exports = function isNumber(num) {
 
 
 /***/ }),
-/* 551 */
+/* 549 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var isBuffer = __webpack_require__(531);
+var isBuffer = __webpack_require__(529);
 var toString = Object.prototype.toString;
 
 /**
@@ -62821,13 +62676,13 @@ module.exports = function kindOf(val) {
 
 
 /***/ }),
-/* 552 */
+/* 550 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isObject = __webpack_require__(553);
+var isObject = __webpack_require__(551);
 
 module.exports = function extend(o/*, objects*/) {
   if (!isObject(o)) { o = {}; }
@@ -62861,7 +62716,7 @@ function hasOwn(obj, key) {
 
 
 /***/ }),
-/* 553 */
+/* 551 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -62881,7 +62736,7 @@ module.exports = function isExtendable(val) {
 
 
 /***/ }),
-/* 554 */
+/* 552 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -62958,7 +62813,7 @@ function repeat(str, num) {
 
 
 /***/ }),
-/* 555 */
+/* 553 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -62971,8 +62826,8 @@ function repeat(str, num) {
 
 
 
-var repeat = __webpack_require__(554);
-var isNumber = __webpack_require__(550);
+var repeat = __webpack_require__(552);
+var isNumber = __webpack_require__(548);
 var cache = {};
 
 function toRegexRange(min, max, options) {
@@ -63259,7 +63114,7 @@ module.exports = toRegexRange;
 
 
 /***/ }),
-/* 556 */
+/* 554 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -63284,14 +63139,14 @@ module.exports = function repeat(ele, num) {
 
 
 /***/ }),
-/* 557 */
+/* 555 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var Node = __webpack_require__(558);
-var utils = __webpack_require__(541);
+var Node = __webpack_require__(556);
+var utils = __webpack_require__(539);
 
 /**
  * Braces parsers
@@ -63651,15 +63506,15 @@ function concatNodes(pos, node, parent, options) {
 
 
 /***/ }),
-/* 558 */
+/* 556 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isObject = __webpack_require__(546);
-var define = __webpack_require__(559);
-var utils = __webpack_require__(566);
+var isObject = __webpack_require__(544);
+var define = __webpack_require__(557);
+var utils = __webpack_require__(564);
 var ownNames;
 
 /**
@@ -64150,7 +64005,7 @@ exports = module.exports = Node;
 
 
 /***/ }),
-/* 559 */
+/* 557 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -64163,7 +64018,7 @@ exports = module.exports = Node;
 
 
 
-var isDescriptor = __webpack_require__(560);
+var isDescriptor = __webpack_require__(558);
 
 module.exports = function defineProperty(obj, prop, val) {
   if (typeof obj !== 'object' && typeof obj !== 'function') {
@@ -64188,7 +64043,7 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 /***/ }),
-/* 560 */
+/* 558 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -64201,9 +64056,9 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 
-var typeOf = __webpack_require__(561);
-var isAccessor = __webpack_require__(562);
-var isData = __webpack_require__(564);
+var typeOf = __webpack_require__(559);
+var isAccessor = __webpack_require__(560);
+var isData = __webpack_require__(562);
 
 module.exports = function isDescriptor(obj, key) {
   if (typeOf(obj) !== 'object') {
@@ -64217,7 +64072,7 @@ module.exports = function isDescriptor(obj, key) {
 
 
 /***/ }),
-/* 561 */
+/* 559 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -64352,7 +64207,7 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 562 */
+/* 560 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -64365,7 +64220,7 @@ function isBuffer(val) {
 
 
 
-var typeOf = __webpack_require__(563);
+var typeOf = __webpack_require__(561);
 
 // accessor descriptor properties
 var accessor = {
@@ -64428,7 +64283,7 @@ module.exports = isAccessorDescriptor;
 
 
 /***/ }),
-/* 563 */
+/* 561 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -64563,7 +64418,7 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 564 */
+/* 562 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -64576,7 +64431,7 @@ function isBuffer(val) {
 
 
 
-var typeOf = __webpack_require__(565);
+var typeOf = __webpack_require__(563);
 
 module.exports = function isDataDescriptor(obj, prop) {
   // data descriptor properties
@@ -64619,7 +64474,7 @@ module.exports = function isDataDescriptor(obj, prop) {
 
 
 /***/ }),
-/* 565 */
+/* 563 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -64754,13 +64609,13 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 566 */
+/* 564 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var typeOf = __webpack_require__(551);
+var typeOf = __webpack_require__(549);
 var utils = module.exports;
 
 /**
@@ -65780,17 +65635,17 @@ function assert(val, message) {
 
 
 /***/ }),
-/* 567 */
+/* 565 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var extend = __webpack_require__(534);
-var Snapdragon = __webpack_require__(568);
-var compilers = __webpack_require__(540);
-var parsers = __webpack_require__(557);
-var utils = __webpack_require__(541);
+var extend = __webpack_require__(532);
+var Snapdragon = __webpack_require__(566);
+var compilers = __webpack_require__(538);
+var parsers = __webpack_require__(555);
+var utils = __webpack_require__(539);
 
 /**
  * Customize Snapdragon parser and renderer
@@ -65891,17 +65746,17 @@ module.exports = Braces;
 
 
 /***/ }),
-/* 568 */
+/* 566 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var Base = __webpack_require__(569);
-var define = __webpack_require__(595);
-var Compiler = __webpack_require__(605);
-var Parser = __webpack_require__(634);
-var utils = __webpack_require__(614);
+var Base = __webpack_require__(567);
+var define = __webpack_require__(593);
+var Compiler = __webpack_require__(603);
+var Parser = __webpack_require__(632);
+var utils = __webpack_require__(612);
 var regexCache = {};
 var cache = {};
 
@@ -66072,20 +65927,20 @@ module.exports.Parser = Parser;
 
 
 /***/ }),
-/* 569 */
+/* 567 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 var util = __webpack_require__(111);
-var define = __webpack_require__(570);
-var CacheBase = __webpack_require__(571);
-var Emitter = __webpack_require__(572);
-var isObject = __webpack_require__(546);
-var merge = __webpack_require__(589);
-var pascal = __webpack_require__(592);
-var cu = __webpack_require__(593);
+var define = __webpack_require__(568);
+var CacheBase = __webpack_require__(569);
+var Emitter = __webpack_require__(570);
+var isObject = __webpack_require__(544);
+var merge = __webpack_require__(587);
+var pascal = __webpack_require__(590);
+var cu = __webpack_require__(591);
 
 /**
  * Optionally define a custom `cache` namespace to use.
@@ -66514,7 +66369,7 @@ module.exports.namespace = namespace;
 
 
 /***/ }),
-/* 570 */
+/* 568 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -66527,7 +66382,7 @@ module.exports.namespace = namespace;
 
 
 
-var isDescriptor = __webpack_require__(560);
+var isDescriptor = __webpack_require__(558);
 
 module.exports = function defineProperty(obj, prop, val) {
   if (typeof obj !== 'object' && typeof obj !== 'function') {
@@ -66552,21 +66407,21 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 /***/ }),
-/* 571 */
+/* 569 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isObject = __webpack_require__(546);
-var Emitter = __webpack_require__(572);
-var visit = __webpack_require__(573);
-var toPath = __webpack_require__(576);
-var union = __webpack_require__(577);
-var del = __webpack_require__(581);
-var get = __webpack_require__(579);
-var has = __webpack_require__(586);
-var set = __webpack_require__(580);
+var isObject = __webpack_require__(544);
+var Emitter = __webpack_require__(570);
+var visit = __webpack_require__(571);
+var toPath = __webpack_require__(574);
+var union = __webpack_require__(575);
+var del = __webpack_require__(579);
+var get = __webpack_require__(577);
+var has = __webpack_require__(584);
+var set = __webpack_require__(578);
 
 /**
  * Create a `Cache` constructor that when instantiated will
@@ -66820,7 +66675,7 @@ module.exports.namespace = namespace;
 
 
 /***/ }),
-/* 572 */
+/* 570 */
 /***/ (function(module, exports, __webpack_require__) {
 
 
@@ -66989,7 +66844,7 @@ Emitter.prototype.hasListeners = function(event){
 
 
 /***/ }),
-/* 573 */
+/* 571 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -67002,8 +66857,8 @@ Emitter.prototype.hasListeners = function(event){
 
 
 
-var visit = __webpack_require__(574);
-var mapVisit = __webpack_require__(575);
+var visit = __webpack_require__(572);
+var mapVisit = __webpack_require__(573);
 
 module.exports = function(collection, method, val) {
   var result;
@@ -67026,7 +66881,7 @@ module.exports = function(collection, method, val) {
 
 
 /***/ }),
-/* 574 */
+/* 572 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -67039,7 +66894,7 @@ module.exports = function(collection, method, val) {
 
 
 
-var isObject = __webpack_require__(546);
+var isObject = __webpack_require__(544);
 
 module.exports = function visit(thisArg, method, target, val) {
   if (!isObject(thisArg) && typeof thisArg !== 'function') {
@@ -67066,14 +66921,14 @@ module.exports = function visit(thisArg, method, target, val) {
 
 
 /***/ }),
-/* 575 */
+/* 573 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 var util = __webpack_require__(111);
-var visit = __webpack_require__(574);
+var visit = __webpack_require__(572);
 
 /**
  * Map `visit` over an array of objects.
@@ -67110,7 +66965,7 @@ function isObject(val) {
 
 
 /***/ }),
-/* 576 */
+/* 574 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -67123,7 +66978,7 @@ function isObject(val) {
 
 
 
-var typeOf = __webpack_require__(551);
+var typeOf = __webpack_require__(549);
 
 module.exports = function toPath(args) {
   if (typeOf(args) !== 'arguments') {
@@ -67150,16 +67005,16 @@ function filter(arr) {
 
 
 /***/ }),
-/* 577 */
+/* 575 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isObject = __webpack_require__(538);
-var union = __webpack_require__(578);
-var get = __webpack_require__(579);
-var set = __webpack_require__(580);
+var isObject = __webpack_require__(536);
+var union = __webpack_require__(576);
+var get = __webpack_require__(577);
+var set = __webpack_require__(578);
 
 module.exports = function unionValue(obj, prop, value) {
   if (!isObject(obj)) {
@@ -67187,7 +67042,7 @@ function arrayify(val) {
 
 
 /***/ }),
-/* 578 */
+/* 576 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -67223,7 +67078,7 @@ module.exports = function union(init) {
 
 
 /***/ }),
-/* 579 */
+/* 577 */
 /***/ (function(module, exports) {
 
 /*!
@@ -67279,7 +67134,7 @@ function toString(val) {
 
 
 /***/ }),
-/* 580 */
+/* 578 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -67292,10 +67147,10 @@ function toString(val) {
 
 
 
-var split = __webpack_require__(542);
-var extend = __webpack_require__(537);
-var isPlainObject = __webpack_require__(545);
-var isObject = __webpack_require__(538);
+var split = __webpack_require__(540);
+var extend = __webpack_require__(535);
+var isPlainObject = __webpack_require__(543);
+var isObject = __webpack_require__(536);
 
 module.exports = function(obj, prop, val) {
   if (!isObject(obj)) {
@@ -67341,7 +67196,7 @@ function isValidKey(key) {
 
 
 /***/ }),
-/* 581 */
+/* 579 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -67354,8 +67209,8 @@ function isValidKey(key) {
 
 
 
-var isObject = __webpack_require__(546);
-var has = __webpack_require__(582);
+var isObject = __webpack_require__(544);
+var has = __webpack_require__(580);
 
 module.exports = function unset(obj, prop) {
   if (!isObject(obj)) {
@@ -67380,7 +67235,7 @@ module.exports = function unset(obj, prop) {
 
 
 /***/ }),
-/* 582 */
+/* 580 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -67393,9 +67248,9 @@ module.exports = function unset(obj, prop) {
 
 
 
-var isObject = __webpack_require__(583);
-var hasValues = __webpack_require__(585);
-var get = __webpack_require__(579);
+var isObject = __webpack_require__(581);
+var hasValues = __webpack_require__(583);
+var get = __webpack_require__(577);
 
 module.exports = function(obj, prop, noZero) {
   if (isObject(obj)) {
@@ -67406,7 +67261,7 @@ module.exports = function(obj, prop, noZero) {
 
 
 /***/ }),
-/* 583 */
+/* 581 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -67419,7 +67274,7 @@ module.exports = function(obj, prop, noZero) {
 
 
 
-var isArray = __webpack_require__(584);
+var isArray = __webpack_require__(582);
 
 module.exports = function isObject(val) {
   return val != null && typeof val === 'object' && isArray(val) === false;
@@ -67427,7 +67282,7 @@ module.exports = function isObject(val) {
 
 
 /***/ }),
-/* 584 */
+/* 582 */
 /***/ (function(module, exports) {
 
 var toString = {}.toString;
@@ -67438,7 +67293,7 @@ module.exports = Array.isArray || function (arr) {
 
 
 /***/ }),
-/* 585 */
+/* 583 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -67481,7 +67336,7 @@ module.exports = function hasValue(o, noZero) {
 
 
 /***/ }),
-/* 586 */
+/* 584 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -67494,9 +67349,9 @@ module.exports = function hasValue(o, noZero) {
 
 
 
-var isObject = __webpack_require__(546);
-var hasValues = __webpack_require__(587);
-var get = __webpack_require__(579);
+var isObject = __webpack_require__(544);
+var hasValues = __webpack_require__(585);
+var get = __webpack_require__(577);
 
 module.exports = function(val, prop) {
   return hasValues(isObject(val) && prop ? get(val, prop) : val);
@@ -67504,7 +67359,7 @@ module.exports = function(val, prop) {
 
 
 /***/ }),
-/* 587 */
+/* 585 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -67517,8 +67372,8 @@ module.exports = function(val, prop) {
 
 
 
-var typeOf = __webpack_require__(588);
-var isNumber = __webpack_require__(550);
+var typeOf = __webpack_require__(586);
+var isNumber = __webpack_require__(548);
 
 module.exports = function hasValue(val) {
   // is-number checks for NaN and other edge cases
@@ -67571,10 +67426,10 @@ module.exports = function hasValue(val) {
 
 
 /***/ }),
-/* 588 */
+/* 586 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var isBuffer = __webpack_require__(531);
+var isBuffer = __webpack_require__(529);
 var toString = Object.prototype.toString;
 
 /**
@@ -67696,14 +67551,14 @@ module.exports = function kindOf(val) {
 
 
 /***/ }),
-/* 589 */
+/* 587 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isExtendable = __webpack_require__(590);
-var forIn = __webpack_require__(591);
+var isExtendable = __webpack_require__(588);
+var forIn = __webpack_require__(589);
 
 function mixinDeep(target, objects) {
   var len = arguments.length, i = 0;
@@ -67767,7 +67622,7 @@ module.exports = mixinDeep;
 
 
 /***/ }),
-/* 590 */
+/* 588 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -67780,7 +67635,7 @@ module.exports = mixinDeep;
 
 
 
-var isPlainObject = __webpack_require__(545);
+var isPlainObject = __webpack_require__(543);
 
 module.exports = function isExtendable(val) {
   return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
@@ -67788,7 +67643,7 @@ module.exports = function isExtendable(val) {
 
 
 /***/ }),
-/* 591 */
+/* 589 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -67811,7 +67666,7 @@ module.exports = function forIn(obj, fn, thisArg) {
 
 
 /***/ }),
-/* 592 */
+/* 590 */
 /***/ (function(module, exports) {
 
 /*!
@@ -67838,14 +67693,14 @@ module.exports = pascalcase;
 
 
 /***/ }),
-/* 593 */
+/* 591 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 var util = __webpack_require__(111);
-var utils = __webpack_require__(594);
+var utils = __webpack_require__(592);
 
 /**
  * Expose class utils
@@ -68210,7 +68065,7 @@ cu.bubble = function(Parent, events) {
 
 
 /***/ }),
-/* 594 */
+/* 592 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -68224,10 +68079,10 @@ var utils = {};
  * Lazily required module dependencies
  */
 
-utils.union = __webpack_require__(578);
-utils.define = __webpack_require__(595);
-utils.isObj = __webpack_require__(546);
-utils.staticExtend = __webpack_require__(602);
+utils.union = __webpack_require__(576);
+utils.define = __webpack_require__(593);
+utils.isObj = __webpack_require__(544);
+utils.staticExtend = __webpack_require__(600);
 
 
 /**
@@ -68238,7 +68093,7 @@ module.exports = utils;
 
 
 /***/ }),
-/* 595 */
+/* 593 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -68251,7 +68106,7 @@ module.exports = utils;
 
 
 
-var isDescriptor = __webpack_require__(596);
+var isDescriptor = __webpack_require__(594);
 
 module.exports = function defineProperty(obj, prop, val) {
   if (typeof obj !== 'object' && typeof obj !== 'function') {
@@ -68276,7 +68131,7 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 /***/ }),
-/* 596 */
+/* 594 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -68289,9 +68144,9 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 
-var typeOf = __webpack_require__(597);
-var isAccessor = __webpack_require__(598);
-var isData = __webpack_require__(600);
+var typeOf = __webpack_require__(595);
+var isAccessor = __webpack_require__(596);
+var isData = __webpack_require__(598);
 
 module.exports = function isDescriptor(obj, key) {
   if (typeOf(obj) !== 'object') {
@@ -68305,7 +68160,7 @@ module.exports = function isDescriptor(obj, key) {
 
 
 /***/ }),
-/* 597 */
+/* 595 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -68458,7 +68313,7 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 598 */
+/* 596 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -68471,7 +68326,7 @@ function isBuffer(val) {
 
 
 
-var typeOf = __webpack_require__(599);
+var typeOf = __webpack_require__(597);
 
 // accessor descriptor properties
 var accessor = {
@@ -68534,10 +68389,10 @@ module.exports = isAccessorDescriptor;
 
 
 /***/ }),
-/* 599 */
+/* 597 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var isBuffer = __webpack_require__(531);
+var isBuffer = __webpack_require__(529);
 var toString = Object.prototype.toString;
 
 /**
@@ -68656,7 +68511,7 @@ module.exports = function kindOf(val) {
 
 
 /***/ }),
-/* 600 */
+/* 598 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -68669,7 +68524,7 @@ module.exports = function kindOf(val) {
 
 
 
-var typeOf = __webpack_require__(601);
+var typeOf = __webpack_require__(599);
 
 // data descriptor properties
 var data = {
@@ -68718,10 +68573,10 @@ module.exports = isDataDescriptor;
 
 
 /***/ }),
-/* 601 */
+/* 599 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var isBuffer = __webpack_require__(531);
+var isBuffer = __webpack_require__(529);
 var toString = Object.prototype.toString;
 
 /**
@@ -68840,7 +68695,7 @@ module.exports = function kindOf(val) {
 
 
 /***/ }),
-/* 602 */
+/* 600 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -68853,8 +68708,8 @@ module.exports = function kindOf(val) {
 
 
 
-var copy = __webpack_require__(603);
-var define = __webpack_require__(595);
+var copy = __webpack_require__(601);
+var define = __webpack_require__(593);
 var util = __webpack_require__(111);
 
 /**
@@ -68937,15 +68792,15 @@ module.exports = extend;
 
 
 /***/ }),
-/* 603 */
+/* 601 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var typeOf = __webpack_require__(551);
-var copyDescriptor = __webpack_require__(604);
-var define = __webpack_require__(595);
+var typeOf = __webpack_require__(549);
+var copyDescriptor = __webpack_require__(602);
+var define = __webpack_require__(593);
 
 /**
  * Copy static properties, prototype properties, and descriptors from one object to another.
@@ -69118,7 +68973,7 @@ module.exports.has = has;
 
 
 /***/ }),
-/* 604 */
+/* 602 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -69206,16 +69061,16 @@ function isObject(val) {
 
 
 /***/ }),
-/* 605 */
+/* 603 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var use = __webpack_require__(606);
-var define = __webpack_require__(595);
-var debug = __webpack_require__(608)('snapdragon:compiler');
-var utils = __webpack_require__(614);
+var use = __webpack_require__(604);
+var define = __webpack_require__(593);
+var debug = __webpack_require__(606)('snapdragon:compiler');
+var utils = __webpack_require__(612);
 
 /**
  * Create a new `Compiler` with the given `options`.
@@ -69369,7 +69224,7 @@ Compiler.prototype = {
 
     // source map support
     if (opts.sourcemap) {
-      var sourcemaps = __webpack_require__(633);
+      var sourcemaps = __webpack_require__(631);
       sourcemaps(this);
       this.mapVisit(this.ast.nodes);
       this.applySourceMaps();
@@ -69390,7 +69245,7 @@ module.exports = Compiler;
 
 
 /***/ }),
-/* 606 */
+/* 604 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -69403,7 +69258,7 @@ module.exports = Compiler;
 
 
 
-var utils = __webpack_require__(607);
+var utils = __webpack_require__(605);
 
 module.exports = function base(app, opts) {
   if (!utils.isObject(app) && typeof app !== 'function') {
@@ -69518,7 +69373,7 @@ module.exports = function base(app, opts) {
 
 
 /***/ }),
-/* 607 */
+/* 605 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -69532,8 +69387,8 @@ var utils = {};
  * Lazily required module dependencies
  */
 
-utils.define = __webpack_require__(595);
-utils.isObject = __webpack_require__(546);
+utils.define = __webpack_require__(593);
+utils.isObject = __webpack_require__(544);
 
 
 utils.isString = function(val) {
@@ -69548,7 +69403,7 @@ module.exports = utils;
 
 
 /***/ }),
-/* 608 */
+/* 606 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
@@ -69557,14 +69412,14 @@ module.exports = utils;
  */
 
 if (typeof process !== 'undefined' && process.type === 'renderer') {
-  module.exports = __webpack_require__(609);
+  module.exports = __webpack_require__(607);
 } else {
-  module.exports = __webpack_require__(612);
+  module.exports = __webpack_require__(610);
 }
 
 
 /***/ }),
-/* 609 */
+/* 607 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
@@ -69573,7 +69428,7 @@ if (typeof process !== 'undefined' && process.type === 'renderer') {
  * Expose `debug()` as the module.
  */
 
-exports = module.exports = __webpack_require__(610);
+exports = module.exports = __webpack_require__(608);
 exports.log = log;
 exports.formatArgs = formatArgs;
 exports.save = save;
@@ -69755,7 +69610,7 @@ function localstorage() {
 
 
 /***/ }),
-/* 610 */
+/* 608 */
 /***/ (function(module, exports, __webpack_require__) {
 
 
@@ -69771,7 +69626,7 @@ exports.coerce = coerce;
 exports.disable = disable;
 exports.enable = enable;
 exports.enabled = enabled;
-exports.humanize = __webpack_require__(611);
+exports.humanize = __webpack_require__(609);
 
 /**
  * The currently active debug mode names, and names to skip.
@@ -69963,7 +69818,7 @@ function coerce(val) {
 
 
 /***/ }),
-/* 611 */
+/* 609 */
 /***/ (function(module, exports) {
 
 /**
@@ -70121,7 +69976,7 @@ function plural(ms, n, name) {
 
 
 /***/ }),
-/* 612 */
+/* 610 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
@@ -70137,7 +69992,7 @@ var util = __webpack_require__(111);
  * Expose `debug()` as the module.
  */
 
-exports = module.exports = __webpack_require__(610);
+exports = module.exports = __webpack_require__(608);
 exports.init = init;
 exports.log = log;
 exports.formatArgs = formatArgs;
@@ -70316,7 +70171,7 @@ function createWritableStdioStream (fd) {
 
     case 'PIPE':
     case 'TCP':
-      var net = __webpack_require__(613);
+      var net = __webpack_require__(611);
       stream = new net.Socket({
         fd: fd,
         readable: false,
@@ -70375,13 +70230,13 @@ exports.enable(load());
 
 
 /***/ }),
-/* 613 */
+/* 611 */
 /***/ (function(module, exports) {
 
 module.exports = require("net");
 
 /***/ }),
-/* 614 */
+/* 612 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -70391,9 +70246,9 @@ module.exports = require("net");
  * Module dependencies
  */
 
-exports.extend = __webpack_require__(537);
-exports.SourceMap = __webpack_require__(615);
-exports.sourceMapResolve = __webpack_require__(626);
+exports.extend = __webpack_require__(535);
+exports.SourceMap = __webpack_require__(613);
+exports.sourceMapResolve = __webpack_require__(624);
 
 /**
  * Convert backslash in the given string to forward slashes
@@ -70436,7 +70291,7 @@ exports.last = function(arr, n) {
 
 
 /***/ }),
-/* 615 */
+/* 613 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /*
@@ -70444,13 +70299,13 @@ exports.last = function(arr, n) {
  * Licensed under the New BSD license. See LICENSE.txt or:
  * http://opensource.org/licenses/BSD-3-Clause
  */
-exports.SourceMapGenerator = __webpack_require__(616).SourceMapGenerator;
-exports.SourceMapConsumer = __webpack_require__(622).SourceMapConsumer;
-exports.SourceNode = __webpack_require__(625).SourceNode;
+exports.SourceMapGenerator = __webpack_require__(614).SourceMapGenerator;
+exports.SourceMapConsumer = __webpack_require__(620).SourceMapConsumer;
+exports.SourceNode = __webpack_require__(623).SourceNode;
 
 
 /***/ }),
-/* 616 */
+/* 614 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -70460,10 +70315,10 @@ exports.SourceNode = __webpack_require__(625).SourceNode;
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-var base64VLQ = __webpack_require__(617);
-var util = __webpack_require__(619);
-var ArraySet = __webpack_require__(620).ArraySet;
-var MappingList = __webpack_require__(621).MappingList;
+var base64VLQ = __webpack_require__(615);
+var util = __webpack_require__(617);
+var ArraySet = __webpack_require__(618).ArraySet;
+var MappingList = __webpack_require__(619).MappingList;
 
 /**
  * An instance of the SourceMapGenerator represents a source map which is
@@ -70872,7 +70727,7 @@ exports.SourceMapGenerator = SourceMapGenerator;
 
 
 /***/ }),
-/* 617 */
+/* 615 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -70912,7 +70767,7 @@ exports.SourceMapGenerator = SourceMapGenerator;
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-var base64 = __webpack_require__(618);
+var base64 = __webpack_require__(616);
 
 // A single base 64 digit can contain 6 bits of data. For the base 64 variable
 // length quantities we use in the source map spec, the first bit is the sign,
@@ -71018,7 +70873,7 @@ exports.decode = function base64VLQ_decode(aStr, aIndex, aOutParam) {
 
 
 /***/ }),
-/* 618 */
+/* 616 */
 /***/ (function(module, exports) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -71091,7 +70946,7 @@ exports.decode = function (charCode) {
 
 
 /***/ }),
-/* 619 */
+/* 617 */
 /***/ (function(module, exports) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -71514,7 +71369,7 @@ exports.compareByGeneratedPositionsInflated = compareByGeneratedPositionsInflate
 
 
 /***/ }),
-/* 620 */
+/* 618 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -71524,7 +71379,7 @@ exports.compareByGeneratedPositionsInflated = compareByGeneratedPositionsInflate
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-var util = __webpack_require__(619);
+var util = __webpack_require__(617);
 var has = Object.prototype.hasOwnProperty;
 var hasNativeMap = typeof Map !== "undefined";
 
@@ -71641,7 +71496,7 @@ exports.ArraySet = ArraySet;
 
 
 /***/ }),
-/* 621 */
+/* 619 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -71651,7 +71506,7 @@ exports.ArraySet = ArraySet;
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-var util = __webpack_require__(619);
+var util = __webpack_require__(617);
 
 /**
  * Determine whether mappingB is after mappingA with respect to generated
@@ -71726,7 +71581,7 @@ exports.MappingList = MappingList;
 
 
 /***/ }),
-/* 622 */
+/* 620 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -71736,11 +71591,11 @@ exports.MappingList = MappingList;
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-var util = __webpack_require__(619);
-var binarySearch = __webpack_require__(623);
-var ArraySet = __webpack_require__(620).ArraySet;
-var base64VLQ = __webpack_require__(617);
-var quickSort = __webpack_require__(624).quickSort;
+var util = __webpack_require__(617);
+var binarySearch = __webpack_require__(621);
+var ArraySet = __webpack_require__(618).ArraySet;
+var base64VLQ = __webpack_require__(615);
+var quickSort = __webpack_require__(622).quickSort;
 
 function SourceMapConsumer(aSourceMap) {
   var sourceMap = aSourceMap;
@@ -72814,7 +72669,7 @@ exports.IndexedSourceMapConsumer = IndexedSourceMapConsumer;
 
 
 /***/ }),
-/* 623 */
+/* 621 */
 /***/ (function(module, exports) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -72931,7 +72786,7 @@ exports.search = function search(aNeedle, aHaystack, aCompare, aBias) {
 
 
 /***/ }),
-/* 624 */
+/* 622 */
 /***/ (function(module, exports) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -73051,7 +72906,7 @@ exports.quickSort = function (ary, comparator) {
 
 
 /***/ }),
-/* 625 */
+/* 623 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -73061,8 +72916,8 @@ exports.quickSort = function (ary, comparator) {
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-var SourceMapGenerator = __webpack_require__(616).SourceMapGenerator;
-var util = __webpack_require__(619);
+var SourceMapGenerator = __webpack_require__(614).SourceMapGenerator;
+var util = __webpack_require__(617);
 
 // Matches a Windows-style `\r\n` newline or a `\n` newline used by all other
 // operating systems these days (capturing the result).
@@ -73470,17 +73325,17 @@ exports.SourceNode = SourceNode;
 
 
 /***/ }),
-/* 626 */
+/* 624 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright 2014, 2015, 2016, 2017 Simon Lydell
 // X11 (“MIT”) Licensed. (See LICENSE.)
 
-var sourceMappingURL   = __webpack_require__(627)
-var resolveUrl         = __webpack_require__(628)
-var decodeUriComponent = __webpack_require__(629)
-var urix               = __webpack_require__(631)
-var atob               = __webpack_require__(632)
+var sourceMappingURL   = __webpack_require__(625)
+var resolveUrl         = __webpack_require__(626)
+var decodeUriComponent = __webpack_require__(627)
+var urix               = __webpack_require__(629)
+var atob               = __webpack_require__(630)
 
 
 
@@ -73778,7 +73633,7 @@ module.exports = {
 
 
 /***/ }),
-/* 627 */
+/* 625 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;// Copyright 2014 Simon Lydell
@@ -73841,7 +73696,7 @@ void (function(root, factory) {
 
 
 /***/ }),
-/* 628 */
+/* 626 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright 2014 Simon Lydell
@@ -73859,13 +73714,13 @@ module.exports = resolveUrl
 
 
 /***/ }),
-/* 629 */
+/* 627 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright 2017 Simon Lydell
 // X11 (“MIT”) Licensed. (See LICENSE.)
 
-var decodeUriComponent = __webpack_require__(630)
+var decodeUriComponent = __webpack_require__(628)
 
 function customDecodeUriComponent(string) {
   // `decodeUriComponent` turns `+` into ` `, but that's not wanted.
@@ -73876,7 +73731,7 @@ module.exports = customDecodeUriComponent
 
 
 /***/ }),
-/* 630 */
+/* 628 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -73977,7 +73832,7 @@ module.exports = function (encodedURI) {
 
 
 /***/ }),
-/* 631 */
+/* 629 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright 2014 Simon Lydell
@@ -74000,7 +73855,7 @@ module.exports = urix
 
 
 /***/ }),
-/* 632 */
+/* 630 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -74014,7 +73869,7 @@ module.exports = atob.atob = atob;
 
 
 /***/ }),
-/* 633 */
+/* 631 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -74022,8 +73877,8 @@ module.exports = atob.atob = atob;
 
 var fs = __webpack_require__(133);
 var path = __webpack_require__(4);
-var define = __webpack_require__(595);
-var utils = __webpack_require__(614);
+var define = __webpack_require__(593);
+var utils = __webpack_require__(612);
 
 /**
  * Expose `mixin()`.
@@ -74166,19 +74021,19 @@ exports.comment = function(node) {
 
 
 /***/ }),
-/* 634 */
+/* 632 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var use = __webpack_require__(606);
+var use = __webpack_require__(604);
 var util = __webpack_require__(111);
-var Cache = __webpack_require__(635);
-var define = __webpack_require__(595);
-var debug = __webpack_require__(608)('snapdragon:parser');
-var Position = __webpack_require__(636);
-var utils = __webpack_require__(614);
+var Cache = __webpack_require__(633);
+var define = __webpack_require__(593);
+var debug = __webpack_require__(606)('snapdragon:parser');
+var Position = __webpack_require__(634);
+var utils = __webpack_require__(612);
 
 /**
  * Create a new `Parser` with the given `input` and `options`.
@@ -74706,7 +74561,7 @@ module.exports = Parser;
 
 
 /***/ }),
-/* 635 */
+/* 633 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -74813,13 +74668,13 @@ MapCache.prototype.del = function mapDelete(key) {
 
 
 /***/ }),
-/* 636 */
+/* 634 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var define = __webpack_require__(595);
+var define = __webpack_require__(593);
 
 /**
  * Store position for a node
@@ -74834,16 +74689,16 @@ module.exports = function Position(start, parser) {
 
 
 /***/ }),
-/* 637 */
+/* 635 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var safe = __webpack_require__(638);
-var define = __webpack_require__(644);
-var extend = __webpack_require__(645);
-var not = __webpack_require__(647);
+var safe = __webpack_require__(636);
+var define = __webpack_require__(642);
+var extend = __webpack_require__(643);
+var not = __webpack_require__(645);
 var MAX_LENGTH = 1024 * 64;
 
 /**
@@ -74996,10 +74851,10 @@ module.exports.makeRe = makeRe;
 
 
 /***/ }),
-/* 638 */
+/* 636 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var parse = __webpack_require__(639);
+var parse = __webpack_require__(637);
 var types = parse.types;
 
 module.exports = function (re, opts) {
@@ -75045,13 +74900,13 @@ function isRegExp (x) {
 
 
 /***/ }),
-/* 639 */
+/* 637 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var util      = __webpack_require__(640);
-var types     = __webpack_require__(641);
-var sets      = __webpack_require__(642);
-var positions = __webpack_require__(643);
+var util      = __webpack_require__(638);
+var types     = __webpack_require__(639);
+var sets      = __webpack_require__(640);
+var positions = __webpack_require__(641);
 
 
 module.exports = function(regexpStr) {
@@ -75333,11 +75188,11 @@ module.exports.types = types;
 
 
 /***/ }),
-/* 640 */
+/* 638 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var types = __webpack_require__(641);
-var sets  = __webpack_require__(642);
+var types = __webpack_require__(639);
+var sets  = __webpack_require__(640);
 
 
 // All of these are private and only used by randexp.
@@ -75450,7 +75305,7 @@ exports.error = function(regexp, msg) {
 
 
 /***/ }),
-/* 641 */
+/* 639 */
 /***/ (function(module, exports) {
 
 module.exports = {
@@ -75466,10 +75321,10 @@ module.exports = {
 
 
 /***/ }),
-/* 642 */
+/* 640 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var types = __webpack_require__(641);
+var types = __webpack_require__(639);
 
 var INTS = function() {
  return [{ type: types.RANGE , from: 48, to: 57 }];
@@ -75554,10 +75409,10 @@ exports.anyChar = function() {
 
 
 /***/ }),
-/* 643 */
+/* 641 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var types = __webpack_require__(641);
+var types = __webpack_require__(639);
 
 exports.wordBoundary = function() {
   return { type: types.POSITION, value: 'b' };
@@ -75577,7 +75432,7 @@ exports.end = function() {
 
 
 /***/ }),
-/* 644 */
+/* 642 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -75590,8 +75445,8 @@ exports.end = function() {
 
 
 
-var isobject = __webpack_require__(546);
-var isDescriptor = __webpack_require__(560);
+var isobject = __webpack_require__(544);
+var isDescriptor = __webpack_require__(558);
 var define = (typeof Reflect !== 'undefined' && Reflect.defineProperty)
   ? Reflect.defineProperty
   : Object.defineProperty;
@@ -75622,14 +75477,14 @@ module.exports = function defineProperty(obj, key, val) {
 
 
 /***/ }),
-/* 645 */
+/* 643 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isExtendable = __webpack_require__(646);
-var assignSymbols = __webpack_require__(547);
+var isExtendable = __webpack_require__(644);
+var assignSymbols = __webpack_require__(545);
 
 module.exports = Object.assign || function(obj/*, objects*/) {
   if (obj === null || typeof obj === 'undefined') {
@@ -75689,7 +75544,7 @@ function isEnum(obj, key) {
 
 
 /***/ }),
-/* 646 */
+/* 644 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -75702,7 +75557,7 @@ function isEnum(obj, key) {
 
 
 
-var isPlainObject = __webpack_require__(545);
+var isPlainObject = __webpack_require__(543);
 
 module.exports = function isExtendable(val) {
   return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
@@ -75710,14 +75565,14 @@ module.exports = function isExtendable(val) {
 
 
 /***/ }),
-/* 647 */
+/* 645 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var extend = __webpack_require__(645);
-var safe = __webpack_require__(638);
+var extend = __webpack_require__(643);
+var safe = __webpack_require__(636);
 
 /**
  * The main export is a function that takes a `pattern` string and an `options` object.
@@ -75789,14 +75644,14 @@ module.exports = toRegex;
 
 
 /***/ }),
-/* 648 */
+/* 646 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var nanomatch = __webpack_require__(649);
-var extglob = __webpack_require__(665);
+var nanomatch = __webpack_require__(647);
+var extglob = __webpack_require__(663);
 
 module.exports = function(snapdragon) {
   var compilers = snapdragon.compiler.compilers;
@@ -75873,7 +75728,7 @@ function escapeExtglobs(compiler) {
 
 
 /***/ }),
-/* 649 */
+/* 647 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -75884,17 +75739,17 @@ function escapeExtglobs(compiler) {
  */
 
 var util = __webpack_require__(111);
-var toRegex = __webpack_require__(650);
-var extend = __webpack_require__(651);
+var toRegex = __webpack_require__(648);
+var extend = __webpack_require__(649);
 
 /**
  * Local dependencies
  */
 
-var compilers = __webpack_require__(653);
-var parsers = __webpack_require__(654);
-var cache = __webpack_require__(657);
-var utils = __webpack_require__(659);
+var compilers = __webpack_require__(651);
+var parsers = __webpack_require__(652);
+var cache = __webpack_require__(655);
+var utils = __webpack_require__(657);
 var MAX_LENGTH = 1024 * 64;
 
 /**
@@ -76718,15 +76573,15 @@ module.exports = nanomatch;
 
 
 /***/ }),
-/* 650 */
+/* 648 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var define = __webpack_require__(595);
-var extend = __webpack_require__(537);
-var not = __webpack_require__(536);
+var define = __webpack_require__(593);
+var extend = __webpack_require__(535);
+var not = __webpack_require__(534);
 var MAX_LENGTH = 1024 * 64;
 
 /**
@@ -76873,14 +76728,14 @@ module.exports.makeRe = makeRe;
 
 
 /***/ }),
-/* 651 */
+/* 649 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isExtendable = __webpack_require__(652);
-var assignSymbols = __webpack_require__(547);
+var isExtendable = __webpack_require__(650);
+var assignSymbols = __webpack_require__(545);
 
 module.exports = Object.assign || function(obj/*, objects*/) {
   if (obj === null || typeof obj === 'undefined') {
@@ -76940,7 +76795,7 @@ function isEnum(obj, key) {
 
 
 /***/ }),
-/* 652 */
+/* 650 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -76953,7 +76808,7 @@ function isEnum(obj, key) {
 
 
 
-var isPlainObject = __webpack_require__(545);
+var isPlainObject = __webpack_require__(543);
 
 module.exports = function isExtendable(val) {
   return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
@@ -76961,7 +76816,7 @@ module.exports = function isExtendable(val) {
 
 
 /***/ }),
-/* 653 */
+/* 651 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -77307,15 +77162,15 @@ module.exports = function(nanomatch, options) {
 
 
 /***/ }),
-/* 654 */
+/* 652 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var regexNot = __webpack_require__(536);
-var toRegex = __webpack_require__(650);
-var isOdd = __webpack_require__(655);
+var regexNot = __webpack_require__(534);
+var toRegex = __webpack_require__(648);
+var isOdd = __webpack_require__(653);
 
 /**
  * Characters to use in negation regex (we want to "not" match
@@ -77701,7 +77556,7 @@ module.exports.not = NOT_REGEX;
 
 
 /***/ }),
-/* 655 */
+/* 653 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -77714,7 +77569,7 @@ module.exports.not = NOT_REGEX;
 
 
 
-var isNumber = __webpack_require__(656);
+var isNumber = __webpack_require__(654);
 
 module.exports = function isOdd(i) {
   if (!isNumber(i)) {
@@ -77728,7 +77583,7 @@ module.exports = function isOdd(i) {
 
 
 /***/ }),
-/* 656 */
+/* 654 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -77756,14 +77611,14 @@ module.exports = function isNumber(num) {
 
 
 /***/ }),
-/* 657 */
+/* 655 */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = new (__webpack_require__(658))();
+module.exports = new (__webpack_require__(656))();
 
 
 /***/ }),
-/* 658 */
+/* 656 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -77776,7 +77631,7 @@ module.exports = new (__webpack_require__(658))();
 
 
 
-var MapCache = __webpack_require__(635);
+var MapCache = __webpack_require__(633);
 
 /**
  * Create a new `FragmentCache` with an optional object to use for `caches`.
@@ -77898,7 +77753,7 @@ exports = module.exports = FragmentCache;
 
 
 /***/ }),
-/* 659 */
+/* 657 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -77911,14 +77766,14 @@ var path = __webpack_require__(4);
  * Module dependencies
  */
 
-var isWindows = __webpack_require__(660)();
-var Snapdragon = __webpack_require__(568);
-utils.define = __webpack_require__(661);
-utils.diff = __webpack_require__(662);
-utils.extend = __webpack_require__(651);
-utils.pick = __webpack_require__(663);
-utils.typeOf = __webpack_require__(664);
-utils.unique = __webpack_require__(539);
+var isWindows = __webpack_require__(658)();
+var Snapdragon = __webpack_require__(566);
+utils.define = __webpack_require__(659);
+utils.diff = __webpack_require__(660);
+utils.extend = __webpack_require__(649);
+utils.pick = __webpack_require__(661);
+utils.typeOf = __webpack_require__(662);
+utils.unique = __webpack_require__(537);
 
 /**
  * Returns true if the given value is effectively an empty string
@@ -78284,7 +78139,7 @@ utils.unixify = function(options) {
 
 
 /***/ }),
-/* 660 */
+/* 658 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
@@ -78312,7 +78167,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
 
 /***/ }),
-/* 661 */
+/* 659 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -78325,8 +78180,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
 
 
-var isobject = __webpack_require__(546);
-var isDescriptor = __webpack_require__(560);
+var isobject = __webpack_require__(544);
+var isDescriptor = __webpack_require__(558);
 var define = (typeof Reflect !== 'undefined' && Reflect.defineProperty)
   ? Reflect.defineProperty
   : Object.defineProperty;
@@ -78357,7 +78212,7 @@ module.exports = function defineProperty(obj, key, val) {
 
 
 /***/ }),
-/* 662 */
+/* 660 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -78411,7 +78266,7 @@ function diffArray(one, two) {
 
 
 /***/ }),
-/* 663 */
+/* 661 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -78424,7 +78279,7 @@ function diffArray(one, two) {
 
 
 
-var isObject = __webpack_require__(546);
+var isObject = __webpack_require__(544);
 
 module.exports = function pick(obj, keys) {
   if (!isObject(obj) && typeof obj !== 'function') {
@@ -78453,7 +78308,7 @@ module.exports = function pick(obj, keys) {
 
 
 /***/ }),
-/* 664 */
+/* 662 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -78588,7 +78443,7 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 665 */
+/* 663 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -78598,18 +78453,18 @@ function isBuffer(val) {
  * Module dependencies
  */
 
-var extend = __webpack_require__(537);
-var unique = __webpack_require__(539);
-var toRegex = __webpack_require__(650);
+var extend = __webpack_require__(535);
+var unique = __webpack_require__(537);
+var toRegex = __webpack_require__(648);
 
 /**
  * Local dependencies
  */
 
-var compilers = __webpack_require__(666);
-var parsers = __webpack_require__(677);
-var Extglob = __webpack_require__(680);
-var utils = __webpack_require__(679);
+var compilers = __webpack_require__(664);
+var parsers = __webpack_require__(675);
+var Extglob = __webpack_require__(678);
+var utils = __webpack_require__(677);
 var MAX_LENGTH = 1024 * 64;
 
 /**
@@ -78926,13 +78781,13 @@ module.exports = extglob;
 
 
 /***/ }),
-/* 666 */
+/* 664 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var brackets = __webpack_require__(667);
+var brackets = __webpack_require__(665);
 
 /**
  * Extglob compilers
@@ -79102,7 +78957,7 @@ module.exports = function(extglob) {
 
 
 /***/ }),
-/* 667 */
+/* 665 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -79112,17 +78967,17 @@ module.exports = function(extglob) {
  * Local dependencies
  */
 
-var compilers = __webpack_require__(668);
-var parsers = __webpack_require__(670);
+var compilers = __webpack_require__(666);
+var parsers = __webpack_require__(668);
 
 /**
  * Module dependencies
  */
 
-var debug = __webpack_require__(672)('expand-brackets');
-var extend = __webpack_require__(537);
-var Snapdragon = __webpack_require__(568);
-var toRegex = __webpack_require__(650);
+var debug = __webpack_require__(670)('expand-brackets');
+var extend = __webpack_require__(535);
+var Snapdragon = __webpack_require__(566);
+var toRegex = __webpack_require__(648);
 
 /**
  * Parses the given POSIX character class `pattern` and returns a
@@ -79320,13 +79175,13 @@ module.exports = brackets;
 
 
 /***/ }),
-/* 668 */
+/* 666 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var posix = __webpack_require__(669);
+var posix = __webpack_require__(667);
 
 module.exports = function(brackets) {
   brackets.compiler
@@ -79414,7 +79269,7 @@ module.exports = function(brackets) {
 
 
 /***/ }),
-/* 669 */
+/* 667 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -79443,14 +79298,14 @@ module.exports = {
 
 
 /***/ }),
-/* 670 */
+/* 668 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(671);
-var define = __webpack_require__(595);
+var utils = __webpack_require__(669);
+var define = __webpack_require__(593);
 
 /**
  * Text regex
@@ -79669,14 +79524,14 @@ module.exports.TEXT_REGEX = TEXT_REGEX;
 
 
 /***/ }),
-/* 671 */
+/* 669 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var toRegex = __webpack_require__(650);
-var regexNot = __webpack_require__(536);
+var toRegex = __webpack_require__(648);
+var regexNot = __webpack_require__(534);
 var cached;
 
 /**
@@ -79710,7 +79565,7 @@ exports.createRegex = function(pattern, include) {
 
 
 /***/ }),
-/* 672 */
+/* 670 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
@@ -79719,14 +79574,14 @@ exports.createRegex = function(pattern, include) {
  */
 
 if (typeof process !== 'undefined' && process.type === 'renderer') {
-  module.exports = __webpack_require__(673);
+  module.exports = __webpack_require__(671);
 } else {
-  module.exports = __webpack_require__(676);
+  module.exports = __webpack_require__(674);
 }
 
 
 /***/ }),
-/* 673 */
+/* 671 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
@@ -79735,7 +79590,7 @@ if (typeof process !== 'undefined' && process.type === 'renderer') {
  * Expose `debug()` as the module.
  */
 
-exports = module.exports = __webpack_require__(674);
+exports = module.exports = __webpack_require__(672);
 exports.log = log;
 exports.formatArgs = formatArgs;
 exports.save = save;
@@ -79917,7 +79772,7 @@ function localstorage() {
 
 
 /***/ }),
-/* 674 */
+/* 672 */
 /***/ (function(module, exports, __webpack_require__) {
 
 
@@ -79933,7 +79788,7 @@ exports.coerce = coerce;
 exports.disable = disable;
 exports.enable = enable;
 exports.enabled = enabled;
-exports.humanize = __webpack_require__(675);
+exports.humanize = __webpack_require__(673);
 
 /**
  * The currently active debug mode names, and names to skip.
@@ -80125,7 +79980,7 @@ function coerce(val) {
 
 
 /***/ }),
-/* 675 */
+/* 673 */
 /***/ (function(module, exports) {
 
 /**
@@ -80283,7 +80138,7 @@ function plural(ms, n, name) {
 
 
 /***/ }),
-/* 676 */
+/* 674 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
@@ -80299,7 +80154,7 @@ var util = __webpack_require__(111);
  * Expose `debug()` as the module.
  */
 
-exports = module.exports = __webpack_require__(674);
+exports = module.exports = __webpack_require__(672);
 exports.init = init;
 exports.log = log;
 exports.formatArgs = formatArgs;
@@ -80478,7 +80333,7 @@ function createWritableStdioStream (fd) {
 
     case 'PIPE':
     case 'TCP':
-      var net = __webpack_require__(613);
+      var net = __webpack_require__(611);
       stream = new net.Socket({
         fd: fd,
         readable: false,
@@ -80537,15 +80392,15 @@ exports.enable(load());
 
 
 /***/ }),
-/* 677 */
+/* 675 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var brackets = __webpack_require__(667);
-var define = __webpack_require__(678);
-var utils = __webpack_require__(679);
+var brackets = __webpack_require__(665);
+var define = __webpack_require__(676);
+var utils = __webpack_require__(677);
 
 /**
  * Characters to use in text regex (we want to "not" match
@@ -80700,7 +80555,7 @@ module.exports = parsers;
 
 
 /***/ }),
-/* 678 */
+/* 676 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -80713,7 +80568,7 @@ module.exports = parsers;
 
 
 
-var isDescriptor = __webpack_require__(560);
+var isDescriptor = __webpack_require__(558);
 
 module.exports = function defineProperty(obj, prop, val) {
   if (typeof obj !== 'object' && typeof obj !== 'function') {
@@ -80738,14 +80593,14 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 /***/ }),
-/* 679 */
+/* 677 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var regex = __webpack_require__(536);
-var Cache = __webpack_require__(658);
+var regex = __webpack_require__(534);
+var Cache = __webpack_require__(656);
 
 /**
  * Utils
@@ -80814,7 +80669,7 @@ utils.createRegex = function(str) {
 
 
 /***/ }),
-/* 680 */
+/* 678 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -80824,16 +80679,16 @@ utils.createRegex = function(str) {
  * Module dependencies
  */
 
-var Snapdragon = __webpack_require__(568);
-var define = __webpack_require__(678);
-var extend = __webpack_require__(537);
+var Snapdragon = __webpack_require__(566);
+var define = __webpack_require__(676);
+var extend = __webpack_require__(535);
 
 /**
  * Local dependencies
  */
 
-var compilers = __webpack_require__(666);
-var parsers = __webpack_require__(677);
+var compilers = __webpack_require__(664);
+var parsers = __webpack_require__(675);
 
 /**
  * Customize Snapdragon parser and renderer
@@ -80899,16 +80754,16 @@ module.exports = Extglob;
 
 
 /***/ }),
-/* 681 */
+/* 679 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var extglob = __webpack_require__(665);
-var nanomatch = __webpack_require__(649);
-var regexNot = __webpack_require__(536);
-var toRegex = __webpack_require__(637);
+var extglob = __webpack_require__(663);
+var nanomatch = __webpack_require__(647);
+var regexNot = __webpack_require__(534);
+var toRegex = __webpack_require__(635);
 var not;
 
 /**
@@ -80989,14 +80844,14 @@ function textRegex(pattern) {
 
 
 /***/ }),
-/* 682 */
+/* 680 */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = new (__webpack_require__(658))();
+module.exports = new (__webpack_require__(656))();
 
 
 /***/ }),
-/* 683 */
+/* 681 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -81009,13 +80864,13 @@ var path = __webpack_require__(4);
  * Module dependencies
  */
 
-var Snapdragon = __webpack_require__(568);
-utils.define = __webpack_require__(644);
-utils.diff = __webpack_require__(662);
-utils.extend = __webpack_require__(645);
-utils.pick = __webpack_require__(663);
-utils.typeOf = __webpack_require__(684);
-utils.unique = __webpack_require__(539);
+var Snapdragon = __webpack_require__(566);
+utils.define = __webpack_require__(642);
+utils.diff = __webpack_require__(660);
+utils.extend = __webpack_require__(643);
+utils.pick = __webpack_require__(661);
+utils.typeOf = __webpack_require__(682);
+utils.unique = __webpack_require__(537);
 
 /**
  * Returns true if the platform is windows, or `path.sep` is `\\`.
@@ -81312,7 +81167,7 @@ utils.unixify = function(options) {
 
 
 /***/ }),
-/* 684 */
+/* 682 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -81447,7 +81302,7 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 685 */
+/* 683 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -81466,9 +81321,9 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-var readdir = __webpack_require__(686);
-var reader_1 = __webpack_require__(699);
-var fs_stream_1 = __webpack_require__(703);
+var readdir = __webpack_require__(684);
+var reader_1 = __webpack_require__(697);
+var fs_stream_1 = __webpack_require__(701);
 var ReaderAsync = /** @class */ (function (_super) {
     __extends(ReaderAsync, _super);
     function ReaderAsync() {
@@ -81529,15 +81384,15 @@ exports.default = ReaderAsync;
 
 
 /***/ }),
-/* 686 */
+/* 684 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const readdirSync = __webpack_require__(687);
-const readdirAsync = __webpack_require__(695);
-const readdirStream = __webpack_require__(698);
+const readdirSync = __webpack_require__(685);
+const readdirAsync = __webpack_require__(693);
+const readdirStream = __webpack_require__(696);
 
 module.exports = exports = readdirAsyncPath;
 exports.readdir = exports.readdirAsync = exports.async = readdirAsyncPath;
@@ -81621,7 +81476,7 @@ function readdirStreamStat (dir, options) {
 
 
 /***/ }),
-/* 687 */
+/* 685 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -81629,11 +81484,11 @@ function readdirStreamStat (dir, options) {
 
 module.exports = readdirSync;
 
-const DirectoryReader = __webpack_require__(688);
+const DirectoryReader = __webpack_require__(686);
 
 let syncFacade = {
-  fs: __webpack_require__(693),
-  forEach: __webpack_require__(694),
+  fs: __webpack_require__(691),
+  forEach: __webpack_require__(692),
   sync: true
 };
 
@@ -81662,7 +81517,7 @@ function readdirSync (dir, options, internalOptions) {
 
 
 /***/ }),
-/* 688 */
+/* 686 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -81671,9 +81526,9 @@ function readdirSync (dir, options, internalOptions) {
 const Readable = __webpack_require__(137).Readable;
 const EventEmitter = __webpack_require__(155).EventEmitter;
 const path = __webpack_require__(4);
-const normalizeOptions = __webpack_require__(689);
-const stat = __webpack_require__(691);
-const call = __webpack_require__(692);
+const normalizeOptions = __webpack_require__(687);
+const stat = __webpack_require__(689);
+const call = __webpack_require__(690);
 
 /**
  * Asynchronously reads the contents of a directory and streams the results
@@ -82049,14 +81904,14 @@ module.exports = DirectoryReader;
 
 
 /***/ }),
-/* 689 */
+/* 687 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 const path = __webpack_require__(4);
-const globToRegExp = __webpack_require__(690);
+const globToRegExp = __webpack_require__(688);
 
 module.exports = normalizeOptions;
 
@@ -82233,7 +82088,7 @@ function normalizeOptions (options, internalOptions) {
 
 
 /***/ }),
-/* 690 */
+/* 688 */
 /***/ (function(module, exports) {
 
 module.exports = function (glob, opts) {
@@ -82370,13 +82225,13 @@ module.exports = function (glob, opts) {
 
 
 /***/ }),
-/* 691 */
+/* 689 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const call = __webpack_require__(692);
+const call = __webpack_require__(690);
 
 module.exports = stat;
 
@@ -82451,7 +82306,7 @@ function symlinkStat (fs, path, lstats, callback) {
 
 
 /***/ }),
-/* 692 */
+/* 690 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -82512,14 +82367,14 @@ function callOnce (fn) {
 
 
 /***/ }),
-/* 693 */
+/* 691 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 const fs = __webpack_require__(133);
-const call = __webpack_require__(692);
+const call = __webpack_require__(690);
 
 /**
  * A facade around {@link fs.readdirSync} that allows it to be called
@@ -82583,7 +82438,7 @@ exports.lstat = function (path, callback) {
 
 
 /***/ }),
-/* 694 */
+/* 692 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -82612,7 +82467,7 @@ function syncForEach (array, iterator, done) {
 
 
 /***/ }),
-/* 695 */
+/* 693 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -82620,12 +82475,12 @@ function syncForEach (array, iterator, done) {
 
 module.exports = readdirAsync;
 
-const maybe = __webpack_require__(696);
-const DirectoryReader = __webpack_require__(688);
+const maybe = __webpack_require__(694);
+const DirectoryReader = __webpack_require__(686);
 
 let asyncFacade = {
   fs: __webpack_require__(133),
-  forEach: __webpack_require__(697),
+  forEach: __webpack_require__(695),
   async: true
 };
 
@@ -82667,7 +82522,7 @@ function readdirAsync (dir, options, callback, internalOptions) {
 
 
 /***/ }),
-/* 696 */
+/* 694 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -82694,7 +82549,7 @@ module.exports = function maybe (cb, promise) {
 
 
 /***/ }),
-/* 697 */
+/* 695 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -82730,7 +82585,7 @@ function asyncForEach (array, iterator, done) {
 
 
 /***/ }),
-/* 698 */
+/* 696 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -82738,11 +82593,11 @@ function asyncForEach (array, iterator, done) {
 
 module.exports = readdirStream;
 
-const DirectoryReader = __webpack_require__(688);
+const DirectoryReader = __webpack_require__(686);
 
 let streamFacade = {
   fs: __webpack_require__(133),
-  forEach: __webpack_require__(697),
+  forEach: __webpack_require__(695),
   async: true
 };
 
@@ -82762,16 +82617,16 @@ function readdirStream (dir, options, internalOptions) {
 
 
 /***/ }),
-/* 699 */
+/* 697 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var path = __webpack_require__(4);
-var deep_1 = __webpack_require__(700);
-var entry_1 = __webpack_require__(702);
-var pathUtil = __webpack_require__(701);
+var deep_1 = __webpack_require__(698);
+var entry_1 = __webpack_require__(700);
+var pathUtil = __webpack_require__(699);
 var Reader = /** @class */ (function () {
     function Reader(options) {
         this.options = options;
@@ -82837,14 +82692,14 @@ exports.default = Reader;
 
 
 /***/ }),
-/* 700 */
+/* 698 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var pathUtils = __webpack_require__(701);
-var patternUtils = __webpack_require__(518);
+var pathUtils = __webpack_require__(699);
+var patternUtils = __webpack_require__(516);
 var DeepFilter = /** @class */ (function () {
     function DeepFilter(options, micromatchOptions) {
         this.options = options;
@@ -82927,7 +82782,7 @@ exports.default = DeepFilter;
 
 
 /***/ }),
-/* 701 */
+/* 699 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -82958,14 +82813,14 @@ exports.makeAbsolute = makeAbsolute;
 
 
 /***/ }),
-/* 702 */
+/* 700 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var pathUtils = __webpack_require__(701);
-var patternUtils = __webpack_require__(518);
+var pathUtils = __webpack_require__(699);
+var patternUtils = __webpack_require__(516);
 var EntryFilter = /** @class */ (function () {
     function EntryFilter(options, micromatchOptions) {
         this.options = options;
@@ -83050,7 +82905,7 @@ exports.default = EntryFilter;
 
 
 /***/ }),
-/* 703 */
+/* 701 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -83070,8 +82925,8 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 var stream = __webpack_require__(137);
-var fsStat = __webpack_require__(704);
-var fs_1 = __webpack_require__(708);
+var fsStat = __webpack_require__(702);
+var fs_1 = __webpack_require__(706);
 var FileSystemStream = /** @class */ (function (_super) {
     __extends(FileSystemStream, _super);
     function FileSystemStream() {
@@ -83121,14 +82976,14 @@ exports.default = FileSystemStream;
 
 
 /***/ }),
-/* 704 */
+/* 702 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const optionsManager = __webpack_require__(705);
-const statProvider = __webpack_require__(707);
+const optionsManager = __webpack_require__(703);
+const statProvider = __webpack_require__(705);
 /**
  * Asynchronous API.
  */
@@ -83159,13 +83014,13 @@ exports.statSync = statSync;
 
 
 /***/ }),
-/* 705 */
+/* 703 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const fsAdapter = __webpack_require__(706);
+const fsAdapter = __webpack_require__(704);
 function prepare(opts) {
     const options = Object.assign({
         fs: fsAdapter.getFileSystemAdapter(opts ? opts.fs : undefined),
@@ -83178,7 +83033,7 @@ exports.prepare = prepare;
 
 
 /***/ }),
-/* 706 */
+/* 704 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -83201,7 +83056,7 @@ exports.getFileSystemAdapter = getFileSystemAdapter;
 
 
 /***/ }),
-/* 707 */
+/* 705 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -83253,7 +83108,7 @@ exports.isFollowedSymlink = isFollowedSymlink;
 
 
 /***/ }),
-/* 708 */
+/* 706 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -83284,7 +83139,7 @@ exports.default = FileSystem;
 
 
 /***/ }),
-/* 709 */
+/* 707 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -83304,9 +83159,9 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 var stream = __webpack_require__(137);
-var readdir = __webpack_require__(686);
-var reader_1 = __webpack_require__(699);
-var fs_stream_1 = __webpack_require__(703);
+var readdir = __webpack_require__(684);
+var reader_1 = __webpack_require__(697);
+var fs_stream_1 = __webpack_require__(701);
 var TransformStream = /** @class */ (function (_super) {
     __extends(TransformStream, _super);
     function TransformStream(reader) {
@@ -83374,7 +83229,7 @@ exports.default = ReaderStream;
 
 
 /***/ }),
-/* 710 */
+/* 708 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -83393,9 +83248,9 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-var readdir = __webpack_require__(686);
-var reader_1 = __webpack_require__(699);
-var fs_sync_1 = __webpack_require__(711);
+var readdir = __webpack_require__(684);
+var reader_1 = __webpack_require__(697);
+var fs_sync_1 = __webpack_require__(709);
 var ReaderSync = /** @class */ (function (_super) {
     __extends(ReaderSync, _super);
     function ReaderSync() {
@@ -83455,7 +83310,7 @@ exports.default = ReaderSync;
 
 
 /***/ }),
-/* 711 */
+/* 709 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -83474,8 +83329,8 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-var fsStat = __webpack_require__(704);
-var fs_1 = __webpack_require__(708);
+var fsStat = __webpack_require__(702);
+var fs_1 = __webpack_require__(706);
 var FileSystemSync = /** @class */ (function (_super) {
     __extends(FileSystemSync, _super);
     function FileSystemSync() {
@@ -83521,7 +83376,7 @@ exports.default = FileSystemSync;
 
 
 /***/ }),
-/* 712 */
+/* 710 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -83537,13 +83392,13 @@ exports.flatten = flatten;
 
 
 /***/ }),
-/* 713 */
+/* 711 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var merge2 = __webpack_require__(299);
+var merge2 = __webpack_require__(291);
 /**
  * Merge multiple streams and propagate their errors into one stream in parallel.
  */
@@ -83558,13 +83413,13 @@ exports.merge = merge;
 
 
 /***/ }),
-/* 714 */
+/* 712 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const path = __webpack_require__(4);
-const pathType = __webpack_require__(715);
+const pathType = __webpack_require__(713);
 
 const getExtensions = extensions => extensions.length > 1 ? `{${extensions.join(',')}}` : extensions[0];
 
@@ -83630,13 +83485,13 @@ module.exports.sync = (input, opts) => {
 
 
 /***/ }),
-/* 715 */
+/* 713 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const fs = __webpack_require__(133);
-const pify = __webpack_require__(716);
+const pify = __webpack_require__(714);
 
 function type(fn, fn2, fp) {
 	if (typeof fp !== 'string') {
@@ -83679,7 +83534,7 @@ exports.symlinkSync = typeSync.bind(null, 'lstatSync', 'isSymbolicLink');
 
 
 /***/ }),
-/* 716 */
+/* 714 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -83770,17 +83625,17 @@ module.exports = (obj, opts) => {
 
 
 /***/ }),
-/* 717 */
+/* 715 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const fs = __webpack_require__(133);
 const path = __webpack_require__(4);
-const fastGlob = __webpack_require__(514);
-const gitIgnore = __webpack_require__(718);
-const pify = __webpack_require__(719);
-const slash = __webpack_require__(720);
+const fastGlob = __webpack_require__(512);
+const gitIgnore = __webpack_require__(716);
+const pify = __webpack_require__(717);
+const slash = __webpack_require__(718);
 
 const DEFAULT_IGNORE = [
 	'**/node_modules/**',
@@ -83878,7 +83733,7 @@ module.exports.sync = options => {
 
 
 /***/ }),
-/* 718 */
+/* 716 */
 /***/ (function(module, exports) {
 
 // A simple implementation of make-array
@@ -84347,7 +84202,7 @@ module.exports = options => new IgnoreBase(options)
 
 
 /***/ }),
-/* 719 */
+/* 717 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -84422,7 +84277,7 @@ module.exports = (input, options) => {
 
 
 /***/ }),
-/* 720 */
+/* 718 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -84440,7 +84295,7 @@ module.exports = input => {
 
 
 /***/ }),
-/* 721 */
+/* 719 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /*!
@@ -84450,7 +84305,7 @@ module.exports = input => {
  * Released under the MIT License.
  */
 
-var isExtglob = __webpack_require__(310);
+var isExtglob = __webpack_require__(302);
 var chars = { '{': '}', '(': ')', '[': ']'};
 var strictRegex = /\\(.)|(^!|\*|[\].+)]\?|\[[^\\\]]+\]|\{[^\\}]+\}|\(\?[:!=][^\\)]+\)|\([^|]+\|[^\\)]+\))/;
 var relaxedRegex = /\\(.)|(^!|[*?{}()[\]]|\(\?)/;
@@ -84494,17 +84349,17 @@ module.exports = function isGlob(str, options) {
 
 
 /***/ }),
-/* 722 */
+/* 720 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const path = __webpack_require__(4);
 const {constants: fsConstants} = __webpack_require__(133);
-const pEvent = __webpack_require__(723);
-const CpFileError = __webpack_require__(726);
-const fs = __webpack_require__(730);
-const ProgressEmitter = __webpack_require__(733);
+const pEvent = __webpack_require__(721);
+const CpFileError = __webpack_require__(724);
+const fs = __webpack_require__(728);
+const ProgressEmitter = __webpack_require__(731);
 
 const cpFileAsync = async (source, destination, options, progressEmitter) => {
 	let readError;
@@ -84618,12 +84473,12 @@ module.exports.sync = (source, destination, options) => {
 
 
 /***/ }),
-/* 723 */
+/* 721 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const pTimeout = __webpack_require__(724);
+const pTimeout = __webpack_require__(722);
 
 const symbolAsyncIterator = Symbol.asyncIterator || '@@asyncIterator';
 
@@ -84914,12 +84769,12 @@ module.exports.iterator = (emitter, event, options) => {
 
 
 /***/ }),
-/* 724 */
+/* 722 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const pFinally = __webpack_require__(725);
+const pFinally = __webpack_require__(723);
 
 class TimeoutError extends Error {
 	constructor(message) {
@@ -84965,7 +84820,7 @@ module.exports.TimeoutError = TimeoutError;
 
 
 /***/ }),
-/* 725 */
+/* 723 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -84987,12 +84842,12 @@ module.exports = (promise, onFinally) => {
 
 
 /***/ }),
-/* 726 */
+/* 724 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const NestedError = __webpack_require__(727);
+const NestedError = __webpack_require__(725);
 
 class CpFileError extends NestedError {
 	constructor(message, nested) {
@@ -85006,10 +84861,10 @@ module.exports = CpFileError;
 
 
 /***/ }),
-/* 727 */
+/* 725 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var inherits = __webpack_require__(728);
+var inherits = __webpack_require__(726);
 
 var NestedError = function (message, nested) {
     this.nested = nested;
@@ -85060,7 +84915,7 @@ module.exports = NestedError;
 
 
 /***/ }),
-/* 728 */
+/* 726 */
 /***/ (function(module, exports, __webpack_require__) {
 
 try {
@@ -85068,12 +84923,12 @@ try {
   if (typeof util.inherits !== 'function') throw '';
   module.exports = util.inherits;
 } catch (e) {
-  module.exports = __webpack_require__(729);
+  module.exports = __webpack_require__(727);
 }
 
 
 /***/ }),
-/* 729 */
+/* 727 */
 /***/ (function(module, exports) {
 
 if (typeof Object.create === 'function') {
@@ -85102,16 +84957,16 @@ if (typeof Object.create === 'function') {
 
 
 /***/ }),
-/* 730 */
+/* 728 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const {promisify} = __webpack_require__(111);
 const fs = __webpack_require__(132);
-const makeDir = __webpack_require__(731);
-const pEvent = __webpack_require__(723);
-const CpFileError = __webpack_require__(726);
+const makeDir = __webpack_require__(729);
+const pEvent = __webpack_require__(721);
+const CpFileError = __webpack_require__(724);
 
 const stat = promisify(fs.stat);
 const lstat = promisify(fs.lstat);
@@ -85208,7 +85063,7 @@ exports.copyFileSync = (source, destination, flags) => {
 
 
 /***/ }),
-/* 731 */
+/* 729 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -85216,7 +85071,7 @@ exports.copyFileSync = (source, destination, flags) => {
 const fs = __webpack_require__(133);
 const path = __webpack_require__(4);
 const {promisify} = __webpack_require__(111);
-const semver = __webpack_require__(732);
+const semver = __webpack_require__(730);
 
 const useNativeRecursiveOption = semver.satisfies(process.version, '>=10.12.0');
 
@@ -85371,7 +85226,7 @@ module.exports.sync = (input, options) => {
 
 
 /***/ }),
-/* 732 */
+/* 730 */
 /***/ (function(module, exports) {
 
 exports = module.exports = SemVer
@@ -86973,7 +86828,7 @@ function coerce (version, options) {
 
 
 /***/ }),
-/* 733 */
+/* 731 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -87014,7 +86869,7 @@ module.exports = ProgressEmitter;
 
 
 /***/ }),
-/* 734 */
+/* 732 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -87060,12 +86915,12 @@ exports.default = module.exports;
 
 
 /***/ }),
-/* 735 */
+/* 733 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const NestedError = __webpack_require__(736);
+const NestedError = __webpack_require__(734);
 
 class CpyError extends NestedError {
 	constructor(message, nested) {
@@ -87079,7 +86934,7 @@ module.exports = CpyError;
 
 
 /***/ }),
-/* 736 */
+/* 734 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var inherits = __webpack_require__(111).inherits;
diff --git a/scripts/generate_plugin.js b/scripts/generate_plugin.js
index e080afb183aa8..f695eabb30f21 100644
--- a/scripts/generate_plugin.js
+++ b/scripts/generate_plugin.js
@@ -17,5 +17,5 @@
  * under the License.
  */
 
-require('../src/setup_node_env');
-require('@kbn/plugin-generator').run(process.argv.slice(2));
+require('../src/setup_node_env/prebuilt_dev_only_entry');
+require('@kbn/plugin-generator').runCli();
diff --git a/src/dev/file.ts b/src/dev/file.ts
index 32998d3e776ef..1209cc323c4c3 100644
--- a/src/dev/file.ts
+++ b/src/dev/file.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { dirname, extname, join, relative, resolve, sep } from 'path';
+import { dirname, extname, join, relative, resolve, sep, basename } from 'path';
 
 export class File {
   private path: string;
@@ -38,6 +38,12 @@ export class File {
     return this.relativePath;
   }
 
+  public getWithoutExtension() {
+    const directory = dirname(this.path);
+    const stem = basename(this.path, this.ext);
+    return new File(resolve(directory, stem));
+  }
+
   public isJs() {
     return this.ext === '.js';
   }
diff --git a/src/dev/i18n/tasks/extract_untracked_translations.ts b/src/dev/i18n/tasks/extract_untracked_translations.ts
index 21ab47641f2f0..928997aced801 100644
--- a/src/dev/i18n/tasks/extract_untracked_translations.ts
+++ b/src/dev/i18n/tasks/extract_untracked_translations.ts
@@ -47,7 +47,7 @@ export async function extractUntrackedMessagesTask({
     '**/build/**',
     '**/__fixtures__/**',
     '**/packages/kbn-i18n/**',
-    '**/packages/kbn-plugin-generator/sao_template/**',
+    '**/packages/kbn-plugin-generator/template/**',
     '**/packages/kbn-ui-framework/generator-kui/**',
     '**/target/**',
     '**/test/**',
diff --git a/src/dev/precommit_hook/casing_check_config.js b/src/dev/precommit_hook/casing_check_config.js
index 19d03e41ac5a9..e22dc03cf57aa 100644
--- a/src/dev/precommit_hook/casing_check_config.js
+++ b/src/dev/precommit_hook/casing_check_config.js
@@ -109,6 +109,14 @@ export const IGNORE_DIRECTORY_GLOBS = [
   'packages/kbn-optimizer/src/__fixtures__/mock_repo/x-pack',
 ];
 
+/**
+ * These patterns identify files which should have the extension stripped
+ * to reveal the actual name that should be checked.
+ *
+ * @type {Array}
+ */
+export const REMOVE_EXTENSION = ['packages/kbn-plugin-generator/template/**/*.ejs'];
+
 /**
  * DO NOT ADD FILES TO THIS LIST!!
  *
diff --git a/src/dev/precommit_hook/check_file_casing.js b/src/dev/precommit_hook/check_file_casing.js
index ec77d9a8bad3c..243818d35a90b 100644
--- a/src/dev/precommit_hook/check_file_casing.js
+++ b/src/dev/precommit_hook/check_file_casing.js
@@ -29,6 +29,7 @@ import {
   IGNORE_FILE_GLOBS,
   TEMPORARILY_IGNORED_PATHS,
   KEBAB_CASE_DIRECTORY_GLOBS,
+  REMOVE_EXTENSION,
 } from './casing_check_config';
 
 const NON_SNAKE_CASE_RE = /[A-Z \-]/;
@@ -143,6 +144,10 @@ async function checkForSnakeCase(log, files) {
 }
 
 export async function checkFileCasing(log, files) {
+  files = files.map((f) =>
+    matchesAnyGlob(f.getRelativePath(), REMOVE_EXTENSION) ? f.getWithoutExtension() : f
+  );
+
   await checkForKebabCase(log, files);
   await checkForSnakeCase(log, files);
 }
diff --git a/yarn.lock b/yarn.lock
index d13db64ad8b79..ed9dda820d66a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3663,6 +3663,11 @@
   resolved "https://registry.yarnpkg.com/@types/dragselect/-/dragselect-1.13.1.tgz#f19b7b41063a7c9d5963194c83c3c364e84d46ee"
   integrity sha512-3m0fvSM0cSs0DXvprytV/ZY92hNX3jJuEb/vkdqU+4QMzV2jxYKgBFTuaT2fflqbmfzUqHHIkGP55WIuigElQw==
 
+"@types/ejs@^3.0.4":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@types/ejs/-/ejs-3.0.4.tgz#8851fcdedb96e410fbb24f83b8be6763ef9afa77"
+  integrity sha512-ZxnwyBGO4KX/82AsFHTX82eMw0PsoBcIngEat+zx0y+3yxoNDJucAihg9nAcrc+g4Cwiv/4WcWsX4oiy0ySrRQ==
+
 "@types/elasticsearch@^5.0.33":
   version "5.0.33"
   resolved "https://registry.yarnpkg.com/@types/elasticsearch/-/elasticsearch-5.0.33.tgz#b0fd37dc674f498223b6d68c313bdfd71f4d812b"
@@ -3942,6 +3947,14 @@
     "@types/through" "*"
     rxjs "^6.4.0"
 
+"@types/inquirer@^7.3.1":
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-7.3.1.tgz#1f231224e7df11ccfaf4cf9acbcc3b935fea292d"
+  integrity sha512-osD38QVIfcdgsPCT0V3lD7eH0OFurX71Jft18bZrsVQWVRt6TuxRzlr0GJLrxoHZR2V5ph7/qP8se/dcnI7o0g==
+  dependencies:
+    "@types/through" "*"
+    rxjs "^6.4.0"
+
 "@types/intl-relativeformat@^2.1.0":
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/@types/intl-relativeformat/-/intl-relativeformat-2.1.0.tgz#3a2b0043380388f39c666665ec517e11412f1358"
@@ -4348,6 +4361,11 @@
   resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-1.19.1.tgz#33509849f8e679e4add158959fdb086440e9553f"
   integrity sha512-5qOlnZscTn4xxM5MeGXAMOsIOIKIbh9e85zJWfBRVPlRMEVawzoPhINYbRGkBZCI8LxvBe7tJCdWiarA99OZfQ==
 
+"@types/prettier@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.0.2.tgz#5bb52ee68d0f8efa9cc0099920e56be6cc4e37f3"
+  integrity sha512-IkVfat549ggtkZUthUzEX49562eGikhSYeVGX97SkMFn+sTZrgRewXjQ4tPKFPCykZHkX1Zfd9OoELGqKU2jJA==
+
 "@types/pretty-ms@^5.0.0":
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/@types/pretty-ms/-/pretty-ms-5.0.1.tgz#f2f0d7be58caf8613d149053d446e0282ae11ff3"
@@ -6535,6 +6553,11 @@ async-value@^1.2.2:
   resolved "https://registry.yarnpkg.com/async-value/-/async-value-1.2.2.tgz#84517a1e7cb6b1a5b5e181fa31be10437b7fb125"
   integrity sha1-hFF6Hny2saW14YH6Mb4QQ3t/sSU=
 
+async@0.9.x:
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
+  integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=
+
 async@^1.4.2, async@^1.5.2, async@~1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
@@ -7485,7 +7508,7 @@ bowser@^1.7.3:
   resolved "https://registry.yarnpkg.com/bowser/-/bowser-1.9.4.tgz#890c58a2813a9d3243704334fa81b96a5c150c9a"
   integrity sha512-9IdMmj2KjigRq6oWhmwv1W36pDuA4STQZ8q6YO9um+x07xgYNCD3Oou+WP/3L1HNz7iqythGet3/p4wvc8AAwQ==
 
-boxen@^1.2.1, boxen@^1.2.2:
+boxen@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b"
   integrity sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==
@@ -7749,15 +7772,6 @@ buffer-xor@^1.0.3:
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
   integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
 
-buffer@^3.0.1:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-3.6.0.tgz#a72c936f77b96bf52f5f7e7b467180628551defb"
-  integrity sha1-pyyTb3e5a/UvX357RnGAYoVR3vs=
-  dependencies:
-    base64-js "0.0.8"
-    ieee754 "^1.1.4"
-    isarray "^1.0.0"
-
 buffer@^4.3.0:
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
@@ -7800,31 +7814,6 @@ bytes@3.1.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
   integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
 
-cac@^3.0.3:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/cac/-/cac-3.0.4.tgz#6d24ceec372efe5c9b798808bc7f49b47242a4ef"
-  integrity sha1-bSTO7Dcu/lybeYgIvH9JtHJCpO8=
-  dependencies:
-    camelcase-keys "^3.0.0"
-    chalk "^1.1.3"
-    indent-string "^3.0.0"
-    minimist "^1.2.0"
-    read-pkg-up "^1.0.1"
-    suffix "^0.1.0"
-    text-table "^0.2.0"
-
-cac@^4.3.4:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/cac/-/cac-4.4.1.tgz#c6867f731c4be7b0c270689d1689400b914c7788"
-  integrity sha512-Ab4JHxgvSNI6niHz5M3JCYRXnzERhY314HDwkndOh7FmIyOX7xY+iUqsl0nE17wjt8+kdvxw+b1HDtmFMiVPNA==
-  dependencies:
-    chalk "^2.0.1"
-    minimost "^1.0.0"
-    read-pkg-up "^2.0.0"
-    redent "^2.0.0"
-    string-width "^2.1.1"
-    text-table "^0.2.0"
-
 cacache@^12.0.2:
   version "12.0.4"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c"
@@ -8035,14 +8024,6 @@ camelcase-keys@^2.0.0:
     camelcase "^2.0.0"
     map-obj "^1.0.0"
 
-camelcase-keys@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-3.0.0.tgz#fc0c6c360363f7377e3793b9a16bccf1070c1ca4"
-  integrity sha1-/AxsNgNj9zd+N5O5oWvM8QcMHKQ=
-  dependencies:
-    camelcase "^3.0.0"
-    map-obj "^1.0.0"
-
 camelcase-keys@^4.0.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77"
@@ -8176,16 +8157,6 @@ catbox@10.x.x:
     hoek "5.x.x"
     joi "13.x.x"
 
-caw@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/caw/-/caw-2.0.1.tgz#6c3ca071fc194720883c2dc5da9b074bfc7e9e95"
-  integrity sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==
-  dependencies:
-    get-proxy "^2.0.0"
-    isurl "^1.0.0-alpha5"
-    tunnel-agent "^0.6.0"
-    url-to-options "^1.0.1"
-
 ccount@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.3.tgz#f1cec43f332e2ea5a569fd46f9f5bde4e6102aff"
@@ -8336,11 +8307,6 @@ chardet@^0.4.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
   integrity sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=
 
-chardet@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.5.0.tgz#fe3ac73c00c3d865ffcc02a0682e2c20b6a06029"
-  integrity sha512-9ZTaoBaePSCFvNlNGrsyI8ZVACP2svUtq0DkM7t4K2ClAa96sqOIRjAzDTc8zXzFt1cZR46rRzLTiHFSJ+Qw0g==
-
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
@@ -8850,11 +8816,6 @@ cmd-shim@^2.1.0:
     graceful-fs "^4.1.2"
     mkdirp "~0.5.0"
 
-co@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-3.1.0.tgz#4ea54ea5a08938153185e15210c68d9092bc1b78"
-  integrity sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g=
-
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
@@ -9086,13 +9047,6 @@ commander@^5.0.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-5.0.0.tgz#dbf1909b49e5044f8fdaf0adc809f0c0722bdfd0"
   integrity sha512-JrDGPAKjMGSP1G0DUoaceEJ3DZgAfr/q6X7FVk4+U5KxUSKviYGM2k6zWkfyyBHy5rAtzgYJFa1ro2O9PtoxwQ==
 
-commander@~2.8.1:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
-  integrity sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=
-  dependencies:
-    graceful-readlink ">= 1.0.0"
-
 common-tags@1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
@@ -9197,7 +9151,7 @@ concat-stream@~2.0.0:
     readable-stream "^3.0.2"
     typedarray "^0.0.6"
 
-conf@^1.1.2, conf@^1.3.1:
+conf@^1.3.1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/conf/-/conf-1.4.0.tgz#1ea66c9d7a9b601674a5bb9d2b8dc3c726625e67"
   integrity sha512-bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg==
@@ -9702,15 +9656,7 @@ cross-spawn@^3.0.0:
     lru-cache "^4.0.1"
     which "^1.2.9"
 
-cross-spawn@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
-  integrity sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=
-  dependencies:
-    lru-cache "^4.0.1"
-    which "^1.2.9"
-
-cross-spawn@^5.0.1, cross-spawn@^5.1.0:
+cross-spawn@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
   integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
@@ -10382,59 +10328,6 @@ decompress-response@^5.0.0:
   dependencies:
     mimic-response "^2.0.0"
 
-decompress-tar@^4.0.0, decompress-tar@^4.1.0, decompress-tar@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/decompress-tar/-/decompress-tar-4.1.1.tgz#718cbd3fcb16209716e70a26b84e7ba4592e5af1"
-  integrity sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==
-  dependencies:
-    file-type "^5.2.0"
-    is-stream "^1.1.0"
-    tar-stream "^1.5.2"
-
-decompress-tarbz2@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz#3082a5b880ea4043816349f378b56c516be1a39b"
-  integrity sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==
-  dependencies:
-    decompress-tar "^4.1.0"
-    file-type "^6.1.0"
-    is-stream "^1.1.0"
-    seek-bzip "^1.0.5"
-    unbzip2-stream "^1.0.9"
-
-decompress-targz@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/decompress-targz/-/decompress-targz-4.1.1.tgz#c09bc35c4d11f3de09f2d2da53e9de23e7ce1eee"
-  integrity sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==
-  dependencies:
-    decompress-tar "^4.1.1"
-    file-type "^5.2.0"
-    is-stream "^1.1.0"
-
-decompress-unzip@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/decompress-unzip/-/decompress-unzip-4.0.1.tgz#deaaccdfd14aeaf85578f733ae8210f9b4848f69"
-  integrity sha1-3qrM39FK6vhVePczroIQ+bSEj2k=
-  dependencies:
-    file-type "^3.8.0"
-    get-stream "^2.2.0"
-    pify "^2.3.0"
-    yauzl "^2.4.2"
-
-decompress@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/decompress/-/decompress-4.2.1.tgz#007f55cc6a62c055afa37c07eb6a4ee1b773f118"
-  integrity sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==
-  dependencies:
-    decompress-tar "^4.0.0"
-    decompress-tarbz2 "^4.0.0"
-    decompress-targz "^4.0.0"
-    decompress-unzip "^4.0.1"
-    graceful-fs "^4.1.10"
-    make-dir "^1.0.0"
-    pify "^2.3.0"
-    strip-dirs "^2.0.0"
-
 dedent@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
@@ -11180,28 +11073,6 @@ downgrade-root@^1.0.0:
     default-uid "^1.0.0"
     is-root "^1.0.0"
 
-download-git-repo@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/download-git-repo/-/download-git-repo-1.0.2.tgz#0b93a62057e41e2f21b1a06c95e7b26362b108ff"
-  integrity sha512-PwAUr0/w74AGB7bukOycXyLnDlt9Lfb3JzsliAWyZCHa/TvbuMYQvH1er2DWXHE4EuI/NjAzRXw+89Waynapgw==
-  dependencies:
-    download "^5.0.3"
-    git-clone "^0.1.0"
-    rimraf "^2.6.1"
-
-download@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/download/-/download-5.0.3.tgz#63537f977f99266a30eb8a2a2fbd1f20b8000f7a"
-  integrity sha1-Y1N/l3+ZJmow64oqL70fILgAD3o=
-  dependencies:
-    caw "^2.0.0"
-    decompress "^4.0.0"
-    filenamify "^2.0.0"
-    get-stream "^3.0.0"
-    got "^6.3.0"
-    mkdirp "^0.5.1"
-    pify "^2.3.0"
-
 dragselect@1.13.1:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/dragselect/-/dragselect-1.13.1.tgz#aa4166e1164b51ed5ee0cd89e0c5310a9c35be6a"
@@ -11313,20 +11184,17 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-ejs@^2.2.4, ejs@^2.3.1:
-  version "2.5.7"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a"
-  integrity sha1-zIcsFoiArjxxiXYv1f/ACJbJUYo=
-
-ejs@^2.7.4:
+ejs@^2.3.1, ejs@^2.7.4:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
   integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
 
-ejs@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.0.2.tgz#745b01cdcfe38c1c6a2da3bbb2d9957060a31226"
-  integrity sha512-IncmUpn1yN84hy2shb0POJ80FWrfGNY0cxO9f4v+/sG7qcBvAtVWUA1IdzY/8EYUmOVhoKJVdJjNd3AZcnxOjA==
+ejs@^3.0.1, ejs@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.5.tgz#aed723844dc20acb4b170cd9ab1017e476a0d93b"
+  integrity sha512-dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w==
+  dependencies:
+    jake "^10.6.1"
 
 elastic-apm-http-client@^9.4.0:
   version "9.4.0"
@@ -12714,15 +12582,6 @@ external-editor@^1.1.0:
     spawn-sync "^1.0.15"
     tmp "^0.0.29"
 
-external-editor@^2.0.4:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.1.0.tgz#3d026a21b7f95b5726387d4200ac160d372c3b48"
-  integrity sha512-E44iT5QVOUJBKij4IIV3uvxuNlbKS38Tw1HiupxEIHPv9qtC2PrDYohbXV5U+1jnfIXttny8gUhj+oZvflFlzA==
-  dependencies:
-    chardet "^0.4.0"
-    iconv-lite "^0.4.17"
-    tmp "^0.0.33"
-
 external-editor@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
@@ -12732,19 +12591,10 @@ external-editor@^2.1.0:
     iconv-lite "^0.4.17"
     tmp "^0.0.33"
 
-external-editor@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.0.tgz#dc35c48c6f98a30ca27a20e9687d7f3c77704bb6"
-  integrity sha512-mpkfj0FEdxrIhOC04zk85X7StNtr0yXnG7zCb+8ikO8OJi2jsHh5YGoknNTyXgsbHOf1WOOcVU3kPFWT2WgCkQ==
-  dependencies:
-    chardet "^0.5.0"
-    iconv-lite "^0.4.22"
-    tmp "^0.0.33"
-
 external-editor@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
-  integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
+  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
   dependencies:
     chardet "^0.7.0"
     iconv-lite "^0.4.24"
@@ -12939,7 +12789,7 @@ fb-watchman@^2.0.0:
   dependencies:
     bser "^2.0.0"
 
-fbjs@^0.8.0, fbjs@^0.8.1, fbjs@^0.8.16:
+fbjs@^0.8.0, fbjs@^0.8.1, fbjs@^0.8.16, fbjs@^0.8.4, fbjs@^0.8.9:
   version "0.8.17"
   resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd"
   integrity sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=
@@ -12952,19 +12802,6 @@ fbjs@^0.8.0, fbjs@^0.8.1, fbjs@^0.8.16:
     setimmediate "^1.0.5"
     ua-parser-js "^0.7.18"
 
-fbjs@^0.8.4, fbjs@^0.8.9:
-  version "0.8.16"
-  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
-  integrity sha1-XmdDL1UNxBtXK/VYR7ispk5TN9s=
-  dependencies:
-    core-js "^1.0.0"
-    isomorphic-fetch "^2.1.1"
-    loose-envify "^1.0.0"
-    object-assign "^4.1.0"
-    promise "^7.1.1"
-    setimmediate "^1.0.5"
-    ua-parser-js "^0.7.9"
-
 fd-slicer@1.1.0, fd-slicer@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
@@ -12972,13 +12809,6 @@ fd-slicer@1.1.0, fd-slicer@~1.1.0:
   dependencies:
     pend "~1.2.0"
 
-fd-slicer@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"
-  integrity sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=
-  dependencies:
-    pend "~1.2.0"
-
 fecha@^2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fecha/-/fecha-2.3.3.tgz#948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd"
@@ -13079,21 +12909,6 @@ file-type@^10.9.0:
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-10.9.0.tgz#f6c12c7cb9e6b8aeefd6917555fd4f9eadf31891"
   integrity sha512-9C5qtGR/fNibHC5gzuMmmgnjH3QDDLKMa8lYe9CiZVmAnI4aUaoMh40QyUPzzs0RYo837SOBKh7TYwle4G8E4w==
 
-file-type@^3.8.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9"
-  integrity sha1-JXoHg4TR24CHvESdEH1SpSZyuek=
-
-file-type@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/file-type/-/file-type-5.2.0.tgz#2ddbea7c73ffe36368dfae49dc338c058c2b8ad6"
-  integrity sha1-LdvqfHP/42No365J3DOMBYwritY=
-
-file-type@^6.1.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/file-type/-/file-type-6.2.0.tgz#e50cd75d356ffed4e306dc4f5bcf52a79903a919"
-  integrity sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==
-
 file-type@^9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-9.0.0.tgz#a68d5ad07f486414dfb2c8866f73161946714a18"
@@ -13104,19 +12919,12 @@ file-uri-to-path@1.0.0:
   resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
   integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
 
-filename-reserved-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz#abf73dfab735d045440abfea2d91f389ebbfa229"
-  integrity sha1-q/c9+rc10EVECr/qLZHzieu/oik=
-
-filenamify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-2.0.0.tgz#bd162262c0b6e94bfbcdcf19a3bbb3764f785695"
-  integrity sha1-vRYiYsC26Uv7zc8Zo7uzdk94VpU=
+filelist@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.1.tgz#f10d1a3ae86c1694808e8f20906f43d4c9132dbb"
+  integrity sha512-8zSK6Nu0DQIC08mUC46sWGXi+q3GGpKydAG36k+JDba6VRpkevvOWUW5a/PhShij4+vHT9M+ghgG7eM+a9JDUQ==
   dependencies:
-    filename-reserved-regex "^2.0.0"
-    strip-outer "^1.0.0"
-    trim-repeated "^1.0.0"
+    minimatch "^3.0.4"
 
 filesize@3.6.1:
   version "3.6.1"
@@ -13618,11 +13426,6 @@ fs-constants@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
   integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
 
-fs-exists-sync@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
-  integrity sha1-mC1ok6+RjnLQjeyehnP/K1qNat0=
-
 fs-extra@8.1.0, fs-extra@^8.0.1, fs-extra@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
@@ -13652,15 +13455,6 @@ fs-extra@^3.0.1:
     jsonfile "^3.0.0"
     universalify "^0.1.0"
 
-fs-extra@^4.0.1:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
-  integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
 fs-extra@^7.0.0, fs-extra@^7.0.1, fs-extra@~7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
@@ -13905,13 +13699,6 @@ get-port@^4.2.0:
   resolved "https://registry.yarnpkg.com/get-port/-/get-port-4.2.0.tgz#e37368b1e863b7629c43c5a323625f95cf24b119"
   integrity sha512-/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw==
 
-get-proxy@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/get-proxy/-/get-proxy-2.1.0.tgz#349f2b4d91d44c4d4d4e9cba2ad90143fac5ef93"
-  integrity sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==
-  dependencies:
-    npm-conf "^1.1.0"
-
 get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
@@ -13927,14 +13714,6 @@ get-stream@3.0.0, get-stream@^3.0.0:
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
   integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
 
-get-stream@^2.2.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de"
-  integrity sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=
-  dependencies:
-    object-assign "^4.0.1"
-    pinkie-promise "^2.0.0"
-
 get-stream@^4.0.0, get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@@ -13999,20 +13778,6 @@ gifwrap@^0.9.2:
     image-q "^1.1.1"
     omggif "^1.0.10"
 
-git-clone@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/git-clone/-/git-clone-0.1.0.tgz#0d76163778093aef7f1c30238f2a9ef3f07a2eb9"
-  integrity sha1-DXYWN3gJOu9/HDAjjyqe8/B6Lrk=
-
-git-config-path@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/git-config-path/-/git-config-path-1.0.1.tgz#6d33f7ed63db0d0e118131503bab3aca47d54664"
-  integrity sha1-bTP37WPbDQ4RgTFQO6s6ykfVRmQ=
-  dependencies:
-    extend-shallow "^2.0.1"
-    fs-exists-sync "^0.1.0"
-    homedir-polyfill "^1.0.0"
-
 git-up@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/git-up/-/git-up-4.0.1.tgz#cb2ef086653640e721d2042fe3104857d89007c0"
@@ -14480,7 +14245,7 @@ got@^3.2.0:
     read-all-stream "^3.0.0"
     timed-out "^2.0.0"
 
-got@^6.2.0, got@^6.3.0, got@^6.7.1:
+got@^6.2.0, got@^6.7.1:
   version "6.7.1"
   resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
   integrity sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=
@@ -14557,27 +14322,7 @@ got@^9.6.0:
     to-readable-stream "^1.0.0"
     url-parse-lax "^3.0.0"
 
-graceful-fs@4.X, graceful-fs@^4.0.0, graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.4:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
-
-graceful-fs@^4.1.15, graceful-fs@^4.1.9:
-  version "4.1.15"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
-  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
-
-graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.2:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
-  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
-
-graceful-fs@^4.2.0:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
-  integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==
-
-graceful-fs@^4.2.3, graceful-fs@^4.2.4:
+graceful-fs@4.X, graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3, graceful-fs@^4.2.4:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
@@ -14587,11 +14332,6 @@ graceful-fs@~1.1:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-1.1.14.tgz#07078db5f6377f6321fceaaedf497de124dc9465"
   integrity sha1-BweNtfY3f2Mh/Oqu30l94STclGU=
 
-"graceful-readlink@>= 1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
-  integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
-
 graphql-anywhere@^4.1.0-alpha.0:
   version "4.1.16"
   resolved "https://registry.yarnpkg.com/graphql-anywhere/-/graphql-anywhere-4.1.16.tgz#82bb59643e30183cfb7b485ed4262a7b39d8a6c1"
@@ -15082,7 +14822,7 @@ handle-thing@^2.0.0:
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754"
   integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==
 
-handlebars@4.7.6, handlebars@^4.0.1:
+handlebars@4.7.6:
   version "4.7.6"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.6.tgz#d4c05c1baf90e9945f77aa68a7a219aa4a7df74e"
   integrity sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==
@@ -15418,7 +15158,7 @@ hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0, hoist-non-react-
   dependencies:
     react-is "^16.7.0"
 
-homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1:
+homedir-polyfill@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
   integrity sha1-TCu8inWJmP7r9e1oWA921GdotLw=
@@ -15731,7 +15471,7 @@ icalendar@0.7.1:
   resolved "https://registry.yarnpkg.com/icalendar/-/icalendar-0.7.1.tgz#d0d3486795f8f1c5cf4f8cafac081b4b4e7a32ae"
   integrity sha1-0NNIZ5X48cXPT4yvrAgbS056Mq4=
 
-iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.22, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -16115,26 +15855,6 @@ inquirer@^1.0.2, inquirer@^1.2.2:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
-inquirer@^3.2.3:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
-  integrity sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==
-  dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.0"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
-    external-editor "^2.0.4"
-    figures "^2.0.0"
-    lodash "^4.3.0"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rx-lite "^4.0.8"
-    rx-lite-aggregates "^4.0.8"
-    string-width "^2.1.0"
-    strip-ansi "^4.0.0"
-    through "^2.3.6"
-
 inquirer@^5.0.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-5.2.0.tgz#db350c2b73daca77ff1243962e9f22f099685726"
@@ -16155,47 +15875,28 @@ inquirer@^5.0.0:
     through "^2.3.6"
 
 inquirer@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.0.0.tgz#e8c20303ddc15bbfc2c12a6213710ccd9e1413d8"
-  integrity sha512-tISQWRwtcAgrz+SHPhTH7d3e73k31gsOy6i1csonLc0u1dVK/wYvuOnFeiWqC5OXFIYbmrIFInef31wbT8MEJg==
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
+  integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==
   dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.0"
+    ansi-escapes "^3.2.0"
+    chalk "^2.4.2"
     cli-cursor "^2.1.0"
     cli-width "^2.0.0"
-    external-editor "^3.0.0"
+    external-editor "^3.0.3"
     figures "^2.0.0"
-    lodash "^4.3.0"
+    lodash "^4.17.12"
     mute-stream "0.0.7"
     run-async "^2.2.0"
-    rxjs "^6.1.0"
-    string-width "^2.1.0"
-    strip-ansi "^4.0.0"
-    through "^2.3.6"
-
-inquirer@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.0.tgz#9e2b032dde77da1db5db804758b8fea3a970519a"
-  integrity sha512-rSdC7zelHdRQFkWnhsMu2+2SO41mpv2oF2zy4tMhmiLWkcKbOAs87fWAJhVXttKVwhdZvymvnuM95EyEXg2/tQ==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    chalk "^2.4.2"
-    cli-cursor "^3.1.0"
-    cli-width "^2.0.0"
-    external-editor "^3.0.3"
-    figures "^3.0.0"
-    lodash "^4.17.15"
-    mute-stream "0.0.8"
-    run-async "^2.2.0"
     rxjs "^6.4.0"
-    string-width "^4.1.0"
+    string-width "^2.1.0"
     strip-ansi "^5.1.0"
     through "^2.3.6"
 
-inquirer@^7.3.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.1.tgz#ac6aba1abdfdd5ad34e7069370411edba17f6439"
-  integrity sha512-/+vOpHQHhoh90Znev8BXiuw1TDQ7IDxWsQnFafUEoK5+4uN5Eoz1p+3GqOj/NtzEi9VzWKQcV9Bm+i8moxedsA==
+inquirer@^7.0.0, inquirer@^7.3.1, inquirer@^7.3.3:
+  version "7.3.3"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
+  integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
   dependencies:
     ansi-escapes "^4.2.1"
     chalk "^4.1.0"
@@ -16203,7 +15904,7 @@ inquirer@^7.3.1:
     cli-width "^3.0.0"
     external-editor "^3.0.3"
     figures "^3.0.0"
-    lodash "^4.17.16"
+    lodash "^4.17.19"
     mute-stream "0.0.8"
     run-async "^2.4.0"
     rxjs "^6.6.0"
@@ -16430,13 +16131,6 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
-is-binary-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.0.0.tgz#0e61cea6974b24dda8bcc8366ce58a69265d1a36"
-  integrity sha1-DmHOppdLJN2ovMg2bOWKaSZdGjY=
-  dependencies:
-    binary-extensions "^1.0.0"
-
 is-binary-path@~2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
@@ -16722,11 +16416,6 @@ is-native@^1.0.1:
     is-nil "^1.0.0"
     to-source-code "^1.0.0"
 
-is-natural-number@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8"
-  integrity sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=
-
 is-negated-glob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2"
@@ -16865,7 +16554,7 @@ is-plain-object@3.0.0, is-plain-object@^3.0.0:
   dependencies:
     isobject "^4.0.0"
 
-is-promise@^2.0.0, is-promise@^2.1, is-promise@^2.1.0:
+is-promise@^2.1, is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
   integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
@@ -17316,6 +17005,16 @@ iterate-value@^1.0.0:
     es-get-iterator "^1.0.2"
     iterate-iterator "^1.0.1"
 
+jake@^10.6.1:
+  version "10.8.2"
+  resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b"
+  integrity sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==
+  dependencies:
+    async "0.9.x"
+    chalk "^2.4.2"
+    filelist "^1.0.1"
+    minimatch "^3.0.4"
+
 jest-canvas-mock@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/jest-canvas-mock/-/jest-canvas-mock-2.2.0.tgz#45fbc58589c6ce9df50dc90bd8adce747cbdada7"
@@ -18233,28 +17932,6 @@ jssha@^2.1.0:
   resolved "https://registry.yarnpkg.com/jssha/-/jssha-2.3.1.tgz#147b2125369035ca4b2f7d210dc539f009b3de9a"
   integrity sha1-FHshJTaQNcpLL30hDcU58Amz3po=
 
-jstransformer-ejs@^0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/jstransformer-ejs/-/jstransformer-ejs-0.0.3.tgz#04d9201469274fcf260f1e7efd732d487fa234b6"
-  integrity sha1-BNkgFGknT88mDx5+/XMtSH+iNLY=
-  dependencies:
-    ejs "^2.2.4"
-
-jstransformer-handlebars@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/jstransformer-handlebars/-/jstransformer-handlebars-1.1.0.tgz#91ba56e0a28aee31bb56d4adbcbce508d8230468"
-  integrity sha1-kbpW4KKK7jG7VtStvLzlCNgjBGg=
-  dependencies:
-    handlebars "^4.0.1"
-
-jstransformer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/jstransformer/-/jstransformer-1.0.0.tgz#ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"
-  integrity sha1-7Yvwkh4vPx7U1cGkT2hwntJHIsM=
-  dependencies:
-    is-promise "^2.0.0"
-    promise "^7.0.1"
-
 jsts@^1.6.2:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/jsts/-/jsts-1.6.2.tgz#c0efc885edae06ae84f78cbf2a0110ba929c5925"
@@ -18446,20 +18123,6 @@ known-css-properties@^0.3.0:
   resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.3.0.tgz#a3d135bbfc60ee8c6eacf2f7e7e6f2d4755e49a4"
   integrity sha512-QMQcnKAiQccfQTqtBh/qwquGZ2XK/DXND1jrcN9M8gMMy99Gwla7GQjndVUsEqIaRyP6bsFRuhwRj5poafBGJQ==
 
-kopy@^8.2.0:
-  version "8.2.5"
-  resolved "https://registry.yarnpkg.com/kopy/-/kopy-8.2.5.tgz#6c95f312e981ab917680d7e5de3cdf29a1bf221f"
-  integrity sha512-+U+LMXZtpRjU5JSGNsXeUG3k/Xvf+7NBQTdP7PxzUNBzLNkyoWxbDkvRchNFh3ANcucJKX/s6+cGxmmPUBBtww==
-  dependencies:
-    inquirer "^3.2.3"
-    is-binary-path "^2.0.0"
-    jstransformer "^1.0.0"
-    jstransformer-ejs "^0.0.3"
-    majo "^0.4.1"
-    minimatch "^3.0.4"
-    multimatch "^2.1.0"
-    path-exists "^3.0.0"
-
 kuler@1.0.x:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/kuler/-/kuler-1.0.1.tgz#ef7c784f36c9fb6e16dd3150d152677b2b0228a6"
@@ -19178,7 +18841,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@4.17.11, lodash@4.17.15, lodash@4.17.19, lodash@>4.17.4, lodash@^4, lodash@^4.0.0, lodash@^4.0.1, lodash@^4.10.0, lodash@^4.11.1, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.16, lodash@^4.17.19, lodash@^4.17.2, lodash@^4.17.20, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.10, lodash@~4.17.15, lodash@~4.17.5:
+lodash@4.17.11, lodash@4.17.15, lodash@4.17.19, lodash@>4.17.4, lodash@^4, lodash@^4.0.0, lodash@^4.0.1, lodash@^4.10.0, lodash@^4.11.1, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.2, lodash@^4.17.20, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.10, lodash@~4.17.15, lodash@~4.17.5:
   version "4.17.20"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
   integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
@@ -19437,15 +19100,6 @@ magic-string@0.25.1:
   dependencies:
     sourcemap-codec "^1.4.1"
 
-majo@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/majo/-/majo-0.4.1.tgz#5e6eeb9b63bda77e59d396b9c9ce4189ce6100bc"
-  integrity sha512-+Ys9ffqdJP9IAE8V8J6xSpemt1i6aleHhpk9R+K0GBkUKd6PE/oOW7GR9FFB5jHodxmX0lWeOezBc5OSoywDhw==
-  dependencies:
-    fs-extra "^3.0.1"
-    globby "^6.1.0"
-    ware "^1.3.0"
-
 make-dir@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -20091,14 +19745,6 @@ minimist@1.2.5, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
-minimost@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/minimost/-/minimost-1.0.0.tgz#1d07954aa0268873408b95552fbffc5977dfc78b"
-  integrity sha1-HQeVSqAmiHNAi5VVL7/8WXffx4s=
-  dependencies:
-    camelcase-keys "^4.0.0"
-    minimist "^1.2.0"
-
 minipass-collect@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
@@ -20432,7 +20078,7 @@ multicast-dns@^6.0.1:
     dns-packet "^1.3.1"
     thunky "^1.0.2"
 
-multimatch@^2.0.0, multimatch@^2.1.0:
+multimatch@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
   integrity sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=
@@ -21108,7 +20754,7 @@ npm-bundled@^1.0.1:
   dependencies:
     npm-normalize-package-bin "^1.0.1"
 
-npm-conf@^1.1.0, npm-conf@^1.1.3:
+npm-conf@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9"
   integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==
@@ -21625,7 +21271,7 @@ ora@^0.2.3:
     cli-spinners "^0.1.2"
     object-assign "^4.0.1"
 
-ora@^1.3.0, ora@^1.4.0:
+ora@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/ora/-/ora-1.4.0.tgz#884458215b3a5d4097592285f93321bb7a79e2e5"
   integrity sha512-iMK1DOQxzzh2MBlVsU42G80mnrvUhqsMh74phHtDlrcTZPK0pH6o7l7DRshK+0YsxDyEuaOkziVdvM3T0QTzpw==
@@ -22092,16 +21738,6 @@ parse-filepath@^1.0.1:
     map-cache "^0.2.0"
     path-root "^0.1.1"
 
-parse-git-config@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/parse-git-config/-/parse-git-config-1.1.1.tgz#d3a9984317132f57398712bba438e129590ddf8c"
-  integrity sha1-06mYQxcTL1c5hxK7pDjhKVkN34w=
-  dependencies:
-    extend-shallow "^2.0.1"
-    fs-exists-sync "^0.1.0"
-    git-config-path "^1.0.1"
-    ini "^1.3.4"
-
 parse-headers@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.1.tgz#6ae83a7aa25a9d9b700acc28698cd1f1ed7e9536"
@@ -22966,7 +22602,7 @@ promise.prototype.finally@^3.1.0:
     es-abstract "^1.9.0"
     function-bind "^1.1.1"
 
-promise@^7.0.1, promise@^7.1.1:
+promise@^7.1.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
   integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
@@ -25483,18 +25119,6 @@ rw@~0.1.4:
   resolved "https://registry.yarnpkg.com/rw/-/rw-0.1.4.tgz#4903cbd80248ae0ede685bf58fd236a7a9b29a3e"
   integrity sha1-SQPL2AJIrg7eaFv1j9I2p6mymj4=
 
-rx-lite-aggregates@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
-  integrity sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=
-  dependencies:
-    rx-lite "*"
-
-rx-lite@*, rx-lite@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
-  integrity sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=
-
 rx-lite@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
@@ -25605,33 +25229,6 @@ sane@^4.0.3:
     minimist "^1.1.1"
     walker "~1.0.5"
 
-sao@^0.22.12:
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/sao/-/sao-0.22.12.tgz#fe13bb32bb0d32892c188024f77c5ac26c19eaf9"
-  integrity sha512-ybJxqUg2wvmnBZ6LBNV2L3ermzjP4RFpti0MSXX3VI+Weaw5wBhgB0umvgeWkyObKhsuP1TmZ22XGfi6v+o1LQ==
-  dependencies:
-    boxen "^1.2.2"
-    cac "^4.3.4"
-    chalk "^2.0.1"
-    co "^4.6.0"
-    conf "^1.1.2"
-    cross-spawn "^5.1.0"
-    download-git-repo "^1.0.1"
-    filenamify "^2.0.0"
-    fs-extra "^4.0.1"
-    git-config-path "^1.0.1"
-    globby "^6.1.0"
-    jstransformer-handlebars "^1.0.0"
-    kopy "^8.2.0"
-    ora "^1.3.0"
-    parse-git-config "^1.1.1"
-    semver "^5.4.1"
-    text-table "^0.2.0"
-    tildify "^1.2.0"
-    update-notifier "^2.2.0"
-    user-home "^2.0.0"
-    yarn-install "^0.5.1"
-
 sass-graph@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
@@ -25777,13 +25374,6 @@ seedrandom@^3.0.5:
   resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-3.0.5.tgz#54edc85c95222525b0c7a6f6b3543d8e0b3aa0a7"
   integrity sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==
 
-seek-bzip@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.5.tgz#cfe917cb3d274bcffac792758af53173eb1fabdc"
-  integrity sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=
-  dependencies:
-    commander "~2.8.1"
-
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
@@ -27155,13 +26745,6 @@ strip-bom@^4.0.0:
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
   integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
 
-strip-dirs@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/strip-dirs/-/strip-dirs-2.1.0.tgz#4987736264fc344cf20f6c34aca9d13d1d4ed6c5"
-  integrity sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==
-  dependencies:
-    is-natural-number "^4.0.1"
-
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
@@ -27211,13 +26794,6 @@ strip-json-comments@~1.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-1.0.4.tgz#1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"
   integrity sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=
 
-strip-outer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-outer/-/strip-outer-1.0.0.tgz#aac0ba60d2e90c5d4f275fd8869fd9a2d310ffb8"
-  integrity sha1-qsC6YNLpDF1PJ1/Yhp/ZotMQ/7g=
-  dependencies:
-    escape-string-regexp "^1.0.2"
-
 strong-log-transformer@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10"
@@ -27304,11 +26880,6 @@ sudo-block@^1.1.0:
     is-docker "^1.0.0"
     is-root "^1.0.0"
 
-suffix@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/suffix/-/suffix-0.1.0.tgz#3e46966de56af17600385e58db8ec659dd797907"
-  integrity sha1-PkaWbeVq8XYAOF5Y247GWd15eQc=
-
 superagent@3.8.2:
   version "3.8.2"
   resolved "https://registry.yarnpkg.com/superagent/-/superagent-3.8.2.tgz#e4a11b9d047f7d3efeb3bbe536d9ec0021d16403"
@@ -27639,7 +27210,7 @@ tar-fs@^1.16.3:
     pump "^1.0.0"
     tar-stream "^1.1.2"
 
-tar-stream@^1.1.2, tar-stream@^1.5.2:
+tar-stream@^1.1.2:
   version "1.5.5"
   resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.5.5.tgz#5cad84779f45c83b1f2508d96b09d88c7218af55"
   integrity sha512-mQdgLPc/Vjfr3VWqWbfxW8yQNiJCbAZ+Gf6GDu1Cy0bdb33ofyiNGBtAY96jHFhDuivCwgW1H9DgTON+INiXgg==
@@ -27922,13 +27493,6 @@ thunky@^1.0.2:
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.2.tgz#a862e018e3fb1ea2ec3fce5d55605cf57f247371"
   integrity sha1-qGLgGOP7HqLsP85dVWBc9X8kc3E=
 
-tildify@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/tildify/-/tildify-1.2.0.tgz#dcec03f55dca9b7aa3e5b04f21817eb56e63588a"
-  integrity sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=
-  dependencies:
-    os-homedir "^1.0.0"
-
 time-stamp@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
@@ -28299,13 +27863,6 @@ trim-newlines@^3.0.0:
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.0.tgz#79726304a6a898aa8373427298d54c2ee8b1cb30"
   integrity sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==
 
-trim-repeated@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/trim-repeated/-/trim-repeated-1.0.0.tgz#e3646a2ea4e891312bf7eace6cfb05380bc01c21"
-  integrity sha1-42RqLqTokTEr9+rObPsFOAvAHCE=
-  dependencies:
-    escape-string-regexp "^1.0.2"
-
 trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
@@ -28598,7 +28155,7 @@ typings-tester@^0.3.2:
   dependencies:
     commander "^2.12.2"
 
-ua-parser-js@^0.7.18, ua-parser-js@^0.7.9:
+ua-parser-js@^0.7.18:
   version "0.7.21"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.21.tgz#853cf9ce93f642f67174273cc34565ae6f308777"
   integrity sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==
@@ -28648,14 +28205,6 @@ uid-safe@2.1.5:
   dependencies:
     random-bytes "~1.0.0"
 
-unbzip2-stream@^1.0.9:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz#73a033a567bbbde59654b193c44d48a7e4f43c47"
-  integrity sha512-izD3jxT8xkzwtXRUZjtmRwKnZoeECrfZ8ra/ketwOcusbZEp4mjULMnJOCfTDZBgGQAAY1AJ/IgxcwkavcX9Og==
-  dependencies:
-    buffer "^3.0.1"
-    through "^2.3.6"
-
 unc-path-regex@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
@@ -29003,21 +28552,6 @@ update-notifier@^0.5.0:
     semver-diff "^2.0.0"
     string-length "^1.0.0"
 
-update-notifier@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.3.0.tgz#4e8827a6bb915140ab093559d7014e3ebb837451"
-  integrity sha1-TognpruRUUCrCTVZ1wFOPruDdFE=
-  dependencies:
-    boxen "^1.2.1"
-    chalk "^2.0.1"
-    configstore "^3.0.0"
-    import-lazy "^2.1.0"
-    is-installed-globally "^0.1.0"
-    is-npm "^1.0.0"
-    latest-version "^3.0.0"
-    semver-diff "^2.0.0"
-    xdg-basedir "^3.0.0"
-
 update-notifier@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6"
@@ -29949,13 +29483,6 @@ walker@^1.0.7, walker@~1.0.5:
   dependencies:
     makeerror "1.0.x"
 
-ware@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/ware/-/ware-1.3.0.tgz#d1b14f39d2e2cb4ab8c4098f756fe4b164e473d4"
-  integrity sha1-0bFPOdLiy0q4xAmPdW/ksWTkc9Q=
-  dependencies:
-    wrap-fn "^0.1.0"
-
 warning@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c"
@@ -30485,13 +30012,6 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-fn@^0.1.0:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/wrap-fn/-/wrap-fn-0.1.5.tgz#f21b6e41016ff4a7e31720dbc63a09016bdf9845"
-  integrity sha1-8htuQQFv9KfjFyDbxjoJAWvfmEU=
-  dependencies:
-    co "3.1.0"
-
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -30974,15 +30494,6 @@ yargs@~3.10.0:
     decamelize "^1.0.0"
     window-size "0.1.0"
 
-yarn-install@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/yarn-install/-/yarn-install-0.5.1.tgz#f3c55e8646b6ac8da360b2f8e31afe5c4a067340"
-  integrity sha512-v0E5rDOoRRGyrbwxIOqPfX/x5kiV4ba7bvzT0wVfOhyZZr7PKP57F3h1hLHa66jYpU7zd4GLTVvjVL/Y1aE/gg==
-  dependencies:
-    cac "^3.0.3"
-    chalk "^1.1.3"
-    cross-spawn "^4.0.2"
-
 yauzl@2.10.0, yauzl@^2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
@@ -30991,14 +30502,6 @@ yauzl@2.10.0, yauzl@^2.10.0:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
 
-yauzl@^2.4.2:
-  version "2.9.1"
-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.9.1.tgz#a81981ea70a57946133883f029c5821a89359a7f"
-  integrity sha1-qBmB6nCleUYTOIPwKcWCGok1mn8=
-  dependencies:
-    buffer-crc32 "~0.2.3"
-    fd-slicer "~1.0.1"
-
 yazl@^2.5.1:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.5.1.tgz#a3d65d3dd659a5b0937850e8609f22fffa2b5c35"

From ec44ee0dc9f5c24bef7c7676466ff3ee5fae56b1 Mon Sep 17 00:00:00 2001
From: Stratoula Kalafateli <efstratia.kalafateli@elastic.co>
Date: Fri, 21 Aug 2020 10:33:07 +0300
Subject: [PATCH 79/85] [TSVB] Disable enableHistogramMode prop when user
 selects non-stacked bar (#74930)

* Remove enableHistogramMode prop from TSVB as it causes bugs with non-stacked bars

* Disable enableHistogramMode property to false only when thr user selects the nobn-stacked option

* small change to be more human readbale

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../application/components/lib/charts.js      | 22 -------------------
 .../components/vis_types/timeseries/vis.js    |  3 ---
 .../visualizations/views/timeseries/index.js  |  7 +++---
 3 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 src/plugins/vis_type_timeseries/public/application/components/lib/charts.js

diff --git a/src/plugins/vis_type_timeseries/public/application/components/lib/charts.js b/src/plugins/vis_type_timeseries/public/application/components/lib/charts.js
deleted file mode 100644
index 2495026304be8..0000000000000
--- a/src/plugins/vis_type_timeseries/public/application/components/lib/charts.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { uniq, map, size, flow } from 'lodash';
-
-export const areFieldsDifferent = (name) => (series) => flow(uniq, size)(map(series, name)) > 1;
diff --git a/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/vis.js b/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/vis.js
index 612a7a48bade1..c14148d4a020f 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/vis.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/vis.js
@@ -31,7 +31,6 @@ import { MarkdownSimple } from '../../../../../../../plugins/kibana_react/public
 import { replaceVars } from '../../lib/replace_vars';
 import { getAxisLabelString } from '../../lib/get_axis_label_string';
 import { getInterval } from '../../lib/get_interval';
-import { areFieldsDifferent } from '../../lib/charts';
 import { createXaxisFormatter } from '../../lib/create_xaxis_formatter';
 import { STACKED_OPTIONS } from '../../../visualizations/constants';
 import { getCoreStart } from '../../../../services';
@@ -164,7 +163,6 @@ export class TimeseriesVisualization extends Component {
     const mainAxisGroupId = yAxisIdGenerator('main_group');
 
     const seriesModel = model.series.filter((s) => !s.hidden).map((s) => cloneDeep(s));
-    const enableHistogramMode = areFieldsDifferent('chart_type')(seriesModel);
     const firstSeries = seriesModel.find((s) => s.formatter && !s.separate_axis);
 
     const mainAxisScaleType = TimeseriesVisualization.getAxisScaleType(model);
@@ -243,7 +241,6 @@ export class TimeseriesVisualization extends Component {
           series={series}
           yAxis={yAxis}
           onBrush={onBrush}
-          enableHistogramMode={enableHistogramMode}
           backgroundColor={model.background_color}
           showGrid={Boolean(model.show_grid)}
           legend={Boolean(model.show_legend)}
diff --git a/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/index.js b/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/index.js
index 64ac5cc5f871f..6b5d84dc56981 100644
--- a/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/index.js
+++ b/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/index.js
@@ -67,7 +67,6 @@ export const TimeSeries = ({
   onBrush,
   xAxisFormatter,
   annotations,
-  enableHistogramMode,
 }) => {
   const chartRef = useRef();
   const updateCursor = (_, cursor) => {
@@ -181,6 +180,7 @@ export const TimeSeries = ({
         ) => {
           const stackAccessors = getStackAccessors(stack);
           const isPercentage = stack === STACKED_OPTIONS.PERCENT;
+          const isStacked = stack !== STACKED_OPTIONS.NONE;
           const key = `${id}-${label}`;
           // Only use color mapping if there is no color from the server
           const finalColor = color ?? colors.mappedColors.mapping[label];
@@ -201,7 +201,7 @@ export const TimeSeries = ({
                 xScaleType={xScaleType}
                 yScaleType={yScaleType}
                 timeZone={timeZone}
-                enableHistogramMode={enableHistogramMode}
+                enableHistogramMode={isStacked}
                 useDefaultGroupDomain={useDefaultGroupDomain}
                 sortIndex={sortIndex}
                 y1AccessorFormat={y1AccessorFormat}
@@ -227,7 +227,7 @@ export const TimeSeries = ({
                 xScaleType={xScaleType}
                 yScaleType={yScaleType}
                 timeZone={timeZone}
-                enableHistogramMode={enableHistogramMode}
+                enableHistogramMode={isStacked}
                 useDefaultGroupDomain={useDefaultGroupDomain}
                 sortIndex={sortIndex}
                 y1AccessorFormat={y1AccessorFormat}
@@ -283,5 +283,4 @@ TimeSeries.propTypes = {
   onBrush: PropTypes.func,
   xAxisFormatter: PropTypes.func,
   annotations: PropTypes.array,
-  enableHistogramMode: PropTypes.bool.isRequired,
 };

From 659890cc91072b5c1477580355cdd39c1526a0ab Mon Sep 17 00:00:00 2001
From: Pete Harverson <peteharverson@users.noreply.github.com>
Date: Fri, 21 Aug 2020 09:25:17 +0100
Subject: [PATCH 80/85] [ML] Transforms: Unset doc title when app unmounts
 (#75539)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../transform/public/app/mount_management_section.ts       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/transform/public/app/mount_management_section.ts b/x-pack/plugins/transform/public/app/mount_management_section.ts
index 454738f7a313a..0392ecbafa832 100644
--- a/x-pack/plugins/transform/public/app/mount_management_section.ts
+++ b/x-pack/plugins/transform/public/app/mount_management_section.ts
@@ -49,5 +49,10 @@ export async function mountManagementSection(
     history,
   };
 
-  return renderApp(element, appDependencies);
+  const unmountAppCallback = renderApp(element, appDependencies);
+
+  return () => {
+    docTitle.reset();
+    unmountAppCallback();
+  };
 }

From 3ddc2acd66208599c260397ed34ee12b6f1b67fa Mon Sep 17 00:00:00 2001
From: Peter Pisljar <peter.pisljar@gmail.com>
Date: Fri, 21 Aug 2020 11:16:52 +0200
Subject: [PATCH 81/85] adding markdown vis renderer (#75532)

---
 src/plugins/vis_type_markdown/kibana.json     |  2 +-
 .../__snapshots__/markdown_fn.test.ts.snap    |  2 +-
 .../public/__snapshots__/to_ast.test.ts.snap  | 67 +++++++++++++++++
 .../vis_type_markdown/public/markdown_fn.ts   |  8 +-
 .../public/markdown_renderer.tsx              | 57 ++++++++++++++
 .../vis_type_markdown/public/markdown_vis.ts  |  4 +-
 .../public/markdown_vis_controller.test.tsx   | 74 ++++++++++++-------
 .../public/markdown_vis_controller.tsx        | 11 ++-
 .../vis_type_markdown/public/plugin.ts        |  6 +-
 .../vis_type_markdown/public/to_ast.test.ts   | 54 ++++++++++++++
 .../vis_type_markdown/public/to_ast.ts        | 39 ++++++++++
 .../__snapshots__/build_pipeline.test.ts.snap |  4 -
 .../public/legacy/build_pipeline.test.ts      | 17 -----
 .../public/legacy/build_pipeline.ts           | 11 ---
 14 files changed, 288 insertions(+), 68 deletions(-)
 create mode 100644 src/plugins/vis_type_markdown/public/__snapshots__/to_ast.test.ts.snap
 create mode 100644 src/plugins/vis_type_markdown/public/markdown_renderer.tsx
 create mode 100644 src/plugins/vis_type_markdown/public/to_ast.test.ts
 create mode 100644 src/plugins/vis_type_markdown/public/to_ast.ts

diff --git a/src/plugins/vis_type_markdown/kibana.json b/src/plugins/vis_type_markdown/kibana.json
index 9241f5eeee837..4196bd7e85707 100644
--- a/src/plugins/vis_type_markdown/kibana.json
+++ b/src/plugins/vis_type_markdown/kibana.json
@@ -4,5 +4,5 @@
     "ui": true,
     "server": true,
     "requiredPlugins": ["expressions", "visualizations"],
-    "requiredBundles": ["kibanaUtils", "kibanaReact", "data", "charts"]
+    "requiredBundles": ["kibanaUtils", "kibanaReact", "data", "charts", "visualizations", "expressions"]
 }
diff --git a/src/plugins/vis_type_markdown/public/__snapshots__/markdown_fn.test.ts.snap b/src/plugins/vis_type_markdown/public/__snapshots__/markdown_fn.test.ts.snap
index 5a107bdfed9e5..473e2cba742b7 100644
--- a/src/plugins/vis_type_markdown/public/__snapshots__/markdown_fn.test.ts.snap
+++ b/src/plugins/vis_type_markdown/public/__snapshots__/markdown_fn.test.ts.snap
@@ -2,7 +2,7 @@
 
 exports[`interpreter/functions#markdown returns an object with the correct structure 1`] = `
 Object {
-  "as": "visualization",
+  "as": "markdown_vis",
   "type": "render",
   "value": Object {
     "visConfig": Object {
diff --git a/src/plugins/vis_type_markdown/public/__snapshots__/to_ast.test.ts.snap b/src/plugins/vis_type_markdown/public/__snapshots__/to_ast.test.ts.snap
new file mode 100644
index 0000000000000..2b8ff47be3f23
--- /dev/null
+++ b/src/plugins/vis_type_markdown/public/__snapshots__/to_ast.test.ts.snap
@@ -0,0 +1,67 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`markdown vis toExpressionAst function with params 1`] = `
+Object {
+  "chain": Array [
+    Object {
+      "arguments": Object {
+        "font": Array [
+          Object {
+            "chain": Array [
+              Object {
+                "arguments": Object {
+                  "size": Array [
+                    15,
+                  ],
+                },
+                "function": "font",
+                "type": "function",
+              },
+            ],
+            "type": "expression",
+          },
+        ],
+        "markdown": Array [
+          "### my markdown",
+        ],
+        "openLinksInNewTab": Array [
+          true,
+        ],
+      },
+      "function": "markdownVis",
+      "type": "function",
+    },
+  ],
+  "type": "expression",
+}
+`;
+
+exports[`markdown vis toExpressionAst function without params 1`] = `
+Object {
+  "chain": Array [
+    Object {
+      "arguments": Object {
+        "font": Array [
+          Object {
+            "chain": Array [
+              Object {
+                "arguments": Object {
+                  "size": Array [
+                    "undefined",
+                  ],
+                },
+                "function": "font",
+                "type": "function",
+              },
+            ],
+            "type": "expression",
+          },
+        ],
+      },
+      "function": "markdownVis",
+      "type": "function",
+    },
+  ],
+  "type": "expression",
+}
+`;
diff --git a/src/plugins/vis_type_markdown/public/markdown_fn.ts b/src/plugins/vis_type_markdown/public/markdown_fn.ts
index 9f0809109e465..4b3c9989431f9 100644
--- a/src/plugins/vis_type_markdown/public/markdown_fn.ts
+++ b/src/plugins/vis_type_markdown/public/markdown_fn.ts
@@ -26,12 +26,14 @@ interface RenderValue {
   visConfig: MarkdownVisParams;
 }
 
-export const createMarkdownVisFn = (): ExpressionFunctionDefinition<
+export type MarkdownVisExpressionFunctionDefinition = ExpressionFunctionDefinition<
   'markdownVis',
   unknown,
   Arguments,
   Render<RenderValue>
-> => ({
+>;
+
+export const createMarkdownVisFn = (): MarkdownVisExpressionFunctionDefinition => ({
   name: 'markdownVis',
   type: 'render',
   inputTypes: [],
@@ -65,7 +67,7 @@ export const createMarkdownVisFn = (): ExpressionFunctionDefinition<
   fn(input, args) {
     return {
       type: 'render',
-      as: 'visualization',
+      as: 'markdown_vis',
       value: {
         visType: 'markdown',
         visConfig: {
diff --git a/src/plugins/vis_type_markdown/public/markdown_renderer.tsx b/src/plugins/vis_type_markdown/public/markdown_renderer.tsx
new file mode 100644
index 0000000000000..5950a762635b2
--- /dev/null
+++ b/src/plugins/vis_type_markdown/public/markdown_renderer.tsx
@@ -0,0 +1,57 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from 'react';
+import { render, unmountComponentAtNode } from 'react-dom';
+import { VisualizationContainer } from '../../visualizations/public';
+import { ExpressionRenderDefinition } from '../../expressions/common/expression_renderers';
+import { MarkdownVisWrapper } from './markdown_vis_controller';
+import { StartServicesGetter } from '../../kibana_utils/public';
+
+export const getMarkdownRenderer = (start: StartServicesGetter) => {
+  const markdownVisRenderer: () => ExpressionRenderDefinition = () => ({
+    name: 'markdown_vis',
+    displayName: 'markdown visualization',
+    reuseDomNode: true,
+    render: async (domNode: HTMLElement, config: any, handlers: any) => {
+      const { visConfig } = config;
+
+      const I18nContext = await start().core.i18n.Context;
+
+      handlers.onDestroy(() => {
+        unmountComponentAtNode(domNode);
+      });
+
+      render(
+        <I18nContext>
+          <VisualizationContainer className="markdownVis">
+            <MarkdownVisWrapper
+              visParams={visConfig}
+              renderComplete={handlers.done}
+              fireEvent={handlers.event}
+            />
+          </VisualizationContainer>
+        </I18nContext>,
+        domNode
+      );
+    },
+  });
+
+  return markdownVisRenderer;
+};
diff --git a/src/plugins/vis_type_markdown/public/markdown_vis.ts b/src/plugins/vis_type_markdown/public/markdown_vis.ts
index 089e00bb44937..27ac038aee6ff 100644
--- a/src/plugins/vis_type_markdown/public/markdown_vis.ts
+++ b/src/plugins/vis_type_markdown/public/markdown_vis.ts
@@ -19,10 +19,10 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { MarkdownVisWrapper } from './markdown_vis_controller';
 import { MarkdownOptions } from './markdown_options';
 import { SettingsOptions } from './settings_options_lazy';
 import { DefaultEditorSize } from '../../vis_default_editor/public';
+import { toExpressionAst } from './to_ast';
 
 export const markdownVisDefinition = {
   name: 'markdown',
@@ -32,8 +32,8 @@ export const markdownVisDefinition = {
   description: i18n.translate('visTypeMarkdown.markdownDescription', {
     defaultMessage: 'Create a document using markdown syntax',
   }),
+  toExpressionAst,
   visConfig: {
-    component: MarkdownVisWrapper,
     defaults: {
       fontSize: 12,
       openLinksInNewTab: false,
diff --git a/src/plugins/vis_type_markdown/public/markdown_vis_controller.test.tsx b/src/plugins/vis_type_markdown/public/markdown_vis_controller.test.tsx
index 103879cb6e6df..ff0cc89a5d9c9 100644
--- a/src/plugins/vis_type_markdown/public/markdown_vis_controller.test.tsx
+++ b/src/plugins/vis_type_markdown/public/markdown_vis_controller.test.tsx
@@ -25,13 +25,15 @@ describe('markdown vis controller', () => {
   it('should set html from markdown params', () => {
     const vis = {
       params: {
+        openLinksInNewTab: false,
+        fontSize: 16,
         markdown:
           'This is a test of the [markdown](http://daringfireball.net/projects/markdown) vis.',
       },
     };
 
     const wrapper = render(
-      <MarkdownVisWrapper vis={vis} visParams={vis.params} renderComplete={jest.fn()} />
+      <MarkdownVisWrapper visParams={vis.params} renderComplete={jest.fn()} fireEvent={jest.fn()} />
     );
     expect(wrapper.find('a').text()).toBe('markdown');
   });
@@ -39,12 +41,14 @@ describe('markdown vis controller', () => {
   it('should not render the html', () => {
     const vis = {
       params: {
+        openLinksInNewTab: false,
+        fontSize: 16,
         markdown: 'Testing <a>html</a>',
       },
     };
 
     const wrapper = render(
-      <MarkdownVisWrapper vis={vis} visParams={vis.params} renderComplete={jest.fn()} />
+      <MarkdownVisWrapper visParams={vis.params} renderComplete={jest.fn()} fireEvent={jest.fn()} />
     );
     expect(wrapper.text()).toBe('Testing <a>html</a>\n');
   });
@@ -52,12 +56,14 @@ describe('markdown vis controller', () => {
   it('should update the HTML when render again with changed params', () => {
     const vis = {
       params: {
+        openLinksInNewTab: false,
+        fontSize: 16,
         markdown: 'Initial',
       },
     };
 
     const wrapper = mount(
-      <MarkdownVisWrapper vis={vis} visParams={vis.params} renderComplete={jest.fn()} />
+      <MarkdownVisWrapper visParams={vis.params} renderComplete={jest.fn()} fireEvent={jest.fn()} />
     );
     expect(wrapper.text().trim()).toBe('Initial');
     vis.params.markdown = 'Updated';
@@ -66,52 +72,68 @@ describe('markdown vis controller', () => {
   });
 
   describe('renderComplete', () => {
+    const vis = {
+      params: {
+        openLinksInNewTab: false,
+        fontSize: 16,
+        markdown: 'test',
+      },
+    };
+
+    const renderComplete = jest.fn();
+
+    beforeEach(() => {
+      renderComplete.mockClear();
+    });
+
     it('should be called on initial rendering', () => {
-      const vis = {
-        params: {
-          markdown: 'test',
-        },
-      };
-      const renderComplete = jest.fn();
       mount(
-        <MarkdownVisWrapper vis={vis} visParams={vis.params} renderComplete={renderComplete} />
+        <MarkdownVisWrapper
+          visParams={vis.params}
+          renderComplete={renderComplete}
+          fireEvent={jest.fn()}
+        />
       );
       expect(renderComplete.mock.calls.length).toBe(1);
     });
 
     it('should be called on successive render when params change', () => {
-      const vis = {
-        params: {
-          markdown: 'test',
-        },
-      };
-      const renderComplete = jest.fn();
       mount(
-        <MarkdownVisWrapper vis={vis} visParams={vis.params} renderComplete={renderComplete} />
+        <MarkdownVisWrapper
+          visParams={vis.params}
+          renderComplete={renderComplete}
+          fireEvent={jest.fn()}
+        />
       );
       expect(renderComplete.mock.calls.length).toBe(1);
       renderComplete.mockClear();
       vis.params.markdown = 'changed';
       mount(
-        <MarkdownVisWrapper vis={vis} visParams={vis.params} renderComplete={renderComplete} />
+        <MarkdownVisWrapper
+          visParams={vis.params}
+          renderComplete={renderComplete}
+          fireEvent={jest.fn()}
+        />
       );
       expect(renderComplete.mock.calls.length).toBe(1);
     });
 
     it('should be called on successive render even without data change', () => {
-      const vis = {
-        params: {
-          markdown: 'test',
-        },
-      };
-      const renderComplete = jest.fn();
       mount(
-        <MarkdownVisWrapper vis={vis} visParams={vis.params} renderComplete={renderComplete} />
+        <MarkdownVisWrapper
+          visParams={vis.params}
+          renderComplete={renderComplete}
+          fireEvent={jest.fn()}
+        />
       );
       expect(renderComplete.mock.calls.length).toBe(1);
       renderComplete.mockClear();
       mount(
-        <MarkdownVisWrapper vis={vis} visParams={vis.params} renderComplete={renderComplete} />
+        <MarkdownVisWrapper
+          visParams={vis.params}
+          renderComplete={renderComplete}
+          fireEvent={jest.fn()}
+        />
       );
       expect(renderComplete.mock.calls.length).toBe(1);
     });
diff --git a/src/plugins/vis_type_markdown/public/markdown_vis_controller.tsx b/src/plugins/vis_type_markdown/public/markdown_vis_controller.tsx
index 4e77bb196b713..e1155ca42df72 100644
--- a/src/plugins/vis_type_markdown/public/markdown_vis_controller.tsx
+++ b/src/plugins/vis_type_markdown/public/markdown_vis_controller.tsx
@@ -22,7 +22,7 @@ import { Markdown } from '../../kibana_react/public';
 import { MarkdownVisParams } from './types';
 
 interface MarkdownVisComponentProps extends MarkdownVisParams {
-  renderComplete: () => {};
+  renderComplete: () => void;
 }
 
 /**
@@ -80,7 +80,14 @@ class MarkdownVisComponent extends React.Component<MarkdownVisComponentProps> {
  * The way React works, this wrapper nearly brings no overhead, but allows us
  * to use proper lifecycle methods in the actual component.
  */
-export function MarkdownVisWrapper(props: any) {
+
+export interface MarkdownVisWrapperProps {
+  visParams: MarkdownVisParams;
+  fireEvent: (event: any) => void;
+  renderComplete: () => void;
+}
+
+export function MarkdownVisWrapper(props: MarkdownVisWrapperProps) {
   return (
     <MarkdownVisComponent
       fontSize={props.visParams.fontSize}
diff --git a/src/plugins/vis_type_markdown/public/plugin.ts b/src/plugins/vis_type_markdown/public/plugin.ts
index 9365017a31adc..c117df7e0fa33 100644
--- a/src/plugins/vis_type_markdown/public/plugin.ts
+++ b/src/plugins/vis_type_markdown/public/plugin.ts
@@ -26,6 +26,8 @@ import { createMarkdownVisFn } from './markdown_fn';
 import { ConfigSchema } from '../config';
 
 import './index.scss';
+import { getMarkdownRenderer } from './markdown_renderer';
+import { createStartServicesGetter } from '../../kibana_utils/public';
 
 /** @internal */
 export interface MarkdownPluginSetupDependencies {
@@ -42,7 +44,9 @@ export class MarkdownPlugin implements Plugin<void, void> {
   }
 
   public setup(core: CoreSetup, { expressions, visualizations }: MarkdownPluginSetupDependencies) {
-    visualizations.createReactVisualization(markdownVisDefinition);
+    const start = createStartServicesGetter(core.getStartServices);
+    visualizations.createBaseVisualization(markdownVisDefinition);
+    expressions.registerRenderer(getMarkdownRenderer(start));
     expressions.registerFunction(createMarkdownVisFn);
   }
 
diff --git a/src/plugins/vis_type_markdown/public/to_ast.test.ts b/src/plugins/vis_type_markdown/public/to_ast.test.ts
new file mode 100644
index 0000000000000..1ad1fa0ee2517
--- /dev/null
+++ b/src/plugins/vis_type_markdown/public/to_ast.test.ts
@@ -0,0 +1,54 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { toExpressionAst } from './to_ast';
+import { Vis } from '../../visualizations/public';
+
+describe('markdown vis toExpressionAst function', () => {
+  let vis: Vis;
+
+  beforeEach(() => {
+    vis = {
+      isHierarchical: () => false,
+      type: {},
+      params: {
+        percentageMode: false,
+      },
+      data: {
+        indexPattern: { id: '123' } as any,
+        aggs: {
+          getResponseAggs: () => [],
+          aggs: [],
+        } as any,
+      },
+    } as any;
+  });
+
+  it('without params', () => {
+    vis.params = {};
+    const actual = toExpressionAst(vis);
+    expect(actual).toMatchSnapshot();
+  });
+
+  it('with params', () => {
+    vis.params = { markdown: '### my markdown', fontSize: 15, openLinksInNewTab: true };
+    const actual = toExpressionAst(vis);
+    expect(actual).toMatchSnapshot();
+  });
+});
diff --git a/src/plugins/vis_type_markdown/public/to_ast.ts b/src/plugins/vis_type_markdown/public/to_ast.ts
new file mode 100644
index 0000000000000..9b481218b42ea
--- /dev/null
+++ b/src/plugins/vis_type_markdown/public/to_ast.ts
@@ -0,0 +1,39 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Vis } from '../../visualizations/public';
+import { buildExpression, buildExpressionFunction } from '../../expressions/public';
+import { MarkdownVisExpressionFunctionDefinition } from './markdown_fn';
+
+export const toExpressionAst = (vis: Vis) => {
+  const { markdown, fontSize, openLinksInNewTab } = vis.params;
+
+  const markdownVis = buildExpressionFunction<MarkdownVisExpressionFunctionDefinition>(
+    'markdownVis',
+    {
+      markdown,
+      font: buildExpression(`font size=${fontSize}`),
+      openLinksInNewTab,
+    }
+  );
+
+  const ast = buildExpression([markdownVis]);
+
+  return ast.toAst();
+};
diff --git a/src/plugins/visualizations/public/legacy/__snapshots__/build_pipeline.test.ts.snap b/src/plugins/visualizations/public/legacy/__snapshots__/build_pipeline.test.ts.snap
index df29c078d23e4..fae777b98ef63 100644
--- a/src/plugins/visualizations/public/legacy/__snapshots__/build_pipeline.test.ts.snap
+++ b/src/plugins/visualizations/public/legacy/__snapshots__/build_pipeline.test.ts.snap
@@ -4,8 +4,6 @@ exports[`visualize loader pipeline helpers: build pipeline buildPipeline calls t
 
 exports[`visualize loader pipeline helpers: build pipeline buildPipelineVisFunction handles input_control_vis function 1`] = `"input_control_vis visConfig='{\\"some\\":\\"nested\\",\\"data\\":{\\"here\\":true}}' "`;
 
-exports[`visualize loader pipeline helpers: build pipeline buildPipelineVisFunction handles markdown function 1`] = `"markdownvis '## hello _markdown_' font={font size=12} openLinksInNewTab=true "`;
-
 exports[`visualize loader pipeline helpers: build pipeline buildPipelineVisFunction handles metrics/tsvb function 1`] = `"tsvb params='{\\"foo\\":\\"bar\\"}'  uiState='{}' "`;
 
 exports[`visualize loader pipeline helpers: build pipeline buildPipelineVisFunction handles pie function 1`] = `"kibana_pie visConfig='{\\"dimensions\\":{\\"metric\\":{\\"accessor\\":0,\\"label\\":\\"\\",\\"format\\":{},\\"params\\":{},\\"aggType\\":\\"\\"},\\"buckets\\":[1,2]}}' "`;
@@ -34,6 +32,4 @@ exports[`visualize loader pipeline helpers: build pipeline buildPipelineVisFunct
 
 exports[`visualize loader pipeline helpers: build pipeline buildPipelineVisFunction handles timelion function 1`] = `"timelion_vis expression='foo' interval='bar' "`;
 
-exports[`visualize loader pipeline helpers: build pipeline buildPipelineVisFunction handles undefined markdown function 1`] = `"markdownvis '' font={font size=12} openLinksInNewTab=true "`;
-
 exports[`visualize loader pipeline helpers: build pipeline buildPipelineVisFunction handles vega function 1`] = `"vega spec='this is a test' "`;
diff --git a/src/plugins/visualizations/public/legacy/build_pipeline.test.ts b/src/plugins/visualizations/public/legacy/build_pipeline.test.ts
index 50fa5ac64e2a1..2d92b386253b0 100644
--- a/src/plugins/visualizations/public/legacy/build_pipeline.test.ts
+++ b/src/plugins/visualizations/public/legacy/build_pipeline.test.ts
@@ -123,23 +123,6 @@ describe('visualize loader pipeline helpers: build pipeline', () => {
       expect(actual).toMatchSnapshot();
     });
 
-    it('handles markdown function', () => {
-      const params = {
-        markdown: '## hello _markdown_',
-        fontSize: 12,
-        openLinksInNewTab: true,
-        foo: 'bar',
-      };
-      const actual = buildPipelineVisFunction.markdown(params, schemasDef, uiState);
-      expect(actual).toMatchSnapshot();
-    });
-
-    it('handles undefined markdown function', () => {
-      const params = { fontSize: 12, openLinksInNewTab: true, foo: 'bar' };
-      const actual = buildPipelineVisFunction.markdown(params, schemasDef, uiState);
-      expect(actual).toMatchSnapshot();
-    });
-
     describe('handles table function', () => {
       it('without splits or buckets', () => {
         const params = { foo: 'bar' };
diff --git a/src/plugins/visualizations/public/legacy/build_pipeline.ts b/src/plugins/visualizations/public/legacy/build_pipeline.ts
index ebd240c79287a..438a6d2337724 100644
--- a/src/plugins/visualizations/public/legacy/build_pipeline.ts
+++ b/src/plugins/visualizations/public/legacy/build_pipeline.ts
@@ -269,17 +269,6 @@ export const buildPipelineVisFunction: BuildPipelineVisFunction = {
     const interval = prepareString('interval', params.interval);
     return `timelion_vis ${expression}${interval}`;
   },
-  markdown: (params) => {
-    const { markdown, fontSize, openLinksInNewTab } = params;
-    let escapedMarkdown = '';
-    if (typeof markdown === 'string' || markdown instanceof String) {
-      escapedMarkdown = escapeString(markdown.toString());
-    }
-    let expr = `markdownvis '${escapedMarkdown}' `;
-    expr += prepareValue('font', `{font size=${fontSize}}`, true);
-    expr += prepareValue('openLinksInNewTab', openLinksInNewTab);
-    return expr;
-  },
   table: (params, schemas) => {
     const visConfig = {
       ...params,

From 74ab9897b57daf746c0a41e739485032ddf6a15f Mon Sep 17 00:00:00 2001
From: Vadim Dalecky <streamich@gmail.com>
Date: Fri, 21 Aug 2020 11:28:37 +0200
Subject: [PATCH 82/85] Embeddable input (#73033)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* refactor: 💡 move timeRange, filters and query to base embeddabl

* refactor: 💡 use new base embeddable input in explore data

* feat: 🎸 import types as types
---
 .../public/lib/embeddables/i_embeddable.ts       | 16 ++++++++++++++++
 .../public/embeddable/visualize_embeddable.ts    |  3 ---
 .../explore_data/abstract_explore_data_action.ts |  1 +
 .../explore_data/explore_data_chart_action.ts    |  9 +++------
 .../explore_data_context_menu_action.ts          |  7 +++----
 5 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts b/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts
index 7628b1d41b452..9c4a1b5602c49 100644
--- a/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts
+++ b/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts
@@ -22,6 +22,7 @@ import { Adapters } from '../types';
 import { IContainer } from '../containers/i_container';
 import { ViewMode } from '../types';
 import { TriggerContextMapping } from '../../../../ui_actions/public';
+import type { TimeRange, Query, Filter } from '../../../../data/common';
 
 export interface EmbeddableError {
   name: string;
@@ -55,6 +56,21 @@ export interface EmbeddableInput {
    */
   disableTriggers?: boolean;
 
+  /**
+   * Time range of the chart.
+   */
+  timeRange?: TimeRange;
+
+  /**
+   * Visualization query string used to narrow down results.
+   */
+  query?: Query;
+
+  /**
+   * Visualization filters used to narrow down results.
+   */
+  filters?: Filter[];
+
   [key: string]: unknown;
 }
 
diff --git a/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts b/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts
index a434bf9756b64..4efdfd2911cbc 100644
--- a/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts
+++ b/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts
@@ -60,9 +60,6 @@ export interface VisualizeEmbeddableConfiguration {
 }
 
 export interface VisualizeInput extends EmbeddableInput {
-  timeRange?: TimeRange;
-  query?: Query;
-  filters?: Filter[];
   vis?: {
     colors?: { [key: string]: string };
   };
diff --git a/x-pack/plugins/discover_enhanced/public/actions/explore_data/abstract_explore_data_action.ts b/x-pack/plugins/discover_enhanced/public/actions/explore_data/abstract_explore_data_action.ts
index 4ddcb3386f314..36a844752a1c3 100644
--- a/x-pack/plugins/discover_enhanced/public/actions/explore_data/abstract_explore_data_action.ts
+++ b/x-pack/plugins/discover_enhanced/public/actions/explore_data/abstract_explore_data_action.ts
@@ -59,6 +59,7 @@ export abstract class AbstractExploreDataAction<Context extends { embeddable?: I
 
     if (!shared.hasExactlyOneIndexPattern(embeddable)) return false;
     if (embeddable.getInput().viewMode !== ViewMode.VIEW) return false;
+
     return true;
   }
 
diff --git a/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.ts b/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.ts
index a89fe3cd12a19..660739f26c70d 100644
--- a/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.ts
+++ b/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.ts
@@ -7,9 +7,6 @@
 import { Action } from '../../../../../../src/plugins/ui_actions/public';
 import { DiscoverUrlGeneratorState } from '../../../../../../src/plugins/discover/public';
 import {
-  isTimeRange,
-  isQuery,
-  isFilters,
   ApplyGlobalFilterActionContext,
   esFilters,
 } from '../../../../../../src/plugins/data/public';
@@ -64,9 +61,9 @@ export class ExploreDataChartAction extends AbstractExploreDataAction<ExploreDat
 
       const input = embeddable.getInput();
 
-      if (isTimeRange(input.timeRange) && !state.timeRange) state.timeRange = input.timeRange;
-      if (isQuery(input.query)) state.query = input.query;
-      if (isFilters(input.filters)) state.filters = [...input.filters, ...(state.filters || [])];
+      if (input.timeRange && !state.timeRange) state.timeRange = input.timeRange;
+      if (input.query) state.query = input.query;
+      if (input.filters) state.filters = [...input.filters, ...(state.filters || [])];
     }
 
     const path = await urlGenerator.createUrl(state);
diff --git a/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_context_menu_action.ts b/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_context_menu_action.ts
index 8b79211a914cc..bc74748806beb 100644
--- a/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_context_menu_action.ts
+++ b/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_context_menu_action.ts
@@ -7,7 +7,6 @@
 import { Action } from '../../../../../../src/plugins/ui_actions/public';
 import { EmbeddableContext } from '../../../../../../src/plugins/embeddable/public';
 import { DiscoverUrlGeneratorState } from '../../../../../../src/plugins/discover/public';
-import { isTimeRange, isQuery, isFilters } from '../../../../../../src/plugins/data/public';
 import { KibanaURL } from './kibana_url';
 import * as shared from './shared';
 import { AbstractExploreDataAction } from './abstract_explore_data_action';
@@ -42,9 +41,9 @@ export class ExploreDataContextMenuAction extends AbstractExploreDataAction<Embe
 
       const input = embeddable.getInput();
 
-      if (isTimeRange(input.timeRange) && !state.timeRange) state.timeRange = input.timeRange;
-      if (isQuery(input.query)) state.query = input.query;
-      if (isFilters(input.filters)) state.filters = [...input.filters, ...(state.filters || [])];
+      if (input.timeRange && !state.timeRange) state.timeRange = input.timeRange;
+      if (input.query) state.query = input.query;
+      if (input.filters) state.filters = [...input.filters, ...(state.filters || [])];
     }
 
     const path = await urlGenerator.createUrl(state);

From 23f46c9d85fcd209a4034bcddd52fd9c98b488fa Mon Sep 17 00:00:00 2001
From: Marta Bondyra <marta.bondyra@gmail.com>
Date: Fri, 21 Aug 2020 11:33:42 +0200
Subject: [PATCH 83/85] [Lens] Use index pattern service instead saved object
 client (#74654)

---
 .../datapanel.test.tsx                        |  45 +-
 .../indexpattern_datasource/datapanel.tsx     |   5 +-
 .../bucket_nesting_editor.test.tsx            |  16 +
 .../dimension_panel/bucket_nesting_editor.tsx |   8 +-
 .../dimension_panel/dimension_panel.test.tsx  |  35 +-
 .../dimension_panel/field_select.tsx          |   6 +-
 .../dimension_panel/popover_editor.tsx        |   1 +
 .../indexpattern_datasource/document_field.ts |   6 +-
 .../field_item.test.tsx                       |  15 +
 .../indexpattern_datasource/field_item.tsx    |   6 +-
 .../indexpattern.test.ts                      |   9 +
 .../indexpattern_datasource/indexpattern.tsx  |   7 +-
 .../indexpattern_suggestions.test.tsx         |  41 +-
 .../indexpattern_suggestions.ts               |  16 +-
 .../layerpanel.test.tsx                       |  11 +
 .../indexpattern_datasource/loader.test.ts    | 554 +++++++++---------
 .../public/indexpattern_datasource/loader.ts  | 153 +++--
 .../public/indexpattern_datasource/mocks.ts   |  20 +
 .../operations/definitions/cardinality.tsx    |   4 +-
 .../operations/definitions/count.tsx          |   2 +-
 .../definitions/date_histogram.test.tsx       |   7 +
 .../operations/definitions/date_histogram.tsx |   4 +-
 .../operations/definitions/metrics.tsx        |   4 +-
 .../operations/definitions/terms.test.tsx     |   8 +
 .../operations/definitions/terms.tsx          |   4 +-
 .../operations/operations.test.ts             |  10 +
 .../state_helpers.test.ts                     |   5 +
 .../public/indexpattern_datasource/types.ts   |   1 +
 28 files changed, 586 insertions(+), 417 deletions(-)

diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.test.tsx
index 4a79f30a17a05..8291b673cd17a 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.test.tsx
@@ -87,36 +87,42 @@ const initialState: IndexPatternPrivateState = {
       fields: [
         {
           name: 'timestamp',
+          displayName: 'timestampLabel',
           type: 'date',
           aggregatable: true,
           searchable: true,
         },
         {
           name: 'bytes',
+          displayName: 'bytes',
           type: 'number',
           aggregatable: true,
           searchable: true,
         },
         {
           name: 'memory',
+          displayName: 'amemory',
           type: 'number',
           aggregatable: true,
           searchable: true,
         },
         {
           name: 'unsupported',
+          displayName: 'unsupported',
           type: 'geo',
           aggregatable: true,
           searchable: true,
         },
         {
           name: 'source',
+          displayName: 'source',
           type: 'string',
           aggregatable: true,
           searchable: true,
         },
         {
           name: 'client',
+          displayName: 'client',
           type: 'ip',
           aggregatable: true,
           searchable: true,
@@ -131,6 +137,7 @@ const initialState: IndexPatternPrivateState = {
       fields: [
         {
           name: 'timestamp',
+          displayName: 'timestampLabel',
           type: 'date',
           aggregatable: true,
           searchable: true,
@@ -145,6 +152,7 @@ const initialState: IndexPatternPrivateState = {
         },
         {
           name: 'bytes',
+          displayName: 'bytes',
           type: 'number',
           aggregatable: true,
           searchable: true,
@@ -166,6 +174,7 @@ const initialState: IndexPatternPrivateState = {
         },
         {
           name: 'source',
+          displayName: 'source',
           type: 'string',
           aggregatable: true,
           searchable: true,
@@ -185,18 +194,21 @@ const initialState: IndexPatternPrivateState = {
       fields: [
         {
           name: 'timestamp',
+          displayName: 'timestampLabel',
           type: 'date',
           aggregatable: true,
           searchable: true,
         },
         {
           name: 'bytes',
+          displayName: 'bytes',
           type: 'number',
           aggregatable: true,
           searchable: true,
         },
         {
           name: 'source',
+          displayName: 'source',
           type: 'string',
           aggregatable: true,
           searchable: true,
@@ -581,18 +593,19 @@ describe('IndexPattern Data Panel', () => {
           .find('[data-test-subj="lnsIndexPatternAvailableFields"]')
           .find(FieldItem)
           .map((fieldItem) => fieldItem.prop('field').name)
-      ).toEqual(['bytes', 'memory']);
+      ).toEqual(['memory', 'bytes']);
       wrapper
         .find('[data-test-subj="lnsIndexPatternEmptyFields"]')
         .find('button')
         .first()
         .simulate('click');
+      const emptyAccordion = wrapper.find('[data-test-subj="lnsIndexPatternEmptyFields"]');
       expect(
-        wrapper
-          .find('[data-test-subj="lnsIndexPatternEmptyFields"]')
-          .find(FieldItem)
-          .map((fieldItem) => fieldItem.prop('field').name)
+        emptyAccordion.find(FieldItem).map((fieldItem) => fieldItem.prop('field').name)
       ).toEqual(['client', 'source', 'timestamp']);
+      expect(
+        emptyAccordion.find(FieldItem).map((fieldItem) => fieldItem.prop('field').displayName)
+      ).toEqual(['client', 'source', 'timestampLabel']);
     });
 
     it('should display NoFieldsCallout when all fields are empty', async () => {
@@ -615,8 +628,8 @@ describe('IndexPattern Data Panel', () => {
         wrapper
           .find('[data-test-subj="lnsIndexPatternEmptyFields"]')
           .find(FieldItem)
-          .map((fieldItem) => fieldItem.prop('field').name)
-      ).toEqual(['bytes', 'client', 'memory', 'source', 'timestamp']);
+          .map((fieldItem) => fieldItem.prop('field').displayName)
+      ).toEqual(['amemory', 'bytes', 'client', 'source', 'timestampLabel']);
     });
 
     it('should display spinner for available fields accordion if existing fields are not loaded yet', async () => {
@@ -656,10 +669,9 @@ describe('IndexPattern Data Panel', () => {
 
       wrapper.find('[data-test-subj="typeFilter-number"]').first().simulate('click');
 
-      expect(wrapper.find(FieldItem).map((fieldItem) => fieldItem.prop('field').name)).toEqual([
-        'bytes',
-        'memory',
-      ]);
+      expect(
+        wrapper.find(FieldItem).map((fieldItem) => fieldItem.prop('field').displayName)
+      ).toEqual(['amemory', 'bytes']);
     });
 
     it('should display no fields in groups when filtered by type Record', () => {
@@ -686,14 +698,9 @@ describe('IndexPattern Data Panel', () => {
         .find('button')
         .first()
         .simulate('click');
-      expect(wrapper.find(FieldItem).map((fieldItem) => fieldItem.prop('field').name)).toEqual([
-        'Records',
-        'bytes',
-        'memory',
-        'client',
-        'source',
-        'timestamp',
-      ]);
+      expect(
+        wrapper.find(FieldItem).map((fieldItem) => fieldItem.prop('field').displayName)
+      ).toEqual(['Records', 'amemory', 'bytes', 'client', 'source', 'timestampLabel']);
     });
 
     it('should filter down by type and by name', () => {
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx
index bdcce52314634..0777b9b9d8e57 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx
@@ -59,7 +59,7 @@ const FixedEuiContextMenuPanel = (EuiContextMenuPanel as unknown) as React.Funct
 >;
 
 function sortFields(fieldA: IndexPatternField, fieldB: IndexPatternField) {
-  return fieldA.name.localeCompare(fieldB.name, undefined, { sensitivity: 'base' });
+  return fieldA.displayName.localeCompare(fieldB.displayName, undefined, { sensitivity: 'base' });
 }
 
 const supportedFieldTypes = new Set(['string', 'number', 'boolean', 'date', 'ip', 'document']);
@@ -323,7 +323,8 @@ export const InnerIndexPatternDataPanel = function InnerIndexPatternDataPanel({
       fieldGroup.filter((field) => {
         if (
           localState.nameFilter.length &&
-          !field.name.toLowerCase().includes(localState.nameFilter.toLowerCase())
+          !field.name.toLowerCase().includes(localState.nameFilter.toLowerCase()) &&
+          !field.displayName.toLowerCase().includes(localState.nameFilter.toLowerCase())
         ) {
           return false;
         }
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/bucket_nesting_editor.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/bucket_nesting_editor.test.tsx
index c6dbb6f617acf..3d6c9f6047c81 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/bucket_nesting_editor.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/bucket_nesting_editor.test.tsx
@@ -8,6 +8,13 @@ import { mount } from 'enzyme';
 import React from 'react';
 import { BucketNestingEditor } from './bucket_nesting_editor';
 import { IndexPatternColumn } from '../indexpattern';
+import { IndexPatternField } from '../types';
+
+const fieldMap = {
+  a: { displayName: 'a' } as IndexPatternField,
+  b: { displayName: 'b' } as IndexPatternField,
+  c: { displayName: 'c' } as IndexPatternField,
+};
 
 describe('BucketNestingEditor', () => {
   function mockCol(col: Partial<IndexPatternColumn> = {}): IndexPatternColumn {
@@ -32,6 +39,7 @@ describe('BucketNestingEditor', () => {
   it('should display the top level grouping when at the root', () => {
     const component = mount(
       <BucketNestingEditor
+        fieldMap={fieldMap}
         columnId="a"
         layer={{
           columnOrder: ['a', 'b', 'c'],
@@ -56,6 +64,7 @@ describe('BucketNestingEditor', () => {
     const component = mount(
       <BucketNestingEditor
         columnId="a"
+        fieldMap={fieldMap}
         layer={{
           columnOrder: ['b', 'a', 'c'],
           columns: {
@@ -81,6 +90,7 @@ describe('BucketNestingEditor', () => {
     const component = mount(
       <BucketNestingEditor
         columnId="a"
+        fieldMap={fieldMap}
         layer={{
           columnOrder: ['b', 'a', 'c'],
           columns: {
@@ -124,6 +134,7 @@ describe('BucketNestingEditor', () => {
     const component = mount(
       <BucketNestingEditor
         columnId="a"
+        fieldMap={fieldMap}
         layer={{
           columnOrder: ['a', 'b', 'c'],
           columns: {
@@ -144,6 +155,7 @@ describe('BucketNestingEditor', () => {
     const component = mount(
       <BucketNestingEditor
         columnId="a"
+        fieldMap={fieldMap}
         layer={{
           columnOrder: ['a', 'b', 'c'],
           columns: {
@@ -164,6 +176,7 @@ describe('BucketNestingEditor', () => {
     const component = mount(
       <BucketNestingEditor
         columnId="a"
+        fieldMap={fieldMap}
         layer={{
           columnOrder: ['c', 'a', 'b'],
           columns: {
@@ -187,6 +200,7 @@ describe('BucketNestingEditor', () => {
     const component = mount(
       <BucketNestingEditor
         columnId="a"
+        fieldMap={fieldMap}
         layer={{
           columnOrder: ['c', 'a', 'b'],
           columns: {
@@ -213,6 +227,7 @@ describe('BucketNestingEditor', () => {
     const component = mount(
       <BucketNestingEditor
         columnId="a"
+        fieldMap={fieldMap}
         layer={{
           columnOrder: ['c', 'a', 'b'],
           columns: {
@@ -238,6 +253,7 @@ describe('BucketNestingEditor', () => {
     const setColumns = jest.fn();
     const component = mount(
       <BucketNestingEditor
+        fieldMap={fieldMap}
         columnId="b"
         layer={{
           columnOrder: ['c', 'a', 'b'],
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/bucket_nesting_editor.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/bucket_nesting_editor.tsx
index ebb706258cf45..198be7085f5fc 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/bucket_nesting_editor.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/bucket_nesting_editor.tsx
@@ -7,7 +7,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFormRow, EuiHorizontalRule, EuiRadio, EuiSelect, htmlIdGenerator } from '@elastic/eui';
-import { IndexPatternLayer } from '../types';
+import { IndexPatternLayer, IndexPatternField } from '../types';
 import { hasField } from '../utils';
 
 const generator = htmlIdGenerator('lens-nesting');
@@ -25,10 +25,12 @@ export function BucketNestingEditor({
   columnId,
   layer,
   setColumns,
+  fieldMap,
 }: {
   columnId: string;
   layer: IndexPatternLayer;
   setColumns: (columns: string[]) => void;
+  fieldMap: Record<string, IndexPatternField>;
 }) {
   const column = layer.columns[columnId];
   const columns = Object.entries(layer.columns);
@@ -37,14 +39,14 @@ export function BucketNestingEditor({
     .map(([value, c]) => ({
       value,
       text: c.label,
-      fieldName: hasField(c) ? c.sourceField : '',
+      fieldName: hasField(c) ? fieldMap[c.sourceField].displayName : '',
     }));
 
   if (!column || !column.isBucketed || !aggColumns.length) {
     return null;
   }
 
-  const fieldName = hasField(column) ? column.sourceField : '';
+  const fieldName = hasField(column) ? fieldMap[column.sourceField].displayName : '';
 
   const prevColumn = layer.columnOrder[layer.columnOrder.indexOf(columnId) - 1];
 
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx
index 1f48f95ee45e0..bca179b437521 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx
@@ -45,6 +45,7 @@ const expectedIndexPatterns = {
     fields: [
       {
         name: 'timestamp',
+        displayName: 'timestampLabel',
         type: 'date',
         aggregatable: true,
         searchable: true,
@@ -52,6 +53,7 @@ const expectedIndexPatterns = {
       },
       {
         name: 'bytes',
+        displayName: 'bytes',
         type: 'number',
         aggregatable: true,
         searchable: true,
@@ -59,6 +61,7 @@ const expectedIndexPatterns = {
       },
       {
         name: 'memory',
+        displayName: 'memory',
         type: 'number',
         aggregatable: true,
         searchable: true,
@@ -66,6 +69,7 @@ const expectedIndexPatterns = {
       },
       {
         name: 'source',
+        displayName: 'source',
         type: 'string',
         aggregatable: true,
         searchable: true,
@@ -210,9 +214,8 @@ describe('IndexPatternDimensionEditorPanel', () => {
       expect(options).toHaveLength(2);
 
       expect(options![0].label).toEqual('Records');
-
       expect(options![1].options!.map(({ label }) => label)).toEqual([
-        'timestamp',
+        'timestampLabel',
         'bytes',
         'memory',
         'source',
@@ -239,7 +242,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
         .filter('[data-test-subj="indexPattern-dimension-field"]')
         .prop('options');
 
-      expect(options![1].options!.map(({ label }) => label)).toEqual(['timestamp', 'source']);
+      expect(options![1].options!.map(({ label }) => label)).toEqual(['timestampLabel', 'source']);
     });
 
     it('should indicate fields which are incompatible for the operation of the current column', () => {
@@ -277,7 +280,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
       expect(options![0]['data-test-subj']).toEqual('lns-fieldOptionIncompatible-Records');
 
       expect(
-        options![1].options!.filter(({ label }) => label === 'timestamp')[0]['data-test-subj']
+        options![1].options!.filter(({ label }) => label === 'timestampLabel')[0]['data-test-subj']
       ).toContain('Incompatible');
       expect(
         options![1].options!.filter(({ label }) => label === 'memory')[0]['data-test-subj']
@@ -651,7 +654,9 @@ describe('IndexPatternDimensionEditorPanel', () => {
         expect(options![0]['data-test-subj']).toContain('Incompatible');
 
         expect(
-          options![1].options!.filter(({ label }) => label === 'timestamp')[0]['data-test-subj']
+          options![1].options!.filter(({ label }) => label === 'timestampLabel')[0][
+            'data-test-subj'
+          ]
         ).toContain('Incompatible');
         expect(
           options![1].options!.filter(({ label }) => label === 'source')[0]['data-test-subj']
@@ -769,7 +774,9 @@ describe('IndexPatternDimensionEditorPanel', () => {
         expect(options![0]['data-test-subj']).toContain('Incompatible');
 
         expect(
-          options![1].options!.filter(({ label }) => label === 'timestamp')[0]['data-test-subj']
+          options![1].options!.filter(({ label }) => label === 'timestampLabel')[0][
+            'data-test-subj'
+          ]
         ).toContain('Incompatible');
         expect(
           options![1].options!.filter(({ label }) => label === 'source')[0]['data-test-subj']
@@ -923,7 +930,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
       expect(options![0]['data-test-subj']).toContain('Incompatible');
 
       expect(
-        options![1].options!.filter(({ label }) => label === 'timestamp')[0]['data-test-subj']
+        options![1].options!.filter(({ label }) => label === 'timestampLabel')[0]['data-test-subj']
       ).toContain('Incompatible');
       expect(
         options![1].options!.filter(({ label }) => label === 'bytes')[0]['data-test-subj']
@@ -1095,12 +1102,12 @@ describe('IndexPatternDimensionEditorPanel', () => {
             columnOrder: ['col1'],
             columns: {
               col1: {
-                label: 'Average of bar',
+                label: 'Average of memory',
                 dataType: 'number',
                 isBucketed: false,
                 // Private
                 operationType: 'avg',
-                sourceField: 'bar',
+                sourceField: 'memory',
               },
             },
           },
@@ -1145,12 +1152,12 @@ describe('IndexPatternDimensionEditorPanel', () => {
             columnOrder: ['col1'],
             columns: {
               col1: {
-                label: 'Average of bar',
+                label: 'Average of memory',
                 dataType: 'number',
                 isBucketed: false,
                 // Private
                 operationType: 'avg',
-                sourceField: 'bar',
+                sourceField: 'memory',
                 params: {
                   format: { id: 'bytes', params: { decimals: 0 } },
                 },
@@ -1195,12 +1202,12 @@ describe('IndexPatternDimensionEditorPanel', () => {
             columnOrder: ['col1'],
             columns: {
               col1: {
-                label: 'Average of bar',
+                label: 'Average of memory',
                 dataType: 'number',
                 isBucketed: false,
                 // Private
                 operationType: 'avg',
-                sourceField: 'bar',
+                sourceField: 'memory',
                 params: {
                   format: { id: 'bytes', params: { decimals: 2 } },
                 },
@@ -1253,12 +1260,14 @@ describe('IndexPatternDimensionEditorPanel', () => {
               {
                 aggregatable: true,
                 name: 'bar',
+                displayName: 'bar',
                 searchable: true,
                 type: 'number',
               },
               {
                 aggregatable: true,
                 name: 'mystring',
+                displayName: 'mystring',
                 searchable: true,
                 type: 'string',
               },
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/field_select.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/field_select.tsx
index 4c85a55ad6011..b2a59788b50f9 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/field_select.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/field_select.tsx
@@ -74,7 +74,7 @@ export function FieldSelect({
     function fieldNamesToOptions(items: string[]) {
       return items
         .map((field) => ({
-          label: field,
+          label: fieldMap[field].displayName,
           value: {
             type: 'field',
             field,
@@ -105,7 +105,7 @@ export function FieldSelect({
             // eslint-disable-next-line @typescript-eslint/naming-convention
             'lnFieldSelect__option--nonExistant': !exists,
           }),
-          'data-test-subj': `lns-fieldOption${compatible ? '' : 'Incompatible'}-${label}`,
+          'data-test-subj': `lns-fieldOption${compatible ? '' : 'Incompatible'}-${value.field}`,
         }));
     }
 
@@ -161,7 +161,7 @@ export function FieldSelect({
           ? selectedColumnSourceField
             ? [
                 {
-                  label: selectedColumnSourceField,
+                  label: fieldMap[selectedColumnSourceField].displayName,
                   value: { type: 'field', field: selectedColumnSourceField },
                 },
               ]
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/popover_editor.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/popover_editor.tsx
index a5108b30cea1d..038b51b922286 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/popover_editor.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/popover_editor.tsx
@@ -378,6 +378,7 @@ export function PopoverEditor(props: PopoverEditorProps) {
 
               {!hideGrouping && (
                 <BucketNestingEditor
+                  fieldMap={fieldMap}
                   layer={state.layers[props.layerId]}
                   columnId={props.columnId}
                   setColumns={(columnOrder) => {
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/document_field.ts b/x-pack/plugins/lens/public/indexpattern_datasource/document_field.ts
index e0a7f27835e42..b0c5540a6b94f 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/document_field.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/document_field.ts
@@ -5,12 +5,16 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { IndexPatternField } from './types';
 
 /**
  * This is a special-case field which allows us to perform
  * document-level operations such as count.
  */
-export const documentField = {
+export const documentField: IndexPatternField = {
+  displayName: i18n.translate('xpack.lens.indexPattern.records', {
+    defaultMessage: 'Records',
+  }),
   name: i18n.translate('xpack.lens.indexPattern.records', {
     defaultMessage: 'Records',
   }),
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/field_item.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/field_item.test.tsx
index 08a2f85ec7053..781222888b6dc 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/field_item.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/field_item.test.tsx
@@ -36,30 +36,35 @@ describe('IndexPattern Field Item', () => {
       fields: [
         {
           name: 'timestamp',
+          displayName: 'timestampLabel',
           type: 'date',
           aggregatable: true,
           searchable: true,
         },
         {
           name: 'bytes',
+          displayName: 'bytesLabel',
           type: 'number',
           aggregatable: true,
           searchable: true,
         },
         {
           name: 'memory',
+          displayName: 'memory',
           type: 'number',
           aggregatable: true,
           searchable: true,
         },
         {
           name: 'unsupported',
+          displayName: 'unsupported',
           type: 'geo',
           aggregatable: true,
           searchable: true,
         },
         {
           name: 'source',
+          displayName: 'source',
           type: 'string',
           aggregatable: true,
           searchable: true,
@@ -83,6 +88,7 @@ describe('IndexPattern Field Item', () => {
       filters: [],
       field: {
         name: 'bytes',
+        displayName: 'bytesLabel',
         type: 'number',
         aggregatable: true,
         searchable: true,
@@ -98,6 +104,13 @@ describe('IndexPattern Field Item', () => {
     } as unknown) as DataPublicPluginStart['fieldFormats'];
   });
 
+  it('should display displayName of a field', () => {
+    const wrapper = mountWithIntl(<InnerFieldItem {...defaultProps} />);
+    expect(wrapper.find('[data-test-subj="lnsFieldListPanelField"]').first().text()).toEqual(
+      'bytesLabel'
+    );
+  });
+
   it('should request field stats without a time field, if the index pattern has none', async () => {
     indexPattern.timeFieldName = undefined;
     core.http.post.mockImplementationOnce(() => {
@@ -149,6 +162,7 @@ describe('IndexPattern Field Item', () => {
           timeFieldName: 'timestamp',
           field: {
             name: 'bytes',
+            displayName: 'bytesLabel',
             type: 'number',
             aggregatable: true,
             searchable: true,
@@ -235,6 +249,7 @@ describe('IndexPattern Field Item', () => {
           timeFieldName: 'timestamp',
           field: {
             name: 'bytes',
+            displayName: 'bytesLabel',
             type: 'number',
             aggregatable: true,
             searchable: true,
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx
index 5dc6673bc29ec..5bcfbc64ec706 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx
@@ -100,7 +100,7 @@ export const InnerFieldItem = function InnerFieldItem(props: FieldItemProps) {
     isLoading: false,
   });
 
-  const wrappableName = wrapOnDot(field.name)!;
+  const wrappableName = wrapOnDot(field.displayName)!;
   const wrappableHighlight = wrapOnDot(highlight);
   const highlightIndex = wrappableHighlight
     ? wrappableName.toLowerCase().indexOf(wrappableHighlight.toLowerCase())
@@ -204,7 +204,7 @@ export const InnerFieldItem = function InnerFieldItem(props: FieldItemProps) {
       container={document.querySelector<HTMLElement>('.application') || undefined}
       button={
         <DragDrop
-          label={field.name}
+          label={field.displayName}
           value={value}
           data-test-subj="lnsFieldListPanelField"
           draggable
@@ -225,7 +225,7 @@ export const InnerFieldItem = function InnerFieldItem(props: FieldItemProps) {
             aria-label={i18n.translate('xpack.lens.indexPattern.fieldStatsButtonAriaLabel', {
               defaultMessage: '{fieldName}: {fieldType}. Hit enter for a field preview.',
               values: {
-                fieldName: field.name,
+                fieldName: field.displayName,
                 fieldType: field.type,
               },
             })}
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts
index 3bd0685551a4c..dc3938ce436e5 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts
@@ -24,36 +24,42 @@ const expectedIndexPatterns = {
     fields: [
       {
         name: 'timestamp',
+        displayName: 'timestampLabel',
         type: 'date',
         aggregatable: true,
         searchable: true,
       },
       {
         name: 'start_date',
+        displayName: 'start_date',
         type: 'date',
         aggregatable: true,
         searchable: true,
       },
       {
         name: 'bytes',
+        displayName: 'bytes',
         type: 'number',
         aggregatable: true,
         searchable: true,
       },
       {
         name: 'memory',
+        displayName: 'memory',
         type: 'number',
         aggregatable: true,
         searchable: true,
       },
       {
         name: 'source',
+        displayName: 'source',
         type: 'string',
         aggregatable: true,
         searchable: true,
       },
       {
         name: 'dest',
+        displayName: 'dest',
         type: 'string',
         aggregatable: true,
         searchable: true,
@@ -67,6 +73,7 @@ const expectedIndexPatterns = {
     fields: [
       {
         name: 'timestamp',
+        displayName: 'timestampLabel',
         type: 'date',
         aggregatable: true,
         searchable: true,
@@ -81,6 +88,7 @@ const expectedIndexPatterns = {
       },
       {
         name: 'bytes',
+        displayName: 'bytes',
         type: 'number',
         aggregatable: true,
         searchable: true,
@@ -106,6 +114,7 @@ const expectedIndexPatterns = {
       },
       {
         name: 'source',
+        displayName: 'source',
         type: 'string',
         aggregatable: true,
         searchable: true,
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.tsx
index e9d095bfbcef1..2fb8d7fe0e553 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.tsx
@@ -119,6 +119,8 @@ export function getIndexPatternDatasource({
       }),
     });
 
+  const indexPatternsService = data.indexPatterns;
+
   // Not stateful. State is persisted to the frame
   const indexPatternDatasource: Datasource<IndexPatternPrivateState, IndexPatternPersistedState> = {
     id: 'indexpattern',
@@ -129,6 +131,7 @@ export function getIndexPatternDatasource({
         savedObjectsClient: await savedObjectsClient,
         defaultIndexPatternId: core.uiSettings.get('defaultIndex'),
         storage,
+        indexPatternsService,
       });
     },
 
@@ -209,9 +212,9 @@ export function getIndexPatternDatasource({
                 id,
                 state,
                 setState,
-                savedObjectsClient,
                 onError: onIndexPatternLoadError,
                 storage,
+                indexPatternsService,
               });
             }}
             data={data}
@@ -289,7 +292,6 @@ export function getIndexPatternDatasource({
         <LayerPanel
           onChangeIndexPattern={(indexPatternId) => {
             changeLayerIndexPattern({
-              savedObjectsClient,
               indexPatternId,
               setState: props.setState,
               state: props.state,
@@ -297,6 +299,7 @@ export function getIndexPatternDatasource({
               onError: onIndexPatternLoadError,
               replaceIfPossible: true,
               storage,
+              indexPatternsService,
             });
           }}
           {...props}
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx
index b6246c6e91e7e..5489dcffc52c4 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx
@@ -23,36 +23,42 @@ const expectedIndexPatterns = {
     fields: [
       {
         name: 'timestamp',
+        displayName: 'timestampLabel',
         type: 'date',
         aggregatable: true,
         searchable: true,
       },
       {
         name: 'start_date',
+        displayName: 'start_date',
         type: 'date',
         aggregatable: true,
         searchable: true,
       },
       {
         name: 'bytes',
+        displayName: 'bytes',
         type: 'number',
         aggregatable: true,
         searchable: true,
       },
       {
         name: 'memory',
+        displayName: 'memory',
         type: 'number',
         aggregatable: true,
         searchable: true,
       },
       {
         name: 'source',
+        displayName: 'source',
         type: 'string',
         aggregatable: true,
         searchable: true,
       },
       {
         name: 'dest',
+        displayName: 'dest',
         type: 'string',
         aggregatable: true,
         searchable: true,
@@ -66,6 +72,7 @@ const expectedIndexPatterns = {
     fields: [
       {
         name: 'timestamp',
+        displayName: 'timestampLabel',
         type: 'date',
         aggregatable: true,
         searchable: true,
@@ -80,6 +87,7 @@ const expectedIndexPatterns = {
       },
       {
         name: 'bytes',
+        displayName: 'bytes',
         type: 'number',
         aggregatable: true,
         searchable: true,
@@ -105,6 +113,7 @@ const expectedIndexPatterns = {
       },
       {
         name: 'source',
+        displayName: 'source',
         type: 'string',
         aggregatable: true,
         searchable: true,
@@ -169,6 +178,7 @@ describe('IndexPattern Data Source suggestions', () => {
       it('should apply a bucketed aggregation for a string field', () => {
         const suggestions = getDatasourceSuggestionsForField(stateWithoutLayer(), '1', {
           name: 'source',
+          displayName: 'source',
           type: 'string',
           aggregatable: true,
           searchable: true,
@@ -214,6 +224,7 @@ describe('IndexPattern Data Source suggestions', () => {
       it('should apply a bucketed aggregation for a date field', () => {
         const suggestions = getDatasourceSuggestionsForField(stateWithoutLayer(), '1', {
           name: 'timestamp',
+          displayName: 'timestampLabel',
           type: 'date',
           aggregatable: true,
           searchable: true,
@@ -258,6 +269,7 @@ describe('IndexPattern Data Source suggestions', () => {
       it('should select a metric for a number field', () => {
         const suggestions = getDatasourceSuggestionsForField(stateWithoutLayer(), '1', {
           name: 'bytes',
+          displayName: 'bytes',
           type: 'number',
           aggregatable: true,
           searchable: true,
@@ -313,6 +325,7 @@ describe('IndexPattern Data Source suggestions', () => {
               fields: [
                 {
                   name: 'bytes',
+                  displayName: 'bytes',
                   type: 'number',
                   aggregatable: true,
                   searchable: true,
@@ -331,6 +344,7 @@ describe('IndexPattern Data Source suggestions', () => {
 
         const suggestions = getDatasourceSuggestionsForField(state, '1', {
           name: 'bytes',
+          displayName: 'bytes',
           type: 'number',
           aggregatable: true,
           searchable: true,
@@ -374,6 +388,7 @@ describe('IndexPattern Data Source suggestions', () => {
       it('should apply a bucketed aggregation for a string field', () => {
         const suggestions = getDatasourceSuggestionsForField(stateWithEmptyLayer(), '1', {
           name: 'source',
+          displayName: 'source',
           type: 'string',
           aggregatable: true,
           searchable: true,
@@ -419,6 +434,7 @@ describe('IndexPattern Data Source suggestions', () => {
       it('should apply a bucketed aggregation for a date field', () => {
         const suggestions = getDatasourceSuggestionsForField(stateWithEmptyLayer(), '1', {
           name: 'timestamp',
+          displayName: 'timestampLabel',
           type: 'date',
           aggregatable: true,
           searchable: true,
@@ -463,6 +479,7 @@ describe('IndexPattern Data Source suggestions', () => {
       it('should select a metric for a number field', () => {
         const suggestions = getDatasourceSuggestionsForField(stateWithEmptyLayer(), '1', {
           name: 'bytes',
+          displayName: 'bytes',
           type: 'number',
           aggregatable: true,
           searchable: true,
@@ -518,6 +535,7 @@ describe('IndexPattern Data Source suggestions', () => {
               fields: [
                 {
                   name: 'bytes',
+                  displayName: 'bytes',
                   type: 'number',
                   aggregatable: true,
                   searchable: true,
@@ -536,6 +554,7 @@ describe('IndexPattern Data Source suggestions', () => {
 
         const suggestions = getDatasourceSuggestionsForField(state, '1', {
           name: 'bytes',
+          displayName: 'bytes',
           type: 'number',
           aggregatable: true,
           searchable: true,
@@ -563,6 +582,7 @@ describe('IndexPattern Data Source suggestions', () => {
       it('creates a new layer and replaces layer if no match is found', () => {
         const suggestions = getDatasourceSuggestionsForField(stateWithEmptyLayer(), '2', {
           name: 'source',
+          displayName: 'source',
           type: 'string',
           aggregatable: true,
           searchable: true,
@@ -693,6 +713,7 @@ describe('IndexPattern Data Source suggestions', () => {
           '1',
           {
             name: 'start_date',
+            displayName: 'start_date',
             type: 'date',
             aggregatable: true,
             searchable: true,
@@ -724,6 +745,7 @@ describe('IndexPattern Data Source suggestions', () => {
         const initialState = stateWithNonEmptyTables();
         const suggestions = getDatasourceSuggestionsForField(initialState, '1', {
           name: 'timestamp',
+          displayName: 'timestampLabel',
           type: 'date',
           aggregatable: true,
           searchable: true,
@@ -770,6 +792,7 @@ describe('IndexPattern Data Source suggestions', () => {
       it('does not use the same field for bucketing multiple times', () => {
         const suggestions = getDatasourceSuggestionsForField(stateWithNonEmptyTables(), '1', {
           name: 'source',
+          displayName: 'source',
           type: 'string',
           aggregatable: true,
           searchable: true,
@@ -785,6 +808,7 @@ describe('IndexPattern Data Source suggestions', () => {
         const initialState = stateWithNonEmptyTables();
         const suggestions = getDatasourceSuggestionsForField(initialState, '1', {
           name: 'dest',
+          displayName: 'dest',
           type: 'string',
           aggregatable: true,
           searchable: true,
@@ -816,6 +840,7 @@ describe('IndexPattern Data Source suggestions', () => {
         const initialState = stateWithNonEmptyTables();
         const suggestions = getDatasourceSuggestionsForField(initialState, '1', {
           name: 'memory',
+          displayName: 'memory',
           type: 'number',
           aggregatable: true,
           searchable: true,
@@ -858,6 +883,7 @@ describe('IndexPattern Data Source suggestions', () => {
         };
         const suggestions = getDatasourceSuggestionsForField(modifiedState, '1', {
           name: 'memory',
+          displayName: 'memory',
           type: 'number',
           aggregatable: true,
           searchable: true,
@@ -908,6 +934,7 @@ describe('IndexPattern Data Source suggestions', () => {
         };
         const suggestions = getDatasourceSuggestionsForField(modifiedState, '1', {
           name: 'memory',
+          displayName: 'memory',
           type: 'number',
           aggregatable: true,
           searchable: true,
@@ -961,6 +988,7 @@ describe('IndexPattern Data Source suggestions', () => {
         const initialState = stateWithCurrentIndexPattern();
         const suggestions = getDatasourceSuggestionsForField(initialState, '2', {
           name: 'timestamp',
+          displayName: 'timestampLabel',
           type: 'date',
           aggregatable: true,
           searchable: true,
@@ -1015,6 +1043,7 @@ describe('IndexPattern Data Source suggestions', () => {
         const initialState = stateWithCurrentIndexPattern();
         const suggestions = getDatasourceSuggestionsForField(initialState, '1', {
           name: 'timestamp',
+          displayName: 'timestampLabel',
           type: 'date',
           aggregatable: true,
           searchable: true,
@@ -1185,7 +1214,7 @@ describe('IndexPattern Data Source suggestions', () => {
               {
                 columnId: 'id1',
                 operation: {
-                  label: 'timestamp',
+                  label: 'timestampLabel',
                   dataType: 'date',
                   isBucketed: true,
                   scale: 'interval',
@@ -1261,7 +1290,7 @@ describe('IndexPattern Data Source suggestions', () => {
               {
                 columnId: 'id1',
                 operation: {
-                  label: 'timestamp',
+                  label: 'timestampLabel',
                   dataType: 'date',
                   isBucketed: true,
                   scale: 'interval',
@@ -1324,30 +1353,35 @@ describe('IndexPattern Data Source suggestions', () => {
             fields: [
               {
                 name: 'field1',
+                displayName: 'field1',
                 type: 'string',
                 aggregatable: true,
                 searchable: true,
               },
               {
                 name: 'field2',
+                displayName: 'field2',
                 type: 'string',
                 aggregatable: true,
                 searchable: true,
               },
               {
                 name: 'field3',
+                displayName: 'field3Label',
                 type: 'string',
                 aggregatable: true,
                 searchable: true,
               },
               {
                 name: 'field4',
+                displayName: 'field4',
                 type: 'number',
                 aggregatable: true,
                 searchable: true,
               },
               {
                 name: 'field5',
+                displayName: 'field5',
                 type: 'number',
                 aggregatable: true,
                 searchable: true,
@@ -1462,12 +1496,14 @@ describe('IndexPattern Data Source suggestions', () => {
             fields: [
               {
                 name: 'field1',
+                displayName: 'field1',
                 type: 'number',
                 aggregatable: true,
                 searchable: true,
               },
               {
                 name: 'field2',
+                displayName: 'field2',
                 type: 'date',
                 aggregatable: true,
                 searchable: true,
@@ -1522,6 +1558,7 @@ describe('IndexPattern Data Source suggestions', () => {
             fields: [
               {
                 name: 'field1',
+                displayName: 'field1',
                 type: 'number',
                 aggregatable: true,
                 searchable: true,
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts
index 111a113a16be7..f3aa9c4f51c82 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts
@@ -481,11 +481,19 @@ function createChangedNestingSuggestion(state: IndexPatternPrivateState, layerId
   const layer = state.layers[layerId];
   const [firstBucket, secondBucket, ...rest] = layer.columnOrder;
   const updatedLayer = { ...layer, columnOrder: [secondBucket, firstBucket, ...rest] };
+  const currentFields = state.indexPatterns[state.currentIndexPatternId].fields;
+  const firstBucketLabel =
+    currentFields.find((field) => field.name === layer.columns[firstBucket].sourceField)
+      ?.displayName || '';
+  const secondBucketLabel =
+    currentFields.find((field) => field.name === layer.columns[secondBucket].sourceField)
+      ?.displayName || '';
+
   return buildSuggestion({
     state,
     layerId,
     updatedLayer,
-    label: getNestedTitle([layer.columns[secondBucket], layer.columns[firstBucket]]),
+    label: getNestedTitle([secondBucketLabel, firstBucketLabel]),
     changeType: 'reorder',
   });
 }
@@ -544,12 +552,12 @@ function createMetricSuggestion(
   });
 }
 
-function getNestedTitle([outerBucket, innerBucket]: IndexPatternColumn[]) {
+function getNestedTitle([outerBucketLabel, innerBucketLabel]: string[]) {
   return i18n.translate('xpack.lens.indexpattern.suggestions.nestingChangeLabel', {
     defaultMessage: '{innerOperation} for each {outerOperation}',
     values: {
-      innerOperation: innerBucket.sourceField,
-      outerOperation: outerBucket.sourceField,
+      innerOperation: innerBucketLabel,
+      outerOperation: outerBucketLabel,
     },
   });
 }
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/layerpanel.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/layerpanel.test.tsx
index 560c48b2155ee..738cdd611a7ba 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/layerpanel.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/layerpanel.test.tsx
@@ -65,30 +65,35 @@ const initialState: IndexPatternPrivateState = {
       fields: [
         {
           name: 'timestamp',
+          displayName: 'timestampLabel',
           type: 'date',
           aggregatable: true,
           searchable: true,
         },
         {
           name: 'bytes',
+          displayName: 'bytes',
           type: 'number',
           aggregatable: true,
           searchable: true,
         },
         {
           name: 'memory',
+          displayName: 'memory',
           type: 'number',
           aggregatable: true,
           searchable: true,
         },
         {
           name: 'unsupported',
+          displayName: 'unsupported',
           type: 'geo',
           aggregatable: true,
           searchable: true,
         },
         {
           name: 'source',
+          displayName: 'source',
           type: 'string',
           aggregatable: true,
           searchable: true,
@@ -102,6 +107,7 @@ const initialState: IndexPatternPrivateState = {
       fields: [
         {
           name: 'timestamp',
+          displayName: 'timestampLabel',
           type: 'date',
           aggregatable: true,
           searchable: true,
@@ -116,6 +122,7 @@ const initialState: IndexPatternPrivateState = {
         },
         {
           name: 'bytes',
+          displayName: 'bytes',
           type: 'number',
           aggregatable: true,
           searchable: true,
@@ -137,6 +144,7 @@ const initialState: IndexPatternPrivateState = {
         },
         {
           name: 'source',
+          displayName: 'source',
           type: 'string',
           aggregatable: true,
           searchable: true,
@@ -155,18 +163,21 @@ const initialState: IndexPatternPrivateState = {
       fields: [
         {
           name: 'timestamp',
+          displayName: 'timestampLabel',
           type: 'date',
           aggregatable: true,
           searchable: true,
         },
         {
           name: 'memory',
+          displayName: 'memory',
           type: 'number',
           aggregatable: true,
           searchable: true,
         },
         {
           name: 'source',
+          displayName: 'source',
           type: 'string',
           aggregatable: true,
           searchable: true,
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/loader.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/loader.test.ts
index 27904a0f23f16..cfabcb4edcef7 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/loader.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/loader.test.ts
@@ -13,7 +13,14 @@ import {
   changeLayerIndexPattern,
   syncExistingFields,
 } from './loader';
-import { IndexPatternPersistedState, IndexPatternPrivateState, IndexPatternField } from './types';
+import { IndexPatternsContract } from '../../../../../src/plugins/data/public';
+import {
+  IndexPatternPersistedState,
+  IndexPatternPrivateState,
+  IndexPatternField,
+  IndexPattern,
+} from './types';
+import { createMockedRestrictedIndexPattern, createMockedIndexPattern } from './mocks';
 import { documentField } from './document_field';
 
 jest.mock('./operations');
@@ -27,154 +34,157 @@ const createMockStorage = (lastData?: Record<string, string>) => {
   };
 };
 
-const sampleIndexPatterns = {
-  a: {
-    id: 'a',
-    title: 'my-fake-index-pattern',
-    timeFieldName: 'timestamp',
-    fields: [
-      {
-        name: 'timestamp',
-        type: 'date',
-        aggregatable: true,
-        searchable: true,
-      },
-      {
-        name: 'start_date',
-        type: 'date',
-        aggregatable: true,
-        searchable: true,
-      },
-      {
-        name: 'bytes',
-        type: 'number',
-        aggregatable: true,
-        searchable: true,
-      },
-      {
-        name: 'memory',
-        type: 'number',
-        aggregatable: true,
-        searchable: true,
-      },
-      {
-        name: 'source',
-        type: 'string',
-        aggregatable: true,
-        searchable: true,
-        esTypes: ['keyword'],
-      },
-      {
-        name: 'dest',
-        type: 'string',
-        aggregatable: true,
-        searchable: true,
-        esTypes: ['keyword'],
-      },
-      documentField,
-    ],
-  },
-  b: {
-    id: 'b',
-    title: 'my-fake-restricted-pattern',
-    timeFieldName: 'timestamp',
-    fields: [
-      {
-        name: 'timestamp',
-        type: 'date',
-        aggregatable: true,
-        searchable: true,
-        aggregationRestrictions: {
-          date_histogram: {
-            agg: 'date_histogram',
-            fixed_interval: '1d',
-            delay: '7d',
-            time_zone: 'UTC',
-          },
+const indexPattern1 = ({
+  id: '1',
+  title: 'my-fake-index-pattern',
+  timeFieldName: 'timestamp',
+  fields: [
+    {
+      name: 'timestamp',
+      displayName: 'timestampLabel',
+      type: 'date',
+      aggregatable: true,
+      searchable: true,
+    },
+    {
+      name: 'start_date',
+      displayName: 'start_date',
+      type: 'date',
+      aggregatable: true,
+      searchable: true,
+    },
+    {
+      name: 'bytes',
+      displayName: 'bytes',
+      type: 'number',
+      aggregatable: true,
+      searchable: true,
+    },
+    {
+      name: 'memory',
+      displayName: 'memory',
+      type: 'number',
+      aggregatable: true,
+      searchable: true,
+    },
+    {
+      name: 'source',
+      displayName: 'source',
+      type: 'string',
+      aggregatable: true,
+      searchable: true,
+      esTypes: ['keyword'],
+    },
+    {
+      name: 'unsupported',
+      displayName: 'unsupported',
+      type: 'geo',
+      aggregatable: true,
+      searchable: true,
+    },
+    {
+      name: 'dest',
+      displayName: 'dest',
+      type: 'string',
+      aggregatable: true,
+      searchable: true,
+      esTypes: ['keyword'],
+    },
+    documentField,
+  ],
+} as unknown) as IndexPattern;
+
+const sampleIndexPatternsFromService = {
+  '1': createMockedIndexPattern(),
+  '2': createMockedRestrictedIndexPattern(),
+};
+
+const indexPattern2 = ({
+  id: '2',
+  title: 'my-fake-restricted-pattern',
+  timeFieldName: 'timestamp',
+  fields: [
+    {
+      name: 'timestamp',
+      displayName: 'timestampLabel',
+      type: 'date',
+      aggregatable: true,
+      searchable: true,
+      aggregationRestrictions: {
+        date_histogram: {
+          agg: 'date_histogram',
+          fixed_interval: '1d',
+          delay: '7d',
+          time_zone: 'UTC',
         },
       },
-      {
-        name: 'bytes',
-        type: 'number',
-        aggregatable: true,
-        searchable: true,
-        aggregationRestrictions: {
-          // Ignored in the UI
-          histogram: {
-            agg: 'histogram',
-            interval: 1000,
-          },
-          avg: {
-            agg: 'avg',
-          },
-          max: {
-            agg: 'max',
-          },
-          min: {
-            agg: 'min',
-          },
-          sum: {
-            agg: 'sum',
-          },
+    },
+    {
+      name: 'bytes',
+      displayName: 'bytes',
+      type: 'number',
+      aggregatable: true,
+      searchable: true,
+      aggregationRestrictions: {
+        // Ignored in the UI
+        histogram: {
+          agg: 'histogram',
+          interval: 1000,
         },
-      },
-      {
-        name: 'source',
-        type: 'string',
-        aggregatable: false,
-        searchable: false,
-        scripted: true,
-        aggregationRestrictions: {
-          terms: {
-            agg: 'terms',
-          },
+        avg: {
+          agg: 'avg',
+        },
+        max: {
+          agg: 'max',
+        },
+        min: {
+          agg: 'min',
+        },
+        sum: {
+          agg: 'sum',
         },
-        esTypes: ['keyword'],
       },
-      documentField,
-    ],
-  },
-};
-
-function indexPatternSavedObject({ id }: { id: keyof typeof sampleIndexPatterns }) {
-  const pattern = {
-    ...sampleIndexPatterns[id],
-    fields: [
-      ...sampleIndexPatterns[id].fields,
-      {
-        name: 'description',
-        type: 'string',
-        aggregatable: false,
-        searchable: true,
-        esTypes: ['text'],
+    },
+    {
+      name: 'source',
+      displayName: 'source',
+      type: 'string',
+      aggregatable: true,
+      searchable: true,
+      scripted: true,
+      aggregationRestrictions: {
+        terms: {
+          agg: 'terms',
+        },
       },
-    ],
-  };
-  return {
-    id,
-    type: 'index-pattern',
-    attributes: {
-      title: pattern.title,
-      timeFieldName: pattern.timeFieldName,
-      fields: JSON.stringify(pattern.fields.filter((f) => f.type !== 'document')),
+      esTypes: ['keyword'],
     },
-  };
-}
+    documentField,
+  ],
+} as unknown) as IndexPattern;
+
+const sampleIndexPatterns = {
+  '1': indexPattern1,
+  '2': indexPattern2,
+};
 
 function mockClient() {
   return ({
     find: jest.fn(async () => ({
       savedObjects: [
-        { id: 'a', attributes: { title: sampleIndexPatterns.a.title } },
-        { id: 'b', attributes: { title: sampleIndexPatterns.b.title } },
+        { id: '1', attributes: { title: sampleIndexPatterns[1].title } },
+        { id: '2', attributes: { title: sampleIndexPatterns[2].title } },
       ],
     })),
-    async bulkGet(indexPatterns: Array<{ id: keyof typeof sampleIndexPatterns }>) {
-      return {
-        savedObjects: indexPatterns.map(({ id }) => indexPatternSavedObject({ id })),
-      };
-    },
-  } as unknown) as Pick<SavedObjectsClientContract, 'find' | 'bulkGet'>;
+  } as unknown) as Pick<SavedObjectsClientContract, 'find'>;
+}
+
+function mockIndexPatternsService() {
+  return ({
+    get: jest.fn(async (id: '1' | '2') => {
+      return sampleIndexPatternsFromService[id];
+    }),
+  } as unknown) as Pick<IndexPatternsContract, 'get'>;
 }
 
 describe('loader', () => {
@@ -182,11 +192,12 @@ describe('loader', () => {
     it('should not load index patterns that are already loaded', async () => {
       const cache = await loadIndexPatterns({
         cache: sampleIndexPatterns,
-        patterns: ['a', 'b'],
-        savedObjectsClient: {
-          bulkGet: jest.fn(() => Promise.reject('bulkGet should not have been called')),
-          find: jest.fn(() => Promise.reject('find should not have been called')),
-        },
+        patterns: ['1', '2'],
+        indexPatternsService: ({
+          get: jest.fn(() =>
+            Promise.reject('mockIndexPatternService.get should not have been called')
+          ),
+        } as unknown) as Pick<IndexPatternsContract, 'get'>,
       });
 
       expect(cache).toEqual(sampleIndexPatterns);
@@ -195,10 +206,10 @@ describe('loader', () => {
     it('should load index patterns that are not loaded', async () => {
       const cache = await loadIndexPatterns({
         cache: {
-          b: sampleIndexPatterns.b,
+          '2': sampleIndexPatterns['2'],
         },
-        patterns: ['a', 'b'],
-        savedObjectsClient: mockClient(),
+        patterns: ['1', '2'],
+        indexPatternsService: mockIndexPatternsService(),
       });
 
       expect(cache).toMatchObject(sampleIndexPatterns);
@@ -207,8 +218,8 @@ describe('loader', () => {
     it('should allow scripted, but not full text fields', async () => {
       const cache = await loadIndexPatterns({
         cache: {},
-        patterns: ['a', 'b'],
-        savedObjectsClient: mockClient(),
+        patterns: ['1', '2'],
+        indexPatternsService: mockIndexPatternsService(),
       });
 
       expect(cache).toMatchObject(sampleIndexPatterns);
@@ -218,61 +229,56 @@ describe('loader', () => {
       const cache = await loadIndexPatterns({
         cache: {},
         patterns: ['foo'],
-        savedObjectsClient: ({
-          ...mockClient(),
-          async bulkGet() {
-            return {
-              savedObjects: [
-                {
-                  id: 'foo',
-                  type: 'index-pattern',
-                  attributes: {
-                    title: 'Foo index',
-                    typeMeta: JSON.stringify({
-                      aggs: {
-                        date_histogram: {
-                          timestamp: {
-                            agg: 'date_histogram',
-                            fixed_interval: 'm',
-                          },
-                        },
-                        sum: {
-                          bytes: {
-                            agg: 'sum',
-                          },
-                        },
-                      },
-                    }),
-                    fields: JSON.stringify([
-                      {
-                        name: 'timestamp',
-                        type: 'date',
-                        aggregatable: true,
-                        searchable: true,
-                      },
-                      {
-                        name: 'bytes',
-                        type: 'number',
-                        aggregatable: true,
-                        searchable: true,
-                      },
-                    ]),
+        indexPatternsService: ({
+          get: jest.fn(async () => ({
+            id: 'foo',
+            title: 'Foo index',
+            typeMeta: {
+              aggs: {
+                date_histogram: {
+                  timestamp: {
+                    agg: 'date_histogram',
+                    fixed_interval: 'm',
                   },
                 },
-              ],
-            };
-          },
-        } as unknown) as Pick<SavedObjectsClientContract, 'find' | 'bulkGet'>,
+                sum: {
+                  bytes: {
+                    agg: 'sum',
+                  },
+                },
+              },
+            },
+            fields: [
+              {
+                name: 'timestamp',
+                displayName: 'timestampLabel',
+                type: 'date',
+                aggregatable: true,
+                searchable: true,
+              },
+              {
+                name: 'bytes',
+                displayName: 'bytes',
+                type: 'number',
+                aggregatable: true,
+                searchable: true,
+              },
+            ],
+          })),
+        } as unknown) as Pick<IndexPatternsContract, 'get'>,
       });
 
-      expect(cache.foo.fields.find((f) => f.name === 'bytes')!.aggregationRestrictions).toEqual({
+      expect(
+        cache.foo.fields.find((f: IndexPatternField) => f.name === 'bytes')!.aggregationRestrictions
+      ).toEqual({
         sum: { agg: 'sum' },
       });
-      expect(cache.foo.fields.find((f) => f.name === 'timestamp')!.aggregationRestrictions).toEqual(
-        {
-          date_histogram: { agg: 'date_histogram', fixed_interval: 'm' },
-        }
-      );
+      expect(
+        cache.foo.fields.find((f: IndexPatternField) => f.name === 'timestamp')!
+          .aggregationRestrictions
+      ).toEqual({
+        date_histogram: { agg: 'date_histogram', fixed_interval: 'm' },
+      });
     });
   });
 
@@ -281,22 +287,23 @@ describe('loader', () => {
       const storage = createMockStorage();
       const state = await loadInitialState({
         savedObjectsClient: mockClient(),
+        indexPatternsService: mockIndexPatternsService(),
         storage,
       });
 
       expect(state).toMatchObject({
-        currentIndexPatternId: 'a',
+        currentIndexPatternId: '1',
         indexPatternRefs: [
-          { id: 'a', title: sampleIndexPatterns.a.title },
-          { id: 'b', title: sampleIndexPatterns.b.title },
+          { id: '1', title: sampleIndexPatterns['1'].title },
+          { id: '2', title: sampleIndexPatterns['2'].title },
         ],
         indexPatterns: {
-          a: sampleIndexPatterns.a,
+          '1': sampleIndexPatterns['1'],
         },
         layers: {},
       });
       expect(storage.set).toHaveBeenCalledWith('lens-settings', {
-        indexPatternId: 'a',
+        indexPatternId: '1',
       });
     });
 
@@ -304,39 +311,41 @@ describe('loader', () => {
       const storage = createMockStorage({ indexPatternId: 'c' });
       const state = await loadInitialState({
         savedObjectsClient: mockClient(),
+        indexPatternsService: mockIndexPatternsService(),
         storage,
       });
 
       expect(state).toMatchObject({
-        currentIndexPatternId: 'a',
+        currentIndexPatternId: '1',
         indexPatternRefs: [
-          { id: 'a', title: sampleIndexPatterns.a.title },
-          { id: 'b', title: sampleIndexPatterns.b.title },
+          { id: '1', title: sampleIndexPatterns['1'].title },
+          { id: '2', title: sampleIndexPatterns['2'].title },
         ],
         indexPatterns: {
-          a: sampleIndexPatterns.a,
+          '1': sampleIndexPatterns['1'],
         },
         layers: {},
       });
       expect(storage.set).toHaveBeenCalledWith('lens-settings', {
-        indexPatternId: 'a',
+        indexPatternId: '1',
       });
     });
 
     it('should load lastUsedIndexPatternId if in localStorage', async () => {
       const state = await loadInitialState({
         savedObjectsClient: mockClient(),
-        storage: createMockStorage({ indexPatternId: 'b' }),
+        indexPatternsService: mockIndexPatternsService(),
+        storage: createMockStorage({ indexPatternId: '2' }),
       });
 
       expect(state).toMatchObject({
-        currentIndexPatternId: 'b',
+        currentIndexPatternId: '2',
         indexPatternRefs: [
-          { id: 'a', title: sampleIndexPatterns.a.title },
-          { id: 'b', title: sampleIndexPatterns.b.title },
+          { id: '1', title: sampleIndexPatterns['1'].title },
+          { id: '2', title: sampleIndexPatterns['2'].title },
         ],
         indexPatterns: {
-          b: sampleIndexPatterns.b,
+          '2': sampleIndexPatterns['2'],
         },
         layers: {},
       });
@@ -345,33 +354,34 @@ describe('loader', () => {
     it('should use the default index pattern id, if provided', async () => {
       const storage = createMockStorage();
       const state = await loadInitialState({
-        defaultIndexPatternId: 'b',
+        defaultIndexPatternId: '2',
         savedObjectsClient: mockClient(),
+        indexPatternsService: mockIndexPatternsService(),
         storage,
       });
 
       expect(state).toMatchObject({
-        currentIndexPatternId: 'b',
+        currentIndexPatternId: '2',
         indexPatternRefs: [
-          { id: 'a', title: sampleIndexPatterns.a.title },
-          { id: 'b', title: sampleIndexPatterns.b.title },
+          { id: '1', title: sampleIndexPatterns['1'].title },
+          { id: '2', title: sampleIndexPatterns['2'].title },
         ],
         indexPatterns: {
-          b: sampleIndexPatterns.b,
+          '2': sampleIndexPatterns['2'],
         },
         layers: {},
       });
       expect(storage.set).toHaveBeenCalledWith('lens-settings', {
-        indexPatternId: 'b',
+        indexPatternId: '2',
       });
     });
 
     it('should initialize from saved state', async () => {
       const savedState: IndexPatternPersistedState = {
-        currentIndexPatternId: 'b',
+        currentIndexPatternId: '2',
         layers: {
           layerb: {
-            indexPatternId: 'b',
+            indexPatternId: '2',
             columnOrder: ['col1', 'col2'],
             columns: {
               col1: {
@@ -395,27 +405,28 @@ describe('loader', () => {
           },
         },
       };
-      const storage = createMockStorage({ indexPatternId: 'a' });
+      const storage = createMockStorage({ indexPatternId: '1' });
       const state = await loadInitialState({
         state: savedState,
         savedObjectsClient: mockClient(),
+        indexPatternsService: mockIndexPatternsService(),
         storage,
       });
 
       expect(state).toMatchObject({
-        currentIndexPatternId: 'b',
+        currentIndexPatternId: '2',
         indexPatternRefs: [
-          { id: 'a', title: sampleIndexPatterns.a.title },
-          { id: 'b', title: sampleIndexPatterns.b.title },
+          { id: '1', title: sampleIndexPatterns['1'].title },
+          { id: '2', title: sampleIndexPatterns['2'].title },
         ],
         indexPatterns: {
-          b: sampleIndexPatterns.b,
+          '2': sampleIndexPatterns['2'],
         },
         layers: savedState.layers,
       });
 
       expect(storage.set).toHaveBeenCalledWith('lens-settings', {
-        indexPatternId: 'b',
+        indexPatternId: '2',
       });
     });
   });
@@ -424,33 +435,36 @@ describe('loader', () => {
     it('loads the index pattern and then sets it as current', async () => {
       const setState = jest.fn();
       const state: IndexPatternPrivateState = {
-        currentIndexPatternId: 'b',
+        currentIndexPatternId: '2',
         indexPatternRefs: [],
         indexPatterns: {},
         existingFields: {},
         layers: {},
         isFirstExistenceFetch: false,
       };
-      const storage = createMockStorage({ indexPatternId: 'b' });
+      const storage = createMockStorage({ indexPatternId: '2' });
 
       await changeIndexPattern({
         state,
         setState,
-        id: 'a',
-        savedObjectsClient: mockClient(),
+        id: '1',
+        indexPatternsService: mockIndexPatternsService(),
         onError: jest.fn(),
         storage,
       });
 
       expect(setState).toHaveBeenCalledTimes(1);
       expect(setState.mock.calls[0][0](state)).toMatchObject({
-        currentIndexPatternId: 'a',
+        currentIndexPatternId: '1',
         indexPatterns: {
-          a: sampleIndexPatterns.a,
+          '1': {
+            ...sampleIndexPatterns['1'],
+            fields: [...sampleIndexPatterns['1'].fields],
+          },
         },
       });
       expect(storage.set).toHaveBeenCalledWith('lens-settings', {
-        indexPatternId: 'a',
+        indexPatternId: '1',
       });
     });
 
@@ -459,7 +473,7 @@ describe('loader', () => {
       const onError = jest.fn();
       const err = new Error('NOPE!');
       const state: IndexPatternPrivateState = {
-        currentIndexPatternId: 'b',
+        currentIndexPatternId: '2',
         indexPatternRefs: [],
         existingFields: {},
         indexPatterns: {},
@@ -467,15 +481,14 @@ describe('loader', () => {
         isFirstExistenceFetch: false,
       };
 
-      const storage = createMockStorage({ indexPatternId: 'b' });
+      const storage = createMockStorage({ indexPatternId: '2' });
 
       await changeIndexPattern({
         state,
         setState,
-        id: 'a',
-        savedObjectsClient: {
-          ...mockClient(),
-          bulkGet: jest.fn(async () => {
+        id: '1',
+        indexPatternsService: {
+          get: jest.fn(async () => {
             throw err;
           }),
         },
@@ -493,17 +506,17 @@ describe('loader', () => {
     it('loads the index pattern and then changes the specified layer', async () => {
       const setState = jest.fn();
       const state: IndexPatternPrivateState = {
-        currentIndexPatternId: 'b',
+        currentIndexPatternId: '2',
         indexPatternRefs: [],
         existingFields: {},
         indexPatterns: {
-          a: sampleIndexPatterns.a,
+          '1': sampleIndexPatterns['1'],
         },
         layers: {
           l0: {
             columnOrder: ['col1'],
             columns: {},
-            indexPatternId: 'a',
+            indexPatternId: '1',
           },
           l1: {
             columnOrder: ['col2'],
@@ -519,36 +532,36 @@ describe('loader', () => {
                 sourceField: 'timestamp',
               },
             },
-            indexPatternId: 'a',
+            indexPatternId: '1',
           },
         },
         isFirstExistenceFetch: false,
       };
 
-      const storage = createMockStorage({ indexPatternId: 'a' });
+      const storage = createMockStorage({ indexPatternId: '1' });
 
       await changeLayerIndexPattern({
         state,
         setState,
-        indexPatternId: 'b',
+        indexPatternId: '2',
         layerId: 'l1',
-        savedObjectsClient: mockClient(),
+        indexPatternsService: mockIndexPatternsService(),
         onError: jest.fn(),
         storage,
       });
 
       expect(setState).toHaveBeenCalledTimes(1);
       expect(setState.mock.calls[0][0](state)).toMatchObject({
-        currentIndexPatternId: 'b',
+        currentIndexPatternId: '2',
         indexPatterns: {
-          a: sampleIndexPatterns.a,
-          b: sampleIndexPatterns.b,
+          1: sampleIndexPatterns['1'],
+          2: sampleIndexPatterns['2'],
         },
         layers: {
           l0: {
             columnOrder: ['col1'],
             columns: {},
-            indexPatternId: 'a',
+            indexPatternId: '1',
           },
           l1: {
             columnOrder: ['col2'],
@@ -564,12 +577,12 @@ describe('loader', () => {
                 sourceField: 'timestamp',
               },
             },
-            indexPatternId: 'b',
+            indexPatternId: '2',
           },
         },
       });
       expect(storage.set).toHaveBeenCalledWith('lens-settings', {
-        indexPatternId: 'b',
+        indexPatternId: '2',
       });
     });
 
@@ -578,32 +591,31 @@ describe('loader', () => {
       const onError = jest.fn();
       const err = new Error('NOPE!');
       const state: IndexPatternPrivateState = {
-        currentIndexPatternId: 'b',
+        currentIndexPatternId: '2',
         indexPatternRefs: [],
         existingFields: {},
         indexPatterns: {
-          a: sampleIndexPatterns.a,
+          '1': sampleIndexPatterns['1'],
         },
         layers: {
           l0: {
             columnOrder: ['col1'],
             columns: {},
-            indexPatternId: 'a',
+            indexPatternId: '1',
           },
         },
         isFirstExistenceFetch: false,
       };
 
-      const storage = createMockStorage({ indexPatternId: 'b' });
+      const storage = createMockStorage({ indexPatternId: '2' });
 
       await changeLayerIndexPattern({
         state,
         setState,
-        indexPatternId: 'b',
+        indexPatternId: '2',
         layerId: 'l0',
-        savedObjectsClient: {
-          ...mockClient(),
-          bulkGet: jest.fn(async () => {
+        indexPatternsService: {
+          get: jest.fn(async () => {
             throw err;
           }),
         },
@@ -634,7 +646,7 @@ describe('loader', () => {
         return {
           indexPatternTitle,
           existingFieldNames: ['field_1', 'field_2'].map(
-            (fieldName) => `${indexPatternTitle}_${fieldName}`
+            (fieldName) => `ip${indexPatternTitle}_${fieldName}`
           ),
         };
       }) as unknown) as HttpHandler;
@@ -643,9 +655,9 @@ describe('loader', () => {
         dateRange: { fromDate: '1900-01-01', toDate: '2000-01-01' },
         fetchJson,
         indexPatterns: [
-          { id: 'a', title: 'a', fields: [] },
-          { id: 'b', title: 'a', fields: [] },
-          { id: 'c', title: 'a', fields: [] },
+          { id: '1', title: '1', fields: [] },
+          { id: '2', title: '1', fields: [] },
+          { id: '3', title: '1', fields: [] },
         ],
         setState,
         dslQuery,
@@ -668,9 +680,9 @@ describe('loader', () => {
         isFirstExistenceFetch: false,
         existenceFetchFailed: false,
         existingFields: {
-          a: { a_field_1: true, a_field_2: true },
-          b: { b_field_1: true, b_field_2: true },
-          c: { c_field_1: true, c_field_2: true },
+          '1': { ip1_field_1: true, ip1_field_2: true },
+          '2': { ip2_field_1: true, ip2_field_2: true },
+          '3': { ip3_field_1: true, ip3_field_2: true },
         },
       });
     });
@@ -683,7 +695,7 @@ describe('loader', () => {
         return {
           indexPatternTitle,
           existingFieldNames:
-            indexPatternTitle === 'a'
+            indexPatternTitle === '1'
               ? ['field_1', 'field_2'].map((fieldName) => `${indexPatternTitle}_${fieldName}`)
               : [],
         };
@@ -693,9 +705,9 @@ describe('loader', () => {
         dateRange: { fromDate: '1900-01-01', toDate: '2000-01-01' },
         fetchJson,
         indexPatterns: [
-          { id: 'a', title: 'a', fields: [] },
-          { id: 'b', title: 'a', fields: [] },
-          { id: 'c', title: 'a', fields: [] },
+          { id: '1', title: '1', fields: [] },
+          { id: '2', title: '1', fields: [] },
+          { id: 'c', title: '1', fields: [] },
         ],
         setState,
         dslQuery,
@@ -725,8 +737,8 @@ describe('loader', () => {
         fetchJson,
         indexPatterns: [
           {
-            id: 'a',
-            title: 'a',
+            id: '1',
+            title: '1',
             fields: [{ name: 'field1' }, { name: 'field2' }] as IndexPatternField[],
           },
         ],
@@ -746,7 +758,7 @@ describe('loader', () => {
       }) as IndexPatternPrivateState;
 
       expect(newState.existenceFetchFailed).toEqual(true);
-      expect(newState.existingFields.a).toEqual({
+      expect(newState.existingFields['1']).toEqual({
         field1: true,
         field2: true,
       });
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/loader.ts b/x-pack/plugins/lens/public/indexpattern_datasource/loader.ts
index 20e7bec6db131..9c4a19e58a052 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/loader.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/loader.ts
@@ -6,8 +6,7 @@
 
 import _ from 'lodash';
 import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import { SavedObjectsClientContract, SavedObjectAttributes, HttpSetup } from 'kibana/public';
-import { SimpleSavedObject } from 'kibana/public';
+import { SavedObjectsClientContract, HttpSetup } from 'kibana/public';
 import { StateSetter } from '../types';
 import {
   IndexPattern,
@@ -19,33 +18,25 @@ import {
 import { updateLayerIndexPattern } from './state_helpers';
 import { DateRange, ExistingFields } from '../../common/types';
 import { BASE_API_URL } from '../../common';
-import { documentField } from './document_field';
 import {
+  IndexPatternsContract,
   indexPatterns as indexPatternsUtils,
-  IFieldType,
-  IndexPatternTypeMeta,
 } from '../../../../../src/plugins/data/public';
+import { documentField } from './document_field';
 import { readFromStorage, writeToStorage } from '../settings_storage';
 
-interface SavedIndexPatternAttributes extends SavedObjectAttributes {
-  title: string;
-  timeFieldName: string | null;
-  fields: string;
-  fieldFormatMap: string;
-  typeMeta: string;
-}
-
 type SetState = StateSetter<IndexPatternPrivateState>;
-type SavedObjectsClient = Pick<SavedObjectsClientContract, 'find' | 'bulkGet'>;
+type SavedObjectsClient = Pick<SavedObjectsClientContract, 'find'>;
+type IndexPatternsService = Pick<IndexPatternsContract, 'get'>;
 type ErrorHandler = (err: Error) => void;
 
 export async function loadIndexPatterns({
+  indexPatternsService,
   patterns,
-  savedObjectsClient,
   cache,
 }: {
+  indexPatternsService: IndexPatternsService;
   patterns: string[];
-  savedObjectsClient: SavedObjectsClient;
   cache: Record<string, IndexPattern>;
 }) {
   const missingIds = patterns.filter((id) => !cache[id]);
@@ -54,20 +45,62 @@ export async function loadIndexPatterns({
     return cache;
   }
 
-  const resp = await savedObjectsClient.bulkGet(
-    missingIds.map((id) => ({ id, type: 'index-pattern' }))
-  );
+  const indexPatterns = await Promise.all(missingIds.map((id) => indexPatternsService.get(id)));
+  const indexPatternsObject = indexPatterns.reduce(
+    (acc, indexPattern) => {
+      const newFields = indexPattern.fields
+        .filter(
+          (field) =>
+            !indexPatternsUtils.isNestedField(field) && (!!field.aggregatable || !!field.scripted)
+        )
+        .map(
+          (field): IndexPatternField => ({
+            name: field.name,
+            displayName: field.displayName,
+            type: field.type,
+            aggregatable: field.aggregatable,
+            searchable: field.searchable,
+            scripted: field.scripted,
+            esTypes: field.esTypes,
+          })
+        )
+        .concat(documentField);
+
+      const { typeMeta, title, timeFieldName, fieldFormatMap } = indexPattern;
+      if (typeMeta?.aggs) {
+        const aggs = Object.keys(typeMeta.aggs);
+        newFields.forEach((field, index) => {
+          const restrictionsObj: IndexPatternField['aggregationRestrictions'] = {};
+          aggs.forEach((agg) => {
+            const restriction =
+              typeMeta.aggs && typeMeta.aggs[agg] && typeMeta.aggs[agg][field.name];
+            if (restriction) {
+              restrictionsObj[agg] = restriction;
+            }
+          });
+          if (Object.keys(restrictionsObj).length) {
+            newFields[index] = { ...field, aggregationRestrictions: restrictionsObj };
+          }
+        });
+      }
 
-  return resp.savedObjects.reduce(
-    (acc, savedObject) => {
-      const indexPattern = fromSavedObject(
-        savedObject as SimpleSavedObject<SavedIndexPatternAttributes>
-      );
-      acc[indexPattern.id] = indexPattern;
-      return acc;
+      const currentIndexPattern: IndexPattern = {
+        id: indexPattern.id!, // id exists for sure because we got index patterns by id
+        title,
+        timeFieldName,
+        fieldFormatMap,
+        fields: newFields,
+      };
+
+      return {
+        [currentIndexPattern.id]: currentIndexPattern,
+        ...acc,
+      };
     },
     { ...cache }
   );
+
+  return indexPatternsObject;
 }
 
 const getLastUsedIndexPatternId = (
@@ -87,11 +120,13 @@ export async function loadInitialState({
   savedObjectsClient,
   defaultIndexPatternId,
   storage,
+  indexPatternsService,
 }: {
   state?: IndexPatternPersistedState;
   savedObjectsClient: SavedObjectsClient;
   defaultIndexPatternId?: string;
   storage: IStorageWrapper;
+  indexPatternsService: IndexPatternsService;
 }): Promise<IndexPatternPrivateState> {
   const indexPatternRefs = await loadIndexPatternRefs(savedObjectsClient);
   const lastUsedIndexPatternId = getLastUsedIndexPatternId(storage, indexPatternRefs);
@@ -108,7 +143,7 @@ export async function loadInitialState({
   setLastUsedIndexPatternId(storage, currentIndexPatternId);
 
   const indexPatterns = await loadIndexPatterns({
-    savedObjectsClient,
+    indexPatternsService,
     cache: {},
     patterns: requiredPatterns,
   });
@@ -135,22 +170,22 @@ export async function loadInitialState({
 
 export async function changeIndexPattern({
   id,
-  savedObjectsClient,
   state,
   setState,
   onError,
   storage,
+  indexPatternsService,
 }: {
   id: string;
-  savedObjectsClient: SavedObjectsClient;
   state: IndexPatternPrivateState;
   setState: SetState;
   onError: ErrorHandler;
   storage: IStorageWrapper;
+  indexPatternsService: IndexPatternsService;
 }) {
   try {
     const indexPatterns = await loadIndexPatterns({
-      savedObjectsClient,
+      indexPatternsService,
       cache: state.indexPatterns,
       patterns: [id],
     });
@@ -175,25 +210,25 @@ export async function changeIndexPattern({
 export async function changeLayerIndexPattern({
   indexPatternId,
   layerId,
-  savedObjectsClient,
   state,
   setState,
   onError,
   replaceIfPossible,
   storage,
+  indexPatternsService,
 }: {
   indexPatternId: string;
   layerId: string;
-  savedObjectsClient: SavedObjectsClient;
   state: IndexPatternPrivateState;
   setState: SetState;
   onError: ErrorHandler;
   replaceIfPossible?: boolean;
   storage: IStorageWrapper;
+  indexPatternsService: IndexPatternsService;
 }) {
   try {
     const indexPatterns = await loadIndexPatterns({
-      savedObjectsClient,
+      indexPatternsService,
       cache: state.indexPatterns,
       patterns: [indexPatternId],
     });
@@ -319,55 +354,3 @@ function isSingleEmptyLayer(layerMap: IndexPatternPrivateState['layers']) {
   const layers = Object.values(layerMap);
   return layers.length === 1 && layers[0].columnOrder.length === 0;
 }
-
-function fromSavedObject(
-  savedObject: SimpleSavedObject<SavedIndexPatternAttributes>
-): IndexPattern {
-  const { id, attributes, type } = savedObject;
-  const indexPattern = {
-    ...attributes,
-    id,
-    type,
-    title: attributes.title,
-    fields: (JSON.parse(attributes.fields) as IFieldType[])
-      .filter(
-        (field) =>
-          !indexPatternsUtils.isNestedField(field) && (!!field.aggregatable || !!field.scripted)
-      )
-      .concat(documentField) as IndexPatternField[],
-    typeMeta: attributes.typeMeta
-      ? (JSON.parse(attributes.typeMeta) as IndexPatternTypeMeta)
-      : undefined,
-    fieldFormatMap: attributes.fieldFormatMap ? JSON.parse(attributes.fieldFormatMap) : undefined,
-  };
-
-  const { typeMeta } = indexPattern;
-  if (!typeMeta) {
-    return indexPattern;
-  }
-
-  const newFields = [...(indexPattern.fields as IndexPatternField[])];
-
-  if (typeMeta.aggs) {
-    const aggs = Object.keys(typeMeta.aggs);
-    newFields.forEach((field, index) => {
-      const restrictionsObj: IndexPatternField['aggregationRestrictions'] = {};
-      aggs.forEach((agg) => {
-        const restriction = typeMeta.aggs && typeMeta.aggs[agg] && typeMeta.aggs[agg][field.name];
-        if (restriction) {
-          restrictionsObj[agg] = restriction;
-        }
-      });
-      if (Object.keys(restrictionsObj).length) {
-        newFields[index] = { ...field, aggregationRestrictions: restrictionsObj };
-      }
-    });
-  }
-
-  return {
-    id: indexPattern.id,
-    title: indexPattern.title,
-    timeFieldName: indexPattern.timeFieldName || undefined,
-    fields: newFields,
-  };
-}
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/mocks.ts b/x-pack/plugins/lens/public/indexpattern_datasource/mocks.ts
index dff3e61342a6a..869eee67d381d 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/mocks.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/mocks.ts
@@ -14,39 +14,54 @@ export const createMockedIndexPattern = (): IndexPattern => ({
   fields: [
     {
       name: 'timestamp',
+      displayName: 'timestampLabel',
       type: 'date',
       aggregatable: true,
       searchable: true,
     },
     {
       name: 'start_date',
+      displayName: 'start_date',
       type: 'date',
       aggregatable: true,
       searchable: true,
     },
     {
       name: 'bytes',
+      displayName: 'bytes',
       type: 'number',
       aggregatable: true,
       searchable: true,
     },
     {
       name: 'memory',
+      displayName: 'memory',
       type: 'number',
       aggregatable: true,
       searchable: true,
     },
     {
       name: 'source',
+      displayName: 'source',
       type: 'string',
       aggregatable: true,
       searchable: true,
+      esTypes: ['keyword'],
+    },
+    {
+      name: 'unsupported',
+      displayName: 'unsupported',
+      type: 'geo',
+      aggregatable: true,
+      searchable: true,
     },
     {
       name: 'dest',
+      displayName: 'dest',
       type: 'string',
       aggregatable: true,
       searchable: true,
+      esTypes: ['keyword'],
     },
   ],
 });
@@ -58,21 +73,26 @@ export const createMockedRestrictedIndexPattern = () => ({
   fields: [
     {
       name: 'timestamp',
+      displayName: 'timestampLabel',
       type: 'date',
       aggregatable: true,
       searchable: true,
     },
     {
       name: 'bytes',
+      displayName: 'bytes',
       type: 'number',
       aggregatable: true,
       searchable: true,
     },
     {
       name: 'source',
+      displayName: 'source',
       type: 'string',
       aggregatable: true,
       searchable: true,
+      scripted: true,
+      esTypes: ['keyword'],
     },
   ],
   typeMeta: {
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/cardinality.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/cardinality.tsx
index 09faa4bb70447..ad04891b637d4 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/cardinality.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/cardinality.tsx
@@ -51,7 +51,7 @@ export const cardinalityOperation: OperationDefinition<CardinalityIndexPatternCo
   },
   buildColumn({ suggestedPriority, field, previousColumn }) {
     return {
-      label: ofName(field.name),
+      label: ofName(field.displayName),
       dataType: 'number',
       operationType: OPERATION_TYPE,
       scale: SCALE,
@@ -75,7 +75,7 @@ export const cardinalityOperation: OperationDefinition<CardinalityIndexPatternCo
   onFieldChange: (oldColumn, indexPattern, field) => {
     return {
       ...oldColumn,
-      label: ofName(field.name),
+      label: ofName(field.displayName),
       sourceField: field.name,
     };
   },
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/count.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/count.tsx
index 1dcaf78b58a6c..4e081da2c6dc9 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/count.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/count.tsx
@@ -26,7 +26,7 @@ export const countOperation: OperationDefinition<CountIndexPatternColumn> = {
   onFieldChange: (oldColumn, indexPattern, field) => {
     return {
       ...oldColumn,
-      label: field.name,
+      label: field.displayName,
       sourceField: field.name,
     };
   },
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.test.tsx
index ebf8e09e86396..48a6079c58ac0 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.test.tsx
@@ -58,6 +58,7 @@ describe('date_histogram', () => {
           fields: [
             {
               name: 'timestamp',
+              displayName: 'timestampLabel',
               type: 'date',
               esTypes: ['date'],
               aggregatable: true,
@@ -71,6 +72,7 @@ describe('date_histogram', () => {
           fields: [
             {
               name: 'other_timestamp',
+              displayName: 'other_timestamp',
               type: 'date',
               esTypes: ['date'],
               aggregatable: true,
@@ -168,6 +170,7 @@ describe('date_histogram', () => {
         indexPattern: createMockedIndexPattern(),
         field: {
           name: 'timestamp',
+          displayName: 'timestampLabel',
           type: 'date',
           esTypes: ['date'],
           aggregatable: true,
@@ -185,6 +188,7 @@ describe('date_histogram', () => {
         indexPattern: createMockedIndexPattern(),
         field: {
           name: 'start_date',
+          displayName: 'start_date',
           type: 'date',
           esTypes: ['date'],
           aggregatable: true,
@@ -202,6 +206,7 @@ describe('date_histogram', () => {
         indexPattern: createMockedIndexPattern(),
         field: {
           name: 'timestamp',
+          displayName: 'timestampLabel',
           type: 'date',
           esTypes: ['date'],
           aggregatable: true,
@@ -298,6 +303,7 @@ describe('date_histogram', () => {
           fields: [
             {
               name: 'dateField',
+              displayName: 'dateField',
               type: 'date',
               aggregatable: true,
               searchable: true,
@@ -340,6 +346,7 @@ describe('date_histogram', () => {
           fields: [
             {
               name: 'dateField',
+              displayName: 'dateField',
               type: 'date',
               aggregatable: true,
               searchable: true,
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.tsx
index 6e007c12acf42..2236bc576e2b6 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.tsx
@@ -64,7 +64,7 @@ export const dateHistogramOperation: OperationDefinition<DateHistogramIndexPatte
       timeZone = field.aggregationRestrictions.date_histogram.time_zone;
     }
     return {
-      label: field.name,
+      label: field.displayName,
       dataType: 'date',
       operationType: 'date_histogram',
       suggestedPriority,
@@ -115,7 +115,7 @@ export const dateHistogramOperation: OperationDefinition<DateHistogramIndexPatte
   onFieldChange: (oldColumn, indexPattern, field) => {
     return {
       ...oldColumn,
-      label: field.name,
+      label: field.displayName,
       sourceField: field.name,
     };
   },
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/metrics.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/metrics.tsx
index 3ede847a5e257..e6c8a5f6ac852 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/metrics.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/metrics.tsx
@@ -51,7 +51,7 @@ function buildMetricOperation<T extends MetricColumn<string>>({
       );
     },
     buildColumn: ({ suggestedPriority, field, previousColumn }) => ({
-      label: ofName(field.name),
+      label: ofName(field.displayName),
       dataType: 'number',
       operationType: type,
       suggestedPriority,
@@ -64,7 +64,7 @@ function buildMetricOperation<T extends MetricColumn<string>>({
     onFieldChange: (oldColumn, indexPattern, field) => {
       return {
         ...oldColumn,
-        label: ofName(field.name),
+        label: ofName(field.displayName),
         sourceField: field.name,
       };
     },
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.test.tsx
index d7f00e185a5bb..05bb2ef673888 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.test.tsx
@@ -118,6 +118,7 @@ describe('terms', () => {
           aggregatable: true,
           searchable: true,
           name: 'test',
+          displayName: 'test',
           type: 'string',
           aggregationRestrictions: {
             terms: {
@@ -136,6 +137,7 @@ describe('terms', () => {
           aggregatable: true,
           searchable: true,
           name: 'test',
+          displayName: 'test',
           type: 'number',
           aggregationRestrictions: {
             terms: {
@@ -154,6 +156,7 @@ describe('terms', () => {
           aggregatable: true,
           searchable: true,
           name: 'test',
+          displayName: 'test',
           type: 'boolean',
         })
       ).toEqual({
@@ -167,6 +170,7 @@ describe('terms', () => {
           aggregatable: true,
           searchable: true,
           name: 'test',
+          displayName: 'test',
           type: 'ip',
         })
       ).toEqual({
@@ -182,6 +186,7 @@ describe('terms', () => {
           aggregatable: false,
           searchable: true,
           name: 'test',
+          displayName: 'test',
           type: 'string',
         })
       ).toEqual(undefined);
@@ -192,6 +197,7 @@ describe('terms', () => {
           aggregationRestrictions: {},
           searchable: true,
           name: 'test',
+          displayName: 'test',
           type: 'string',
         })
       ).toEqual(undefined);
@@ -209,6 +215,7 @@ describe('terms', () => {
           searchable: true,
           type: 'boolean',
           name: 'test',
+          displayName: 'test',
         },
         columns: {},
       });
@@ -234,6 +241,7 @@ describe('terms', () => {
           searchable: true,
           type: 'boolean',
           name: 'test',
+          displayName: 'test',
         },
       });
       expect(termsColumn.params).toEqual(
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.tsx
index 1ab58cb11c598..ac1ff9da2fea0 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.tsx
@@ -79,7 +79,7 @@ export const termsOperation: OperationDefinition<TermsIndexPatternColumn> = {
       .map(([id]) => id)[0];
 
     return {
-      label: ofName(field.name),
+      label: ofName(field.displayName),
       dataType: field.type as DataType,
       operationType: 'terms',
       scale: 'ordinal',
@@ -115,7 +115,7 @@ export const termsOperation: OperationDefinition<TermsIndexPatternColumn> = {
   onFieldChange: (oldColumn, indexPattern, field) => {
     return {
       ...oldColumn,
-      label: ofName(field.name),
+      label: ofName(field.displayName),
       sourceField: field.name,
     };
   },
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/operations.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/operations.test.ts
index 1a37e5e4cf6a4..3fce2562f528e 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/operations.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/operations.test.ts
@@ -19,18 +19,21 @@ const expectedIndexPatterns = {
     fields: [
       {
         name: 'timestamp',
+        displayName: 'timestamp',
         type: 'date',
         aggregatable: true,
         searchable: true,
       },
       {
         name: 'bytes',
+        displayName: 'bytes',
         type: 'number',
         aggregatable: true,
         searchable: true,
       },
       {
         name: 'source',
+        displayName: 'source',
         type: 'string',
         aggregatable: true,
         searchable: true,
@@ -46,6 +49,7 @@ describe('getOperationTypesForField', () => {
         getOperationTypesForField({
           type: 'string',
           name: 'a',
+          displayName: 'aLabel',
           aggregatable: true,
           searchable: true,
         })
@@ -57,6 +61,7 @@ describe('getOperationTypesForField', () => {
         getOperationTypesForField({
           type: 'number',
           name: 'a',
+          displayName: 'aLabel',
           aggregatable: true,
           searchable: true,
         })
@@ -68,6 +73,7 @@ describe('getOperationTypesForField', () => {
         getOperationTypesForField({
           type: 'date',
           name: 'a',
+          displayName: 'aLabel',
           aggregatable: true,
           searchable: true,
         })
@@ -79,6 +85,7 @@ describe('getOperationTypesForField', () => {
         getOperationTypesForField({
           type: '_source',
           name: 'a',
+          displayName: 'aLabel',
           aggregatable: true,
           searchable: true,
         })
@@ -92,6 +99,7 @@ describe('getOperationTypesForField', () => {
         getOperationTypesForField({
           type: 'string',
           name: 'a',
+          displayName: 'aLabel',
           aggregatable: true,
           searchable: true,
           aggregationRestrictions: {
@@ -108,6 +116,7 @@ describe('getOperationTypesForField', () => {
         getOperationTypesForField({
           type: 'number',
           name: 'a',
+          displayName: 'aLabel',
           aggregatable: true,
           searchable: true,
           aggregationRestrictions: {
@@ -127,6 +136,7 @@ describe('getOperationTypesForField', () => {
         getOperationTypesForField({
           type: 'date',
           name: 'a',
+          displayName: 'aLabel',
           aggregatable: true,
           searchable: true,
           aggregationRestrictions: {
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/state_helpers.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/state_helpers.test.ts
index d778749ef3940..d7fd0d3661c86 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/state_helpers.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/state_helpers.test.ts
@@ -573,12 +573,14 @@ describe('state_helpers', () => {
       fields: [
         {
           name: 'fieldA',
+          displayName: 'fieldA',
           aggregatable: true,
           searchable: true,
           type: 'string',
         },
         {
           name: 'fieldB',
+          displayName: 'fieldB',
           aggregatable: true,
           searchable: true,
           type: 'number',
@@ -590,12 +592,14 @@ describe('state_helpers', () => {
         },
         {
           name: 'fieldC',
+          displayName: 'fieldC',
           aggregatable: false,
           searchable: true,
           type: 'date',
         },
         {
           name: 'fieldD',
+          displayName: 'fieldD',
           aggregatable: true,
           searchable: true,
           type: 'date',
@@ -609,6 +613,7 @@ describe('state_helpers', () => {
         },
         {
           name: 'fieldE',
+          displayName: 'fieldE',
           aggregatable: true,
           searchable: true,
           type: 'date',
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/types.ts b/x-pack/plugins/lens/public/indexpattern_datasource/types.ts
index 2a9b3f452d991..8d0e82b176aa9 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/types.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/types.ts
@@ -23,6 +23,7 @@ export interface IndexPattern {
 
 export interface IndexPatternField {
   name: string;
+  displayName: string;
   type: string;
   esTypes?: string[];
   aggregatable: boolean;

From 506bf6c76455eb2264e5c67c0cfa9ce2c64253f7 Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad.muhammad@elastic.co>
Date: Fri, 21 Aug 2020 12:10:50 +0200
Subject: [PATCH 84/85] [Uptime] Add delay in telemetry test (#75162)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../apis/uptime/rest/telemetry_collectors.ts  | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/x-pack/test/api_integration/apis/uptime/rest/telemetry_collectors.ts b/x-pack/test/api_integration/apis/uptime/rest/telemetry_collectors.ts
index f07ddf68152d3..cf1e7ff9f0716 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/telemetry_collectors.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/telemetry_collectors.ts
@@ -118,9 +118,9 @@ export default function ({ getService }: FtrProviderContext) {
       });
     });
 
-    it('should receive expected results after calling overview logging', async () => {
+    it('should receive 200 status after overview logging', async () => {
       // call overview page
-      const { body: result } = await supertest
+      await supertest
         .post(API_URLS.LOG_PAGE_VIEW)
         .set('kbn-xsrf', 'true')
         .send({
@@ -131,21 +131,6 @@ export default function ({ getService }: FtrProviderContext) {
           autoRefreshEnabled: true,
         })
         .expect(200);
-
-      expect(result).to.eql({
-        overview_page: 1,
-        monitor_page: 1,
-        no_of_unique_monitors: 4,
-        settings_page: 0,
-        monitor_frequency: [120, 0.001, 60, 60],
-        monitor_name_stats: { min_length: 7, max_length: 22, avg_length: 12 },
-        no_of_unique_observer_locations: 3,
-        observer_location_name_stats: { min_length: 2, max_length: 7, avg_length: 4.8 },
-        dateRangeStart: ['now/d', 'now/d'],
-        dateRangeEnd: ['now/d', 'now-30'],
-        autoRefreshEnabled: true,
-        autorefreshInterval: [100, 60],
-      });
     });
   });
 }

From 7376e4ca3dcd0e40b132c55dcd379b1356522599 Mon Sep 17 00:00:00 2001
From: Jean-Louis Leysens <jloleysens@gmail.com>
Date: Fri, 21 Aug 2020 12:20:46 +0200
Subject: [PATCH 85/85] [Console] Get ES Config from core (#75406)

* Server side changes

- removed console_legacy plugin!
- added new es_config endpoint that returns server side es config
  at the moment this is just the first value in hosts
- Slight refactor to how routes are registered to bring them more
  in line with other ES UI plugins

* Client side update

- Updated the client to not get es host from injected metadata.
  Instead use the new endpoint created server side that returns
  this value
- Added a small README.md regarding the hooks lib and need to
  refactor use of jQuery in console
- Write code to init the es host value on the client once at start
  up in a non-blocking way. If this fails we just use the default
  value of http://localhost:9200 as this powers non-essential
  console functionality (i.e., copy as cURL).

* fix type issue and jest tests

* fix another type issue

* simplify proxy assignment in proxy handler mock

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../core_plugins/console_legacy/index.ts      | 49 --------------
 .../core_plugins/console_legacy/package.json  |  4 --
 .../console/common/types/api_responses.ts     | 29 +++++++++
 .../editor/legacy/console_editor/editor.tsx   |  5 +-
 .../contexts/services_context.mock.ts         |  8 ++-
 .../application/contexts/services_context.tsx | 30 +++++----
 .../public/application/hooks/README.md        |  5 ++
 .../console/public/application/index.tsx      | 11 ++--
 .../console/public/application/lib/api.ts     | 39 +++++++++++
 .../public/application/lib/es_host_service.ts | 54 ++++++++++++++++
 .../console/public/application/lib/index.ts   | 21 ++++++
 src/plugins/console/public/plugin.ts          | 10 +--
 src/plugins/console/public/shared_imports.ts  | 22 +++++++
 .../server/__tests__/proxy_route/mocks.ts     | 46 +++++++++----
 .../__tests__/proxy_route/params.test.ts      |  8 ++-
 .../proxy_route/proxy_fallback.test.ts        | 14 ++--
 src/plugins/console/server/plugin.ts          | 54 +++++++++-------
 .../routes/api/console/es_config/index.ts     | 33 ++++++++++
 .../api/console/proxy/create_handler.ts       | 25 ++------
 .../server/routes/api/console/proxy/index.ts  | 16 ++---
 .../api/console/spec_definitions/index.ts     | 14 ++--
 src/plugins/console/server/routes/index.ts    | 50 +++++++++++++++
 .../services/es_legacy_config_service.ts      | 64 +++++++++++++++++++
 src/plugins/console/server/services/index.ts  |  2 +
 src/plugins/console/server/types.ts           |  2 +-
 25 files changed, 451 insertions(+), 164 deletions(-)
 delete mode 100644 src/legacy/core_plugins/console_legacy/index.ts
 delete mode 100644 src/legacy/core_plugins/console_legacy/package.json
 create mode 100644 src/plugins/console/common/types/api_responses.ts
 create mode 100644 src/plugins/console/public/application/hooks/README.md
 create mode 100644 src/plugins/console/public/application/lib/api.ts
 create mode 100644 src/plugins/console/public/application/lib/es_host_service.ts
 create mode 100644 src/plugins/console/public/application/lib/index.ts
 create mode 100644 src/plugins/console/public/shared_imports.ts
 create mode 100644 src/plugins/console/server/routes/api/console/es_config/index.ts
 create mode 100644 src/plugins/console/server/routes/index.ts
 create mode 100644 src/plugins/console/server/services/es_legacy_config_service.ts

diff --git a/src/legacy/core_plugins/console_legacy/index.ts b/src/legacy/core_plugins/console_legacy/index.ts
deleted file mode 100644
index 82e00a99c6cfd..0000000000000
--- a/src/legacy/core_plugins/console_legacy/index.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { first } from 'rxjs/operators';
-import { head } from 'lodash';
-import url from 'url';
-
-// TODO: Remove this hack once we can get the ES config we need for Console proxy a better way.
-let _legacyEsConfig: any;
-export const readLegacyEsConfig = () => {
-  return _legacyEsConfig;
-};
-
-// eslint-disable-next-line import/no-default-export
-export default function (kibana: any) {
-  return new kibana.Plugin({
-    id: 'console_legacy',
-
-    async init(server: any) {
-      _legacyEsConfig = await server.newPlatform.__internals.elasticsearch.legacy.config$
-        .pipe(first())
-        .toPromise();
-    },
-
-    uiExports: {
-      injectDefaultVars: () => ({
-        elasticsearchUrl: url.format(
-          Object.assign(url.parse(head(_legacyEsConfig.hosts) as any), { auth: false })
-        ),
-      }),
-    },
-  } as any);
-}
diff --git a/src/legacy/core_plugins/console_legacy/package.json b/src/legacy/core_plugins/console_legacy/package.json
deleted file mode 100644
index b78807daed959..0000000000000
--- a/src/legacy/core_plugins/console_legacy/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "console_legacy",
-  "version": "kibana"
-}
diff --git a/src/plugins/console/common/types/api_responses.ts b/src/plugins/console/common/types/api_responses.ts
new file mode 100644
index 0000000000000..1c8166bbe27f2
--- /dev/null
+++ b/src/plugins/console/common/types/api_responses.ts
@@ -0,0 +1,29 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export interface EsConfigApiResponse {
+  /**
+   * This is the first host in the hosts array that Kibana is configured to use
+   * to communicate with ES.
+   *
+   * At the moment this is used to power the copy as cURL functionality in Console
+   * to complete the host portion of the URL.
+   */
+  host?: string;
+}
diff --git a/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.tsx b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.tsx
index 880069d8ebc7a..fc88b31711b23 100644
--- a/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.tsx
+++ b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.tsx
@@ -67,9 +67,8 @@ const inputId = 'ConAppInputTextarea';
 
 function EditorUI({ initialTextValue }: EditorProps) {
   const {
-    services: { history, notifications, settings: settingsService },
+    services: { history, notifications, settings: settingsService, esHostService },
     docLinkVersion,
-    elasticsearchUrl,
   } = useServicesContext();
 
   const { settings } = useEditorReadContext();
@@ -232,7 +231,7 @@ function EditorUI({ initialTextValue }: EditorProps) {
           <EuiFlexItem>
             <ConsoleMenu
               getCurl={() => {
-                return editorInstanceRef.current!.getRequestsAsCURL(elasticsearchUrl);
+                return editorInstanceRef.current!.getRequestsAsCURL(esHostService.getHost());
               }}
               getDocumentation={() => {
                 return getDocumentation(editorInstanceRef.current!, docLinkVersion);
diff --git a/src/plugins/console/public/application/contexts/services_context.mock.ts b/src/plugins/console/public/application/contexts/services_context.mock.ts
index ae8d15a890782..ba982d3f50cfb 100644
--- a/src/plugins/console/public/application/contexts/services_context.mock.ts
+++ b/src/plugins/console/public/application/contexts/services_context.mock.ts
@@ -17,21 +17,27 @@
  * under the License.
  */
 import { notificationServiceMock } from '../../../../../core/public/mocks';
+import { httpServiceMock } from '../../../../../core/public/mocks';
+
 import { HistoryMock } from '../../services/history.mock';
 import { SettingsMock } from '../../services/settings.mock';
 import { StorageMock } from '../../services/storage.mock';
+import { createApi, createEsHostService } from '../lib';
 
 import { ContextValue } from './services_context';
 
 export const serviceContextMock = {
   create: (): ContextValue => {
     const storage = new StorageMock({} as any, 'test');
+    const http = httpServiceMock.createSetupContract();
+    const api = createApi({ http });
+    const esHostService = createEsHostService({ api });
     (storage.keys as jest.Mock).mockImplementation(() => []);
     return {
-      elasticsearchUrl: 'test',
       services: {
         trackUiMetric: { count: () => {}, load: () => {} },
         storage,
+        esHostService,
         settings: new SettingsMock(storage),
         history: new HistoryMock(storage),
         notifications: notificationServiceMock.createSetupContract(),
diff --git a/src/plugins/console/public/application/contexts/services_context.tsx b/src/plugins/console/public/application/contexts/services_context.tsx
index 3d4ac3291c5ac..e2f01a152b27b 100644
--- a/src/plugins/console/public/application/contexts/services_context.tsx
+++ b/src/plugins/console/public/application/contexts/services_context.tsx
@@ -17,22 +17,25 @@
  * under the License.
  */
 
-import React, { createContext, useContext } from 'react';
+import React, { createContext, useContext, useEffect } from 'react';
 import { NotificationsSetup } from 'kibana/public';
-import { History, Storage, Settings } from '../../services';
+import { History, Settings, Storage } from '../../services';
 import { ObjectStorageClient } from '../../../common/types';
 import { MetricsTracker } from '../../types';
+import { EsHostService } from '../lib';
+
+interface ContextServices {
+  history: History;
+  storage: Storage;
+  settings: Settings;
+  notifications: NotificationsSetup;
+  objectStorageClient: ObjectStorageClient;
+  trackUiMetric: MetricsTracker;
+  esHostService: EsHostService;
+}
 
 export interface ContextValue {
-  services: {
-    history: History;
-    storage: Storage;
-    settings: Settings;
-    notifications: NotificationsSetup;
-    objectStorageClient: ObjectStorageClient;
-    trackUiMetric: MetricsTracker;
-  };
-  elasticsearchUrl: string;
+  services: ContextServices;
   docLinkVersion: string;
 }
 
@@ -44,6 +47,11 @@ interface ContextProps {
 const ServicesContext = createContext<ContextValue>(null as any);
 
 export function ServicesContextProvider({ children, value }: ContextProps) {
+  useEffect(() => {
+    // Fire and forget, we attempt to init the host service once.
+    value.services.esHostService.init();
+  }, [value.services.esHostService]);
+
   return <ServicesContext.Provider value={value}>{children}</ServicesContext.Provider>;
 }
 
diff --git a/src/plugins/console/public/application/hooks/README.md b/src/plugins/console/public/application/hooks/README.md
new file mode 100644
index 0000000000000..10057193560e9
--- /dev/null
+++ b/src/plugins/console/public/application/hooks/README.md
@@ -0,0 +1,5 @@
+## Notes
+
+* Do not add any code directly to this directory. This code should be moved to the neighbouring `lib` directory to be in line with future ES UI plugin patterns.
+
+* The `es.send` method uses $.ajax under the hood and needs to be refactored to use the new platform-provided http client.
\ No newline at end of file
diff --git a/src/plugins/console/public/application/index.tsx b/src/plugins/console/public/application/index.tsx
index 051eaea27a7de..0a5a502eb5062 100644
--- a/src/plugins/console/public/application/index.tsx
+++ b/src/plugins/console/public/application/index.tsx
@@ -19,19 +19,20 @@
 
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { NotificationsSetup } from 'src/core/public';
+import { HttpSetup, NotificationsSetup } from 'src/core/public';
 import { ServicesContextProvider, EditorContextProvider, RequestContextProvider } from './contexts';
 import { Main } from './containers';
 import { createStorage, createHistory, createSettings } from '../services';
 import * as localStorageObjectClient from '../lib/local_storage_object_client';
 import { createUsageTracker } from '../services/tracker';
 import { UsageCollectionSetup } from '../../../usage_collection/public';
+import { createApi, createEsHostService } from './lib';
 
 export interface BootDependencies {
+  http: HttpSetup;
   docLinkVersion: string;
   I18nContext: any;
   notifications: NotificationsSetup;
-  elasticsearchUrl: string;
   usageCollection?: UsageCollectionSetup;
   element: HTMLElement;
 }
@@ -40,9 +41,9 @@ export function renderApp({
   I18nContext,
   notifications,
   docLinkVersion,
-  elasticsearchUrl,
   usageCollection,
   element,
+  http,
 }: BootDependencies) {
   const trackUiMetric = createUsageTracker(usageCollection);
   trackUiMetric.load('opened_app');
@@ -54,14 +55,16 @@ export function renderApp({
   const history = createHistory({ storage });
   const settings = createSettings({ storage });
   const objectStorageClient = localStorageObjectClient.create(storage);
+  const api = createApi({ http });
+  const esHostService = createEsHostService({ api });
 
   render(
     <I18nContext>
       <ServicesContextProvider
         value={{
-          elasticsearchUrl,
           docLinkVersion,
           services: {
+            esHostService,
             storage,
             history,
             settings,
diff --git a/src/plugins/console/public/application/lib/api.ts b/src/plugins/console/public/application/lib/api.ts
new file mode 100644
index 0000000000000..fd807e8dd9239
--- /dev/null
+++ b/src/plugins/console/public/application/lib/api.ts
@@ -0,0 +1,39 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { HttpSetup } from 'kibana/public';
+import { EsConfigApiResponse } from '../../../common/types/api_responses';
+import { sendRequest } from '../../shared_imports';
+
+interface Dependencies {
+  http: HttpSetup;
+}
+
+export type Api = ReturnType<typeof createApi>;
+
+export const createApi = ({ http }: Dependencies) => {
+  return {
+    getEsConfig: () => {
+      return sendRequest<EsConfigApiResponse>(http, {
+        path: '/api/console/es_config',
+        method: 'get',
+      });
+    },
+  };
+};
diff --git a/src/plugins/console/public/application/lib/es_host_service.ts b/src/plugins/console/public/application/lib/es_host_service.ts
new file mode 100644
index 0000000000000..887f270a24687
--- /dev/null
+++ b/src/plugins/console/public/application/lib/es_host_service.ts
@@ -0,0 +1,54 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Api } from './api';
+
+/**
+ * Very simple state for holding the current ES host.
+ *
+ * This is used to power the copy as cURL functionality.
+ */
+export class EsHostService {
+  private host = 'http://localhost:9200';
+
+  constructor(private readonly api: Api) {}
+
+  private setHost(host: string): void {
+    this.host = host;
+  }
+
+  /**
+   * Initialize the host value based on the value set on the server.
+   *
+   * This call is necessary because this value can only be retrieved at
+   * runtime.
+   */
+  public async init() {
+    const { data } = await this.api.getEsConfig();
+    if (data && data.host) {
+      this.setHost(data.host);
+    }
+  }
+
+  public getHost(): string {
+    return this.host;
+  }
+}
+
+export const createEsHostService = ({ api }: { api: Api }) => new EsHostService(api);
diff --git a/src/plugins/console/public/application/lib/index.ts b/src/plugins/console/public/application/lib/index.ts
new file mode 100644
index 0000000000000..1ba99cc607269
--- /dev/null
+++ b/src/plugins/console/public/application/lib/index.ts
@@ -0,0 +1,21 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { createApi, Api } from './api';
+export { createEsHostService, EsHostService } from './es_host_service';
diff --git a/src/plugins/console/public/plugin.ts b/src/plugins/console/public/plugin.ts
index 851dc7a063d7b..03b65a8bd145c 100644
--- a/src/plugins/console/public/plugin.ts
+++ b/src/plugins/console/public/plugin.ts
@@ -25,7 +25,7 @@ import { AppSetupUIPluginDependencies } from './types';
 
 export class ConsoleUIPlugin implements Plugin<void, void, AppSetupUIPluginDependencies> {
   public setup(
-    { notifications, getStartServices }: CoreSetup,
+    { notifications, getStartServices, http }: CoreSetup,
     { devTools, home, usageCollection }: AppSetupUIPluginDependencies
   ) {
     home.featureCatalogue.register({
@@ -53,23 +53,17 @@ export class ConsoleUIPlugin implements Plugin<void, void, AppSetupUIPluginDepen
         const [core] = await getStartServices();
 
         const {
-          injectedMetadata,
           i18n: { Context: I18nContext },
           docLinks: { DOC_LINK_VERSION },
         } = core;
 
         const { renderApp } = await import('./application');
 
-        const elasticsearchUrl = injectedMetadata.getInjectedVar(
-          'elasticsearchUrl',
-          'http://localhost:9200'
-        ) as string;
-
         return renderApp({
+          http,
           docLinkVersion: DOC_LINK_VERSION,
           I18nContext,
           notifications,
-          elasticsearchUrl,
           usageCollection,
           element,
         });
diff --git a/src/plugins/console/public/shared_imports.ts b/src/plugins/console/public/shared_imports.ts
new file mode 100644
index 0000000000000..aa64091903fb7
--- /dev/null
+++ b/src/plugins/console/public/shared_imports.ts
@@ -0,0 +1,22 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { sendRequest } from '../../es_ui_shared/public';
+
+export { sendRequest };
diff --git a/src/plugins/console/server/__tests__/proxy_route/mocks.ts b/src/plugins/console/server/__tests__/proxy_route/mocks.ts
index 74bd43fe52146..411bea1a48e8a 100644
--- a/src/plugins/console/server/__tests__/proxy_route/mocks.ts
+++ b/src/plugins/console/server/__tests__/proxy_route/mocks.ts
@@ -23,22 +23,44 @@ jest.mock('../../lib/proxy_request', () => ({
 
 import { duration } from 'moment';
 import { ProxyConfigCollection } from '../../lib';
-import { CreateHandlerDependencies } from '../../routes/api/console/proxy/create_handler';
-import { coreMock } from '../../../../../core/server/mocks';
+import { RouteDependencies, ProxyDependencies } from '../../routes';
+import { EsLegacyConfigService, SpecDefinitionsService } from '../../services';
+import { coreMock, httpServiceMock } from '../../../../../core/server/mocks';
 
-export const getProxyRouteHandlerDeps = ({
-  proxyConfigCollection = new ProxyConfigCollection([]),
-  pathFilters = [/.*/],
-  readLegacyESConfig = () => ({
+const defaultProxyValue = Object.freeze({
+  readLegacyESConfig: async () => ({
     requestTimeout: duration(30000),
     customHeaders: {},
     requestHeadersWhitelist: [],
     hosts: ['http://localhost:9200'],
   }),
-  log = coreMock.createPluginInitializerContext().logger.get(),
-}: Partial<CreateHandlerDependencies>): CreateHandlerDependencies => ({
-  proxyConfigCollection,
-  pathFilters,
-  readLegacyESConfig,
-  log,
+  pathFilters: [/.*/],
+  proxyConfigCollection: new ProxyConfigCollection([]),
 });
+
+interface MockDepsArgument extends Partial<Omit<RouteDependencies, 'proxy'>> {
+  proxy?: Partial<ProxyDependencies>;
+}
+
+export const getProxyRouteHandlerDeps = ({
+  proxy,
+  log = coreMock.createPluginInitializerContext().logger.get(),
+  router = httpServiceMock.createSetupContract().createRouter(),
+}: MockDepsArgument): RouteDependencies => {
+  const services: RouteDependencies['services'] = {
+    esLegacyConfigService: new EsLegacyConfigService(),
+    specDefinitionService: new SpecDefinitionsService(),
+  };
+
+  return {
+    services,
+    router,
+    proxy: proxy
+      ? {
+          ...defaultProxyValue,
+          ...proxy,
+        }
+      : defaultProxyValue,
+    log,
+  };
+};
diff --git a/src/plugins/console/server/__tests__/proxy_route/params.test.ts b/src/plugins/console/server/__tests__/proxy_route/params.test.ts
index 1ab9c3ae789cc..e1c5295f6d30f 100644
--- a/src/plugins/console/server/__tests__/proxy_route/params.test.ts
+++ b/src/plugins/console/server/__tests__/proxy_route/params.test.ts
@@ -36,7 +36,7 @@ describe('Console Proxy Route', () => {
       describe('no matches', () => {
         it('rejects with 403', async () => {
           handler = createHandler(
-            getProxyRouteHandlerDeps({ pathFilters: [/^\/foo\//, /^\/bar\//] })
+            getProxyRouteHandlerDeps({ proxy: { pathFilters: [/^\/foo\//, /^\/bar\//] } })
           );
 
           const { status } = await handler(
@@ -51,7 +51,7 @@ describe('Console Proxy Route', () => {
       describe('one match', () => {
         it('allows the request', async () => {
           handler = createHandler(
-            getProxyRouteHandlerDeps({ pathFilters: [/^\/foo\//, /^\/bar\//] })
+            getProxyRouteHandlerDeps({ proxy: { pathFilters: [/^\/foo\//, /^\/bar\//] } })
           );
 
           (requestModule.proxyRequest as jest.Mock).mockResolvedValue(createResponseStub('foo'));
@@ -68,7 +68,9 @@ describe('Console Proxy Route', () => {
       });
       describe('all match', () => {
         it('allows the request', async () => {
-          handler = createHandler(getProxyRouteHandlerDeps({ pathFilters: [/^\/foo\//] }));
+          handler = createHandler(
+            getProxyRouteHandlerDeps({ proxy: { pathFilters: [/^\/foo\//] } })
+          );
 
           (requestModule.proxyRequest as jest.Mock).mockResolvedValue(createResponseStub('foo'));
 
diff --git a/src/plugins/console/server/__tests__/proxy_route/proxy_fallback.test.ts b/src/plugins/console/server/__tests__/proxy_route/proxy_fallback.test.ts
index b226bad11a01a..fc5233d0f833d 100644
--- a/src/plugins/console/server/__tests__/proxy_route/proxy_fallback.test.ts
+++ b/src/plugins/console/server/__tests__/proxy_route/proxy_fallback.test.ts
@@ -38,12 +38,14 @@ describe('Console Proxy Route', () => {
 
       const handler = createHandler(
         getProxyRouteHandlerDeps({
-          readLegacyESConfig: () => ({
-            requestTimeout: duration(30000),
-            customHeaders: {},
-            requestHeadersWhitelist: [],
-            hosts: ['http://localhost:9201', 'http://localhost:9202', 'http://localhost:9203'],
-          }),
+          proxy: {
+            readLegacyESConfig: async () => ({
+              requestTimeout: duration(30000),
+              customHeaders: {},
+              requestHeadersWhitelist: [],
+              hosts: ['http://localhost:9201', 'http://localhost:9202', 'http://localhost:9203'],
+            }),
+          },
         })
       );
 
diff --git a/src/plugins/console/server/plugin.ts b/src/plugins/console/server/plugin.ts
index eedd1541e8898..a76a35f8146c9 100644
--- a/src/plugins/console/server/plugin.ts
+++ b/src/plugins/console/server/plugin.ts
@@ -19,13 +19,12 @@
 import { first } from 'rxjs/operators';
 import { CoreSetup, Logger, Plugin, PluginInitializerContext } from 'kibana/server';
 
-import { readLegacyEsConfig } from '../../../legacy/core_plugins/console_legacy';
-
 import { ProxyConfigCollection } from './lib';
-import { SpecDefinitionsService } from './services';
+import { SpecDefinitionsService, EsLegacyConfigService } from './services';
 import { ConfigType } from './config';
-import { registerProxyRoute } from './routes/api/console/proxy';
-import { registerSpecDefinitionsRoute } from './routes/api/console/spec_definitions';
+
+import { registerRoutes } from './routes';
+
 import { ESConfigForProxy, ConsoleSetup, ConsoleStart } from './types';
 
 export class ConsoleServerPlugin implements Plugin<ConsoleSetup, ConsoleStart> {
@@ -33,11 +32,13 @@ export class ConsoleServerPlugin implements Plugin<ConsoleSetup, ConsoleStart> {
 
   specDefinitionsService = new SpecDefinitionsService();
 
+  esLegacyConfigService = new EsLegacyConfigService();
+
   constructor(private readonly ctx: PluginInitializerContext<ConfigType>) {
     this.log = this.ctx.logger.get();
   }
 
-  async setup({ http, capabilities, getStartServices }: CoreSetup) {
+  async setup({ http, capabilities, getStartServices, elasticsearch }: CoreSetup) {
     capabilities.registerProvider(() => ({
       dev_tools: {
         show: true,
@@ -46,30 +47,31 @@ export class ConsoleServerPlugin implements Plugin<ConsoleSetup, ConsoleStart> {
     }));
 
     const config = await this.ctx.config.create().pipe(first()).toPromise();
-
-    const { elasticsearch } = await this.ctx.config.legacy.globalConfig$.pipe(first()).toPromise();
-
+    const globalConfig = await this.ctx.config.legacy.globalConfig$.pipe(first()).toPromise();
     const proxyPathFilters = config.proxyFilter.map((str: string) => new RegExp(str));
 
+    this.esLegacyConfigService.setup(elasticsearch.legacy.config$);
+
     const router = http.createRouter();
 
-    registerProxyRoute({
+    registerRoutes({
+      router,
       log: this.log,
-      proxyConfigCollection: new ProxyConfigCollection(config.proxyConfig),
-      readLegacyESConfig: (): ESConfigForProxy => {
-        const legacyConfig = readLegacyEsConfig();
-        return {
-          ...elasticsearch,
-          ...legacyConfig,
-        };
+      services: {
+        esLegacyConfigService: this.esLegacyConfigService,
+        specDefinitionService: this.specDefinitionsService,
+      },
+      proxy: {
+        proxyConfigCollection: new ProxyConfigCollection(config.proxyConfig),
+        readLegacyESConfig: async (): Promise<ESConfigForProxy> => {
+          const legacyConfig = await this.esLegacyConfigService.readConfig();
+          return {
+            ...globalConfig.elasticsearch,
+            ...legacyConfig,
+          };
+        },
+        pathFilters: proxyPathFilters,
       },
-      pathFilters: proxyPathFilters,
-      router,
-    });
-
-    registerSpecDefinitionsRoute({
-      router,
-      services: { specDefinitions: this.specDefinitionsService },
     });
 
     return {
@@ -82,4 +84,8 @@ export class ConsoleServerPlugin implements Plugin<ConsoleSetup, ConsoleStart> {
       ...this.specDefinitionsService.start(),
     };
   }
+
+  stop() {
+    this.esLegacyConfigService.stop();
+  }
 }
diff --git a/src/plugins/console/server/routes/api/console/es_config/index.ts b/src/plugins/console/server/routes/api/console/es_config/index.ts
new file mode 100644
index 0000000000000..a115a6b32ad01
--- /dev/null
+++ b/src/plugins/console/server/routes/api/console/es_config/index.ts
@@ -0,0 +1,33 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { EsConfigApiResponse } from '../../../../../common/types/api_responses';
+import { RouteDependencies } from '../../../';
+
+export const registerEsConfigRoute = ({ router, services }: RouteDependencies): void => {
+  router.get({ path: '/api/console/es_config', validate: false }, async (ctx, req, res) => {
+    const {
+      hosts: [host],
+    } = await services.esLegacyConfigService.readConfig();
+
+    const body: EsConfigApiResponse = { host };
+
+    return res.ok({ body });
+  });
+};
diff --git a/src/plugins/console/server/routes/api/console/proxy/create_handler.ts b/src/plugins/console/server/routes/api/console/proxy/create_handler.ts
index a16fb1dadfbcf..f6d9bcb77ddda 100644
--- a/src/plugins/console/server/routes/api/console/proxy/create_handler.ts
+++ b/src/plugins/console/server/routes/api/console/proxy/create_handler.ts
@@ -21,7 +21,7 @@ import { Agent, IncomingMessage } from 'http';
 import * as url from 'url';
 import { pick, trimStart, trimEnd } from 'lodash';
 
-import { KibanaRequest, Logger, RequestHandler } from 'kibana/server';
+import { KibanaRequest, RequestHandler } from 'kibana/server';
 
 import { ESConfigForProxy } from '../../../../types';
 import {
@@ -31,19 +31,14 @@ import {
   setHeaders,
 } from '../../../../lib';
 
-import { Body, Query } from './validation_config';
-
 // TODO: find a better way to get information from the request like remoteAddress and remotePort
 // for forwarding.
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { ensureRawRequest } from '../../../../../../../core/server/http/router';
 
-export interface CreateHandlerDependencies {
-  log: Logger;
-  readLegacyESConfig: () => ESConfigForProxy;
-  pathFilters: RegExp[];
-  proxyConfigCollection: ProxyConfigCollection;
-}
+import { RouteDependencies } from '../../../';
+
+import { Body, Query } from './validation_config';
 
 function toURL(base: string, path: string) {
   const urlResult = new url.URL(`${trimEnd(base, '/')}/${trimStart(path, '/')}`);
@@ -120,14 +115,8 @@ function getProxyHeaders(req: KibanaRequest) {
 
 export const createHandler = ({
   log,
-  readLegacyESConfig,
-  pathFilters,
-  proxyConfigCollection,
-}: CreateHandlerDependencies): RequestHandler<unknown, Query, Body> => async (
-  ctx,
-  request,
-  response
-) => {
+  proxy: { readLegacyESConfig, pathFilters, proxyConfigCollection },
+}: RouteDependencies): RequestHandler<unknown, Query, Body> => async (ctx, request, response) => {
   const { body, query } = request;
   const { path, method } = query;
 
@@ -140,7 +129,7 @@ export const createHandler = ({
     });
   }
 
-  const legacyConfig = readLegacyESConfig();
+  const legacyConfig = await readLegacyESConfig();
   const { hosts } = legacyConfig;
   let esIncomingMessage: IncomingMessage;
 
diff --git a/src/plugins/console/server/routes/api/console/proxy/index.ts b/src/plugins/console/server/routes/api/console/proxy/index.ts
index 5f7df1d7cf66b..5841671c340bd 100644
--- a/src/plugins/console/server/routes/api/console/proxy/index.ts
+++ b/src/plugins/console/server/routes/api/console/proxy/index.ts
@@ -17,17 +17,13 @@
  * under the License.
  */
 
-import { IRouter } from 'kibana/server';
 import { routeValidationConfig } from './validation_config';
-import { createHandler, CreateHandlerDependencies } from './create_handler';
+import { createHandler } from './create_handler';
 
-export const registerProxyRoute = (
-  deps: {
-    router: IRouter;
-  } & CreateHandlerDependencies
-) => {
-  const { router, ...handlerDeps } = deps;
-  router.post(
+import { RouteDependencies } from '../../../';
+
+export const registerProxyRoute = (deps: RouteDependencies) => {
+  deps.router.post(
     {
       path: '/api/console/proxy',
       options: {
@@ -39,6 +35,6 @@ export const registerProxyRoute = (
       },
       validate: routeValidationConfig,
     },
-    createHandler(handlerDeps)
+    createHandler(deps)
   );
 };
diff --git a/src/plugins/console/server/routes/api/console/spec_definitions/index.ts b/src/plugins/console/server/routes/api/console/spec_definitions/index.ts
index 5c7e679cd0d35..a179c36364e26 100644
--- a/src/plugins/console/server/routes/api/console/spec_definitions/index.ts
+++ b/src/plugins/console/server/routes/api/console/spec_definitions/index.ts
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { IRouter, RequestHandler } from 'kibana/server';
-import { SpecDefinitionsService } from '../../../../services';
+import { RequestHandler } from 'kibana/server';
+import { RouteDependencies } from '../../../';
 
 interface SpecDefinitionsRouteResponse {
   es: {
@@ -27,16 +27,10 @@ interface SpecDefinitionsRouteResponse {
   };
 }
 
-export const registerSpecDefinitionsRoute = ({
-  router,
-  services,
-}: {
-  router: IRouter;
-  services: { specDefinitions: SpecDefinitionsService };
-}) => {
+export const registerSpecDefinitionsRoute = ({ router, services }: RouteDependencies) => {
   const handler: RequestHandler = async (ctx, request, response) => {
     const specResponse: SpecDefinitionsRouteResponse = {
-      es: services.specDefinitions.asJson(),
+      es: services.specDefinitionService.asJson(),
     };
 
     return response.ok({
diff --git a/src/plugins/console/server/routes/index.ts b/src/plugins/console/server/routes/index.ts
new file mode 100644
index 0000000000000..cbd1cef7b36e3
--- /dev/null
+++ b/src/plugins/console/server/routes/index.ts
@@ -0,0 +1,50 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { IRouter, Logger } from 'kibana/server';
+
+import { EsLegacyConfigService, SpecDefinitionsService } from '../services';
+import { ESConfigForProxy } from '../types';
+import { ProxyConfigCollection } from '../lib';
+
+import { registerEsConfigRoute } from './api/console/es_config';
+import { registerProxyRoute } from './api/console/proxy';
+import { registerSpecDefinitionsRoute } from './api/console/spec_definitions';
+
+export interface ProxyDependencies {
+  readLegacyESConfig: () => Promise<ESConfigForProxy>;
+  pathFilters: RegExp[];
+  proxyConfigCollection: ProxyConfigCollection;
+}
+
+export interface RouteDependencies {
+  router: IRouter;
+  log: Logger;
+  proxy: ProxyDependencies;
+  services: {
+    esLegacyConfigService: EsLegacyConfigService;
+    specDefinitionService: SpecDefinitionsService;
+  };
+}
+
+export const registerRoutes = (dependencies: RouteDependencies) => {
+  registerEsConfigRoute(dependencies);
+  registerProxyRoute(dependencies);
+  registerSpecDefinitionsRoute(dependencies);
+};
diff --git a/src/plugins/console/server/services/es_legacy_config_service.ts b/src/plugins/console/server/services/es_legacy_config_service.ts
new file mode 100644
index 0000000000000..37928839b1846
--- /dev/null
+++ b/src/plugins/console/server/services/es_legacy_config_service.ts
@@ -0,0 +1,64 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Observable, Subscription } from 'rxjs';
+import { first } from 'rxjs/operators';
+import { ElasticsearchConfig } from 'kibana/server';
+
+export class EsLegacyConfigService {
+  /**
+   * The elasticsearch config value at a given point in time.
+   */
+  private config?: ElasticsearchConfig;
+
+  /**
+   * An observable that emits elasticsearch config.
+   */
+  private config$?: Observable<ElasticsearchConfig>;
+
+  /**
+   * A reference to the subscription to the elasticsearch observable
+   */
+  private configSub?: Subscription;
+
+  setup(config$: Observable<ElasticsearchConfig>) {
+    this.config$ = config$;
+    this.configSub = this.config$.subscribe((config) => {
+      this.config = config;
+    });
+  }
+
+  stop() {
+    if (this.configSub) {
+      this.configSub.unsubscribe();
+    }
+  }
+
+  async readConfig(): Promise<ElasticsearchConfig> {
+    if (!this.config$) {
+      throw new Error('Could not read elasticsearch config, this service has not been setup!');
+    }
+
+    if (!this.config) {
+      return this.config$.pipe(first()).toPromise();
+    }
+
+    return this.config;
+  }
+}
diff --git a/src/plugins/console/server/services/index.ts b/src/plugins/console/server/services/index.ts
index c8dfeccd23070..c9d0b8b858150 100644
--- a/src/plugins/console/server/services/index.ts
+++ b/src/plugins/console/server/services/index.ts
@@ -17,4 +17,6 @@
  * under the License.
  */
 
+export { EsLegacyConfigService } from './es_legacy_config_service';
+
 export { SpecDefinitionsService } from './spec_definitions_service';
diff --git a/src/plugins/console/server/types.ts b/src/plugins/console/server/types.ts
index 4f026555ada7b..5dc8322c23ea9 100644
--- a/src/plugins/console/server/types.ts
+++ b/src/plugins/console/server/types.ts
@@ -38,8 +38,8 @@ export interface ESConfigForProxy {
   requestTimeout: Duration;
   ssl?: {
     verificationMode: 'none' | 'certificate' | 'full';
-    certificateAuthorities: string[] | string;
     alwaysPresentCertificate: boolean;
+    certificateAuthorities?: string[];
     certificate?: string;
     key?: string;
     keyPassphrase?: string;